Merge pull request conan-io#1794 from czoido/merge_master_to_dev_1.28

Merge master to dev 1.28

_themes/conan/layout.html

@@ -158,7 +158,7 @@
           {% include "breadcrumbs.html" %}
           <!--<select id="search" name="state" multiple="true" onchange="window.location = reldir + this.value;" style="width:90%"></select>
           <hr/>-->
-          <!-- <div class="admonition important"></div> -->
+          <div class="admonition important"> Join the <a href=https://blog.conan.io/2020/07/28/Launching-Conan-2.0-Tribe.html>Conan 2.0 Tribe</a> and contribute to define the next Conan 2.0 major version</div>
           <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
            <div itemprop="articleBody">
             {% block body %}{% endblock %}

changelog.rst

@@ -18,9 +18,14 @@ Check https://github.com/conan-io/conan for issues and more details about develo
 
 .. important::
 
-    Conan 1.26 shouldn't break any existing 1.0 recipe or command line invocation. If it does, please submit a report on GitHub.
+    Conan 1.27 shouldn't break any existing 1.0 recipe or command line invocation. If it does, please submit a report on GitHub.
     Read more about the :ref:`Conan stability commitment<stability>`.
 
+1.27.1 (10-Jul-2020)
+--------------------
+
+- Bugfix: Recover quotes around linker flags in CMake generators, fix failure with Macos frameworks `#7322 <https://github.com/conan-io/conan/pull/7322>`_
+
 1.27.0 (01-Jul-2020)
 --------------------
 

conf.py

@@ -43,7 +43,7 @@
 # The short X.Y version.
 version = "1.27"
 # The full version, including alpha/beta/rc tags.
-release = u'1.27.0'
+release = u'1.27.1'
 
 dir_path = os.path.dirname(os.path.realpath(__file__))
 if not os.path.exists(os.path.join(dir_path, "versions.json")):

howtos/generic_ci_artifactory.rst

@@ -3,6 +3,16 @@
 Use a generic CI with Conan and Artifactory
 ===========================================
 
+.. warning::
+
+    Some problems regarding the use of BuildInfo with Conan packages `have been reported
+    <https://www.jfrog.com/jira/browse/RTFACT-9343>`_. If the BuildInfo contains artifacts that have
+    the same checksum as other artifacts, this may result in losing the path of the artifact in the
+    BuildInfo in Artifactory and also fail in the promotion process. 
+
+    We are currently working along with the Artifactory team to solve those problems. Until this
+    issue gets fixed, we do not recommend using BuildInfo's for Conan.
+
 Uploading the BuildInfo
 -----------------------
 

reference/commands/misc/conan_build_info.rst

@@ -1,6 +1,20 @@
 
 .. _conan_build_info:
 
+.. warning::
+
+    This is an **experimental** feature subject to breaking changes in future releases.
+
+.. warning::
+
+    Some problems regarding the use of BuildInfo with Conan packages `have been reported
+    <https://www.jfrog.com/jira/browse/RTFACT-9343>`_. If the BuildInfo contains artifacts that have
+    the same checksum as other artifacts, this may result in losing the path of the artifact in the
+    BuildInfo in Artifactory and also fail in the promotion process. 
+
+    We are currently working along with the Artifactory team to solve those problems. Until this
+    issue gets fixed, we do not recommend using BuildInfo's for Conan.
+
 conan_build_info v1
 -------------------
 

reference/tools.rst

@@ -1865,7 +1865,7 @@ tools.remove_files_by_mask()
 
     def remove_files_by_mask(directory, pattern)
 
-Removes files in the given ``directory`` matching the ``pattern``. The function removes only files, and never removes directories, even if their names match the pattern. The functions returns the array of the files removed (empty array in case no files were removed). The paths in the returned array are relative to the given ``directory``.
+Removes files recursively in the given ``directory`` matching the ``pattern``. The function removes only files, and never removes directories, even if their names match the pattern. The functions returns the array of the files removed (empty array in case no files were removed). The paths in the returned array are relative to the given ``directory``.
 
 Parameters:
     - **directory** (Required): Directory to remove files inside. You may use ``os.getcwd`` or ``self.package_folder``, for instance.