Doc: Update screenshots of Locals and Expressions views

They are now two separate views instead of one.
Also fix some related issues in text.

Change-Id: I31578fc1ca4f97f9010031a5778c4a33e65d129c
Reviewed-by: hjk <hjk@qt.io>

6 files changed, 9 insertions, 8 deletions

diff --git a/doc/images/qtcreator-debugger-expressions.png b/doc/images/qtcreator-debugger-expressions.png
new file mode 100644
index 0000000000..84a3abbefd
--- /dev/null
+++ b/doc/images/qtcreator-debugger-expressions.png
diff --git a/doc/images/qtcreator-locals-expressions.png b/doc/images/qtcreator-locals-expressions.png
deleted file mode 100644
index 7196babe81..0000000000
--- a/doc/images/qtcreator-locals-expressions.png
+++ /dev/null
diff --git a/doc/images/qtcreator-locals.png b/doc/images/qtcreator-locals.png
new file mode 100644
index 0000000000..81b407d973
--- /dev/null
+++ b/doc/images/qtcreator-locals.png
diff --git a/doc/images/qtcreator-watcher.png b/doc/images/qtcreator-watcher.png
index 242c06be4d..97b150b589 100644
--- a/doc/images/qtcreator-watcher.png
+++ b/doc/images/qtcreator-watcher.png
diff --git a/doc/src/debugger/creator-debugger-example.qdoc b/doc/src/debugger/creator-debugger-example.qdoc
index 610508c1e2..a43afe684c 100644
--- a/doc/src/debugger/creator-debugger-example.qdoc
+++ b/doc/src/debugger/creator-debugger-example.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -65,7 +65,7 @@
 
 
         \li To view the base classes and data members of the TextFinder class,
-            go to the \uicontrol {Locals and Expressions} view.
+            go to the \uicontrol Locals view.
 
             \image qtcreator-watcher.png
 
diff --git a/doc/src/debugger/creator-debugger.qdoc b/doc/src/debugger/creator-debugger.qdoc
index 7a569838d9..fa50073ef3 100644
--- a/doc/src/debugger/creator-debugger.qdoc
+++ b/doc/src/debugger/creator-debugger.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -679,11 +679,10 @@
 
     \section1 Local Variables and Function Parameters
 
-    The Locals view consists of two parts: the \uicontrol Locals pane at the top
-    and the \uicontrol {Return Value} pane at the bottom. The
-    \uicontrol {Return Value} is only visible if it is not empty.
+    The Locals view consists of the \uicontrol Locals pane and the
+    \uicontrol {Return Value} pane (hidden when empty).
 
-    \image qtcreator-locals-expressions.png "Locals view"
+    \image qtcreator-locals.png "Locals view"
 
     Whenever a program stops under the control of the debugger, it retrieves
     information about the topmost stack frame and displays it in the
@@ -694,7 +693,7 @@
     pane displays the value returned by the function.
 
 
-    \section1 Evaluating Expresssion
+    \section1 Evaluating Expressions
 
     To compute values of arithmetic expressions or function calls, use
     expression evaluators in the \uicontrol Expressions view. To insert a new
@@ -703,6 +702,8 @@
     \uicontrol {Add New Expression Evaluator} from the context menu, or drag and
     drop an expression from the code editor.
 
+    \image qtcreator-debugger-expressions.png
+
     \note Expression evaluators are powerful, but slow down debugger operation
     significantly. It is advisable to not use them excessively, and to remove
     unneeded expression evaluators as soon as possible.