Doc: new options in the editor toolbar.

Moving to line and column and showing the file encoding.

Change-Id: Ifd9727b3f1812da4b165eb9224cc7d042ae840d2
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

3 files changed, 31 insertions, 4 deletions

diff --git a/doc/images/qtcreator-editortoolbar-symbols.png b/doc/images/qtcreator-editortoolbar-symbols.png
index 7386697de3..8f55b277b7 100644
--- a/doc/images/qtcreator-editortoolbar-symbols.png
+++ b/doc/images/qtcreator-editortoolbar-symbols.png
diff --git a/doc/src/editors/creator-coding-edit-mode.qdoc b/doc/src/editors/creator-coding-edit-mode.qdoc
index 3dba28bb1c..d868c7ca15 100644
--- a/doc/src/editors/creator-coding-edit-mode.qdoc
+++ b/doc/src/editors/creator-coding-edit-mode.qdoc
@@ -57,6 +57,19 @@
     select \gui {Sort Alphabetically} to arrange the symbols in alphabetic
     order.
 
+    To jump to a line and column in the current file, select the line and column
+    indicator (3) or press \key {Ctrl+L} (or \key {Cmd+L} on Mac OS X) to open
+    the locator. Enter the line number and column number in the locator,
+    separated by a colon (:).
+
+    To show the file encoding of the current file on the editor toolbar (4),
+    select \gui Tools > \gui Options > \gui {Text Editor} > \gui Display >
+    \gui {Display file encoding}.
+
+    \note Other convenient ways of navigating in \QC are provided by the
+    \l{Searching with the Locator}{locator}, \l{Keyboard Shortcuts}
+    {keyboard shortcuts}, and the \l{Browsing Project Contents}{sidebar}.
+
     \section1 Splitting the Editor View
 
     Split the editor view or open the editor in a new window when you want to
diff --git a/doc/src/editors/creator-editors.qdoc b/doc/src/editors/creator-editors.qdoc
index 504559809d..94dd8bc125 100644
--- a/doc/src/editors/creator-editors.qdoc
+++ b/doc/src/editors/creator-editors.qdoc
@@ -2044,11 +2044,24 @@
     \title Searching with the Locator
 
     You can find the locator in the bottom left of the \QC window.
-    To activate the locator, press \key Ctrl+K (\key Cmd+K on Mac OS X) or
-    select \gui Tools > \gui Locate.
 
     \image qtcreator-locator.png
 
+    To activate the locator:
+
+    \list
+
+        \li Press \key Ctrl+K (\key Cmd+K on Mac OS X).
+
+        \li Select \gui Tools > \gui Locate.
+
+        \li Select \gui Edit > \gui {Go to Line}.
+
+        \li Click the line and column indicator on the
+            \l{Using the Editor Toolbar}{editor toolbar}.
+
+    \endlist
+
     To edit the currently open project's main.cpp file using the locator:
 
     \list 1
@@ -2108,7 +2121,8 @@
 
         \li Locating class and method definitions in the current document
 
-        \li Locating a specific line in the document displayed in your editor
+        \li Locating a specific line and column in the document displayed in
+            your editor
 
         \li Opening help topics, including Qt documentation
 
@@ -2148,7 +2162,7 @@
 
     \list
 
-        \li Going to a line in the current file (l).
+        \li Going to a line and column in the current file (l).
 
         \li Going to an open file (o).