diff --git a/doc/qtcreator/images/qtcreator-options-text-editor-behavior.png b/doc/qtcreator/images/qtcreator-options-text-editor-behavior.png
index b63ca8164eb..239ca6737e0 100644
Binary files a/doc/qtcreator/images/qtcreator-options-text-editor-behavior.png and b/doc/qtcreator/images/qtcreator-options-text-editor-behavior.png differ
diff --git a/doc/qtcreator/src/editors/creator-code-indentation.qdoc b/doc/qtcreator/src/editors/creator-code-indentation.qdoc
index f23e5b48502..8607d45ca8d 100644
--- a/doc/qtcreator/src/editors/creator-code-indentation.qdoc
+++ b/doc/qtcreator/src/editors/creator-code-indentation.qdoc
@@ -233,7 +233,7 @@
     select \uicontrol Tools > \uicontrol Options > \uicontrol {Text Editor} >
     \uicontrol Behavior > \uicontrol Typing.
 
-    To disable automatic indentation,  deselect the
+    To disable automatic indentation, deselect the
     \uicontrol {Enable automatic indentation} check box.
 
     You can specify how the indentation is decreased when you press
@@ -250,6 +250,10 @@
     the cursor is located within leading white space, select \uicontrol {In
     Leading White Space}.
 
+    Your highlight definition file can contain definitions for both multi and
+    single line comments. To apply the single line comment definition when
+    commenting out a selection, select \uicontrol {Prefer single line comments}.
+
     \if defined(qtcreator)
     \section1 Specifying Settings for Content