Merge branch 'master' into develop

Author: memsharded

_elastic/indexer.py

@@ -6,6 +6,7 @@
 from elasticsearch import Elasticsearch, RequestsHttpConnection
 from elasticsearch.helpers import bulk
 from requests_aws4auth import AWS4Auth
+from bs4 import BeautifulSoup
 
 
 def build_documents(version, build_folder):
@@ -22,8 +23,15 @@ def build_documents(version, build_folder):
                 slug = data["current_page_name"] + ".html"
                 parent_title = data["parents"][0]["title"] if data["parents"] else ""
                 html = data["body"]
+                soup = BeautifulSoup(html, 'html.parser')
+                h1_elements = [a.get_text().replace("¶", "") for a in soup.find_all("h1")]
+                h2_elements = [a.get_text().replace("¶", "") for a in soup.find_all("h2")]
+                h3_elements = [a.get_text().replace("¶", "") for a in soup.find_all("h3")]
+                plain_text = soup.get_text()
+
                 element = {"version": version, "title": title, "parent_title": parent_title,
-                           "slug": slug, "html": html}
+                           "slug": slug, "html": html, "h1": h1_elements, "h2": h2_elements,
+                           "h3": h3_elements, "plain": plain_text}
                 yield element
 
 
@@ -74,7 +82,11 @@ def create_index(self):
           "title" : { "type" : "text" },
           "parent_title" : { "type" : "text" },
           "version": {"type": "text"},
-          "url" : { "type" : "text" }
+          "url" : { "type" : "text" },
+          "h1" : { "type" : "text" },
+          "h2" : { "type" : "text" },
+          "h3" : { "type" : "text" },
+          "plain" : { "type" : "text" }
         }
       }
     }

_themes/conan/static/css/search.css

@@ -69,7 +69,7 @@ input{
     margin-bottom: 2px;
     margin-left: 40px;
     width: 20%;
-    display: inline-block;
+    display: inline-table;
     border-right: 1px solid #CCCCCC;
     text-align: right;
     padding-right: 20px;
@@ -83,10 +83,10 @@ input{
     font-size: 0.9em;
     margin-bottom: 2px;
     margin-left: 20px;
-    width: 65%;
-    display: inline-block;
+    display: inline-table;
     color: #222222;
     vertical-align: top;
+    width: 60%;
 }
 
 #search{

integrations/build_system/cmake/cmake_find_package_multi_generator.rst

@@ -27,7 +27,13 @@ Usage
     $ conan install . -g cmake_find_package_multi -s build_type=Release
 
 These commands will generate several files for each dependency in your graph, including a ``XXXConfig.cmake`` that can be located
-by the CMake `find_package(XXX) <https://cmake.org/cmake/help/v3.0/command/find_package.html>`_ command, with XXX as the package name.
+by the CMake `find_package(XXX CONFIG) <https://cmake.org/cmake/help/v3.0/command/find_package.html>`_ command, with XXX as the package name.
+
+.. important::
+
+    Add the ``CONFIG`` option to ``find_package`` so that *module mode* is explicitly skipped by CMake. This helps to 
+    solve issues when there is for example a ``FindXXXX.cmake`` file in CMake's default modules directory that could be loaded instead of the 
+    ``XXXXConfig.cmake`` generated by Conan.
 
 The name of the files follows the pattern ``<package_name>Config.cmake``. So for the ``zlib/1.2.11@conan/stable`` package,
 a ``zlibConfig.cmake`` file will be generated.

reference/generators/cmake_find_package_multi.rst

@@ -59,7 +59,13 @@ is declared like this:
 
 The targets are also transitive. So, if your project depends on a packages ``A`` and ``B``, and at the same time
 ``A`` depends on ``C``, the ``A`` target will contain automatically the properties of the ``C`` dependency, so
-in your `CMakeLists.txt` file you only need to ``find_package(A)`` and ``find_package(B)``.
+in your `CMakeLists.txt` file you only need to ``find_package(A CONFIG)`` and ``find_package(B CONFIG)``.
+
+.. important::
+
+    Add the ``CONFIG`` option to ``find_package`` so that *module mode* is explicitly skipped by CMake. 
+    This helps to solve issues when there is for example a ``FindXXXX.cmake`` file in CMake's default modules directory 
+    that could be loaded instead of the ``XXXXConfig.cmake`` generated by Conan. 
 
 You also need to adjust `CMAKE_PREFIX_PATH <https://cmake.org/cmake/help/v3.0/variable/CMAKE_PREFIX_PATH.html>`_ and
 `CMAKE_MODULE_PATH <https://cmake.org/cmake/help/v3.0/variable/CMAKE_MODULE_PATH.html>`_ so CMake can locate all

requirements.txt

@@ -3,4 +3,5 @@ sphinxcontrib-spelling
 elasticsearch>=6.0.0,<7.0.0
 boto3
 requests
-requests-aws4auth
+requests-aws4auth
+beautifulsoup4