[gentoo-commits] proj/gnome:gnome-next commit in: gnome-extra/evolution-data-server/, mail-client/evolution/, ...

[Alexandre Restovtsev]

commit:     96d36ced9cd4692b8be160f7e43a7f6eca599345
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Mon Aug 29 02:50:37 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Mon Aug 29 02:50:37 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=96d36ced

evolution & friends: 3.1.5 → 3.1.90

Bump evolution and friends to 3.1.90; features lots of bugfixes and a
new settings API. The mallard relaxng patch has been applied upstream.
Make sure to use ${EPREFIX}/usr as the kerberos library directory prefix
for prefix friendliness.

---
 ....ebuild => evolution-data-server-3.1.90.ebuild} |    0
 ...1.5.ebuild => evolution-exchange-3.1.90.ebuild} |    2 +-
 .../evolution-exchange-9999.ebuild                 |    2 +-
 ...lution-3.1.5.ebuild => evolution-3.1.90.ebuild} |    5 +-
 mail-client/evolution/evolution-9999.ebuild        |    4 +-
 ...n-3.1.5-mallard-relaxng-validation-errors.patch |  430 --------------------
 6 files changed, 5 insertions(+), 438 deletions(-)

diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.1.5.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.1.90.ebuild
similarity index 100%
rename from gnome-extra/evolution-data-server/evolution-data-server-3.1.5.ebuild
rename to gnome-extra/evolution-data-server/evolution-data-server-3.1.90.ebuild

diff --git a/gnome-extra/evolution-exchange/evolution-exchange-3.1.5.ebuild b/gnome-extra/evolution-exchange/evolution-exchange-3.1.90.ebuild
similarity index 97%
rename from gnome-extra/evolution-exchange/evolution-exchange-3.1.5.ebuild
rename to gnome-extra/evolution-exchange/evolution-exchange-3.1.90.ebuild
index 6891c2f..2daeb35 100644
--- a/gnome-extra/evolution-exchange/evolution-exchange-3.1.5.ebuild
+++ b/gnome-extra/evolution-exchange/evolution-exchange-3.1.90.ebuild
@@ -41,7 +41,7 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
 	G2CONF="${G2CONF}
-		--with-krb5=/usr
+		--with-krb5=${EPREFIX}/usr
 		--with-openldap
 		--disable-static
 		--disable-maintainer-mode

diff --git a/gnome-extra/evolution-exchange/evolution-exchange-9999.ebuild b/gnome-extra/evolution-exchange/evolution-exchange-9999.ebuild
index 6891c2f..2daeb35 100644
--- a/gnome-extra/evolution-exchange/evolution-exchange-9999.ebuild
+++ b/gnome-extra/evolution-exchange/evolution-exchange-9999.ebuild
@@ -41,7 +41,7 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
 	G2CONF="${G2CONF}
-		--with-krb5=/usr
+		--with-krb5=${EPREFIX}/usr
 		--with-openldap
 		--disable-static
 		--disable-maintainer-mode

diff --git a/mail-client/evolution/evolution-3.1.5.ebuild b/mail-client/evolution/evolution-3.1.90.ebuild
similarity index 97%
rename from mail-client/evolution/evolution-3.1.5.ebuild
rename to mail-client/evolution/evolution-3.1.90.ebuild
index e583ee1..49c720f 100644
--- a/mail-client/evolution/evolution-3.1.5.ebuild
+++ b/mail-client/evolution/evolution-3.1.90.ebuild
@@ -118,7 +118,7 @@ pkg_setup() {
 		$(use_enable python)
 		$(use_with clutter)
 		$(use_with ldap openldap)
-		$(use_with kerberos krb5 /usr)"
+		$(use_with kerberos krb5 ${EPREFIX}/usr)"
 
 	# workaround for lack of EAPI 4 support in python.eclass
 	local myconf="--disable-contact-maps"
@@ -157,9 +157,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# https://bugzilla.gnome.org/show_bug.cgi?id=656537
-	epatch "${FILESDIR}/${P}-mallard-relaxng-validation-errors.patch"
-
 	# Use NSS/NSPR only if 'ssl' is enabled.
 	if use ssl ; then
 		sed -e 's|mozilla-nss|nss|' \

diff --git a/mail-client/evolution/evolution-9999.ebuild b/mail-client/evolution/evolution-9999.ebuild
index ea6f018..49c720f 100644
--- a/mail-client/evolution/evolution-9999.ebuild
+++ b/mail-client/evolution/evolution-9999.ebuild
@@ -8,7 +8,7 @@ GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="python? 2:2.4"
 
-inherit autotools flag-o-matic gnome2 python
+inherit autotools eutils flag-o-matic gnome2 python
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -118,7 +118,7 @@ pkg_setup() {
 		$(use_enable python)
 		$(use_with clutter)
 		$(use_with ldap openldap)
-		$(use_with kerberos krb5 /usr)"
+		$(use_with kerberos krb5 ${EPREFIX}/usr)"
 
 	# workaround for lack of EAPI 4 support in python.eclass
 	local myconf="--disable-contact-maps"

diff --git a/mail-client/evolution/files/evolution-3.1.5-mallard-relaxng-validation-errors.patch b/mail-client/evolution/files/evolution-3.1.5-mallard-relaxng-validation-errors.patch
deleted file mode 100644
index 8f1eaf1..0000000
--- a/mail-client/evolution/files/evolution-3.1.5-mallard-relaxng-validation-errors.patch
+++ /dev/null
@@ -1,430 +0,0 @@
-From 825e64ba1f268b05d590e7fda4d7e77815571018 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@×××××.com>
-Date: Sun, 14 Aug 2011 20:33:56 -0400
-Subject: [PATCH] Fix mallard relaxng validation errors in help pages
-
-Addresses https://bugzilla.gnome.org/show_bug.cgi?id=656537
----
- help/C/calendar-layout-appointment-display.page |    2 ++
- help/C/calendar-searching.page                  |    2 +-
- help/C/contacts-ldap.page                       |    2 +-
- help/C/contacts-searching.page                  |    2 +-
- help/C/contacts-using-contact-lists.page        |    2 +-
- help/C/import-apps-outlook.page                 |    9 +++++----
- help/C/mail-composer-html-image.page            |    2 +-
- help/C/mail-composer-several-recipients.page    |    4 ++--
- help/C/mail-encryption-gpg-create-key.page      |    4 ++--
- help/C/mail-encryption-gpg-set-up.page          |    3 ++-
- help/C/mail-filters.page                        |    1 -
- help/C/mail-folders.page                        |    9 +++++----
- help/C/mail-organizing.page                     |    4 ++--
- help/C/mail-searching.page                      |    2 +-
- help/C/mail-send-and-receive.page               |    2 +-
- help/C/mail-sending-options-smtp.page           |    3 ++-
- help/C/mail-sorting-message-list.page           |   16 ++++++++--------
- help/C/mail-spam-settings.page                  |    3 ++-
- help/C/memos-searching.page                     |    2 +-
- help/C/tasks-searching.page                     |    2 +-
- help/C/using-categories.page                    |    4 ++--
- 21 files changed, 43 insertions(+), 37 deletions(-)
-
-diff --git a/help/C/calendar-layout-appointment-display.page b/help/C/calendar-layout-appointment-display.page
-index 621cc60..010c83e 100644
---- a/help/C/calendar-layout-appointment-display.page
-+++ b/help/C/calendar-layout-appointment-display.page
-@@ -47,7 +47,9 @@
- <section id="date-time">
- <title>Date/Time Format</title>
- <list>
-+<item>
- <p>You can change the format of the <gui>Date</gui> column by setting your preferred format.</p><p>The placeholders in the format expression are strftime variables.</p>
-+</item>
- </list>
- </section>
- 
-diff --git a/help/C/calendar-searching.page b/help/C/calendar-searching.page
-index d600668..0b2d445 100644
---- a/help/C/calendar-searching.page
-+++ b/help/C/calendar-searching.page
-@@ -70,7 +70,7 @@
- <section id="editing-a-saved-search">
- <title>Editing a Saved Search</title>
- <steps>
--<item><p>Select <guiseq><gui>Search</gui><gui>Edit Saved Searches</gui></guiseq> from the menu bar to open the window.</p>.</item>
-+<item><p>Select <guiseq><gui>Search</gui><gui>Edit Saved Searches</gui></guiseq> from the menu bar to open the window.</p></item>
- <item><p>Click the <gui style="button">Edit</gui> button to open the <gui>Edit Rule</gui> window.</p></item>
- <item><p>Edit the title or search conditions from the dialog box.</p></item>
- <item><p>Click <gui>OK</gui>.</p></item>
-diff --git a/help/C/contacts-ldap.page b/help/C/contacts-ldap.page
-index 119b005..37815ac 100644
---- a/help/C/contacts-ldap.page
-+++ b/help/C/contacts-ldap.page
-@@ -61,7 +61,7 @@
- 
- </section>
- 
--<section id="add-ldap-addressbook">
-+<section id="ldap-vs-local-addressbooks">
- <title>Differences to local address books</title>
- 
- <p>LDAP address books work like local address books on your computer, with the following exceptions:</p>
-diff --git a/help/C/contacts-searching.page b/help/C/contacts-searching.page
-index e4fbcef..ab7e826 100644
---- a/help/C/contacts-searching.page
-+++ b/help/C/contacts-searching.page
-@@ -70,7 +70,7 @@
- <section id="editing-a-saved-search">
- <title>Editing a Saved Search</title>
- <steps>
--<item><p>Select <guiseq><gui>Search</gui><gui>Edit Saved Searches</gui></guiseq> from the menu bar to open the window.</p>.</item>
-+<item><p>Select <guiseq><gui>Search</gui><gui>Edit Saved Searches</gui></guiseq> from the menu bar to open the window.</p></item>
- <item><p>Click the <gui style="button">Edit</gui> button to open the <gui>Edit Rule</gui> window.</p></item>
- <item><p>Edit the title or search conditions from the dialog box.</p></item>
- <item><p>Click <gui>OK</gui>.</p></item>
-diff --git a/help/C/contacts-using-contact-lists.page b/help/C/contacts-using-contact-lists.page
-index b538223..0fd5a40 100644
---- a/help/C/contacts-using-contact-lists.page
-+++ b/help/C/contacts-using-contact-lists.page
-@@ -40,7 +40,7 @@
- <p>The contact list will be added to the chosen address book in Evolution.</p>
- </section>
- 
--<section id="create-contact-list">
-+<section id="send-to-contact-list">
- <title>Sending messages to a contact list</title>
- <p>To send a message to the contact list, enter the name that you chose for the contact list as the recipient in the mail composer. You can also right-click the contact list in your address book and select <gui>Send Message to List</gui>.</p>
- </section>
-diff --git a/help/C/import-apps-outlook.page b/help/C/import-apps-outlook.page
-index 1b9a242..cee5655 100644
---- a/help/C/import-apps-outlook.page
-+++ b/help/C/import-apps-outlook.page
-@@ -35,10 +35,10 @@
-     <td></td><td><p>Windows 7, Windows Vista</p></td><td><p>Windows XP</p></td>
-   </tr>
-   <tr>
--    <td>Outlook 2010</td><td><p><file>C:\Users\username\My Documents\Outlook Files</file></p></td><td><p><file>C:\Documents and Settings\username\My Documents\Outlook Files</file></p></td>
-+    <td><p>Outlook 2010</p></td><td><p><file>C:\Users\username\My Documents\Outlook Files</file></p></td><td><p><file>C:\Documents and Settings\username\My Documents\Outlook Files</file></p></td>
-   </tr>
-   <tr>
--    <td>Outlook 2007 and earlier</td><td><p><file>C:\Users\username\AppData\Local\Microsoft\Outlook</file></p></td><td><p><file>C:\Documents and Settings\username\AppData\Local\Microsoft\Outlook</file></p></td>
-+    <td><p>Outlook 2007 and earlier</p></td><td><p><file>C:\Users\username\AppData\Local\Microsoft\Outlook</file></p></td><td><p><file>C:\Documents and Settings\username\AppData\Local\Microsoft\Outlook</file></p></td>
-   </tr>
- </table>
- <p>(Replace "username" by your username.)</p>
-@@ -53,13 +53,14 @@
- </steps>
- </section>
- 
--<section id="prerequisites">
-+<section id="importing">
- <title>Importing into Evolution</title>
- <steps>
- <item><p>Click <guiseq><gui>File</gui><gui>Import</gui></guiseq>.</p></item>
- <item><p>In the <gui>Importer Type</gui> tab, click <gui>Import a single file</gui>.</p></item>
--<item><p>Choose the Outlook personal folders (.pst) file that you would like to import.</p><p>The file type will be automatically determined.</p></item>
-+<item><p>Choose the Outlook personal folders (.pst) file that you would like to import.</p><p>The file type will be automatically determined.</p>
- <note style="tip"><p>If the option to import Outlook personal folders (.pst files) is not available under <guiseq><gui>File</gui><gui>Import</gui><gui>Import single file</gui><gui>File type</gui></guiseq>, your distribution might have not enabled this functionality.</p></note>
-+</item>
- <item><p>Choose the destination (e.g. the folder in Evolution) for the imported data.</p></item>
- <item><p>Repeat the import steps until you have imported all your data.</p></item>
- </steps>
-diff --git a/help/C/mail-composer-html-image.page b/help/C/mail-composer-html-image.page
-index 44e4d71..825b504 100644
---- a/help/C/mail-composer-html-image.page
-+++ b/help/C/mail-composer-html-image.page
-@@ -27,7 +27,7 @@
- <item><p>Click <gui>Open</gui>.</p></item>
- </steps>
- 
--<note>Alternately, you can also drag an image into the text area of the message composer.</note>
-+<note><p>Alternately, you can also drag an image into the text area of the message composer.</p></note>
- 
- </page>
- 
-diff --git a/help/C/mail-composer-several-recipients.page b/help/C/mail-composer-several-recipients.page
-index 16c8876..0063823 100644
---- a/help/C/mail-composer-several-recipients.page
-+++ b/help/C/mail-composer-several-recipients.page
-@@ -27,6 +27,8 @@
- 
- <p>To send a message to more than one person, enter the addresses in the composer by separating them with commas or semicolons.</p>
- 
-+<note><p>If you frequently write email to the same groups of people, you can create <link xref="contacts-using-contact-lists">contact lists</link> to send them mail as though they have a single address.</p></note>
-+
- <section id="to-cc-bcc-meaning">
- <title>Recipient types</title>
- <p>Email messages can have three different types of recipients. The simplest way is to put the email address or addresses in the <gui>To:</gui> text field. The <gui>Cc:</gui> text field is used for recipients that are meant to receive a copy of your message but are not the primary recipients.</p>
-@@ -45,7 +47,5 @@
- <p>Instead of typing the recipients' names you can also click the <gui style="button">To:</gui>, <gui style="button">Cc:</gui>, or <gui style="button">Bcc:</gui> buttons to get a list of the email addresses in your address books. Select the addresses and click the arrow buttons to move them into the appropriate address columns (To:, Cc:, Bcc:).</p>
- </section>
- 
--<note><p>If you frequently write email to the same groups of people, you can create <link xref="contacts-using-contact-lists">contact lists</link> to send them mail as though they have a single address.</p></note>
--
- </page>
- 
-diff --git a/help/C/mail-encryption-gpg-create-key.page b/help/C/mail-encryption-gpg-create-key.page
-index a99004a..e7997e2 100644
---- a/help/C/mail-encryption-gpg-create-key.page
-+++ b/help/C/mail-encryption-gpg-create-key.page
-@@ -22,7 +22,7 @@
- 
-   <title>Creating a GPG key</title>
- 
--<note>These steps are very technical. For average users we nowadays recommend using the Seahorse application for managing GPG keys.</note>
-+<note><p>These steps are very technical. For average users we nowadays recommend using the Seahorse application for managing GPG 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. -->
- 
- <p>Before you can get or send GPG encrypted mail, you need to generate your public and private keys with GPG.</p>
-@@ -44,7 +44,7 @@
- <p>If you want, you can upload your keys to a key server:</p>
- <steps>
- <item><p>Check your public key ID with <code>gpg --list-keys</code>. It is the string after <code>1024D</code> on the line beginning with <code>pub</code>. In the example above, it is <code>32j38dk2</code>.</p></item>
--<item><p>Enter the command <code>gpg --send-keys --keyserver wwwkeys.pgp.net <varname>32j38dk2</varname></code>. Substitute your key ID for <quote>32j38dk2</quote>. You need your password to do this.</p></item>
-+<item><p>Enter the command <code>gpg --send-keys --keyserver wwwkeys.pgp.net 32j38dk2</code>. Substitute your key ID for <code>32j38dk2</code>. You need your password to do this.</p></item>
- </steps>
- 
- <p>Key servers store your public keys for you so that your friends can decrypt your messages. If you choose not to use a key server, you can manually send your public key, include it in your signature file, or put it on your own Web page. However, it is easier to publish a key once, and then let people download it from a central place when they want.</p>
-diff --git a/help/C/mail-encryption-gpg-set-up.page b/help/C/mail-encryption-gpg-set-up.page
-index d1bc94b..c3bc3db 100644
---- a/help/C/mail-encryption-gpg-set-up.page
-+++ b/help/C/mail-encryption-gpg-set-up.page
-@@ -29,8 +29,9 @@
- <item><p>Select <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui></guiseq>.</p></item>
- <item><p>Select the account you want to use securely, then click <gui style="button">Edit</gui>.</p></item>
- <item><p>Click the <gui>Security</gui> tab.</p></item>
--<item><p>Specify your key ID in the <gui>PGP/GPG Key ID</gui> field.</p></item>
-+<item><p>Specify your key ID in the <gui>PGP/GPG Key ID</gui> field.</p>
- <note style="tip"><p>Below the field you can choose whether to always sign outgoing messages when using this account, and other options.</p></note>
-+</item>
- <item><p>Click <gui style="button">OK</gui>.</p></item>
- <item><p>Click <gui style="button">Close</gui>.</p></item>
- </steps>
-diff --git a/help/C/mail-filters.page b/help/C/mail-filters.page
-index 04857d4..e8d902e 100644
---- a/help/C/mail-filters.page
-+++ b/help/C/mail-filters.page
-@@ -68,6 +68,5 @@
- 
- 
- 
--<p></p>
- 	
- </page>
-diff --git a/help/C/mail-folders.page b/help/C/mail-folders.page
-index 2c9f162..75b57d3 100644
---- a/help/C/mail-folders.page
-+++ b/help/C/mail-folders.page
-@@ -38,6 +38,11 @@
- <item><p>Click on the <gui>Create</gui> button. </p></item>
- </steps>
- <p>The new folder will be shown in the folder view. You can then move messages into the folder.</p>
-+
-+<note>
-+<p>The Inbox folders on most IMAP servers cannot contain both messages and subfolders. When creating additional folders on your IMAP mail server, branch the folders from the root of the IMAP account and not from the Inbox. Creating subfolders in your Inbox may prevent you from reading messages that exist in the Inbox. If this happens, move the folders to the IMAP account.</p>
-+</note>
-+
- </section>
- 
- <section id="use-folder">
-@@ -56,10 +61,6 @@
- 
- </section>
- 
--<note>
--<p>The Inbox folders on most IMAP servers cannot contain both messages and subfolders. When creating additional folders on your IMAP mail server, branch the folders from the root of the IMAP account and not from the Inbox. Creating subfolders in your Inbox may prevent you from reading messages that exist in the Inbox. If this happens, move the folders to the IMAP account.</p>
--</note>
--
- <!--Reuse http://library.gnome.org/users/evolution/2.32/usage-mail-organize-folders.html.en and add "Novell, Inc" as an author to this page. Mention the combination with filters (see seealso link)-->
- 	
- </page>
-diff --git a/help/C/mail-organizing.page b/help/C/mail-organizing.page
-index 46e4294..9a31798 100644
---- a/help/C/mail-organizing.page
-+++ b/help/C/mail-organizing.page
-@@ -20,9 +20,9 @@
- 
- <title>Sorting and organizing mail</title>
- 
-+<p>Evolution provides several options to organize your mail according to your needs.</p>
-+
-   <section id="advanced" style="2column">
-     <title>Advanced Options</title>
-   </section>
--
--<p>Evolution provides several options to organize your mail according to your needs.</p>
- </page>
-diff --git a/help/C/mail-searching.page b/help/C/mail-searching.page
-index 9d1d53b..636c2c7 100644
---- a/help/C/mail-searching.page
-+++ b/help/C/mail-searching.page
-@@ -66,7 +66,7 @@
- <section id="editing-a-saved-search">
- <title>Editing a Saved Search</title>
- <steps>
--<item><p>Select <guiseq><gui>Search</gui><gui>Edit Saved Searches</gui></guiseq> from the menu bar to open the window.</p>.</item>
-+<item><p>Select <guiseq><gui>Search</gui><gui>Edit Saved Searches</gui></guiseq> from the menu bar to open the window.</p></item>
- <item><p>Click the <gui style="button">Edit</gui> button to open the <gui>Edit Rule</gui> window.</p></item>
- <item><p>Edit the title or search conditions from the dialog box.</p></item>
- <item><p>Click <gui>OK</gui>.</p></item>
-diff --git a/help/C/mail-send-and-receive.page b/help/C/mail-send-and-receive.page
-index 3c14186..ae606a6 100644
---- a/help/C/mail-send-and-receive.page
-+++ b/help/C/mail-send-and-receive.page
-@@ -19,6 +19,6 @@
- 
- <title>Sending and receiving mail</title>
- 
--<p>This section refers to receiving mail and sending written emails. For writing a new message, please refer to the <link type="guide" xref="index#mail-composing">Composing mail</link> section.</p>
-+<p>This section refers to receiving mail and sending written emails. For writing a new message, please refer to the <link xref="index#mail-composing">Composing mail</link> section.</p>
- 
- </page>
-diff --git a/help/C/mail-sending-options-smtp.page b/help/C/mail-sending-options-smtp.page
-index 18149e1..603641d 100644
---- a/help/C/mail-sending-options-smtp.page
-+++ b/help/C/mail-sending-options-smtp.page
-@@ -27,8 +27,9 @@
-   <title>SMTP sending options</title>
- 
- <steps>
--<item><p>Enter the address of your mail server for sending mail in the <gui>Server</gui> field and select if the server requires authentication (entering a username and a password).</p></item>
-+<item><p>Enter the address of your mail server for sending mail in the <gui>Server</gui> field and select if the server requires authentication (entering a username and a password).</p>
- <note style="tip"><p>Free webmail providers often supply information about which of these options can be used. If you are in an organizational environment, you may want to contact your system administrator for more information.</p></note>
-+</item>
- <item><p>If the server requires authentication, you need to provide the following information:</p>
- <steps>
-   <item><p>Select the authentication type in the Authentication list, or click <gui>Check for Supported Types</gui> to have Evolution check. Some servers do not support this, so clicking this button is not a guarantee that available mechanisms actually work.</p></item>
-diff --git a/help/C/mail-sorting-message-list.page b/help/C/mail-sorting-message-list.page
-index 44f19fb..84ed48e 100644
---- a/help/C/mail-sorting-message-list.page
-+++ b/help/C/mail-sorting-message-list.page
-@@ -31,7 +31,7 @@
- <note><p>To view the complete headers for a message, click <guiseq><gui>View</gui><gui>All Message Headers</gui></guiseq>. This will display the complete header data on the viewing pane.</p> 
- <p>To view the message data, click on <guiseq><gui>View</gui><gui>Message Source</gui></guiseq> or press <keyseq><key>Ctrl</key><key>U</key></keyseq>. This will display the message data in a pop-up window.</p></note>
- 
--<section id="email threads">
-+<section id="email-threads">
- <title>Sorting Mail in Email Threads</title>
- <p>You can use a threaded message view to sort emails. To enable this feature, click on <guiseq><gui>View</gui><gui>Group By Threads</gui></guiseq> or press <keyseq><key>Ctrl</key><key>T</key></keyseq>.</p>
- <p>This feature, when enabled, groups replies with the original email and allows you to follow the flow of the conversation from one message to the next.</p>
-@@ -40,22 +40,22 @@
- </note>
- </section>
- 
--<section id="column headers">
-+<section id="column-headers">
- <title>Sorting Mail with Column Headers</title>
- <p>The message list displays columns that indicate whether a message has been read, whether it has attachments, how important the message is, the sender, date, and the subject. To change the columns used in the message list, you can do one of the following:</p>
- <list>
- <item><p>Drag and drop the column header bars</p></item>
--<item><p>Right-click on the header.</p></item>S
-+<item><p>Right-click on the header.</p></item>
- <item><p>Select the <gui>Remove This Column</gui> or <gui>Add a Column</gui> option.</p></item>
- </list>
- 
- <p>Evolution allows you to sort your messages using these columns. Just click on the column label to sort the emails. The direction of the arrow next to the label indicates the direction of the sort.</p>
- </section>
- 
--<section id="sort options">
-+<section id="sort-options">
- <title>Using Other Sorting Options</title>
- <p>Evolution provides other ways for sorting email messages. You can use Sort By, Sort Ascending, Sort Descending, or Unsort.</p>
--	<section>
-+	<section id="sort-options-by">
- 	<title>Sort By</title>
- 		<p>You can also sort email messages using the <gui>Sort By</gui> list.</p>
- 		<steps>
-@@ -86,7 +86,7 @@
- 		</steps>
- 	</section>
- 
--	<section>
-+	<section id="sort-options-ascending">
- 	<title>Sort Ascending</title>
- 		<steps>
- 		<item><p>Right-click on the message list column headers.</p></item>
-@@ -95,7 +95,7 @@
- 		<p>The messages will be displayed with the most recent at the bottom.</p>
- 	</section>
- 
--	<section>
-+	<section id="sort-options-descending">
- 	<title>Sort Descending</title>
- 		<steps>
- 		<item><p>Right-click on the message list column headers.</p></item>
-@@ -104,7 +104,7 @@
- 		<p>The messages will be displayed with the most recent at the top.</p>
- 	</section>
- 
--	<section>
-+	<section id="sort-options-unsort">
- 	<title>Unsort</title>
- 		<steps>
- 		<item><p>Right-click on the message list column headers.</p></item>
-diff --git a/help/C/mail-spam-settings.page b/help/C/mail-spam-settings.page
-index b49dda6..e6f3d51 100644
---- a/help/C/mail-spam-settings.page
-+++ b/help/C/mail-spam-settings.page
-@@ -38,6 +38,8 @@
- <item><p>Click <gui>Close</gui>.</p></item>
- </steps>
- 
-+<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>
-+
- <section id="preferences">
- <title>Junk Mail Preferences</title>
- <p>You can modify how Evolution handles junk mail by changing the Junk Mail Preferences:</p>
-@@ -57,5 +59,4 @@
- </steps>
- </section>
- 
--<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>
- </page>
-diff --git a/help/C/memos-searching.page b/help/C/memos-searching.page
-index 3d3b5e0..96fed6d 100644
---- a/help/C/memos-searching.page
-+++ b/help/C/memos-searching.page
-@@ -70,7 +70,7 @@
- <section id="editing-a-saved-search">
- <title>Editing a Saved Search</title>
- <steps>
--<item><p>Select <guiseq><gui>Search</gui><gui>Edit Saved Searches</gui></guiseq> from the menu bar to open the window.</p>.</item>
-+<item><p>Select <guiseq><gui>Search</gui><gui>Edit Saved Searches</gui></guiseq> from the menu bar to open the window.</p></item>
- <item><p>Click the <gui style="button">Edit</gui> button to open the <gui>Edit Rule</gui> window.</p></item>
- <item><p>Edit the title or search conditions from the dialog box.</p></item>
- <item><p>Click <gui>OK</gui>.</p></item>
-diff --git a/help/C/tasks-searching.page b/help/C/tasks-searching.page
-index 29d6cdd..d1f3f49 100644
---- a/help/C/tasks-searching.page
-+++ b/help/C/tasks-searching.page
-@@ -70,7 +70,7 @@
- <section id="editing-a-saved-search">
- <title>Editing a Saved Search</title>
- <steps>
--<item><p>Select <guiseq><gui>Search</gui><gui>Edit Saved Searches</gui></guiseq> from the menu bar to open the window.</p>.</item>
-+<item><p>Select <guiseq><gui>Search</gui><gui>Edit Saved Searches</gui></guiseq> from the menu bar to open the window.</p></item>
- <item><p>Click the <gui style="button">Edit</gui> button to open the <gui>Edit Rule</gui> window.</p></item>
- <item><p>Edit the title or search conditions from the dialog box.</p></item>
- <item><p>Click <gui>OK</gui>.</p></item>
-diff --git a/help/C/using-categories.page b/help/C/using-categories.page
-index fe9e8b9..c688b88 100644
---- a/help/C/using-categories.page
-+++ b/help/C/using-categories.page
-@@ -26,6 +26,8 @@
- 
- <p>Another way to group contacts, appointments, tasks and memos (summarized by the term "objects" in the following text) is to mark them as belonging to different categories. You can mark an object as being in several categories or no category at all. For example in your address book, you put a friend in the "Business" category because he works with you and the "Friends" category because he is a friend.</p>
- 
-+<note><p>To display only the objects in a particular category, select the corresponding category in the quick <link xref="searching-items">search</link> bar.</p></note>
-+
- <section id="set-category-for-object">
- <title>Setting categories for an object</title>
- 
-@@ -54,6 +56,4 @@
- <p>In the <gui>Categories Editor</gui> you can edit or set the color and icon for each category available by clicking <gui style="button">Edit</gui> at the bottom of the <gui>Categories</gui> window. Press <gui style="button">Delete</gui> to delete categories from the list.</p>
- </section>
- 
--<note><p>To display only the objects in a particular category, select the corresponding category in the quick <link xref="searching-items">search</link> bar.</p></note>
--
- </page>
--- 
-1.7.6
-