Merge "Merge 1.12 into master"

1 files changed, 39 insertions, 2 deletions

diff --git a/doc/reference/cli/cli-options.qdocinc b/doc/reference/cli/cli-options.qdocinc
index 5316f459d..189a3526a 100644
--- a/doc/reference/cli/cli-options.qdocinc
+++ b/doc/reference/cli/cli-options.qdocinc
@@ -100,13 +100,13 @@
 
 //! [check-timestamps]
 
-//! [clean-install-root]
+//! [clean_install_root]
 
     \section2 \c --clean-install-root
 
     Removes the installation base directory before installing.
 
-//! [clean-install-root]
+//! [clean_install_root]
 
 //! [command-echo-mode]
 
@@ -287,6 +287,33 @@
 
 //! [list-root]
 
+//! [config-user]
+
+    \section2 \c {--user}
+
+    Causes read operations to display only the user-level settings,
+    while the system-level settings are ignored.
+    Write operations will target the user-level settings, which is also the default.
+
+//! [config-user]
+
+//! [config-system]
+
+    \section2 \c {--system}
+
+    Read and write operations will consider only the system-level settings.
+
+//! [config-system]
+
+//! [config-ui-system]
+
+    \section2 \c {--system}
+
+    Instructs the tool to work on the system-level settings. Otherwise,
+    the user-level settings are presented.
+
+//! [config-ui-system]
+
 //! [log-level]
 
     \section2 \c {--log-level <level>}
@@ -418,6 +445,16 @@
 
 //! [show-progress]
 
+//! [setup-tools-system]
+
+    \section2 \c {--system}
+
+    If this option is given, the profile(s) created by this tool will end up
+    in the system-level settings and thus be available to all users.
+    Otherwise, they go into the user-level settings.
+
+//! [setup-tools-system]
+
 //! [type]
 
     \section2 \c {--type <toolchain type>}