Merge remote-tracking branch 'origin/master' into feature/versioning

conan-io · Jul 9, 2019 · 896b628 · 896b628
2 parents d1e8743 + 8b81a4b
commit 896b628
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/_themes/conan/layout.html b/_themes/conan/layout.html
@@ -156,6 +156,11 @@
       <div class="wy-nav-content">
         <div class="rst-content">
           {% include "breadcrumbs.html" %}
+          <div class="admonition important">
+              Conan users please fill
+              <a href="https://www.surveymonkey.com/r/ConanCommunity">this 2 min survey.</a>
+              Thanks!
+          </div>
           <select id="search" name="state" multiple="true" onchange="window.location = reldir + this.value;" style="width:90%"></select>
           <hr/>
           <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">

diff --git a/howtos/vs2017_cmake.rst b/howtos/vs2017_cmake.rst
@@ -154,16 +154,13 @@ Using tasks with tasks.vs.json
 Another alternative is using file `tasks <https://docs.microsoft.com/en-us/visualstudio/ide/customize-build-and-debug-tasks-in-visual-studio?view=vs-2017>`_
 feature of Visual Studio 2017. This way you can install dependencies by running :command:`conan install` as task directly in the IDE.
 
-All you need is to right click on your *conanfile.py*-> Configure Tasks (see the
+All you need is to right click on your *conanfile.py* -> Configure Tasks (see the
 `link above <https://docs.microsoft.com/en-us/visualstudio/ide/customize-build-and-debug-tasks-in-visual-studio?view=vs-2017>`_) and add the
 following to your *tasks.vs.json*.
 
 .. warning::
 
-    The file *tasks.vs.json* is added to your local *.vs* folder so it is not supposed to be added to your version control system. There is
-    also a feature
-    `request <https://visualstudio.uservoice.com/forums/121579-visual-studio-ide/suggestions/33814138-add-macro-buildroot-to-tasks-vs-json>`_
-    to improve this process.
+    The file *tasks.vs.json* is added to your local *.vs* folder so it is not supposed to be added to your version control system.
 
 .. code-block:: text
    :emphasize-lines: 7,9,16,18

diff --git a/reference/conanfile/attributes.rst b/reference/conanfile/attributes.rst
@@ -743,7 +743,7 @@ It tells Conan to workaround the limitation of 260 chars in Windows paths.
 .. important::
 
     Since Windows 10 (ver. 10.0.14393), it is possible to `enable long paths at the system level
-    <https://docs.microsoft.com/es-es/windows/desktop/FileIO/naming-a-file#maximum-path-length-limitation>`_.
+    <https://docs.microsoft.com/es-es/windows/win32/fileio/naming-a-file#maximum-path-length-limitation>`_.
     Latest python 2.x and 3.x installers enable this by default. With the path limit removed both on the OS
     and on Python, the ``short_paths`` functionality becomes unnecessary, and may be disabled explicitly
     through the ``CONAN_USER_HOME_SHORT`` environment variable.