From 85bcb5b5c7fdd9d5e14577ba475b9bb5dd3a6f32 Mon Sep 17 00:00:00 2001
From: Leena Miettinen <riitta-leena.miettinen@qt.io>
Date: Mon, 31 Oct 2016 11:03:17 +0100
Subject: [PATCH] Doc: Restructure the Diff editor docs

Move the instructions for changing the default colors
to the end and add a section title.

Change-Id: I837e4d25a686d1bf7e9288a438f6321a9ae9d7ed
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
---
 doc/src/editors/creator-diff-editor.qdoc | 38 +++++++++++++-----------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/doc/src/editors/creator-diff-editor.qdoc b/doc/src/editors/creator-diff-editor.qdoc
index b9b16e80d21..a0286ae8615 100644
--- a/doc/src/editors/creator-diff-editor.qdoc
+++ b/doc/src/editors/creator-diff-editor.qdoc
@@ -80,6 +80,26 @@
     \inlineimage sidebysidediff.png
     (\uicontrol {Switch to Side by Side Diff Editor}).
 
+    To only show text changes, select \uicontrol {Ignore Whitespace}.
+
+    To expand the context for the changes, set the number of unchanged lines to
+    show in \uicontrol {Context lines}. Set the value to -1 to show the whole
+    file.
+
+    By default, the horizontal scroll bars in the left and right pane are
+    synchronized. To use them independently of each other, select the
+    \inlineimage linkicon.png
+    (\uicontrol {Synchronize Horizontal Scroll Bars}) button.
+
+    If the files change outside \QC, select \inlineimage reload_gray.png
+    (\uicontrol {Reload Editor}) to compare them again and to show the results.
+
+    To send a chunk of changes to a \l{Pasting and Fetching Code Snippets}
+    {code pasting service}, select \uicontrol {Send Chunk to CodePaster} in the
+    context menu.
+
+    \section1 Changing the Colors
+
     To change the default colors, select \uicontrol Tools > \uicontrol Options >
     \uicontrol {Text Editor} > \uicontrol {Font & Colors}. Create your own color
     scheme and select new colors for the following options:
@@ -105,22 +125,4 @@
             indicates added characters.
 
     \endlist
-
-    To only show text changes, select \uicontrol {Ignore Whitespace}.
-
-    To expand the context for the changes, set the number of unchanged lines to
-    show in \uicontrol {Context lines}. Set the value to -1 to show the whole
-    file.
-
-    By default, the horizontal scroll bars in the left and right pane are
-    synchronized. To use them independently of each other, select the
-    \inlineimage linkicon.png
-    (\uicontrol {Synchronize Horizontal Scroll Bars}) button.
-
-    If the files change outside \QC, select \inlineimage reload_gray.png
-    (\uicontrol {Reload Editor}) to compare them again and to show the results.
-
-    To send a chunk of changes to a \l{Pasting and Fetching Code Snippets}
-    {code pasting service}, select \uicontrol {Send Chunk to CodePaster} in the
-    context menu.
 */