Merge branch 'master' into develop

Author: danimtb

conf.py

@@ -59,7 +59,12 @@
 
 html_context = {
     "versions": versions_dict,
-    "current_version": version
+    "current_version": version,
+    "display_github": True, # Integrate GitHub
+    "github_user": "conan-io", # Username
+    "github_repo": "docs", # Repo name
+    "github_version": "master", # Version
+    "conf_py_path": "/" # Path in the checkout to the docs root
 }
 
 # Add any paths that contain templates here, relative to this directory.

extending/plugins.rst

@@ -142,7 +142,8 @@ And it can be used in plugin importing the module:
 Storage, activation and sharing
 -------------------------------
 
-Plugins are Python files stored under *~/.conan/plugins* folder and their file name should be the same used for activation.
+Plugins are Python files stored under *~/.conan/plugins* folder and **their file name should be the same used for activation** (without the
+*.py* extension).
 
 The activation of the plugins is done in the *conan.conf* section named ``[plugins]``. The plugin names listed under this section will be
 considered activated.

mastering/conditional.rst

@@ -66,7 +66,7 @@ There are two approaches for this situation:
 
       def configure(self):
           if self.settings.os == "Windows":
-            raise ConanException("This library is not compatible with Windows")
+            raise ConanInvalidConfiguration("This library is not compatible with Windows")
 
   This same method is also valid for ``options`` and ``config_options()`` method and it is commonly used to remove options for one setting:
 

reference/build_helpers/cmake.rst

@@ -139,7 +139,7 @@ The CMake helper will automatically append some definitions based on your settin
 +-------------------------------------------+------------------------------------------------------------------------------------------------------------------------------+
 | CONAN_CMAKE_FIND_ROOT_PATH_MODE_INCLUDE   |  Definition only set if same environment variable is declared by user                                                        |
 +-------------------------------------------+------------------------------------------------------------------------------------------------------------------------------+
-| CONAN_CMAKE_POSITION_INDEPENDENT_CODE     |  When ``fPIC`` option is present and True or when ``fPIC`` is present and False but and option ``shared`` is present and True|
+| CONAN_CMAKE_POSITION_INDEPENDENT_CODE     |  When ``fPIC`` option is present and True or when ``fPIC`` is present and False but option ``shared`` is present and True    |
 +-------------------------------------------+------------------------------------------------------------------------------------------------------------------------------+
 | CONAN_SHARED_LINKER_FLAGS                 |  -m32 and -m64 based on your architecture                                                                                    |
 +-------------------------------------------+------------------------------------------------------------------------------------------------------------------------------+

reference/conanfile/attributes.rst

@@ -349,15 +349,15 @@ consistent implementation take into account these considerations:
     - equals ``False`` for the values ``False``, ``"False"`` and ``"false"``, also for the empty
       string and for ``0`` and ``"0"`` as expected.
 
-- Comparaison using ``is`` is always equals to ``False`` because the types would be different as
+- Comparison using ``is`` is always equals to ``False`` because the types would be different as
   the option value is encapsulated inside a Conan class.
 
-- Explicit comparaisons with the ``==`` symbol **are case sensitive**, so:
+- Explicit comparisons with the ``==`` symbol **are case sensitive**, so:
 
     - ``self.options.option = "False"`` satisfies ``assert self.options.option == False``,
       ``assert self.options.option == "False"``, but ``assert self.options.option != "false"``.
 
-- A different behaviour has ``self.options.option = None``, because
+- A different behavior has ``self.options.option = None``, because
   ``assert self.options.option != None``.
 
 
@@ -366,21 +366,21 @@ consistent implementation take into account these considerations:
 default_options
 ---------------
 
-As you have seen in the examples above, recipe's default options can be assigned to the desired value. However, you can also specify
-default option values of the required dependencies:
+As you have seen in the examples above, recipe's default options are declared as a dictionary with the initial desired value of the options.
+However, you can also specify default option values of the required dependencies:
 
 .. code-block:: python
 
     class OtherPkg(ConanFile):
         requires = "Pkg/0.1@user/channel"
-        default_options = "Pkg:pkg_option=value"
+        default_options = {"Pkg:pkg_option": "value"}
 
 And it also works with default option values of conditional required dependencies:
 
 .. code-block:: python
 
     class OtherPkg(ConanFile):
-        default_options = "Pkg:pkg_option=value"
+        default_options = {"Pkg:pkg_option": "value"}
 
         def requirements(self):
             if self.settings.os != "Windows":

reference/conanfile/methods.rst

@@ -419,6 +419,7 @@ it is an example of a recipe for a library that doesn't support Windows operatin
         if self.settings.os == "Windows":
             raise ConanInvalidConfiguration("Library MyLib is only supported for Windows")
 
+This exception will be propagated and Conan application will exit with the error code ``6``.
 
 requirements()
 --------------

reference/plugins.rst

@@ -146,7 +146,7 @@ subsequent **pre**/**post** ``download_package()``/``upload_package()`` if that
     using :command:`conan create` or :command:`conan install`.
 
 Function parameters
---------------------
+-------------------
 
 Here you can find the description for each parameter:
 
@@ -193,14 +193,14 @@ Table legend:
   - **post**: Only available in ``post`` function.
   - **cache**: Only available when the context of the command executed is the local cache. e.g. :command:`conan create`,
     :command:`conan install`...
-  - **user space**: Only available when the context of the command executed is the local cache. e.g. :command:`conan build`
+  - **user space**: Only available when the context of the command executed is the user space. e.g. :command:`conan build`
 
 .. note::
 
     Path to the different folders of the Conan execution flow may be accessible as usual through the ``conanfile`` object. See
     :ref:`folders_attributes_reference` to learn more.
 
-Some of this parameters does not appear in the signature of the function as they may not be available always (Mostly depending on the recipe
+Some of this parameters does not appear in the signature of the function as they may not be always available (Mostly depending on the recipe
 living in the local cache or in user space). However, they can be checked with the ``kwargs`` parameter.
 
 .. important::