Doc: Update info about managing workspaces

Change-Id: I1cd79ac60641d99b86b246cb540cb6a9e70d1f30
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>

4 files changed, 30 insertions, 8 deletions

diff --git a/doc/qtcreator/images/icons/detach-group-icon.png b/doc/qtcreator/images/icons/detach-group-icon.png
new file mode 100644
index 0000000000..7a3bea690c
--- /dev/null
+++ b/doc/qtcreator/images/icons/detach-group-icon.png
diff --git a/doc/qtcreator/images/qtcreator-workspace-attaching-views.png b/doc/qtcreator/images/qtcreator-workspace-attaching-views.png
new file mode 100644
index 0000000000..e1eeae51a7
--- /dev/null
+++ b/doc/qtcreator/images/qtcreator-workspace-attaching-views.png
diff --git a/doc/qtcreator/images/qtcreator-workspace-manager.png b/doc/qtcreator/images/qtcreator-workspace-manager.png
index 3a42f3e536..603b16f918 100644
--- a/doc/qtcreator/images/qtcreator-workspace-manager.png
+++ b/doc/qtcreator/images/qtcreator-workspace-manager.png
diff --git a/doc/qtcreator/src/howto/creator-workspaces.qdoc b/doc/qtcreator/src/howto/creator-workspaces.qdoc
index c297c4dc92..49dfa82a37 100644
--- a/doc/qtcreator/src/howto/creator-workspaces.qdoc
+++ b/doc/qtcreator/src/howto/creator-workspaces.qdoc
@@ -32,21 +32,42 @@
     \title Managing Workspaces
 
     In the Design and Debug modes, you can arrange a set of \QC
-    views as a \e workspace on the screen. For a list of views,
-    select \uicontrol Window > \uicontrol Views.
+    views as a \e workspace on the screen.
 
-    In \QMLD, you can select the \uicontrol {Restore last workspace on startup}
-    check box to save the current workspace as a \e default workspace when you
-    exit \QC and to restore it the next time you start \QC.
+    To detach views:
 
-    To manage workspaces, select \uicontrol Window > \uicontrol Workspaces >
-    \uicontrol Manage.
+    \list
+        \li Double-click the title bar of the view.
+        \li Start dragging the view to another position.
+        \li Select the \inlineimage icons/detach-group-icon.png
+            (\uicontrol {Detach Group}) button.
+    \endlist
+
+    You can move detached views or groups of views anywhere on the screen.
+
+    To attach views, drag them over the dock area markers until the dock area
+    where you want to attach the view is highlighted, and then drop them into
+    the dock area.
+
+    \image qtcreator-workspace-attaching-views.png "Attaching views"
+
+    To close groups of views, select the \uicontrol {Close Group} button.
+
+    To open closed views, select \uicontrol Window > \uicontrol Views.
+
+    \section1 Saving Workspaces
+
+    The changes you make to a workspace are saved when you exit \QC.
+    In \QMLD, you can select \uicontrol Window > \uicontrol Workspaces >
+    \uicontrol Manage > \uicontrol {Restore last workspace on startup}
+    to restore the current workspace the next time you start \QC.
 
     \image qtcreator-workspace-manager.png "Workspace Manager"
 
     To save a workspace under a new name, select \uicontrol Clone.
 
-    To delete the selected workspace, select \uicontrol Delete.
+    To revert the changes you made to a preset workspace, select
+    \uicontrol Reset.
 
     To switch between workspaces, select \uicontrol {Switch To}.
 
@@ -61,4 +82,5 @@
             switch to it.
     \endlist
 
+    To delete the selected workspace, select \uicontrol Delete.
 */