diff --git a/doc/images/qtcreator-editor-settings.png b/doc/images/qtcreator-editor-settings.png
index 9766b153f3f..583af66502d 100644
Binary files a/doc/images/qtcreator-editor-settings.png and b/doc/images/qtcreator-editor-settings.png differ
diff --git a/doc/src/editors/creator-editors.qdoc b/doc/src/editors/creator-editors.qdoc
index 35017f91225..bc631612aa7 100644
--- a/doc/src/editors/creator-editors.qdoc
+++ b/doc/src/editors/creator-editors.qdoc
@@ -142,6 +142,17 @@
     \uicontrol Tools > \uicontrol Options > \uicontrol {Text Editor} >
     \uicontrol Display and deselect \uicontrol {Animate matching parentheses}.
 
+    You can use keyboard shortcuts to move within and between blocks. To go to
+    block end, press \key {Ctrl+]} and to go to block start, press
+    \key {Ctrl+[}. To also select the lines from the cursor position to the end
+    or beginning of the block, press \key {Ctrl+Shift+]} and
+    \key {Ctrl+Shift+[}, respectively.
+
+    To select the current block, press \key Ctrl+U. A second key press extends
+    the selection to the parent block. To undo the last selection, press
+    \key {Ctrl+Alt+Shift+U}. To enable smart block selection, select
+    \uicontrol Tools > \uicontrol Options > \uicontrol {Text Editor} >
+    \uicontrol Behavior > \uicontrol {Enable smart selection changing}.
 */
 
 
diff --git a/doc/src/howto/creator-keyboard-shortcuts.qdoc b/doc/src/howto/creator-keyboard-shortcuts.qdoc
index 46257783e01..c8fab9e4474 100644
--- a/doc/src/howto/creator-keyboard-shortcuts.qdoc
+++ b/doc/src/howto/creator-keyboard-shortcuts.qdoc
@@ -337,11 +337,25 @@
             \li  Go to block start
             \li  Ctrl+[
         \row
-            \li  Go to block end with selection
-            \li  Ctrl+}
+            \li  Go to block end and select the lines between the current cursor
+                 position and the end of the block
+            \li  Ctrl+Shift+]
         \row
-            \li  Go to block start with selection
-            \li  Ctrl+{
+            \li  Go to block start and select the lines between the current
+                 cursor position and the beginning of the block
+            \li  Ctrl+Shift+[
+        \row
+            \li  Select the current block
+
+                 The second press extends the selection to the parent block. To
+                 enable this behavior, select \uicontrol Tools >
+                 \uicontrol Options > \uicontrol {Text Editor} >
+                 \uicontrol Behavior >
+                 \uicontrol {Enable smart selection changing}.
+            \li  Ctrl+U
+        \row
+            \li  Undo the latest smart block selection
+            \li  Ctrl+Alt+Shift+U
         \row
             \li  Move current line down
             \li  Ctrl+Shift+Down
@@ -354,11 +368,6 @@
         \row
             \li  Rewrap paragraph
             \li  Ctrl+E, R
-        \row
-            \li  Select the current block
-
-               The second press extends the selection to the parent block
-            \li  Ctrl+U
         \row
             \li  Enable text wrapping
             \li  Ctrl+E, Ctrl+W
diff --git a/doc/src/projects/creator-projects-settings-editor.qdoc b/doc/src/projects/creator-projects-settings-editor.qdoc
index f1f49b90fba..c2b8a108bd5 100644
--- a/doc/src/projects/creator-projects-settings-editor.qdoc
+++ b/doc/src/projects/creator-projects-settings-editor.qdoc
@@ -74,6 +74,8 @@
 
         \li \l{Configuring Fonts}
 
+        \li \l{Highlighting and Folding Blocks}
+
         \li \l{Viewing Function Tooltips}
 
     \endlist