Merge lp://qastaging/~amachattie/gtg/patch_one into lp://qastaging/~gtg/gtg/old-trunk

The massive diff is caused by using windows line endings. I'll convert the line endings back to unix ones.

Launchpad does not support directly ignoring whitespace. You can see the diff locally:

bzr cdiff --diff-options='-w'
=== modified file 'docs/userdoc/C/gtg-add-sync.page'
--- docs/userdoc/C/gtg-add-sync.page 2013-06-18 21:34:59 +0000
+++ docs/userdoc/C/gtg-add-sync.page 2014-03-18 07:43:01 +0000
@@ -4,7 +4,7 @@
       id="gtg-add-sync">

   <info>
- <link type="guide" xref="index#gtg-sync"/>
+ <link type="guide" xref="index#gtg-sync" group="second"/>
      <link type="seealso" xref="gtg-sync"/>
       <link type="seealso" xref="gtg-remove-sync"/>

=== modified file 'docs/userdoc/C/gtg-quickadd-dates.page'
--- docs/userdoc/C/gtg-quickadd-dates.page 2012-11-15 10:55:45 +0000
+++ docs/userdoc/C/gtg-quickadd-dates.page 2014-03-18 07:43:02 +0000
@@ -15,7 +15,7 @@

   <title>Add Dates and Tags to Tasks using the Quick Add Entry</title>

- <p>You can also create a task in the Quick Add Entry and at the same time specify its tags, due and defer date. Follow these format rules:</p>
+ <p>You can also create a task in the Quick Add Entry and at the same time specify its tags, due and defer date. The defer date allows you to set a date on which you intend to start the task. Follow these format rules:</p>

     <p><em style="strong">tags:tag1,tag2,tag3</em></p>

=== modified file 'docs/userdoc/C/gtg-quickadd.page'
--- docs/userdoc/C/gtg-quickadd.page 2013-06-18 22:31:16 +0000
+++ docs/userdoc/C/gtg-quickadd.page 2014-03-18 07:43:02 +0000
@@ -4,7 +4,7 @@
       id="gtg-quickadd">

   <info>
- <link type="guide" xref="index#gtg-task-management" group="fourth"/>
+ <link type="guide" xref="index#gtg-task-management" group="second"/>

       <revision pkgversion="1301" date="2013-06-18" status="candidate"/>
    <credit type="author copyright">

=== modified file 'docs/userdoc/C/gtg-search-intro.page'
--- docs/userdoc/C/gtg-search-intro.page 2013-06-18 22:31:16 +0000
+++ docs/userdoc/C/gtg-search-intro.page 2014-03-18 07:43:02 +0000
@@ -18,7 +18,7 @@
 for tasks based on their content.</p>

 <p>Searching for tasks is really easy: just type the words you are looking for
-in the Quick Add Entry, and select &quot;Search&quot; in the menu that
+in the <gui>Quick Add Entry</gui>, and select &quot;Search&quot; in the menu that
 will appear automatically.</p>

 <p>GTG stores your searches in the sidebar, under the &quot;Search&quot;
@@ -27,8 +27,7 @@
 all the tasks matching your search request.</p>

 <p>GTG also saves all the search requests you have made until you explicitely
-delete them (which you can do by right-clicking on them and selecting
-&quot;Delete&quot;). That allows you to safely quit GTG without loosing your
+delete them (which you can do by right-clicking on them and selecting <gui>Delete</gui>). That allows you to safely quit GTG without loosing your
 search requests. This can be very useful when you use the search features
 to identify specific tasks regularly!</p>

=== modified file 'docs/userdoc/C/gtg-search-syntax.page'
--- docs/userdoc/C/gtg-search-syntax.page 2013-06-18 22:31:16 +0000
+++ docs/u...