diff --git a/doc/src/debugger/creator-debugger.qdoc b/doc/src/debugger/creator-debugger.qdoc
index 593d368f311..d322ac3c336 100644
--- a/doc/src/debugger/creator-debugger.qdoc
+++ b/doc/src/debugger/creator-debugger.qdoc
@@ -726,15 +726,17 @@
     attach it to a running process, specify the process ID as a parameter for
     the \c {-debug} option. To examine a core file, specify the file name.
     \QC executes all the necessary steps, such as searching for
-    the binary that belongs to a core file.
+    the binary that belongs to a core file. To connect to a debug server,
+    specify the server location and port number.
 
     For example:
 
     \list
 
         \li  \c {C:\qtcreator\bin>qtcreator -debug 2000}
-
-        \li  \c {C:\qtcreator\bin>qtcreator -debug core.2000}
+        \li  \c {C:\qtcreator\bin>qtcreator -debug core=core.2000}
+        \li  \c {C:\qtcreator\bin>qtcreator -debug some.exe,core=core}
+        \li  \c {C:\qtcreator\bin>qtcreator -debug server=some.dot.com:4251}
 
     \endlist
 
diff --git a/doc/src/howto/creator-cli.qdoc b/doc/src/howto/creator-cli.qdoc
index 6e9599ff49a..5a8adba0c37 100644
--- a/doc/src/howto/creator-cli.qdoc
+++ b/doc/src/howto/creator-cli.qdoc
@@ -100,8 +100,36 @@
             \li  Core plugin: override the selected UI color.
 
         \row
-            \li  -debug <PID-or-corefile>
-            \li  Debugger plugin: attach to process ID or core file.
+            \li  -debug <pid>
+            \li  Debugger plugin: attach to the process with the given process ID.
+
+        \row
+            \li  -debug <executable>[,kit=<kit>]
+            \li  Debugger plugin: launch and debug the executable with the name
+                 \c{executable}.
+                 A \c{kit} can be specified to point to non-default debuggers
+                 and sysroots.
+
+        \row
+            \li  -debug [executable,]core=<corefile>[,kit=<kit>]
+            \li  Debugger plugin: load the core file named \c{corefile}.
+                 The parameter \c{executable} specifies the executable that
+                 produced the core file.
+                 If this parameter is omitted, \QC will attempt to reconstruct
+                 it from the core file itself.
+                 This will fail for paths with more than about 80 characters.
+                 In such cases the \c{executable} parameter is mandatory.
+                 A \c{kit} can be specified to point to non-default debuggers
+                 and sysroots.
+
+        \row
+            \li  -debug <executable>,server=<server:port>[,kit=<kit>]
+            \li  Debugger plugin: attach to a debug server running on the port
+                 \c{port} on the server \c{server}. The parameter \c{executable}
+                 specifies a local copy of the executable the remote debug server is
+                 manipulating.
+                 A \c{kit} can be specified to point to non-default debuggers
+                 and sysroots.
 
         \row
             \li  -wincrashevent <event-handle>