Update help commands to newer versions (#3439)

reference/commands/build.rst

@@ -10,16 +10,17 @@ conan build
                        [--user USER] [--channel CHANNEL] [-g GENERATOR]
                        [-of OUTPUT_FOLDER] [-d DEPLOYER]
                        [--deployer-folder DEPLOYER_FOLDER] [--build-require]
-                       [-b BUILD] [-r REMOTE | -nr] [-u] [-o OPTIONS_HOST]
-                       [-o:b OPTIONS_BUILD] [-o:h OPTIONS_HOST] [-pr PROFILE_HOST]
+                       [-b BUILD] [-r REMOTE | -nr] [-u] [-pr PROFILE]
                        [-pr:b PROFILE_BUILD] [-pr:h PROFILE_HOST]
-                       [-s SETTINGS_HOST] [-s:b SETTINGS_BUILD]
-                       [-s:h SETTINGS_HOST] [-c CONF_HOST] [-c:b CONF_BUILD]
-                       [-c:h CONF_HOST] [-l LOCKFILE] [--lockfile-partial]
-                       [--lockfile-out LOCKFILE_OUT] [--lockfile-packages]
-                       [--lockfile-clean]
+                       [-pr:a PROFILE_ALL] [-o OPTIONS] [-o:b OPTIONS_BUILD]
+                       [-o:h OPTIONS_HOST] [-o:a OPTIONS_ALL] [-s SETTINGS]
+                       [-s:b SETTINGS_BUILD] [-s:h SETTINGS_HOST]
+                       [-s:a SETTINGS_ALL] [-c CONF] [-c:b CONF_BUILD]
+                       [-c:h CONF_HOST] [-c:a CONF_ALL] [-l LOCKFILE]
+                       [--lockfile-partial] [--lockfile-out LOCKFILE_OUT]
+                       [--lockfile-packages] [--lockfile-clean]
                        [--lockfile-overrides LOCKFILE_OVERRIDES]
-                       [path]
+                       path
 
     Install dependencies and call the build() method.
 
@@ -28,7 +29,7 @@ conan build
                             containing a conanfile.py recipe. conanfile.txt cannot
                             be used with conan build.
 
-    optional arguments:
+    options:
       -h, --help            show this help message and exit
       -v [V]                Level of detail of the output. Valid options from less
                             verbose to more verbose: -vquiet, -verror, -vwarning,
@@ -80,42 +81,41 @@ conan build
                             that satisfies the range. Also, if using revisions, it
                             will update to the latest revision for the resolved
                             version range.
-      -o OPTIONS_HOST, --options OPTIONS_HOST
-                            Define options values (host machine), e.g.: -o
-                            Pkg:with_qt=true
-      -o:b OPTIONS_BUILD, --options:build OPTIONS_BUILD
-                            Define options values (build machine), e.g.: -o:b
-                            Pkg:with_qt=true
-      -o:h OPTIONS_HOST, --options:host OPTIONS_HOST
-                            Define options values (host machine), e.g.: -o:h
-                            Pkg:with_qt=true
-      -pr PROFILE_HOST, --profile PROFILE_HOST
-                            Apply the specified profile to the host machine
+      -pr PROFILE, --profile PROFILE
+                            Apply the specified profile. By default, or if
+                            specifying -pr:h (--profile:host), it applies to the
+                            host context. Use -pr:b (--profile:build) to specify
+                            the build context, or -pr:a (--profile:all) to specify
+                            both contexts at once
       -pr:b PROFILE_BUILD, --profile:build PROFILE_BUILD
-                            Apply the specified profile to the build machine
       -pr:h PROFILE_HOST, --profile:host PROFILE_HOST
-                            Apply the specified profile to the host machine
-      -s SETTINGS_HOST, --settings SETTINGS_HOST
-                            Settings to build the package, overwriting the
-                            defaults (host machine). e.g.: -s compiler=gcc
+      -pr:a PROFILE_ALL, --profile:all PROFILE_ALL
+      -o OPTIONS, --options OPTIONS
+                            Apply the specified options. By default, or if
+                            specifying -o:h (--options:host), it applies to the
+                            host context. Use -o:b (--options:build) to specify
+                            the build context, or -o:a (--options:all) to specify
+                            both contexts at once. Example: -o pkg:with_qt=true
+      -o:b OPTIONS_BUILD, --options:build OPTIONS_BUILD
+      -o:h OPTIONS_HOST, --options:host OPTIONS_HOST
+      -o:a OPTIONS_ALL, --options:all OPTIONS_ALL
+      -s SETTINGS, --settings SETTINGS
+                            Apply the specified settings. By default, or if
+                            specifying -s:h (--settings:host), it applies to the
+                            host context. Use -s:b (--settings:build) to specify
+                            the build context, or -s:a (--settings:all) to specify
+                            both contexts at once. Example: -s compiler=gcc
       -s:b SETTINGS_BUILD, --settings:build SETTINGS_BUILD
-                            Settings to build the package, overwriting the
-                            defaults (build machine). e.g.: -s:b compiler=gcc
       -s:h SETTINGS_HOST, --settings:host SETTINGS_HOST
-                            Settings to build the package, overwriting the
-                            defaults (host machine). e.g.: -s:h compiler=gcc
-      -c CONF_HOST, --conf CONF_HOST
-                            Configuration to build the package, overwriting the
-                            defaults (host machine). e.g.: -c
-                            tools.cmake.cmaketoolchain:generator=Xcode
+      -s:a SETTINGS_ALL, --settings:all SETTINGS_ALL
+      -c CONF, --conf CONF  Apply the specified conf. By default, or if specifying
+                            -c:h (--conf:host), it applies to the host context.
+                            Use -c:b (--conf:build) to specify the build context,
+                            or -c:a (--conf:all) to specify both contexts at once.
+                            Example: -c tools.cmake.cmaketoolchain:generator=Xcode
       -c:b CONF_BUILD, --conf:build CONF_BUILD
-                            Configuration to build the package, overwriting the
-                            defaults (build machine). e.g.: -c:b
-                            tools.cmake.cmaketoolchain:generator=Xcode
       -c:h CONF_HOST, --conf:host CONF_HOST
-                            Configuration to build the package, overwriting the
-                            defaults (host machine). e.g.: -c:h
-                            tools.cmake.cmaketoolchain:generator=Xcode
+      -c:a CONF_ALL, --conf:all CONF_ALL
       -l LOCKFILE, --lockfile LOCKFILE
                             Path to a lockfile. Use --lockfile="" to avoid
                             automatic use of existing 'conan.lock' file

reference/commands/create.rst

@@ -10,21 +10,21 @@ conan create
                         [--lockfile-out LOCKFILE_OUT] [--lockfile-packages]
                         [--lockfile-clean]
                         [--lockfile-overrides LOCKFILE_OVERRIDES] [-b BUILD]
-                        [-r REMOTE | -nr] [-u] [-o OPTIONS_HOST]
+                        [-r REMOTE | -nr] [-u] [-pr PROFILE] [-pr:b PROFILE_BUILD]
+                        [-pr:h PROFILE_HOST] [-pr:a PROFILE_ALL] [-o OPTIONS]
                         [-o:b OPTIONS_BUILD] [-o:h OPTIONS_HOST]
-                        [-pr PROFILE_HOST] [-pr:b PROFILE_BUILD]
-                        [-pr:h PROFILE_HOST] [-s SETTINGS_HOST]
-                        [-s:b SETTINGS_BUILD] [-s:h SETTINGS_HOST] [-c CONF_HOST]
-                        [-c:b CONF_BUILD] [-c:h CONF_HOST] [--build-require]
-                        [-tf TEST_FOLDER] [-bt BUILD_TEST]
+                        [-o:a OPTIONS_ALL] [-s SETTINGS] [-s:b SETTINGS_BUILD]
+                        [-s:h SETTINGS_HOST] [-s:a SETTINGS_ALL] [-c CONF]
+                        [-c:b CONF_BUILD] [-c:h CONF_HOST] [-c:a CONF_ALL]
+                        [--build-require] [-tf TEST_FOLDER] [-bt BUILD_TEST]
                         path
 
     Create a package.
 
     positional arguments:
       path                  Path to a folder containing a recipe (conanfile.py)
 
-    optional arguments:
+    options:
       -h, --help            show this help message and exit
       -v [V]                Level of detail of the output. Valid options from less
                             verbose to more verbose: -vquiet, -verror, -vwarning,
@@ -78,42 +78,41 @@ conan create
                             that satisfies the range. Also, if using revisions, it
                             will update to the latest revision for the resolved
                             version range.
-      -o OPTIONS_HOST, --options OPTIONS_HOST
-                            Define options values (host machine), e.g.: -o
-                            Pkg:with_qt=true
-      -o:b OPTIONS_BUILD, --options:build OPTIONS_BUILD
-                            Define options values (build machine), e.g.: -o:b
-                            Pkg:with_qt=true
-      -o:h OPTIONS_HOST, --options:host OPTIONS_HOST
-                            Define options values (host machine), e.g.: -o:h
-                            Pkg:with_qt=true
-      -pr PROFILE_HOST, --profile PROFILE_HOST
-                            Apply the specified profile to the host machine
+      -pr PROFILE, --profile PROFILE
+                            Apply the specified profile. By default, or if
+                            specifying -pr:h (--profile:host), it applies to the
+                            host context. Use -pr:b (--profile:build) to specify
+                            the build context, or -pr:a (--profile:all) to specify
+                            both contexts at once
       -pr:b PROFILE_BUILD, --profile:build PROFILE_BUILD
-                            Apply the specified profile to the build machine
       -pr:h PROFILE_HOST, --profile:host PROFILE_HOST
-                            Apply the specified profile to the host machine
-      -s SETTINGS_HOST, --settings SETTINGS_HOST
-                            Settings to build the package, overwriting the
-                            defaults (host machine). e.g.: -s compiler=gcc
+      -pr:a PROFILE_ALL, --profile:all PROFILE_ALL
+      -o OPTIONS, --options OPTIONS
+                            Apply the specified options. By default, or if
+                            specifying -o:h (--options:host), it applies to the
+                            host context. Use -o:b (--options:build) to specify
+                            the build context, or -o:a (--options:all) to specify
+                            both contexts at once. Example: -o pkg:with_qt=true
+      -o:b OPTIONS_BUILD, --options:build OPTIONS_BUILD
+      -o:h OPTIONS_HOST, --options:host OPTIONS_HOST
+      -o:a OPTIONS_ALL, --options:all OPTIONS_ALL
+      -s SETTINGS, --settings SETTINGS
+                            Apply the specified settings. By default, or if
+                            specifying -s:h (--settings:host), it applies to the
+                            host context. Use -s:b (--settings:build) to specify
+                            the build context, or -s:a (--settings:all) to specify
+                            both contexts at once. Example: -s compiler=gcc
       -s:b SETTINGS_BUILD, --settings:build SETTINGS_BUILD
-                            Settings to build the package, overwriting the
-                            defaults (build machine). e.g.: -s:b compiler=gcc
       -s:h SETTINGS_HOST, --settings:host SETTINGS_HOST
-                            Settings to build the package, overwriting the
-                            defaults (host machine). e.g.: -s:h compiler=gcc
-      -c CONF_HOST, --conf CONF_HOST
-                            Configuration to build the package, overwriting the
-                            defaults (host machine). e.g.: -c
-                            tools.cmake.cmaketoolchain:generator=Xcode
+      -s:a SETTINGS_ALL, --settings:all SETTINGS_ALL
+      -c CONF, --conf CONF  Apply the specified conf. By default, or if specifying
+                            -c:h (--conf:host), it applies to the host context.
+                            Use -c:b (--conf:build) to specify the build context,
+                            or -c:a (--conf:all) to specify both contexts at once.
+                            Example: -c tools.cmake.cmaketoolchain:generator=Xcode
       -c:b CONF_BUILD, --conf:build CONF_BUILD
-                            Configuration to build the package, overwriting the
-                            defaults (build machine). e.g.: -c:b
-                            tools.cmake.cmaketoolchain:generator=Xcode
       -c:h CONF_HOST, --conf:host CONF_HOST
-                            Configuration to build the package, overwriting the
-                            defaults (host machine). e.g.: -c:h
-                            tools.cmake.cmaketoolchain:generator=Xcode
+      -c:a CONF_ALL, --conf:all CONF_ALL
       --build-require       Whether the package being created is a build-require
                             (to be used as tool_requires() by other packages)
       -tf TEST_FOLDER, --test-folder TEST_FOLDER