From a8cca2b170036afbd0a572331ab41fbd94d09941 Mon Sep 17 00:00:00 2001
From: Andre Klapper <a9016009@gmx.de>
Date: Fri, 19 Apr 2013 22:39:25 +0200
Subject: User docs: Misc. comment updates

---
 help/C/calendar-layout-appointment-display.page               |  2 +-
 help/C/calendar-layout-general-formatting.page                |  2 +-
 help/C/change-switcher-appearance.page                        |  2 +-
 help/C/exchange-connectors-overview.page                      |  4 +---
 help/C/mail-composer-mail-signatures-per-account.page         |  2 +-
 help/C/mail-encryption-gpg-create-key.page                    |  2 +-
 help/C/mail-encryption-gpg-getting-keys.page                  |  2 +-
 help/C/mail-encryption-gpg-set-up.page                        |  2 +-
 help/C/mail-filters-conditions.page                           |  4 ++--
 help/C/mail-filters-not-working.page                          | 10 ++++------
 help/C/mail-reading-keyboard-shortcuts.page                   |  2 +-
 help/C/mail-receiving-options-exchange-ews.page               |  2 +-
 help/C/mail-receiving-options-exchange-mapi.page              |  2 +-
 help/C/mail-receiving-options-imap-plus.page                  |  2 +-
 help/C/mail-receiving-options-local-delivery.page             |  2 +-
 help/C/mail-receiving-options-maildir-format-directories.page |  2 +-
 help/C/mail-receiving-options-mh-format-directories.page      |  2 +-
 help/C/mail-receiving-options-pop.page                        |  2 +-
 help/C/mail-receiving-options-unix-mbox-spool-directory.page  |  2 +-
 help/C/mail-receiving-options-unix-mbox-spool-file.page       |  2 +-
 help/C/mail-receiving-options-usenet-news.page                |  2 +-
 help/C/mail-search-folders-conditions.page                    |  6 +++---
 help/C/mail-sending-options-smtp.page                         |  2 +-
 help/C/mail-spam-settings.page                                |  4 ++--
 help/C/mail-working-offline.page                              |  2 +-
 help/C/memos-usage.page                                       |  2 +-
 help/C/sync-with-other-devices.page                           |  2 +-
 help/C/tasks-display-settings.page                            |  2 +-
 28 files changed, 35 insertions(+), 39 deletions(-)

(limited to 'help/C')

diff --git a/help/C/calendar-layout-appointment-display.page b/help/C/calendar-layout-appointment-display.page
index 9d6282b4e5..d74c2e6bcd 100644
--- a/help/C/calendar-layout-appointment-display.page
+++ b/help/C/calendar-layout-appointment-display.page
@@ -22,7 +22,7 @@
 
 <title>Appearance of Appointments</title>
 
-<!-- TODO:POST-3-2: Just listing the partially busted UI options (also see calendar-layout-general-formatting) here is very poor and not task-oriented, but that's it for the time being. Better ideas welcome. -->
+<!-- TODO:POST-3-8: Just listing the partially busted UI options (also see calendar-layout-general-formatting) here is very poor and not task-oriented, but that's it for the time being. Better ideas welcome. -->
 
 <!-- TODO: Recheck once https://bugzilla.gnome.org/show_bug.cgi?id=657233 is fixed, as the current UI is a huge mess. -->
 
diff --git a/help/C/calendar-layout-general-formatting.page b/help/C/calendar-layout-general-formatting.page
index a114a814da..d8e69f174f 100644
--- a/help/C/calendar-layout-general-formatting.page
+++ b/help/C/calendar-layout-general-formatting.page
@@ -18,7 +18,7 @@
       <p>Creative Commons Share Alike 3.0</p>
     </license>
 
-<!-- TODO:POST-3-2: Just listing the partially busted UI options (also see calendar-layout-appointment-display) here is very poor and not task-oriented, but that's it for the time being. Better ideas welcome. -->
+<!-- TODO:POST-3-8: Just listing the partially busted UI options (also see calendar-layout-appointment-display) here is very poor and not task-oriented, but that's it for the time being. Better ideas welcome. -->
 
   </info>
 
diff --git a/help/C/change-switcher-appearance.page b/help/C/change-switcher-appearance.page
index 8560760afe..069df4c12c 100644
--- a/help/C/change-switcher-appearance.page
+++ b/help/C/change-switcher-appearance.page
@@ -4,7 +4,7 @@
   <info>
     <desc>Changing the display of the window buttons in the lower left corner.</desc>
     <link type="guide" xref="index#common-other-problems" />
-<!-- TODO:POST-3-2: Create a general interface adjustment guide page that also includes mail-layout-changing.page -->
+<!-- TODO:POST-3-8: Create a general interface adjustment guide page that also includes mail-layout-changing.page -->
     <revision pkgversion="2.32.2" version="0.1" date="2011-07-21" status="stub"/>
     <credit type="author">
       <name its:translate="no">Andre Klapper</name>
diff --git a/help/C/exchange-connectors-overview.page b/help/C/exchange-connectors-overview.page
index c475d1e191..3b33d66c09 100644
--- a/help/C/exchange-connectors-overview.page
+++ b/help/C/exchange-connectors-overview.page
@@ -45,9 +45,7 @@
 
 <note style="tip"><p>If you are unsure which Microsoft Exchange server version is used, you may want to contact your system administrator for more information.</p></note>
 
-<!-- TODO:POST-3-4:
-<mbarnes> actually, a table in the docs would make it crystal clear  (Exchange version x Evolution backend)
-<seanius> also, a feature matrix of what works in the particular releases might be helpful, though maybe hard to visualize in a compact manner
+<!-- TODO:POST-3-4: <mbarnes> actually, a table in the docs would make it crystal clear  (Exchange version x Evolution backend); <seanius> also, a feature matrix of what works in the particular releases might be helpful, though maybe hard to visualize in a compact manner
 -->
 
 </page>
diff --git a/help/C/mail-composer-mail-signatures-per-account.page b/help/C/mail-composer-mail-signatures-per-account.page
index 9c941ee856..e304009537 100644
--- a/help/C/mail-composer-mail-signatures-per-account.page
+++ b/help/C/mail-composer-mail-signatures-per-account.page
@@ -13,7 +13,7 @@
     <link type="guide" xref="mail-account-manage-unix-mbox-spool-directory#identity"/>
     <link type="guide" xref="mail-account-manage-unix-mbox-spool-file#identity"/>
     <link type="guide" xref="mail-account-manage-usenet-news#identity"/>
-    <!-- TODO:POST-3-2: Having 13 guide links here looks really ugly -->
+    <!-- TODO:POST-3-8: Having 13 guide links here looks really ugly -->
 
     <revision pkgversion="3.0.2" version="0.3" date="2012-02-19" status="final"/>
     <credit type="author">
diff --git a/help/C/mail-encryption-gpg-create-key.page b/help/C/mail-encryption-gpg-create-key.page
index 516676b052..9edfb44c14 100644
--- a/help/C/mail-encryption-gpg-create-key.page
+++ b/help/C/mail-encryption-gpg-create-key.page
@@ -23,7 +23,7 @@
   <title>Creating a GPG key</title>
 
 <note style="advanced"><p>These steps are very technical. For average users we recommend using the <link href="help:seahorse/index"><app>Seahorse</app> application</link> for managing GPG/OpenPGP keys.</p></note>
-<!-- TODO:POST-3-2: Update and rewrite using Seahorse. Needs a complete rewrite once https://bugzilla.gnome.org/show_bug.cgi?id=508744 is fixed. -->
+<!-- TODO:POST-3-8: Update and rewrite using Seahorse. Needs a complete rewrite once https://bugzilla.gnome.org/show_bug.cgi?id=508744 is fixed. -->
 
 <p>Before you can get or send GPG encrypted mail, you need to generate your public and private keys with GPG.</p>
 <steps>
diff --git a/help/C/mail-encryption-gpg-getting-keys.page b/help/C/mail-encryption-gpg-getting-keys.page
index eec20684ef..78bfe72d13 100644
--- a/help/C/mail-encryption-gpg-getting-keys.page
+++ b/help/C/mail-encryption-gpg-getting-keys.page
@@ -21,7 +21,7 @@
   </info>
 
   <title>Getting and using GPG public keys</title>
-<!-- TODO:POST-3-2: Update and rewrite using Seahorse. Needs a complete rewrite once https://bugzilla.gnome.org/show_bug.cgi?id=508744 is fixed. -->
+<!-- TODO:POST-3-8: Update and rewrite using Seahorse. Needs a complete rewrite once https://bugzilla.gnome.org/show_bug.cgi?id=508744 is fixed. -->
 
 <p>To send an encrypted message, you need to use the recipient's public key in combination with your private key. Evolution handles the encryption, but you need to get the public key and add it to your keyring.</p>
 
diff --git a/help/C/mail-encryption-gpg-set-up.page b/help/C/mail-encryption-gpg-set-up.page
index c99a02ab02..472a607013 100644
--- a/help/C/mail-encryption-gpg-set-up.page
+++ b/help/C/mail-encryption-gpg-set-up.page
@@ -21,7 +21,7 @@
   </info>
 
   <title>Setting up GPG for your mail account</title>
-<!-- TODO:POST-3-2: Update and rewrite using Seahorse. Needs a complete rewrite once https://bugzilla.gnome.org/show_bug.cgi?id=508744 is fixed. -->
+<!-- TODO:POST-3-8: Update and rewrite using Seahorse. Needs a complete rewrite once https://bugzilla.gnome.org/show_bug.cgi?id=508744 is fixed. -->
 
 <note style="tip"><p>You need a GPG key to do this. If you do not have one yet, please refer to <link xref="mail-encryption-gpg-create-key">Creating a GPG key</link>.</p></note>
 
diff --git a/help/C/mail-filters-conditions.page b/help/C/mail-filters-conditions.page
index 9b533e057b..05aecbe2f9 100644
--- a/help/C/mail-filters-conditions.page
+++ b/help/C/mail-filters-conditions.page
@@ -73,7 +73,7 @@
 <p>Checks whether the message is <link xref="mail-follow-up-flag">flagged for follow-up</link>.</p></item>
 
 <item><p>Completed On:</p></item>
-<!-- TODO: Explain usage of this option. -->
+<!-- TODO: Explain usage of this option: Completed On -->
 
 <item><p>Attachments:</p>
 <p>Checks whether there is an attachment for the email.</p></item>
@@ -94,6 +94,6 @@
 <p>Filters based on the results of the <link xref="mail-spam">junk mail</link> test.</p></item>
 
 <item><p>Match All:</p></item>
-<!-- TODO: Explain usage of this option. -->
+<!-- TODO: Explain usage of this option: Match All -->
 </list>
 </page>
diff --git a/help/C/mail-filters-not-working.page b/help/C/mail-filters-not-working.page
index 811bfb92e4..3dd3b4ad8c 100644
--- a/help/C/mail-filters-not-working.page
+++ b/help/C/mail-filters-not-working.page
@@ -37,7 +37,9 @@
 <p>Another thing you have to keep in mind is that filters depend on the "new" flag that is set on the server when a particular email message is initially fetched from the server. If you use another email client aside from Evolution, your filters may not work automatically.</p>
 </section>
 
-<!-- TODO: This really needs testing before 3.6 and if this is correct: -->
+<!-- TODO: Filter logging currently does not work at all and needs updates and uncommenting after https://bugzilla.gnome.org/show_bug.cgi?id=669471 has been fixed: -->
+<!--
+"CAMEL_DEBUG=filter" should work and "CAMEL_DEBUG=junk" for monitoring junk mail classification?
 <section id="filter-log">
 <title>Logging Filter Actions</title>
 If it is still unclear why filters do not work as expected, you can enable logging filter actions.
@@ -55,10 +57,6 @@ If it is still unclear why filters do not work as expected, you can enable loggi
 
 <p>You can also use the <app>dconf-editor</app> application to do this.</p>
 </section>
-
-<!-- TODO: As per https://bugzilla.gnome.org/show_bug.cgi?id=669471#c2 :
-Haven't tried it, but it looks like "CAMEL_DEBUG=filter" should work.
-Similarly, there's "CAMEL_DEBUG=junk" for monitoring junk mail classification.
-But maybe not in this place... -->
+-->
 
 </page>
diff --git a/help/C/mail-reading-keyboard-shortcuts.page b/help/C/mail-reading-keyboard-shortcuts.page
index 5a53773ed1..5c6a493ef9 100644
--- a/help/C/mail-reading-keyboard-shortcuts.page
+++ b/help/C/mail-reading-keyboard-shortcuts.page
@@ -5,7 +5,7 @@
     <desc>Keyboard shortcuts that can save you some time when reading mail.</desc>
 
     <link type="guide" xref="index#mail-basic" />
-<!-- TODO:POST-3-2: maybe introduce keyboard shortcuts guide xref covering any shortcuts in all modules, covering http://library.gnome.org/users/evolution/2.32/quickref-mail.html.en ? -->
+<!-- TODO:POST-3-8: maybe introduce keyboard shortcuts guide xref covering any shortcuts in all modules, covering http://library.gnome.org/users/evolution/2.32/quickref-mail.html.en ? -->
 
     <revision pkgversion="3.1.5" version="0.2" date="2011-07-29" status="final"/>
     <credit type="author">
diff --git a/help/C/mail-receiving-options-exchange-ews.page b/help/C/mail-receiving-options-exchange-ews.page
index 7eb1dd4567..b79efc3860 100644
--- a/help/C/mail-receiving-options-exchange-ews.page
+++ b/help/C/mail-receiving-options-exchange-ews.page
@@ -48,7 +48,7 @@
 </section>
 
 <section id="return-to-assistant-bottom-link">
-<!-- TODO:XINCLUDE: Maybe later replace this "go back" workaround by doing some content sharing with xinclude and xpointer in intro-first-run.page itself? <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. -->
+<!-- TODO:XINCLUDE: Replace this "go back" workaround by using xinclude and ui:expanded in intro-first-run.page itself, so content is embedded there and expandable. See http://projectmallard.org/ui/1.0/ui_expanded.html and https://help.gnome.org/users/gnome-help/3.6/keyboard-shortcuts-set.html -->
 <p>If you came to this page from the first-run wizard help page, click <link xref="intro-first-run#sending">here</link> to continue with the next step.</p>
 </section>
 
diff --git a/help/C/mail-receiving-options-exchange-mapi.page b/help/C/mail-receiving-options-exchange-mapi.page
index 5276d96a52..90a3bada04 100644
--- a/help/C/mail-receiving-options-exchange-mapi.page
+++ b/help/C/mail-receiving-options-exchange-mapi.page
@@ -48,7 +48,7 @@
 </section>
 
 <section id="return-to-assistant-bottom-link">
-<!-- TODO:XINCLUDE: Maybe later replace this "go back" workaround by doing some content sharing with xinclude and xpointer in intro-first-run.page itself? <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. -->
+<!-- TODO:XINCLUDE: Replace this "go back" workaround by using xinclude and ui:expanded in intro-first-run.page itself, so content is embedded there and expandable. See http://projectmallard.org/ui/1.0/ui_expanded.html and https://help.gnome.org/users/gnome-help/3.6/keyboard-shortcuts-set.html -->
 <p>If you came to this page from the first-run wizard help page, click <link xref="intro-first-run#sending">here</link> to continue with the next step.</p>
 </section>
 </page>
diff --git a/help/C/mail-receiving-options-imap-plus.page b/help/C/mail-receiving-options-imap-plus.page
index ff92454425..73cd223431 100644
--- a/help/C/mail-receiving-options-imap-plus.page
+++ b/help/C/mail-receiving-options-imap-plus.page
@@ -54,7 +54,7 @@
 </section>
 
 <section id="return-to-assistant-bottom-link">
-<!-- TODO:XINCLUDE: Maybe later replace this "go back" workaround by doing some content sharing with xinclude and xpointer in intro-first-run.page itself? <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. -->
+<!-- TODO:XINCLUDE: Replace this "go back" workaround by using xinclude and ui:expanded in intro-first-run.page itself, so content is embedded there and expandable. See http://projectmallard.org/ui/1.0/ui_expanded.html and https://help.gnome.org/users/gnome-help/3.6/keyboard-shortcuts-set.html -->
 <p>If you came to this page from the first-run wizard help page, click <link xref="intro-first-run#sending">here</link> to continue with the next step.</p>
 </section>
 </page>
diff --git a/help/C/mail-receiving-options-local-delivery.page b/help/C/mail-receiving-options-local-delivery.page
index 769d50e28f..d64f268ef4 100644
--- a/help/C/mail-receiving-options-local-delivery.page
+++ b/help/C/mail-receiving-options-local-delivery.page
@@ -42,7 +42,7 @@
 </section>
 
 <section id="return-to-assistant-bottom-link">
-<!-- TODO:XINCLUDE: Maybe later replace this "go back" workaround by doing some content sharing with xinclude and xpointer in intro-first-run.page itself? <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. -->
+<!-- TODO:XINCLUDE: Replace this "go back" workaround by using xinclude and ui:expanded in intro-first-run.page itself, so content is embedded there and expandable. See http://projectmallard.org/ui/1.0/ui_expanded.html and https://help.gnome.org/users/gnome-help/3.6/keyboard-shortcuts-set.html -->
 <p>If you came to this page from the first-run wizard help page, click <link xref="intro-first-run#sending">here</link> to continue with the next step.</p>
 </section>
 </page>
diff --git a/help/C/mail-receiving-options-maildir-format-directories.page b/help/C/mail-receiving-options-maildir-format-directories.page
index 0e75c12b0e..75cf4adc56 100644
--- a/help/C/mail-receiving-options-maildir-format-directories.page
+++ b/help/C/mail-receiving-options-maildir-format-directories.page
@@ -43,7 +43,7 @@
 </section>
 
 <section id="return-to-assistant-bottom-link">
-<!-- TODO:XINCLUDE: Maybe later replace this "go back" workaround by doing some content sharing with xinclude and xpointer in intro-first-run.page itself? <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. -->
+<!-- TODO:XINCLUDE: Replace this "go back" workaround by using xinclude and ui:expanded in intro-first-run.page itself, so content is embedded there and expandable. See http://projectmallard.org/ui/1.0/ui_expanded.html and https://help.gnome.org/users/gnome-help/3.6/keyboard-shortcuts-set.html -->
 <p>If you came to this page from the first-run wizard help page, click <link xref="intro-first-run#sending">here</link> to continue with the next step.</p>
 </section>
 </page>
diff --git a/help/C/mail-receiving-options-mh-format-directories.page b/help/C/mail-receiving-options-mh-format-directories.page
index 8cd6205c72..fd109afdf7 100644
--- a/help/C/mail-receiving-options-mh-format-directories.page
+++ b/help/C/mail-receiving-options-mh-format-directories.page
@@ -42,7 +42,7 @@
 </section>
 
 <section id="return-to-assistant-bottom-link">
-<!-- TODO:XINCLUDE: Maybe later replace this "go back" workaround by doing some content sharing with xinclude and xpointer in intro-first-run.page itself? <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. -->
+<!-- TODO:XINCLUDE: Replace this "go back" workaround by using xinclude and ui:expanded in intro-first-run.page itself, so content is embedded there and expandable. See http://projectmallard.org/ui/1.0/ui_expanded.html and https://help.gnome.org/users/gnome-help/3.6/keyboard-shortcuts-set.html -->
 <p>If you came to this page from the first-run wizard help page, click <link xref="intro-first-run#sending">here</link> to continue with the next step.</p>
 </section>
 </page>
diff --git a/help/C/mail-receiving-options-pop.page b/help/C/mail-receiving-options-pop.page
index 5264eb40f3..3785797ced 100644
--- a/help/C/mail-receiving-options-pop.page
+++ b/help/C/mail-receiving-options-pop.page
@@ -56,7 +56,7 @@
 </section>
 
 <section id="return-to-assistant-bottom-link">
-<!-- TODO:XINCLUDE: Maybe later replace this "go back" workaround by doing some content sharing with xinclude and xpointer in intro-first-run.page itself? <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. -->
+<!-- TODO:XINCLUDE: Replace this "go back" workaround by using xinclude and ui:expanded in intro-first-run.page itself, so content is embedded there and expandable. See http://projectmallard.org/ui/1.0/ui_expanded.html and https://help.gnome.org/users/gnome-help/3.6/keyboard-shortcuts-set.html -->
 <p>If you came to this page from the first-run wizard help page, click <link xref="intro-first-run#sending">here</link> to continue with the next step.</p>
 </section>
 </page>
diff --git a/help/C/mail-receiving-options-unix-mbox-spool-directory.page b/help/C/mail-receiving-options-unix-mbox-spool-directory.page
index d4bf400dc5..310ccaad0f 100644
--- a/help/C/mail-receiving-options-unix-mbox-spool-directory.page
+++ b/help/C/mail-receiving-options-unix-mbox-spool-directory.page
@@ -42,7 +42,7 @@
 </section>
 
 <section id="return-to-assistant-bottom-link">
-<!-- TODO:XINCLUDE: Maybe later replace this "go back" workaround by doing some content sharing with xinclude and xpointer in intro-first-run.page itself? <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. -->
+<!-- TODO:XINCLUDE: Replace this "go back" workaround by using xinclude and ui:expanded in intro-first-run.page itself, so content is embedded there and expandable. See http://projectmallard.org/ui/1.0/ui_expanded.html and https://help.gnome.org/users/gnome-help/3.6/keyboard-shortcuts-set.html -->
 <p>If you came to this page from the first-run wizard help page, click <link xref="intro-first-run#sending">here</link> to continue with the next step.</p>
 </section>
 </page>
diff --git a/help/C/mail-receiving-options-unix-mbox-spool-file.page b/help/C/mail-receiving-options-unix-mbox-spool-file.page
index c2a55b1d40..d32b71e100 100644
--- a/help/C/mail-receiving-options-unix-mbox-spool-file.page
+++ b/help/C/mail-receiving-options-unix-mbox-spool-file.page
@@ -43,7 +43,7 @@
 </section>
 
 <section id="return-to-assistant-bottom-link">
-<!-- TODO:XINCLUDE: Maybe later replace this "go back" workaround by doing some content sharing with xinclude and xpointer in intro-first-run.page itself? <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. -->
+<!-- TODO:XINCLUDE: Replace this "go back" workaround by using xinclude and ui:expanded in intro-first-run.page itself, so content is embedded there and expandable. See http://projectmallard.org/ui/1.0/ui_expanded.html and https://help.gnome.org/users/gnome-help/3.6/keyboard-shortcuts-set.html -->
 <p>If you came to this page from the first-run wizard help page, click <link xref="intro-first-run#sending">here</link> to continue with the next step.</p>
 </section>
 </page>
diff --git a/help/C/mail-receiving-options-usenet-news.page b/help/C/mail-receiving-options-usenet-news.page
index 89ba11d223..2f433d209a 100644
--- a/help/C/mail-receiving-options-usenet-news.page
+++ b/help/C/mail-receiving-options-usenet-news.page
@@ -53,7 +53,7 @@
 </section>
 
 <section id="return-to-assistant-bottom-link">
-<!-- TODO:XINCLUDE: Maybe later replace this "go back" workaround by doing some content sharing with xinclude and xpointer in intro-first-run.page itself? <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. -->
+<!-- TODO:XINCLUDE: Replace this "go back" workaround by using xinclude and ui:expanded in intro-first-run.page itself, so content is embedded there and expandable. See http://projectmallard.org/ui/1.0/ui_expanded.html and https://help.gnome.org/users/gnome-help/3.6/keyboard-shortcuts-set.html -->
 <p>If you came to this page from the first-run wizard help page, click <link xref="intro-first-run#sending">here</link> to continue with the next step.</p>
 </section>
 </page>
diff --git a/help/C/mail-search-folders-conditions.page b/help/C/mail-search-folders-conditions.page
index 1bca398484..cb40c97166 100644
--- a/help/C/mail-search-folders-conditions.page
+++ b/help/C/mail-search-folders-conditions.page
@@ -73,7 +73,7 @@
 <p>Checks whether the message is <link xref="mail-follow-up-flag">flagged for follow-up</link>.</p></item>
 
 <item><p>Completed On:</p></item>
-<!-- TODO: Explain usage of this option. -->
+<!-- TODO: Explain usage of this option: Completed On -->
 
 <item><p>Attachments:</p>
 <p>Checks whether there is an attachment for the email.</p></item>
@@ -85,9 +85,9 @@
 <p>(For programmers only) If you know your way around a <link href="https://secure.wikimedia.org/wikipedia/en/wiki/Regular_expression">regex</link>, or regular expression, this option allows you to search for complex patterns of letters, so that you can find, for example, all words that start with a and end with m, and are between six and fifteen letters long, or all messages that declare a particular header twice. For information about how to use regular expressions, check the man page for the <cmd>grep</cmd> command.</p></item>
 
 <item><p>Message Location:</p></item>
-<!-- TODO: Explain usage of this option. -->
+<!-- TODO: Explain usage of this option: Message Location -->
 
 <item><p>Match All:</p></item>
-<!-- TODO: Explain usage of this option. -->
+<!-- TODO: Explain usage of this option: Match All -->
 </list>
 </page>
diff --git a/help/C/mail-sending-options-smtp.page b/help/C/mail-sending-options-smtp.page
index f05208c72e..4c8ca5094d 100644
--- a/help/C/mail-sending-options-smtp.page
+++ b/help/C/mail-sending-options-smtp.page
@@ -38,7 +38,7 @@
 <item><p>Choose <gui>Use secure connection</gui> if you want to connect securely.</p></item>
 </steps>
 
-<!-- TODO:XINCLUDE: Maybe later replace this "go back" workaround by doing some content sharing with xinclude and xpointer in intro-first-run.page itself? <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. -->
+<!-- TODO:XINCLUDE: Replace this "go back" workaround by using xinclude and ui:expanded in intro-first-run.page itself, so content is embedded there and expandable. See http://projectmallard.org/ui/1.0/ui_expanded.html and https://help.gnome.org/users/gnome-help/3.6/keyboard-shortcuts-set.html -->
 <p>If you came to this page from the first-run wizard help page, click <link xref="intro-first-run#account-information">here</link> to continue with the next step.</p>
 
 </page>
diff --git a/help/C/mail-spam-settings.page b/help/C/mail-spam-settings.page
index d66cdbe2fe..3a88e1b0d7 100644
--- a/help/C/mail-spam-settings.page
+++ b/help/C/mail-spam-settings.page
@@ -9,7 +9,7 @@
     <link type="guide" xref="mail-spam" />
     <link type="seealso" xref="mail-spam-marking"/>
 
-    <revision pkgversion="3.5.1" version="0.7" date="2012-04-25" status="final"/>
+    <revision pkgversion="3.8.1" version="0.8" date="2013-04-19" status="final"/>
     <credit type="author">
       <name its:translate="no">Andre Klapper</name>
       <email its:translate="no">ak-47@gmx.net</email>
@@ -59,7 +59,7 @@
 
 <section id="preferences">
 <title>Junk Mail Preferences</title>
-<note style="tip"><p>The junk mail options discussed in this page refer only to POP and Local Delivery. For handling junk mails on IMAP, see the Evolution settings under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Options</gui></guiseq>.</p></note>
+<note style="tip"><p>The junk mail options discussed in this page refer only to POP and Local Delivery accounts. For handling junk mails on IMAP accounts, see the Evolution settings under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Options</gui></guiseq>.</p></note>
 <p>You can modify how Evolution handles junk mail by changing the Junk Mail Preferences:</p>
 <steps>
 <item><p>Click <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq> or press <keyseq><key>Shift</key><key>Ctrl</key><key>S</key></keyseq>.</p></item>
diff --git a/help/C/mail-working-offline.page b/help/C/mail-working-offline.page
index 91b748603e..a8e681a734 100644
--- a/help/C/mail-working-offline.page
+++ b/help/C/mail-working-offline.page
@@ -3,7 +3,7 @@
 
   <info>
     <desc>Work with your mail while not being connected to the network.</desc>
-<!-- TODO:POST-3-2: Offline work for web calendars etc also exists => create index page for Offline working? -->
+<!-- TODO:POST-3-8: Offline work for web calendars etc also exists => create index page for Offline working? -->
     <link type="guide" xref="index#mail-basic" />
 
     <revision pkgversion="3.7.4" version="0.3" date="2013-01-22" status="final"/>
diff --git a/help/C/memos-usage.page b/help/C/memos-usage.page
index 339fd7be12..ce1ec32b06 100644
--- a/help/C/memos-usage.page
+++ b/help/C/memos-usage.page
@@ -20,6 +20,6 @@
 <title>Add, Edit and Delete Memos</title>
 
 <note style="tip"><p>Currently there is no support for syncing memos with the <app>Tomboy</app> or <app>Gnote</app> applications.</p></note>
-<!-- TODO:POST-3-2: Periodically recheck status of https://bugzilla.gnome.org/show_bug.cgi?id=469217 -->
+<!-- TODO:POST-3-8: Periodically recheck status of https://bugzilla.gnome.org/show_bug.cgi?id=469217 -->
 
 </page>
diff --git a/help/C/sync-with-other-devices.page b/help/C/sync-with-other-devices.page
index c3b57e174c..455615c365 100644
--- a/help/C/sync-with-other-devices.page
+++ b/help/C/sync-with-other-devices.page
@@ -17,7 +17,7 @@
     <license>
       <p>Creative Commons Share Alike 3.0</p>
     </license>
-<!-- TODO:POST-3-2: Find out how to sync modern devices, e.g. Android, iPhone, Nokia N97 / N900, N9, N950, etc. Maybe SyncEvolution is the recommended (and external) way here? -->
+<!-- TODO:POST-3-8: Find out how to sync modern devices, e.g. Android, iPhone, Nokia N97 / N900, N9, N950, etc. Maybe SyncEvolution is the recommended (and external) way here? -->
   </info>
 
   <title>Synchronize <app>Evolution</app> with other devices</title>
diff --git a/help/C/tasks-display-settings.page b/help/C/tasks-display-settings.page
index 5fc7335f2b..7ded4fd111 100644
--- a/help/C/tasks-display-settings.page
+++ b/help/C/tasks-display-settings.page
@@ -22,7 +22,7 @@
 
 <title>Displaying of tasks</title>
 
-<!-- TODO:POST-3-2: Just listing the partially busted UI options (also see calendar-layout-appointment-display) here is very poor and not task-oriented, but that's it for the time being. Better ideas welcome. -->
+<!-- TODO:POST-3-8: Just listing the partially busted UI options (also see calendar-layout-appointment-display) here is very poor and not task-oriented, but that's it for the time being. Better ideas welcome. -->
 
 <p>The following task-related options are available under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Calendar and Tasks</gui><gui>Tasks</gui></guiseq>.</p>
 <!-- This is the location since 3.1.5, see bug https://bugzilla.gnome.org/show_bug.cgi?id=655666 -->
-- 
cgit v1.2.3