[evolution/wip/gsettings] Put new user documentation in place
- From: Rodrigo Moya <rodrigo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/wip/gsettings] Put new user documentation in place
- Date: Wed, 14 Sep 2011 12:21:32 +0000 (UTC)
commit b77802eb8a19ab035fe00b60bf3a025eaa67e3e0
Author: Andre Klapper <a9016009 gmx de>
Date: Thu Aug 4 15:38:54 2011 +0200
Put new user documentation in place
help/C/backup-restore.page | 44 +
help/C/calendar-alarms-and-reminders.page | 44 +
help/C/calendar-caldav.page | 40 +
help/C/calendar-classifications.page | 29 +
help/C/calendar-free-busy.page | 52 +
help/C/calendar-google.page | 40 +
help/C/calendar-layout-appointment-display.page | 54 +
help/C/calendar-layout-general-formatting.page | 57 +
help/C/calendar-layout-views.page | 42 +
help/C/calendar-layout.page | 22 +
help/C/calendar-local.page | 33 +
help/C/calendar-marcus-bains-line.page | 23 +
help/C/calendar-meetings-delegating.page | 42 +
.../calendar-meetings-replying-to-invitation.page | 33 +
help/C/calendar-meetings-sending-invitation.page | 52 +
help/C/calendar-meetings.page | 22 +
help/C/calendar-organizing.page | 23 +
help/C/calendar-publishing.page | 31 +
help/C/calendar-recurrence.page | 27 +
help/C/calendar-searching.page | 80 +
help/C/calendar-sharing-information.page | 22 +
help/C/calendar-timezones.page | 41 +
help/C/calendar-usage-add-appointment.page | 36 +
help/C/calendar-usage-delete-appointment.page | 24 +
help/C/calendar-usage-edit-appointment.page | 30 +
help/C/calendar-usage.page | 23 +
help/C/calendar-using-several-calendars.page | 33 +
help/C/calendar-weather.page | 39 +
help/C/calendar-webdav.page | 39 +
help/C/change-switcher-appearance.page | 40 +
help/C/contacts-add-automatically.page | 30 +
help/C/contacts-autocompletion.page | 36 +
help/C/contacts-google.page | 36 +
help/C/contacts-ldap.page | 76 +
help/C/contacts-local.page | 32 +
help/C/contacts-organizing.page | 25 +
help/C/contacts-searching.page | 80 +
help/C/contacts-usage-add-contact.page | 41 +
help/C/contacts-usage-delete-contact.page | 24 +
help/C/contacts-usage-edit-contact.page | 30 +
help/C/contacts-usage.page | 22 +
help/C/contacts-using-contact-lists.page | 48 +
help/C/contacts-using-several-addressbooks.page | 26 +
help/C/credits.page | 95 +
help/C/data-storage.page | 47 +
help/C/default-browser.page | 27 +
help/C/deleting-appointments.page | 25 +
help/C/deleting-emails.page | 39 +
help/C/deleting-to-free-disk-space.page | 23 +
help/C/evolution.xml | 7306 --------------------
help/C/exchange-connectors-overview.page | 37 +
help/C/exchange-placeholder.page | 23 +
help/C/exporting-data-calendar.page | 25 +
help/C/exporting-data-contacts.page | 29 +
help/C/exporting-data-mail.page | 27 +
help/C/exporting-data.page | 22 +
help/C/express-mode.page | 25 +
help/C/figures/attach_reminder_a.png | Bin 19642 -> 0 bytes
help/C/figures/calendar_preference_display.png | Bin 77619 -> 0 bytes
help/C/figures/categories_a.png | Bin 38554 -> 0 bytes
help/C/figures/color-204a87.png | Bin 0 -> 208 bytes
help/C/figures/color-2e3436.png | Bin 0 -> 208 bytes
help/C/figures/color-4e9a06.png | Bin 0 -> 208 bytes
help/C/figures/color-5c3566.png | Bin 0 -> 208 bytes
help/C/figures/color-8f5902.png | Bin 0 -> 207 bytes
help/C/figures/color-a40000.png | Bin 0 -> 207 bytes
help/C/figures/color-c4a000.png | Bin 0 -> 208 bytes
help/C/figures/color-ce5c00.png | Bin 0 -> 208 bytes
help/C/figures/contacts_mainwindow_a.png | Bin 100492 -> 0 bytes
help/C/figures/delgt-add.png | Bin 11936 -> 0 bytes
help/C/figures/evo_Wcal_prop_a.png | Bin 18687 -> 0 bytes
help/C/figures/evo_adv_search_a.png | Bin 21314 -> 0 bytes
help/C/figures/evo_attachreminder_plugin.png | Bin 38713 -> 0 bytes
help/C/figures/evo_blink.png | Bin 634 -> 0 bytes
help/C/figures/evo_cal_callout_a.png | Bin 94435 -> 0 bytes
help/C/figures/evo_calender_appointmnt.png | Bin 39381 -> 0 bytes
help/C/figures/evo_calstatus_a.png | Bin 23863 -> 0 bytes
help/C/figures/evo_caltasks_a.png | Bin 65089 -> 0 bytes
help/C/figures/evo_contacteditor_a.png | Bin 41292 -> 0 bytes
help/C/figures/evo_delegate_permission_a.png | Bin 15004 -> 0 bytes
help/C/figures/evo_dialog-info.png | Bin 1188 -> 0 bytes
help/C/figures/evo_dialog-warning.png | Bin 966 -> 0 bytes
help/C/figures/evo_edit_search.png | Bin 22823 -> 0 bytes
help/C/figures/evo_exchng_mapi.png | Bin 28952 -> 0 bytes
help/C/figures/evo_flag_follow_up_a.png | Bin 24639 -> 0 bytes
help/C/figures/evo_gwreceive_a.png | Bin 31773 -> 0 bytes
help/C/figures/evo_gwstatustrack.png | Bin 22429 -> 0 bytes
help/C/figures/evo_imapreceive_a.png | Bin 53846 -> 0 bytes
help/C/figures/evo_junk_a.png | Bin 84969 -> 0 bytes
help/C/figures/evo_label_a.png | Bin 19473 -> 0 bytes
help/C/figures/evo_labels_a.png | Bin 46267 -> 0 bytes
help/C/figures/evo_mail_a.png | Bin 126047 -> 0 bytes
help/C/figures/evo_mail_callout_a.png | Bin 132913 -> 0 bytes
help/C/figures/evo_maildirreceive_a.png | Bin 20862 -> 0 bytes
help/C/figures/evo_mboxreceive_a.png | Bin 22531 -> 0 bytes
help/C/figures/evo_memo_a.png | Bin 26419 -> 0 bytes
help/C/figures/evo_mhreceive_a.png | Bin 20379 -> 0 bytes
help/C/figures/evo_newmail.png | Bin 3854 -> 0 bytes
help/C/figures/evo_newmess_a.png | Bin 40375 -> 0 bytes
help/C/figures/evo_offline.png | Bin 18667 -> 0 bytes
help/C/figures/evo_popreceive_a.png | Bin 23091 -> 0 bytes
help/C/figures/evo_proxyadd_a.png | Bin 15425 -> 0 bytes
help/C/figures/evo_rule_a.png | Bin 31171 -> 0 bytes
help/C/figures/evo_send_option_a.png | Bin 18118 -> 0 bytes
help/C/figures/evo_send_setup_a.png | Bin 35178 -> 0 bytes
help/C/figures/evo_sendstatus_a.png | Bin 24511 -> 0 bytes
help/C/figures/evo_shd_memo_a.png | Bin 31429 -> 0 bytes
help/C/figures/evo_usereceive_a.png | Bin 22900 -> 0 bytes
help/C/figures/evolution_contact_preference.png | Bin 53816 -> 0 bytes
help/C/figures/evolution_mail_preference.png | Bin 74894 -> 0 bytes
help/C/figures/evolutionlogo.png | Bin 0 -> 3660 bytes
help/C/figures/exchng-rec-mails.png | Bin 34962 -> 0 bytes
help/C/figures/exchng-rec-options.png | Bin 46867 -> 0 bytes
help/C/figures/filter-new-fig.png | Bin 17512 -> 0 bytes
help/C/figures/folder_plus.png | Bin 6576 -> 0 bytes
help/C/figures/google_cal_view.png | Bin 26633 -> 0 bytes
help/C/figures/groupwise_resend.png | Bin 16604 -> 0 bytes
help/C/figures/groupwise_resend_retract.png | Bin 16071 -> 0 bytes
help/C/figures/local_ics_calendar.png | Bin 25601 -> 0 bytes
help/C/figures/mailer_preferences.png | Bin 70153 -> 0 bytes
help/C/figures/meeting.png | Bin 55690 -> 0 bytes
help/C/figures/{minus.png => minus-icon.png} | Bin 344 -> 344 bytes
help/C/figures/new-mail-notification.png | Bin 0 -> 431131 bytes
help/C/figures/new-mail-switcher.png | Bin 0 -> 8613 bytes
help/C/figures/{plus.png => plus-icon.png} | Bin 406 -> 406 bytes
help/C/figures/quick_add_a.png | Bin 19153 -> 0 bytes
help/C/figures/quick_reference.png | Bin 51534 -> 0 bytes
.../figures/{stock_search.png => search-icon.png} | Bin 1014 -> 1014 bytes
help/C/figures/ver_view_a.png | Bin 162099 -> 0 bytes
help/C/figures/window-overview-layers.png | Bin 0 -> 130866 bytes
help/C/google-services.page | 20 +
help/C/groupwise-placeholder.page | 23 +
help/C/import-apps-mozilla.page | 30 +
help/C/import-apps-outlook.page | 69 +
help/C/import-data.page | 26 +
help/C/import-single-files.page | 32 +
help/C/import-supported-file-formats.page | 87 +
help/C/index.page | 91 +
help/C/intro-first-run.page | 108 +
help/C/intro-main-window.page | 158 +
help/C/mail-access-gmail-imap-account.page | 30 +
help/C/mail-access-gmail-pop-account.page | 43 +
help/C/mail-account-manage-imap-plus.page | 60 +
help/C/mail-account-manage-imap.page | 61 +
help/C/mail-account-manage-local-delivery.page | 57 +
...-account-manage-maildir-format-directories.page | 57 +
.../mail-account-manage-mh-format-directories.page | 57 +
...-account-manage-microsoft-exchange-evo-ews.page | 24 +
...unt-manage-microsoft-exchange-evo-exchange.page | 59 +
...account-manage-microsoft-exchange-evo-mapi.page | 59 +
help/C/mail-account-manage-microsoft-exchange.page | 25 +
help/C/mail-account-manage-novell-groupwise.page | 61 +
help/C/mail-account-manage-pop.page | 57 +
...l-account-manage-unix-mbox-spool-directory.page | 57 +
.../mail-account-manage-unix-mbox-spool-file.page | 57 +
help/C/mail-account-manage-usenet-news.page | 57 +
help/C/mail-account-management.page | 34 +
help/C/mail-attachments-received.page | 34 +
help/C/mail-attachments-sending.page | 55 +
help/C/mail-attachments.page | 20 +
help/C/mail-calendar-sending-invitations.page | 44 +
help/C/mail-cannot-see.page | 45 +
help/C/mail-change-columns-in-message-list.page | 25 +
help/C/mail-change-time-format.page | 23 +
help/C/mail-composer-change-quotation-string.page | 27 +
help/C/mail-composer-custom-header-lines.page | 49 +
help/C/mail-composer-forward-as-attachment.page | 29 +
help/C/mail-composer-forward.page | 45 +
help/C/mail-composer-html-image.page | 33 +
help/C/mail-composer-html-link.page | 34 +
help/C/mail-composer-html-rule.page | 32 +
help/C/mail-composer-html-table.page | 33 +
help/C/mail-composer-html-text.page | 82 +
help/C/mail-composer-html.page | 35 +
help/C/mail-composer-mail-signatures-manage.page | 25 +
.../mail-composer-mail-signatures-per-account.page | 38 +
help/C/mail-composer-mail-signatures.page | 26 +
help/C/mail-composer-message-templates.page | 99 +
help/C/mail-composer-priority.page | 29 +
help/C/mail-composer-reply.page | 58 +
help/C/mail-composer-search.page | 42 +
help/C/mail-composer-several-recipients.page | 51 +
help/C/mail-composer-spellcheck.page | 44 +
help/C/mail-composer-write-new-message.page | 31 +
help/C/mail-default-CC-and-BCC.page | 32 +
help/C/mail-default-folder-locations.page | 36 +
help/C/mail-delete-and-undelete.page | 45 +
help/C/mail-displaying-character-encodings.page | 27 +
help/C/mail-displaying-collapsible-headers.page | 31 +
help/C/mail-displaying-images-in-html.page | 55 +
help/C/mail-displaying-message.page | 22 +
help/C/mail-displaying-no-css.page | 29 +
help/C/mail-displaying-sender-photograph.page | 34 +
help/C/mail-duplicates.page | 43 +
help/C/mail-encryption-gpg-create-key.page | 53 +
help/C/mail-encryption-gpg-decrypting.page | 36 +
help/C/mail-encryption-gpg-getting-keys.page | 31 +
help/C/mail-encryption-gpg-set-up.page | 39 +
help/C/mail-encryption-gpg-signing-encrypting.page | 39 +
help/C/mail-encryption-s-mime-manage.page | 30 +
.../mail-encryption-s-mime-signing-encrypting.page | 37 +
help/C/mail-encryption.page | 45 +
...mail-error-failed-to-append-to-sent-folder.page | 32 +
help/C/mail-error-folder-mismatch.page | 52 +
help/C/mail-error-no-provider-available.page | 49 +
help/C/mail-filters-actions.page | 72 +
help/C/mail-filters-conditions.page | 97 +
help/C/mail-filters-not-working.page | 46 +
help/C/mail-filters.page | 73 +
help/C/mail-folders.page | 67 +
help/C/mail-follow-up-flag.page | 45 +
help/C/mail-imap-headers.page | 47 +
help/C/mail-imap-subscriptions.page | 38 +
help/C/mail-labels.page | 38 +
help/C/mail-layout-changing.page | 22 +
help/C/mail-moving-emails.page | 33 +
help/C/mail-not-sent.page | 35 +
help/C/mail-organizing.page | 28 +
help/C/mail-read-receipts.page | 41 +
help/C/mail-reading-keyboard-shortcuts.page | 62 +
help/C/mail-received-notification.page | 35 +
.../mail-receiving-options-evolution-exchange.page | 49 +
help/C/mail-receiving-options-exchange-mapi.page | 42 +
help/C/mail-receiving-options-imap-plus.page | 47 +
help/C/mail-receiving-options-imap.page | 47 +
help/C/mail-receiving-options-local-delivery.page | 34 +
...ceiving-options-maildir-format-directories.page | 34 +
...il-receiving-options-mh-format-directories.page | 33 +
.../C/mail-receiving-options-novell-groupwise.page | 47 +
help/C/mail-receiving-options-pop.page | 50 +
...eceiving-options-unix-mbox-spool-directory.page | 33 +
...ail-receiving-options-unix-mbox-spool-file.page | 35 +
help/C/mail-receiving-options-usenet-news.page | 45 +
help/C/mail-receiving-options.page | 31 +
help/C/mail-recognized-thread-related-headers.page | 31 +
help/C/mail-refresh-folders.page | 26 +
help/C/mail-search-folders-add.page | 51 +
help/C/mail-search-folders-conditions.page | 90 +
help/C/mail-search-folders-refresh.page | 33 +
help/C/mail-search-folders.page | 34 +
help/C/mail-searching-attachment-type.page | 25 +
help/C/mail-searching.page | 76 +
help/C/mail-send-and-receive-automatically.page | 24 +
help/C/mail-send-and-receive-manual.page | 25 +
help/C/mail-send-and-receive.page | 24 +
help/C/mail-sending-options-smtp.page | 44 +
help/C/mail-several-pop-accounts.page | 29 +
help/C/mail-sorting-message-list.page | 119 +
help/C/mail-spam-groupwise-add-to-list.page | 36 +
help/C/mail-spam-groupwise-manage-list.page | 34 +
help/C/mail-spam-groupwise-mark-message.page | 28 +
help/C/mail-spam-groupwise-remove-from-list.page | 30 +
help/C/mail-spam-groupwise-unmark-message.page | 32 +
help/C/mail-spam-marking.page | 33 +
help/C/mail-spam-settings.page | 61 +
help/C/mail-spam.page | 27 +
help/C/mail-two-trash-folders.page | 32 +
help/C/mail-usenet-subscriptions.page | 35 +
help/C/mail-vertical-view.page | 32 +
help/C/mail-word-wrap.page | 25 +
help/C/mail-working-offline.page | 49 +
help/C/mail-wrong-fonts-in-3-0.page | 27 +
help/C/memos-searching.page | 80 +
help/C/memos-usage-add-memo.page | 53 +
help/C/memos-usage-delete-memo.page | 24 +
help/C/memos-usage-edit-memo.page | 29 +
help/C/memos-usage.page | 25 +
help/C/minimize-to-system-tray.page | 31 +
help/C/organizing.page | 20 +
help/C/problems-debug-how-to.page | 31 +
help/C/problems-getting-help.page | 27 +
help/C/problems-reporting-bugs.page | 25 +
help/C/searching-items.page | 20 +
help/C/sync-with-other-devices.page | 66 +
help/C/tasks-caldav.page | 37 +
help/C/tasks-display-settings.page | 40 +
help/C/tasks-local.page | 33 +
help/C/tasks-organizing.page | 23 +
help/C/tasks-searching.page | 80 +
help/C/tasks-usage-add-task.page | 45 +
help/C/tasks-usage-delete-task.page | 24 +
help/C/tasks-usage-edit-task.page | 30 +
help/C/tasks-usage.page | 22 +
help/C/tasks-using-several-tasklists.page | 28 +
help/C/tasks-webdav.page | 39 +
help/C/using-categories.page | 59 +
help/Makefile.am | 307 +-
287 files changed, 8992 insertions(+), 7381 deletions(-)
---
diff --git a/help/C/backup-restore.page b/help/C/backup-restore.page
new file mode 100644
index 0000000..96dcab1
--- /dev/null
+++ b/help/C/backup-restore.page
@@ -0,0 +1,44 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="backup-restore">
+
+ <info>
+ <desc>Back up and restore your Evolution data and settings.</desc>
+
+ <link type="guide" xref="index#data-migration-and-sync"/>
+ <link type="seealso" xref="data-storage"/>
+
+ <revision pkgversion="2.32.1" version="0.1" date="2011-01-06" status="draft"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <title>Back up and restore</title>
+
+<p>You can back up your Evolution data. The backup saves your settings, mail, contacts, tasks, memos and calendars. It will be stored in a gzip-compressed tar archive file.</p>
+
+<section id="backup">
+<title>Backing up</title>
+<list>
+<item><p>Select <guiseq><gui>File</gui><gui>Back up Evolution Settings...</gui></guiseq>.</p></item>
+<item><p>Choose a filename and the folder where you want to save the backup file, and click <gui style="button">Save</gui>.</p></item>
+<item><p>You will get asked to close Evolution. Answer with <gui style="button">Yes</gui>.</p></item>
+</list>
+</section>
+
+<section id="restore">
+<title>Restoring</title>
+<list>
+<item><p>Select <guiseq><gui>File</gui><gui>Restore Evolution Settings...</gui></guiseq>.</p></item>
+<item><p>Choose the file, and click <gui style="button">Open</gui>.</p></item>
+<item><p>You will get asked to close Evolution. Answer with <gui style="button">Yes</gui>.</p></item>
+</list>
+<note style="tip"><p>In the <link xref="intro-first-run">first-run assistant</link>, you can restore Evolution data from a backup file.</p></note>
+</section>
+
+</page>
diff --git a/help/C/calendar-alarms-and-reminders.page b/help/C/calendar-alarms-and-reminders.page
new file mode 100644
index 0000000..c3433d2
--- /dev/null
+++ b/help/C/calendar-alarms-and-reminders.page
@@ -0,0 +1,44 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="calendar-alarms-and-reminders">
+
+ <info>
+ <desc>Setting up reminder notifications for appointments.</desc>
+
+ <link type="guide" xref="index#calendar" />
+
+ <revision pkgversion="3.1.5" version="0.4" date="2011-08-02" status="draft"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/config-prefs-cal.html.en#CACHCGCI -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Reminders for appointments</title>
+
+<section id="general-settings">
+<title>General Settings</title>
+
+<p>Under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Calendar and Tasks</gui><gui>Reminders</gui></guiseq> you can select those calendars for which you want to receive reminder notifications. If you do not select a calendar, you will not receive reminders for any events in this calendar. You can also define whether to show a reminder for every appointment and for every birthday and anniversary.</p>
+
+</section>
+
+<section id="manual-reminders">
+<title>Manual Reminders</title>
+
+<p>Apart from the general settings you can also set up reminders in the appointment editor for certain appointments only:</p>
+<steps>
+<item><p>Click <guiseq><gui>Options</gui><gui>Reminders</gui></guiseq> or press the Reminder button in the toolbar.</p></item>
+<item><p>From the dropdown menu, choose either one of the available default options when to show a notification reminder, <!-- TODO: Test how this is in GNOME3? Displayed in Notification area, permanent? --> or choose <gui>Customize</gui>.</p></item>
+<item><p>In case of <gui>Customize</gui>, the reminder can be a popup, a sound played, or a program ran. You can also define whether the reminder should be repeated.</p></item>
+</steps>
+
+</section>
+
+</page>
diff --git a/help/C/calendar-caldav.page b/help/C/calendar-caldav.page
new file mode 100644
index 0000000..fbf8930
--- /dev/null
+++ b/help/C/calendar-caldav.page
@@ -0,0 +1,40 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="calendar-caldav">
+
+ <info>
+ <desc>Using an online CalDAV calendar.</desc>
+
+ <link type="guide" xref="calendar-using-several-calendars"/>
+
+ <revision pkgversion="3.1.5" version="0.3" date="2011-07-28" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-calendar-multiple.html.en -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Using a CalDAV calendar</title>
+
+<p>To add such a calendar to Evolution, perform the following steps:</p>
+<steps>
+<item><p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Calendar</gui></guiseq>.</p></item>
+<item><p>Select the type <gui>CalDAV</gui>.</p></item>
+<item><p>Enter a name that you prefer.</p></item>
+<item><p>Optionally choose a color that you prefer.</p></item>
+<item><p>Choose if you want to be able to view the content also when being offline.</p></item>
+<item><p>Enter the address of the calendar in the <gui>URL</gui> field.</p></item>
+<item><p>Choose <gui>Use secure connection</gui> if you want to connect securely.</p></item>
+<item><p>Enter your username and your email address.</p></item>
+<item><p>Click <gui style="button">Apply</gui>.</p></item>
+</steps>
+
+<p>The calendar will be added to the list of calendars in Evolution.</p>
+
+</page>
diff --git a/help/C/calendar-classifications.page b/help/C/calendar-classifications.page
new file mode 100644
index 0000000..835e8b3
--- /dev/null
+++ b/help/C/calendar-classifications.page
@@ -0,0 +1,29 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="calendar-classifications">
+
+ <info>
+ <desc>Classifying appointments and tasks on groupware servers.</desc>
+
+ <link type="guide" xref="index#calendar-advanced" />
+
+ <revision pkgversion="3.0.2" version="0.1" date="2011-07-31" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-calendar-apts.html.en#bxmtbjb -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Using Classifications</title>
+
+<p>If you are using a calendar on a Novell GroupWise or Microsoft Exchange server, you can select a classification to determine who can view it.</p>
+<p>To set a classification for an appointment or a task, click <guiseq><gui>Options</gui><gui>Classifications</gui></guiseq> and select a classification in the editor. <gui>Public</gui> is the default category, and a public appointment can be viewed by anyone on the calendar-sharing network. <gui>Private</gui> denotes one level of security, and <gui>Confidential</gui> an even higher level.</p>
+<p>The different levels vary depending on your server settings; check with your system administrator or adjust your delegation settings.</p>
+
+</page>
diff --git a/help/C/calendar-free-busy.page b/help/C/calendar-free-busy.page
new file mode 100644
index 0000000..6eb4f19
--- /dev/null
+++ b/help/C/calendar-free-busy.page
@@ -0,0 +1,52 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="calendar-free-busy">
+
+ <info>
+ <desc>Using the Free/Busy view for setting up meetings.</desc>
+
+ <link type="guide" xref="calendar-sharing-information" />
+
+ <revision pkgversion="3.0.2" version="0.2" date="2011-07-31" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-calendar-apts.html.en and http://library.gnome.org/users/evolution/2.32/usage-calendar-apts.html.en#usage-calendar-freebusy -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Free/Busy information</title>
+
+<p>You can use the Free/Busy search for meetings to determine the availability of invitees.</p>
+
+<!-- TODO: Recheck once https://bugzilla.gnome.org/show_bug.cgi?id=655494 is fixed -->
+
+<p>In addition to the standard meeting scheduling tools, you can use the Free/Busy view to check whether people are available in advance. The Free/Busy feature is normally a function of dedicated groupware servers such as Microsoft Exchange and Novell GroupWise. However, you can also publish Free/Busy information online, and access Free/Busy information published elsewhere. If not everyone you collaborate with publishes Free/Busy data, you can still use <link xref="calendar-meetings-sending-invitation">meeting invitations</link> to coordinate schedules with other people.</p>
+
+<p>To access the free/busy view:</p>
+<steps>
+<item><p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Meeting</gui></guiseq>.</p></item>
+<item><p>Click <gui style="button">Add</gui> to add the email addresses of people you want to invite.</p></item>
+<item><p>Click the <gui>Free/Busy</gui> button on the toolbar, or click <guiseq><gui>Options</gui><gui>Free/Busy</gui></guiseq>.</p></item>
+<item><p>Adjust the meeting time, either by dragging the meeting borders or by using the <gui>Autopick</gui> buttons to choose a time automatically, then click <gui style="button">Close</gui>. Attendees on an Exchange server have the appointment updated automatically; others receive email notification of any change in plans.</p></item>
+</steps>
+
+<list>
+<item><p>Attendee List:</p><p>The Attendee List shows the people who have been invited to the appointment.</p></item>
+<item><p>Schedule Grid:</p><p>The Schedule Grid shows the published Free/Busy information for the people you have invited. This is where you compare schedules to find free time to schedule the appointment. Individuals have visible scheduling information only if they use the same Novell GroupWise or Microsoft Exchange server you do (that is, if they are in the same organization as you), or if they publish free/busy information at a URL you can reach and you have entered that URL into their contact cards using the contact editor.</p></item>
+</list>
+
+<p>You can publish Calendar and Free/Busy information to a WebDAV server, FTP server, a remote machine through SSH or to any other web server with HTTP PUT support.</p>
+
+<section id="no-groupware">
+<title>Accessing Free/Busy Data Without a Groupware Server</title>
+
+<p>If individuals give you a URL for Free/Busy data or for their web calendar, you can add the URL under <guiseq><gui>Personal Information</gui><gui>Web Addresses</gui></guiseq> in the <link xref="contacts-usage-edit-contact">Contact Editor</link>. Then, when you schedule a meeting with them, Evolution looks up the schedule and displays it in the Free/Busy data.</p>
+</section>
+
+</page>
diff --git a/help/C/calendar-google.page b/help/C/calendar-google.page
new file mode 100644
index 0000000..573fb21
--- /dev/null
+++ b/help/C/calendar-google.page
@@ -0,0 +1,40 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="calendar-google">
+
+ <info>
+ <desc>Using the online calendar of your Google account.</desc>
+
+ <link type="guide" xref="calendar-using-several-calendars"/>
+ <link type="guide" xref="google-services"/>
+
+ <revision pkgversion="3.1.5" version="0.3" date="2011-07-28" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-calendar-view.html.en#b1a47igh -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Using a Google calendar</title>
+
+<p>To add such a calendar to Evolution, perform the following steps:</p>
+<steps>
+<item><p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Calendar</gui></guiseq>.</p></item>
+<item><p>Select the type <gui>Google</gui>.</p></item>
+<item><p>Enter a name that you prefer.</p></item>
+<item><p>Optionally choose a color that you prefer.</p></item>
+<item><p>Choose if you want to be able to view the content also when being offline.</p></item>
+<item><p>Enter your Google username.</p></item>
+<item><p>If you have more than one Google calendar, define which of them to use.</p></item>
+<item><p>Click <gui style="button">Apply</gui>.</p></item>
+</steps>
+
+<p>The calendar will be added to the list of calendars in Evolution.</p>
+
+</page>
diff --git a/help/C/calendar-layout-appointment-display.page b/help/C/calendar-layout-appointment-display.page
new file mode 100644
index 0000000..bda9ff6
--- /dev/null
+++ b/help/C/calendar-layout-appointment-display.page
@@ -0,0 +1,54 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="calendar-layout-appointment-display">
+
+ <info>
+ <desc>Define the displaying of appointments in the calendar.</desc>
+
+ <link type="guide" xref="calendar-layout" />
+
+ <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/config-prefs-cal.html.en#bshpsxa -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<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:ANDREKLAPPER: File bug report similar to #655666 once checked in 3.1 about General & Display tabs. This is a huge mess, e.g. time settings are split onto two tabs. -->
+
+<p>The following calendar-related options are available under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Calendar and Tasks</gui><gui>Display</gui></guiseq>.</p>
+
+<section id="general">
+<title>General</title>
+<list>
+<item><p>Time Divisions:</p>
+<p>Sets the time increments shown as fine lines on the daily view in the calendar.</p></item>
+<item><p>Show appointment end times in week and month views:</p>
+<p>If there is space, Evolution shows the end times in the week and month views for each appointment.</p></item>
+<item><p>Compress weekends in month view:</p>
+<p>Select this option to display weekends in one box instead of two in the month view.</p></item>
+<item><p>Show week numbers:</p>
+<p>Shows the week numbers next to the respective weeks in the calendar.</p></item>
+<item><p>Show recurring events in italic in bottom left calendar</p></item>
+<item><p>Scroll Month View by a week</p></item>
+</list>
+</section>
+
+<section id="date-time">
+<title>Date/Time Format</title>
+<list>
+<p>You can change the format of the <gui>Date</gui> column by setting your prefered format.</p><p>The placeholders in the format expression are strftime variables.</p>
+</list>
+</section>
+
+</page>
diff --git a/help/C/calendar-layout-general-formatting.page b/help/C/calendar-layout-general-formatting.page
new file mode 100644
index 0000000..b98fb22
--- /dev/null
+++ b/help/C/calendar-layout-general-formatting.page
@@ -0,0 +1,57 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="calendar-layout-general-formatting">
+
+ <info>
+ <desc>General formatting options for the calendar.</desc>
+
+ <link type="guide" xref="calendar-layout" />
+
+ <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/config-prefs-cal.html.en#bshpskx -->
+ </credit>
+ <license>
+ <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. -->
+
+ </info>
+
+<title>General formatting options</title>
+
+<p>The following options are available under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Calendar and Tasks</gui><gui>General</gui></guiseq>.</p>
+<section id="time">
+<title>Time</title>
+<list>
+<item><p>Time format:</p>
+<p>Choose between twelve-hour (AM/PM) and twenty-four-hour time formats.</p></item>
+<item><p><link xref="calendar-timezones">Time zone</link> and Second zone:</p>
+<p>The city you are located in, and optionally a second city.</p></item>
+</list>
+</section>
+
+<section id="work-week">
+<title>Work Week</title>
+<list>
+<item><p>Week starts on:</p>
+<p>Select the day to display as the first in each week.</p></item>
+<item><p>Work days:</p>
+<p>Define which week days are work days.</p></item>
+<item><p>Day begins:</p>
+<p>Define at which time your work day begins.</p></item>
+<item><p>Day ends:</p>
+<p>Define at which time your work day ends.</p></item>
+</list>
+</section>
+
+<section id="alerts">
+<title>Alerts</title>
+<p>If you want to be warned before you delete any appointment, select this option.</p>
+</section>
+
+</page>
diff --git a/help/C/calendar-layout-views.page b/help/C/calendar-layout-views.page
new file mode 100644
index 0000000..c097ff3
--- /dev/null
+++ b/help/C/calendar-layout-views.page
@@ -0,0 +1,42 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="calendar-layout-views">
+
+ <info>
+ <desc>Using date ranges (day, week, month) to look at the calendar.</desc>
+
+ <link type="guide" xref="calendar-layout" />
+
+ <revision pkgversion="3.1.5" version="0.2" date="2011-07-27" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-calendar-view.html.en -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Available views</title>
+
+<p>Evolution offers five different views of your calendar data:</p>
+<list>
+<item><p>Day (<keyseq><key>Ctrl</key><key>Y</key></keyseq>)</p></item>
+<item><p>Work Week (<keyseq><key>Ctrl</key><key>J</key></keyseq>)</p></item>
+<item><p>Week (<keyseq><key>Ctrl</key><key>K</key></keyseq>)</p></item>
+<item><p>Month (<keyseq><key>Ctrl</key><key>M</key></keyseq>)</p></item>
+<item><p>List (<keyseq><key>Ctrl</key><key>L</key></keyseq>)</p></item>
+</list>
+
+<p>You can switch the view by either using the buttons in the toolbar, or by clicking <guiseq><gui>View</gui><gui>Current View</gui></guiseq>.</p>
+
+<p>You can also select an arbitrary range of days in the small calendar in the side bar. To do this, select the days that you want to view in your calendar.</p>
+
+<p>The Previous and Next buttons move you forward and back in your calendar pages. If you are using a week or month view, you can move by week or month. To return to today's listing, click the <gui>Select today</gui> button between the two arrow buttons in the toolbar.</p>
+
+<p>To visit calendar entries for a specific date, click the <gui>Select a specific date</gui> button in the toolbar.</p>
+
+</page>
diff --git a/help/C/calendar-layout.page b/help/C/calendar-layout.page
new file mode 100644
index 0000000..c81d164
--- /dev/null
+++ b/help/C/calendar-layout.page
@@ -0,0 +1,22 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="calendar-layout">
+
+ <info>
+ <desc>Adjusting the display and views of the calendar.</desc>
+
+ <link type="guide" xref="index#calendar"/>
+
+ <revision pkgversion="3.0.0" version="0.1" date="2011-07-21" status="draft"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <title>Changing the calendar layout</title>
+
+</page>
diff --git a/help/C/calendar-local.page b/help/C/calendar-local.page
new file mode 100644
index 0000000..105c071
--- /dev/null
+++ b/help/C/calendar-local.page
@@ -0,0 +1,33 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="calendar-local">
+
+ <info>
+ <desc>Adding another local calendar.</desc>
+
+ <link type="guide" xref="calendar-using-several-calendars"/>
+
+ <revision pkgversion="3.1.5" version="0.3" date="2011-07-28" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Adding another local calendar</title>
+
+<p>To add another local calendar to Evolution, perform the following steps:</p>
+<steps>
+<item><p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Calendar</gui></guiseq>.</p></item>
+<item><p>Select the type <gui>On This Computer</gui>.</p></item>
+<item><p>Enter a name that you prefer.</p></item>
+<item><p>Optionally choose a color that you prefer.</p></item>
+<item><p>Click <gui style="button">Apply</gui>.</p></item>
+</steps>
+
+<p>The calendar will be added to the list of calendars in Evolution.</p>
+
+</page>
diff --git a/help/C/calendar-marcus-bains-line.page b/help/C/calendar-marcus-bains-line.page
new file mode 100644
index 0000000..c05a939
--- /dev/null
+++ b/help/C/calendar-marcus-bains-line.page
@@ -0,0 +1,23 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="calendar-marcus-bains-line">
+
+ <info>
+ <desc>The red "Marcus Bains" line displays the current time.</desc>
+
+ <link type="guide" xref="calendar-layout" />
+
+ <revision pkgversion="2.32.1" version="0.1" date="2011-07-21" status="draft"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+ </info>
+
+<title>Time display in the Day view</title>
+
+<p>The red Marcus Bains Line in the Day view of the calendar is a marker to show the current date and time.</p>
+
+</page>
diff --git a/help/C/calendar-meetings-delegating.page b/help/C/calendar-meetings-delegating.page
new file mode 100644
index 0000000..e38ae5e
--- /dev/null
+++ b/help/C/calendar-meetings-delegating.page
@@ -0,0 +1,42 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="calendar-meetings-delegating">
+
+ <info>
+ <desc>Ask somebody else to run the meeting.</desc>
+
+ <link type="guide" xref="calendar-meetings" />
+
+ <revision pkgversion="3.0.2" version="0.2" date="2011-07-29" status="stub"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/bxqatxt.html -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+<!-- TODO: Check if all these steps are still correct in 3.1 -->
+
+ </info>
+
+<title>Delegating Meetings</title>
+<p>Only attendees of a meeting can delegate a meeting.</p>
+<steps>
+ <item>
+ <p>Right-click on the meeting that you want to delegate.</p>
+ </item>
+ <item>
+ <p>Click <gui>Delegate Meeting</gui>.</p>
+ </item>
+ <item>
+ <p>Select the contacts you want to delegate the meeting to.</p>
+ </item>
+ <item>
+ <p>Click <gui style="button">OK</gui>.</p>
+ </item>
+</steps>
+ <p>Each contact receives a copy of the meeting invitation.</p>
+</page>
diff --git a/help/C/calendar-meetings-replying-to-invitation.page b/help/C/calendar-meetings-replying-to-invitation.page
new file mode 100644
index 0000000..66d3e53
--- /dev/null
+++ b/help/C/calendar-meetings-replying-to-invitation.page
@@ -0,0 +1,33 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="calendar-meetings-replying-to-invitation">
+
+ <info>
+ <desc>Accepting and replying to a meeting invitation.</desc>
+
+ <link type="guide" xref="calendar-meetings" />
+
+ <revision pkgversion="3.0.2" version="0.3" date="2011-08-01" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-calendar-apts.html.en#replying-to-rsvp -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+<!-- TODO: Check if all these steps are still correct in 3.1 -->
+
+ </info>
+
+<title>Replying to a Meeting Request</title>
+<p>Meeting requests are sent as attachments. To view or respond to one, click the attachment icon and view it in the mail window. All the details about the event are shown, including time and dates. Then you can choose how to reply to the invitation - the options are to <gui>Accept</gui>, <gui>Tentatively Accept</gui>, or <gui>Decline</gui>.</p>
+
+<p>Click <gui style="button">OK</gui> to send your answer per email to the organizer. The event is also added automatically to your calendar if you accept.</p>
+<p>After you have added the meeting to your calendar, you can make changes to the meeting, but if the original organizer sends out an update, your changes might be overwritten.</p>
+
+<note><p>Under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>Calendar and Tasks</gui><gui>Conflict Search</gui></guiseq> you can define which calendars are used for warning you of meeting conflicts.</p></note>
+<!-- TODO: Recheck once https://bugzilla.gnome.org/show_bug.cgi?id=655494 is fixed -->
+</page>
diff --git a/help/C/calendar-meetings-sending-invitation.page b/help/C/calendar-meetings-sending-invitation.page
new file mode 100644
index 0000000..654a172
--- /dev/null
+++ b/help/C/calendar-meetings-sending-invitation.page
@@ -0,0 +1,52 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="calendar-meetings-sending-invitation">
+
+ <info>
+ <desc>Sending a Meeting Invitation.</desc>
+
+ <link type="guide" xref="calendar-meetings" />
+
+ <revision pkgversion="3.0.2" version="0.2" date="2011-07-29" status="stub"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-calendar-apts.html.en#usage-calendar-rsvp -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Sending a Meeting Invitation</title>
+
+<p>When you create a meeting (group appointment), you can specify the attendees in several categories, such as "chair" or "required". When you save the meeting listing, each attendee is sent an email with the meeting information, which also gives them the option to respond.</p>
+<p>If you do not need to collect attendance information when you're scheduling an event, and would rather just announce the event, right-click the meeting and select <gui>Forward as iCalendar</gui>. This opens a new email message with the event notification attached as an announcement. Recipients can add the event to their calendars with one click, but it will not automatically send you email about whether they plan to attend.</p>
+
+<p>To schedule a meeting:</p>
+
+<steps>
+<item><p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Meeting</gui></guiseq>.</p></item>
+<item><p>If you have multiple email accounts, select the one to use by selecting an item in the <gui>Organizer</gui> field.</p></item>
+<item><p>Select a calendar in the <gui>Calendar</gui> drop-down list.</p></item>
+<item><p>Click <gui style="button">Add</gui> to add the email addresses of people you want to invite.</p></item>
+<item><p>Click <gui>View</gui> in the menu bar to show or hide the <gui>Type</gui>, <gui>Role</gui>, <gui>Status</gui>, and <gui>RSVP</gui> fields.</p></item>
+<item><p>Enter a brief summary in the <gui>Summary</gui> field.</p></item>
+<item><p>(Optional) Type a location in the <gui>Location</gui> field.</p></item>
+<item><p>To select this appointment as an all day event, click <guiseq><gui>Options</gui><gui>All Day Event</gui></guiseq>, or click the <gui>All Day Event</gui> button on the toolbar.</p></item>
+<item><p>Select the date and time.</p></item>
+<item><p>If the event is not an all day event, select either <gui>For</gui> to specify the duration, or select <gui>Until</gui> to specify the ending time of the event.</p></item>
+<item><p>(Optional) Enter a description in the <gui>Description</gui> field.</p></item>
+<item><p>To query <link xref="calendar-free-busy">free/busy</link> information for the attendees, click the <gui>Free/Busy</gui> button on the toolbar, or click <guiseq><gui>Options</gui><gui>Free/Busy</gui></guiseq>.</p></item>
+<item><p>Click <gui>Save</gui> to save the meeting.</p></item>
+</steps>
+
+<p>An email is sent out to all the recipients, inviting them to your event.</p>
+
+<note><p>You can also define a <link xref="calendar-timezones">time zone</link>, a <link xref="using-categories">category</link>, a <link xref="calendar-alarms-and-reminders">reminder</link>, a <link xref="calendar-recurrence">recurrence</link>, or a <link xref="calendar-classifications">classification</link> for the event, or add an attachment.</p></note>
+
+<note><p>In Evolution, a meeting can have only one organizer, and only the organizer can add participants to that meeting. Though it is possible to change the organizer of a meeting, this is not recommended as a means to invite additional participants to meetings. If you want to invite additional people to a meeting and are not that meeting's organizer, it is recommended that you forward the invitation message you received from the original meeting organiser to additional participants.</p></note>
+
+</page>
diff --git a/help/C/calendar-meetings.page b/help/C/calendar-meetings.page
new file mode 100644
index 0000000..a29f58c
--- /dev/null
+++ b/help/C/calendar-meetings.page
@@ -0,0 +1,22 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="calendar-meetings">
+
+ <info>
+ <desc>Using meetings in the calendar.</desc>
+
+ <link type="guide" xref="index#calendar-advanced" />
+
+ <revision pkgversion="2.32.2" version="0.1" date="2011-07-21" status="draft"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Meetings</title>
+
+</page>
diff --git a/help/C/calendar-organizing.page b/help/C/calendar-organizing.page
new file mode 100644
index 0000000..b967ca3
--- /dev/null
+++ b/help/C/calendar-organizing.page
@@ -0,0 +1,23 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="calendar-organizing">
+
+ <info>
+ <desc>On using several calendars, searching, and categories.</desc>
+
+ <link type="guide" xref="index#calendar" />
+ <link type="guide" xref="organizing" />
+
+ <revision pkgversion="2.32.1" version="0.1" date="2011-01-05" status="stub"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Sorting and organizing calendars</title>
+
+</page>
diff --git a/help/C/calendar-publishing.page b/help/C/calendar-publishing.page
new file mode 100644
index 0000000..fd95a0b
--- /dev/null
+++ b/help/C/calendar-publishing.page
@@ -0,0 +1,31 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="calendar-publishing">
+
+ <info>
+ <desc>Post your calendar content in public.</desc>
+
+ <link type="guide" xref="calendar-sharing-information" />
+
+ <revision pkgversion="3.1.5" version="0.3" date="2011-07-31" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from Reuse http://library.gnome.org/users/evolution/2.32/config-prefs-cal.html.en#bxjng8p and http://library.gnome.org/users/evolution/2.32/usage-calendar-apts.html.en#publishing-freebusy -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Calendar Publishing</title>
+<p>In order to make one of your calendars available to the public, you can define calendars to be uploaded to a web server under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Calendar and Tasks</gui><gui>Calendar Publishing</gui><gui style="button">Add</gui></guiseq>.</p>
+
+<p>You can specify the online location, the frequency of publishing, which calendar(s) to publish, and authentication information for uploading.</p>
+
+<p>You can publish Calendar and Free/Busy information to a WebDAV server, FTP server, a remote machine through SSH or to any other web server with HTTP PUT support.</p>
+
+<p>To immediately publish calendar information, click <guiseq><gui>Actions</gui><gui>Publish Calendar Information</gui></guiseq> in the calendar.</p>
+</page>
diff --git a/help/C/calendar-recurrence.page b/help/C/calendar-recurrence.page
new file mode 100644
index 0000000..5b7785a
--- /dev/null
+++ b/help/C/calendar-recurrence.page
@@ -0,0 +1,27 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="calendar-recurrence">
+
+ <info>
+ <desc>Repeating appointments.</desc>
+
+ <link type="guide" xref="index#calendar-advanced" />
+
+ <revision pkgversion="3.0.2" version="0.1" date="2011-08-01" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-calendar-apts.html.en#bxmtcp3 -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Using Recurrence</title>
+
+<p>If you have an appointment that takes place regurlarly, you can define its recurrence by clicking the <gui>Recurrence</gui> button in the <gui>Appointment Editor</gui> or by clicking <guiseq><gui>Options</gui><gui>Recurrence</gui></guiseq>. You can then choose a time and date when the appointment stops recurring, and, under <gui>Exceptions</gui>, pick individual days when the appointment does not recur. Make your selections from left to right, and you form a sentence: "Every two weeks on Monday and Friday until January 3, 2015" or "Every month on the first Friday for 12 occurrences."</p>
+
+</page>
diff --git a/help/C/calendar-searching.page b/help/C/calendar-searching.page
new file mode 100644
index 0000000..d600668
--- /dev/null
+++ b/help/C/calendar-searching.page
@@ -0,0 +1,80 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="calendar-searching">
+
+ <info>
+ <desc>Searching appointments and meetings.</desc>
+
+ <link type="guide" xref="searching-items" />
+ <link type="guide" xref="calendar-organizing" />
+
+ <revision pkgversion="2.32.1" version="0.2" date="2010-10-12" status="draft"/>
+ <credit type="author">
+ <name>Max Vorobuov</name>
+ <email>vmax0770 gmail com</email>
+ </credit>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-contact-organize.html.en -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Searching for Calendar Items</title>
+<section id="quick-search">
+<title>Quick Search</title>
+<p>In the Calendar view, you can quickly search for appointments and meetings either by summary or by category.</p>
+<p>Searching by summary:</p>
+<steps>
+<item><p>Click the search icon <media type="image" mime="image/png" src="figures/search-icon.png"/> to expand the drop-down list.</p></item>
+<item><p>Select the search condition from the list.</p></item>
+<item><p>Enter the text you want to search for and press <key>Enter</key>.</p></item>
+<item><p>Evolution displays the search results.</p></item>
+</steps>
+<p>Searching by category:</p>
+<steps>
+<item><p>Click the <gui>Show</gui> drop-down list.</p></item>
+<item><p>Select the category from the list.</p></item>
+<item><p>Evolution displays the search results.</p></item>
+</steps>
+<p>If you want to set several search conditions, you should use an Advanced search, which is described below.</p>
+</section>
+
+<section id="advanced-search">
+<title>Advanced Search</title>
+<steps>
+<item><p>Select the <guiseq><gui>Search</gui><gui>Advanced Search</gui></guiseq> menu to open the dialog box.</p></item>
+<item><p>Click <gui style="button">Add Condition</gui> to add any number of rules.</p></item>
+<item><p>Select the condition from the dropdown list, and then type a search entry in the field.</p></item>
+<item><p>Click <gui style="button">OK</gui> to get the search results displayed.</p></item>
+</steps>
+</section>
+
+<!-- TODO:XINCLUDE: Needs refactoring as clearing-search and saved-searches are totally identical in all *-searching.page files -->
+<section id="clearing-search">
+<title>Clearing the Search results</title>
+<p>To clear your search view and get back to the default view, click the <gui>Clear</gui> icon in the search string field, or choose <guiseq><gui>Search</gui><gui>Clear</gui></guiseq> from the menubar. You can also press <keyseq><key>Shift</key><key>Ctrl</key><key>Q</key></keyseq> to clear the search.</p>
+</section>
+
+<section id="saved-searches">
+<title>Saved Searches</title>
+<p>If you search for something rather often, you will prefer not to type it many times. In this case you can use saved searches.</p>
+<p>To save your search results, either click <gui>Save</gui> instead of <gui>OK</gui> in the Search dialog, or in case the search results are already displayed, select <guiseq><gui>Search</gui><gui>Save Search</gui></guiseq>. From now on this search will be directly available from the <gui>Search</gui> menu.</p>
+</section>
+
+<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>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>
+</steps>
+</section>
+
+</page>
diff --git a/help/C/calendar-sharing-information.page b/help/C/calendar-sharing-information.page
new file mode 100644
index 0000000..5568678
--- /dev/null
+++ b/help/C/calendar-sharing-information.page
@@ -0,0 +1,22 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="calendar-sharing-information">
+
+ <info>
+ <desc>Make your information (appointments and free/busy times) available to others.</desc>
+
+ <link type="guide" xref="index#calendar-advanced" />
+
+ <revision pkgversion="2.32.2" version="0.1" date="2011-07-21" status="draft"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Sharing your calendar information</title>
+
+</page>
diff --git a/help/C/calendar-timezones.page b/help/C/calendar-timezones.page
new file mode 100644
index 0000000..10a10f8
--- /dev/null
+++ b/help/C/calendar-timezones.page
@@ -0,0 +1,41 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="calendar-timezones">
+
+ <info>
+ <desc>Using time zones in the calendar.</desc>
+
+ <link type="guide" xref="index#calendar-advanced" />
+
+ <revision pkgversion="3.1.5" version="0.4" date="2011-07-28" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/bshlzlu.html.en -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Using time zones</title>
+
+<p>Evolution supports using multiple time zones.</p>
+
+<section id="default-timezone">
+<title>Setting your global timezone(s)</title>
+
+<p>By default Evolution uses the system-wide time zone. This can be changed under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Calendar and Tasks</gui><gui>General</gui><gui>Time</gui><gui>Time zone</gui></guiseq>.</p>
+
+<p>If you deal a lot with people in another specific time zone you can display that second time zone in the day view of the calendar. You can set a second time zone under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Calendar and Tasks</gui><gui>General</gui><gui>Time</gui><gui>Second zone</gui></guiseq>.</p>
+</section>
+
+<section id="appointment-timezone">
+<title>Setting a timezone for an appointment</title>
+
+<p>You can also configure time zone information specific to each appointment. To do that, <link xref="calendar-usage">add a new or edit an existing appointment</link> and click the globe button to customize the time zone that the time exists in. For example, if you live in New York but have a telephone meeting set for noon with someone in California, you need to make sure that your schedules are coordinated. Setting time zones on a per-appointment basis helps avoid that potential confusion.</p>
+</section>
+
+</page>
diff --git a/help/C/calendar-usage-add-appointment.page b/help/C/calendar-usage-add-appointment.page
new file mode 100644
index 0000000..04d2001
--- /dev/null
+++ b/help/C/calendar-usage-add-appointment.page
@@ -0,0 +1,36 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="calendar-usage-add-appointment">
+
+ <info>
+ <desc>Adding an appointment.</desc>
+
+ <link type="guide" xref="calendar-usage" />
+
+ <revision pkgversion="3.0.2" version="0.2" date="2011-08-01" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Adding an Appointment</title>
+
+<steps>
+<item><p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Appointment</gui></guiseq>, or double-click in a blank space in the calendar to open the Appointment dialog. The particular time on the calendar view against which you have double clicked on will be suggested for the new appointment. You can also directly write in the calendar and then adjust the duration by dragging it with the mouse.</p></item>
+<item><p>If you use the Appointment dialog:</p></item>
+<item><p>Select a calendar in the <gui>Calendar</gui> drop-down list.</p></item>
+<item><p>Enter a brief summary in the <gui>Summary</gui> field.</p></item>
+<item><p>(Optional) Type a location in the <gui>Location</gui> field.</p></item>
+<item><p>To select this appointment as an all day event, click <guiseq><gui>Options</gui><gui>All Day Event</gui></guiseq>, or click the <gui>All Day Event</gui> button on the toolbar.</p></item>
+<item><p>Select the date and time.</p></item>
+<item><p>If the event is not an all day event, select either <gui>For</gui> to specify the duration, or select <gui>Until</gui> to specify the ending time of the event.</p></item>
+<item><p>(Optional) Enter a description in the <gui>Description</gui> field.</p></item>
+<item><p>To show the time as <link xref="calendar-free-busy">busy</link> to others, click <guiseq><gui>Options</gui><gui>Show Time as Busy</gui></guiseq>.</p></item>
+</steps>
+<note><p>You can also define a <link xref="calendar-timezones">time zone</link>, a <link xref="using-categories">category</link>, a <link xref="calendar-alarms-and-reminders">reminder</link>, a <link xref="calendar-recurrence">recurrence</link>, or a <link xref="calendar-classifications">classification</link> for the event, or add an attachment.</p></note>
+
+</page>
diff --git a/help/C/calendar-usage-delete-appointment.page b/help/C/calendar-usage-delete-appointment.page
new file mode 100644
index 0000000..1520178
--- /dev/null
+++ b/help/C/calendar-usage-delete-appointment.page
@@ -0,0 +1,24 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="calendar-usage-delete-appointment">
+
+ <info>
+ <desc>Deleting in appointment in your calendar.</desc>
+
+ <link type="guide" xref="calendar-usage" />
+
+ <revision pkgversion="3.0.2" version="0.2" date="2011-08-01" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Deleting an Appointment</title>
+
+<p>If you want to delete an appointment in your calendars, right-click on the appointment in the calendar and select <gui>Delete Appointment</gui>, or click on the appointment and click <gui>Delete</gui> in the tool bar or press <keyseq><key>Ctrl</key><key>D</key></keyseq>. If you are in the <link xref="calendar-layout-views">list view</link> you can also use <guiseq><gui>Edit</gui><gui>Delete Appointment</gui></guiseq>.</p>
+
+</page>
diff --git a/help/C/calendar-usage-edit-appointment.page b/help/C/calendar-usage-edit-appointment.page
new file mode 100644
index 0000000..eb333e9
--- /dev/null
+++ b/help/C/calendar-usage-edit-appointment.page
@@ -0,0 +1,30 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="calendar-usage-edit-appointment">
+
+ <info>
+ <desc>Editing in appointment in your calendar.</desc>
+
+ <link type="guide" xref="calendar-usage" />
+
+ <revision pkgversion="3.0.2" version="0.2" date="2011-08-01" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Editing an Appointment</title>
+
+<p>If you want to change an appointment that already exists in your calendars,</p>
+
+<steps>
+<item><p>Double-click on the appointment that you want to edit in the calendar.</p></item>
+<item><p>Edit the appointment (see <link xref="calendar-usage-add-appointment">Adding an Appointment</link> for the list of available options).</p></item>
+<item><p>Click the <gui style="button">Save</gui> button, or <guiseq><gui>File</gui><gui>Save</gui></guiseq>.</p></item>
+</steps>
+
+</page>
diff --git a/help/C/calendar-usage.page b/help/C/calendar-usage.page
new file mode 100644
index 0000000..ed313e8
--- /dev/null
+++ b/help/C/calendar-usage.page
@@ -0,0 +1,23 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="calendar-usage">
+
+ <info>
+ <desc>On adding, editing, and deleting appointments.</desc>
+
+ <link type="guide" xref="index#calendar" />
+ <link type="seealso" xref="calendar-meetings" />
+
+ <revision pkgversion="3.1.5" version="0.1" date="2011-08-01" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Add, Edit, and Delete Appointments</title>
+
+</page>
diff --git a/help/C/calendar-using-several-calendars.page b/help/C/calendar-using-several-calendars.page
new file mode 100644
index 0000000..315d84a
--- /dev/null
+++ b/help/C/calendar-using-several-calendars.page
@@ -0,0 +1,33 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="calendar-using-several-calendars">
+
+ <info>
+ <desc>Adding and using more than one calendar and different types.</desc>
+
+ <link type="guide" xref="calendar-organizing" />
+
+ <revision pkgversion="3.1.5" version="0.2" date="2011-07-28" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-calendar-multiple.html.en and http://library.gnome.org/users/evolution/2.32/usage-calendar-view.html.en -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Using several calendars</title>
+
+<p>You can have multiple calendars and overlay them one over the next. For example, you might have a schedule of events for work, one for home, and one for your favorite sports team. The side bar lists those calendars, and you can select or deselect the boxes next to them to show and hide the appointments in your calendar view. By hiding and showing different sets of appointments, you can be sure to avoid conflicts, while keeping a minimum of clutter in your view.</p>
+
+<p>Appointments for each calendar appear as a different color.</p>
+
+<p>You can also use calendars that are not on your computer, such as on the internet or in a local network.</p>
+
+<p>For example, the <link href="http://icalshare.com";>icalshare.com website</link> has an extensive list of shared online calendars, including national and religious holidays, phases of the moon, sports, and local and regional events.</p>
+
+</page>
diff --git a/help/C/calendar-weather.page b/help/C/calendar-weather.page
new file mode 100644
index 0000000..902c03a
--- /dev/null
+++ b/help/C/calendar-weather.page
@@ -0,0 +1,39 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="calendar-weather">
+
+ <info>
+ <desc>Display the weather in the calendar.</desc>
+
+ <link type="guide" xref="calendar-using-several-calendars"/>
+
+ <revision pkgversion="3.1.5" version="0.3" date="2011-07-28" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Using a weather calendar</title>
+
+<p>Calendars of this type are read-only.</p>
+
+<p>To add such a calendar to Evolution, perform the following steps:</p>
+<steps>
+<item><p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Calendar</gui></guiseq>.</p></item>
+<item><p>Select the type <gui>Weather</gui>.</p></item>
+<item><p>Enter a name that you prefer.</p></item>
+<item><p>Optionally choose a color that you prefer.</p></item>
+<item><p>Choose if you want to be able to view the content also when being offline.</p></item>
+<item><p>Choose a location by selecting continent, country and city.</p></item>
+<item><p>Choose <gui>Use secure connection</gui> if you want to connect securely.</p></item>
+<item><p>Choose the temperature unit.</p></item>
+<item><p>Click <gui style="button">Apply</gui>.</p></item>
+</steps>
+
+<p>The calendar will be added to the list of calendars in Evolution.</p>
+
+</page>
diff --git a/help/C/calendar-webdav.page b/help/C/calendar-webdav.page
new file mode 100644
index 0000000..fbce16d
--- /dev/null
+++ b/help/C/calendar-webdav.page
@@ -0,0 +1,39 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="calendar-webdav">
+
+ <info>
+ <desc>Using an online Webcal/WebDAV calendar.</desc>
+
+ <link type="guide" xref="calendar-using-several-calendars"/>
+
+ <revision pkgversion="3.1.5" version="0.3" date="2011-07-28" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Using a WebDAV calendar</title>
+
+<p>Calendars of this type are read-only.</p>
+
+<p>To add such a calendar to Evolution, perform the following steps:</p>
+<steps>
+<item><p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Calendar</gui></guiseq>.</p></item>
+<item><p>Select the type <gui>On the Web</gui>.</p></item>
+<item><p>Enter a name that you prefer.</p></item>
+<item><p>Optionally choose a color that you prefer.</p></item>
+<item><p>Choose if you want to be able to view the content also when being offline.</p></item>
+<item><p>Enter the address of the calendar in the <gui>URL</gui> field.</p></item>
+<item><p>Choose <gui>Use secure connection</gui> if you want to connect securely.</p></item>
+<item><p>Enter your username.</p></item>
+<item><p>Click <gui style="button">Apply</gui>.</p></item>
+</steps>
+
+<p>The calendar will be added to the list of calendars in Evolution.</p>
+
+</page>
diff --git a/help/C/change-switcher-appearance.page b/help/C/change-switcher-appearance.page
new file mode 100644
index 0000000..707c965
--- /dev/null
+++ b/help/C/change-switcher-appearance.page
@@ -0,0 +1,40 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="change-switcher-appearance">
+
+ <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 -->
+ <revision pkgversion="2.32.2" version="0.1" date="2011-07-21" status="stub"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <title>Changing the Switcher appearance</title>
+
+<p>The display of the window buttons in the lower left corner (Mail, Contacts, Calendar, Tasks and Memos) can be changed via <guiseq><gui>View</gui><gui>Switcher Appearance</gui></guiseq>. This can be helpful if you have a small display. You can also completely hide them.</p>
+<p>The available options are:</p>
+<list>
+<item><p>
+Icons and Text
+</p></item>
+<item><p>
+Icons Only
+</p></item>
+<item><p>
+Text Only
+</p></item>
+<item><p>
+Toolbar Style
+</p></item>
+<item><p>
+Show Buttons
+</p></item>
+</list>
+</page>
diff --git a/help/C/contacts-add-automatically.page b/help/C/contacts-add-automatically.page
new file mode 100644
index 0000000..f2f6561
--- /dev/null
+++ b/help/C/contacts-add-automatically.page
@@ -0,0 +1,30 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="contacts-add-automatically">
+
+ <info>
+ <desc>Automatically add senders of mail that you have received to your contacts.</desc>
+
+ <link type="guide" xref="contacts-usage"/>
+
+ <revision pkgversion="2.32.1" version="0.2" date="2011-01-05" status="draft"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Barbara Tobias</name>
+ <email>barbtobias09 gmail com</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Adding people automatically to my contacts</title>
+
+
+<p>You can add people automatically to your contacts when you reply to received email. Enable the plugin <gui>Automatic Contacts</gui> by going to <guiseq><gui>Edit</gui><gui>Plugins</gui></guiseq>; click on "Automatic Contacts" so that it shows a check mark. Then go to <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>Automatic Contacts</gui></guiseq> and enable the <gui>Create address book entries when sending emails</gui> option and select an address book in the drop-down field below that will receive the new contacts.</p>
+<!-- TODO: Update once https://bugzilla.gnome.org/show_bug.cgi?id=655492 is fixed -->
+<p>From now on, contacts will be automatically created for senders of received mail when you reply to that mail.</p>
+</page>
diff --git a/help/C/contacts-autocompletion.page b/help/C/contacts-autocompletion.page
new file mode 100644
index 0000000..9b9ccba
--- /dev/null
+++ b/help/C/contacts-autocompletion.page
@@ -0,0 +1,36 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="contacts-autocompletion">
+
+ <info>
+ <desc>Autocompletion of names and email addresses entered in the mail composer.</desc>
+
+ <link type="guide" xref="index#contacts"/>
+ <link type="guide" xref="index#mail-composing"/>
+ <link type="seealso" xref="mail-composer-forward"/>
+ <link type="seealso" xref="mail-composer-reply"/>
+ <link type="seealso" xref="mail-composer-write-new-message"/>
+
+ <revision pkgversion="2.32.1" version="0.1" date="2011-01-05" status="draft"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-getnsend-send.html.en#usage-mail-getnsend-send-to -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Autocompletion of mail recipients</title>
+
+<p>You can enter the first three letters of names and email addresses in the recipients text field and Evolution will present you with a list of matches from your address books.</p>
+<p>To enable autocompletion, go to <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Contacts</gui><gui>Autocompletion</gui></guiseq> and choose the address books from the list that Evolution should look in for matches.</p>
+
+<p>Select <gui>Always show address of the autocompleted contact</gui> to also show the email address along with the name. This can be helpful to distinguish if a contact has several email addresses.</p>
+
+<p>Alternately, you can click the <gui>To:</gui>, <gui>Cc:</gui>, or <gui>Bcc:</gui> buttons to get a list of the email addresses in your contacts. Select addresses and click the arrow buttons to move them into the appropriate address columns.</p>
+
+</page>
diff --git a/help/C/contacts-google.page b/help/C/contacts-google.page
new file mode 100644
index 0000000..62a1d38
--- /dev/null
+++ b/help/C/contacts-google.page
@@ -0,0 +1,36 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="contacts-google">
+
+ <info>
+ <desc>Use the online address book of your Google account.</desc>
+
+ <link type="guide" xref="contacts-using-several-addressbooks"/>
+ <link type="guide" xref="google-services"/>
+
+ <revision pkgversion="3.1.5" version="0.3" date="2011-07-28" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Using a Google addressbook</title>
+
+<p>To add such an adress book to Evolution, perform the following steps:</p>
+<steps>
+<item><p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Address Book</gui></guiseq>.</p></item>
+<item><p>Select the type <gui>Google</gui>.</p></item>
+<item><p>Enter a name that you prefer.</p></item>
+<item><p>Choose if you want to be able to view the content also when being offline.</p></item>
+<item><p>Enter your Google username.</p></item>
+<item><p>Choose <gui>Use secure connection</gui> if you want to connect securely.</p></item>
+<item><p>Click <gui style="button">Apply</gui>.</p></item>
+</steps>
+
+<p>The address book will be added to the list of address books in Evolution.</p>
+
+</page>
diff --git a/help/C/contacts-ldap.page b/help/C/contacts-ldap.page
new file mode 100644
index 0000000..119b005
--- /dev/null
+++ b/help/C/contacts-ldap.page
@@ -0,0 +1,76 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="contacts-ldap">
+
+ <info>
+ <desc>Use shared address books on a local network.</desc>
+
+ <link type="guide" xref="contacts-using-several-addressbooks"/>
+
+ <revision pkgversion="3.1.5" version="0.3" date="2011-07-28" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-contact-sharing.html.en and http://library.gnome.org/users/evolution/2.32/config-prefs-contact.html.en#bxmw6w5 -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Adding LDAP access</title>
+
+<p>The LDAP protocol was created to let users share contact information over a network by sharing access to a central directory. LDAP allows a company to maintain a shared set of contact information. Many companies keep a common LDAP address book for all their employees or for client contacts.</p>
+
+<section id="add-ldap-addressbook">
+<title>Adding an LDAP address book</title>
+
+<steps>
+<item><p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Address Book</gui></guiseq>.</p></item>
+<item><p>In the <gui>General</gui> tab, select the type <gui>On LDAP Servers</gui>.</p></item>
+<item><p>Enter a name that you prefer.</p></item>
+<item><p>Enter the address of the server, the port number (the default number is 389) and whether you want to connect securely.</p></item>
+<item><p>Define the login method and your user name.</p></item>
+<item><p>Click <gui style="button">Apply</gui>.</p></item>
+<item><p>In the <gui>Details</gui> tab you can define the following settings:</p>
+<list>
+ <item><p>Search Base: The search base is the starting point for a directory search. Contact your system administrator for information about the correct settings.</p></item>
+ <item><p>Search Scope: The search scope is the breadth of a given search. The following options are available:</p>
+ <list>
+ <item><p>One: Searches the Search Base and one entry below it.</p></item>
+ <item><p>Sub: Searches the Search Base and all entries below it.</p></item>
+ </list>
+ </item>
+ <item><p>Search Filter: The search filter can be set here for all the LDAP queries. For example:</p>
+ <list>
+ <item><p><code>ObjectClass=*</code>: Lists all the objects from the server.</p></item>
+ <item><p><code>ObjectClass=User</code>: Lists only the users.</p></item>
+ <item><p><code>Filter (|(ObjectClass=User)(ObjectClass=groupOfNames))</code>: Retrieves the User and Contact List objects.</p></item>
+ <item><p><code>(&(mail=*)(ObjectClass=*))</code>: Lists the objects associated with the email addresses.</p></item>
+ </list>
+ </item>
+ <item><p>Timeout (minutes): The maximum time Evolution attempts to download data from the server before giving up.</p></item>
+ <item><p>Download Limit: The maximum number of results for a given search. Most servers refuse to send more than 500 contacts, but you can set the number lower if you want to shorten downloads for very broad searches.</p></item>
+</list>
+</item>
+</steps>
+
+<note><p>If you are unsure about some settings, ask your system administrator.</p></note>
+
+</section>
+
+<section id="add-ldap-addressbook">
+<title>Differences to local address books</title>
+
+<p>LDAP address books work like local address books on your computer, with the following exceptions:</p>
+<list>
+<item><p>Network folders are only available when you are connected to the network. If you use a laptop or have a modem connection, you might want to copy or cache some of the network directory. You do this by dragging and dropping your desired contacts into the local address books.</p></item>
+<item><p>You can also mark the network folder for offline usage. To mark the folder, right-click the folder, click Properties and select Copy Folder Content Locally for Offline Operation.</p></item>
+<item><p>To prevent excess network traffic, Evolution does not normally load data from the LDAP server upon opening.</p></item>
+<item><p>Depending on your server settings, you might not be able to edit all the fields in a contact stored on an LDAP server. Some servers prohibit some or all changes, and others use a smaller set of fields than Evolution allows. Check with your system administrator if you need different settings.</p></item>
+</list>
+</section>
+
+</page>
diff --git a/help/C/contacts-local.page b/help/C/contacts-local.page
new file mode 100644
index 0000000..c57a8eb
--- /dev/null
+++ b/help/C/contacts-local.page
@@ -0,0 +1,32 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="contacts-local">
+
+ <info>
+ <desc>Adding another local address book.</desc>
+
+ <link type="guide" xref="contacts-using-several-addressbooks"/>
+
+ <revision pkgversion="3.1.5" version="0.3" date="2011-07-28" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Adding another local address book</title>
+
+<p>To add another local calendar to Evolution, perform the following steps:</p>
+<steps>
+<item><p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Address Book</gui></guiseq>.</p></item>
+<item><p>Select the type <gui>On This Computer</gui>.</p></item>
+<item><p>Enter a name that you prefer.</p></item>
+<item><p>Click <gui style="button">Apply</gui>.</p></item>
+</steps>
+
+<p>The address book will be added to the list of address books in Evolution.</p>
+
+</page>
diff --git a/help/C/contacts-organizing.page b/help/C/contacts-organizing.page
new file mode 100644
index 0000000..2823913
--- /dev/null
+++ b/help/C/contacts-organizing.page
@@ -0,0 +1,25 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="contacts-organizing">
+
+ <info>
+ <desc>On address books, searching, contact lists, and categories.</desc>
+
+ <link type="guide" xref="index#contacts" />
+ <link type="guide" xref="organizing" />
+
+ <revision pkgversion="2.32.1" version="0.1" date="2011-01-05" status="stub"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Sorting, organizing and grouping contacts</title>
+
+<p>There are several ways how to organize your contacts. You can use several addressbooks and categories, and for conveniently sending messages to a group of people contact lists are available.</p>
+
+</page>
diff --git a/help/C/contacts-searching.page b/help/C/contacts-searching.page
new file mode 100644
index 0000000..e4fbcef
--- /dev/null
+++ b/help/C/contacts-searching.page
@@ -0,0 +1,80 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="contacts-searching">
+
+ <info>
+ <desc>Searching contacts.</desc>
+
+ <link type="guide" xref="searching-items" />
+ <link type="guide" xref="contacts-organizing" />
+
+ <revision pkgversion="2.32.1" version="0.2" date="2010-10-12" status="draft"/>
+ <credit type="author">
+ <name>Max Vorobuov</name>
+ <email>vmax0770 gmail com</email>
+ </credit>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+<!-- TODO: Evo 3.0.2 also has Edit > Find in contact, and I have no idea how it exactly works. Find out! -->
+ </info>
+
+<title>Searching Contacts</title>
+<section id="quick-search">
+<title>Quick Search</title>
+<p>In the Calendar view, you can quickly search for contacts either by category or by contact's info.</p>
+<p>Searching by contact's info:</p>
+<steps>
+<item><p>Click the search icon <media type="image" mime="image/png" src="figures/search-icon.png"/> to expand the drop-down list.</p></item>
+<item><p>Select the search condition from the list.</p></item>
+<item><p>Enter the text you want to search for and press <key>Enter</key>.</p></item>
+<item><p>Evolution displays the search results.</p></item>
+</steps>
+<p>Searching by category:</p>
+<steps>
+<item><p>Click the <gui>Show</gui> drop-down list.</p></item>
+<item><p>Select the category from the list.</p></item>
+<item><p>Evolution displays the search results.</p></item>
+</steps>
+<p>If you want to set several search conditions, you should use an Advanced search, which is described below.</p>
+</section>
+
+<section id="advanced-search">
+<title>Advanced Search</title>
+<steps>
+<item><p>Select the <guiseq><gui>Search</gui><gui>Advanced Search</gui></guiseq> menu to open the dialog box.</p></item>
+<item><p>Click <gui style="button">Add Condition</gui> to add any number of rules.</p></item>
+<item><p>Select the condition from the dropdown list, and then type a search entry in the field.</p></item>
+<item><p>Click <gui style="button">OK</gui> to get the search results displayed.</p></item>
+</steps>
+</section>
+
+<!-- TODO:XINCLUDE: Needs refactoring as clearing-search and saved-searches are totally identical in all *-searching.page files -->
+<section id="clearing-search">
+<title>Clearing the Search results</title>
+<p>To clear your search view and get back to the default view, click the <gui>Clear</gui> icon in the search string field, or choose <guiseq><gui>Search</gui><gui>Clear</gui></guiseq> from the menubar. You can also press <keyseq><key>Shift</key><key>Ctrl</key><key>Q</key></keyseq> to clear the search.</p>
+</section>
+
+<section id="saved-searches">
+<title>Saved Searches</title>
+<p>If you search for something rather often, you will prefer not to type it many times. In this case you can use saved searches.</p>
+<p>To save your search results, either click <gui>Save</gui> instead of <gui>OK</gui> in the Search dialog, or in case the search results are already displayed, select <guiseq><gui>Search</gui><gui>Save Search</gui></guiseq>. From now on this search will be directly available from the <gui>Search</gui> menu.</p>
+</section>
+
+<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>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>
+</steps>
+</section>
+
+</page>
diff --git a/help/C/contacts-usage-add-contact.page b/help/C/contacts-usage-add-contact.page
new file mode 100644
index 0000000..846a286
--- /dev/null
+++ b/help/C/contacts-usage-add-contact.page
@@ -0,0 +1,41 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="contacts-usage-add-contact">
+
+ <info>
+ <desc>Adding a contact to your address book.</desc>
+
+ <link type="guide" xref="contacts-usage" />
+
+ <revision pkgversion="3.0.2" version="0.1" date="2011-08-01" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Adding a Contact</title>
+
+<steps>
+<item><p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Contact</gui></guiseq>, or right-click in a blank space in the list of contacts and click "New Contact...", or press <keyseq><key>Shift</key><key>Ctrl</key><key>C</key></keyseq>.</p></item>
+<item><p>Select the address book under <gui>Where:</gui> to which it will be added.</p></item>
+<item><p>Enter the contact information. Note that there are several tabs.</p></item>
+<item><p>You can add a photograph to the contact by clicking the large field (showing a stylized person) next to <gui>Full Name</gui> and <gui>Categories</gui>.</p></item>
+<item><p>Click <gui style="button">OK</gui>.</p></item>
+</steps>
+
+<section id="contact-quick-add">
+<title>Contact Quick-Add from the Email Window</title>
+
+<p>You can also add a contact directly from an email.</p>
+<steps>
+<item><p>Right-click on the email address in the message header.</p></item>
+<item><p>Select <gui>Add to Address Book...</gui>.</p></item>
+<item><p>Either press <gui style="button">Edit Full</gui> to bring up the full <gui>Contact Editor</gui>, or click <gui style="button">OK</gui> to directly add the contact to the chosen address book.</p></item>
+</steps>
+</section>
+
+</page>
diff --git a/help/C/contacts-usage-delete-contact.page b/help/C/contacts-usage-delete-contact.page
new file mode 100644
index 0000000..065c2e9
--- /dev/null
+++ b/help/C/contacts-usage-delete-contact.page
@@ -0,0 +1,24 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="contacts-usage-delete-contact">
+
+ <info>
+ <desc>Deleting a contact from your address book.</desc>
+
+ <link type="guide" xref="contacts-usage" />
+
+ <revision pkgversion="3.0.2" version="0.1" date="2011-08-01" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Deleting a Contact</title>
+
+<p>If you want to delete a contact in your address books, right-click on the contact and select <gui>Delete</gui>, or click on the appointment and click <gui>Delete</gui> in the tool bar or press <keyseq><key>Ctrl</key><key>D</key></keyseq>, or click <guiseq><gui>Edit</gui><gui>Delete Contact</gui></guiseq>.</p>
+
+</page>
diff --git a/help/C/contacts-usage-edit-contact.page b/help/C/contacts-usage-edit-contact.page
new file mode 100644
index 0000000..df02afd
--- /dev/null
+++ b/help/C/contacts-usage-edit-contact.page
@@ -0,0 +1,30 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="contacts-usage-edit-contact">
+
+ <info>
+ <desc>Editing a contact in your address book.</desc>
+
+ <link type="guide" xref="contacts-usage" />
+
+ <revision pkgversion="3.0.2" version="0.1" date="2011-08-01" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Editing a Contact</title>
+
+<p>If you want to change a contact that already exists in your address books,</p>
+
+<steps>
+<item><p>Double-click on the contact that you want to edit in the list of contacts, or select the contact and press <key>Enter</key>.</p></item>
+<item><p>Edit the contact information.</p></item>
+<item><p>Click <gui style="button">OK</gui>.</p></item>
+</steps>
+
+</page>
diff --git a/help/C/contacts-usage.page b/help/C/contacts-usage.page
new file mode 100644
index 0000000..0e1d727
--- /dev/null
+++ b/help/C/contacts-usage.page
@@ -0,0 +1,22 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="contacts-usage">
+
+ <info>
+ <desc>On adding, editing, and deleting contacts in address books.</desc>
+
+ <link type="guide" xref="index#contacts" />
+
+ <revision pkgversion="2.32.1" version="0.1" date="2011-07-21" status="stub"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Add, Edit, and Delete Contacts</title>
+
+</page>
diff --git a/help/C/contacts-using-contact-lists.page b/help/C/contacts-using-contact-lists.page
new file mode 100644
index 0000000..b538223
--- /dev/null
+++ b/help/C/contacts-using-contact-lists.page
@@ -0,0 +1,48 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="contacts-using-contact-lists">
+
+ <info>
+ <desc>Using contact lists for grouping contacts.</desc>
+
+ <link type="guide" xref="contacts-organizing" />
+
+ <revision pkgversion="2.32.1" version="0.2" date="2011-07-28" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-contact-organize.html.en#usage-contact-organize-group-list -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Using Contact Lists</title>
+
+<p>A contact list is a set of contacts with a single nickname that you create. When you send mail to this nickname it is actually sent to every member of the list. This differs from a "real" mailing list in that it exists only on your computer as a convenience to you, rather than as an actual email address managed by a mailing list application on a server.</p>
+
+<p>For example, you could create one contact for each family member, then add those contacts to a contact list called "Family". Then, instead of entering each person's email address individually, you can send emails to "Family" and the messages would go to all of them.</p>
+
+<section id="create-contact-list">
+<title>Creating a contact list</title>
+<steps>
+<item><p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Contact List</gui></guiseq>.</p></item>
+<item><p>Enter a name that you prefer.</p></item>
+<item><p>Select the address book under <gui>Where:</gui> to which it will be added.</p></item>
+<item><p>Specify the list members by either entering the names or email addresses of contacts (the text field supports autocompletion), or by dragging contacts from the Contacts window into the list, or by using the <gui style="button">Select...</gui> button.</p></item>
+<item><p>Choose whether you want to hide the email addresses when you send a message to the list.</p><p>Unless it is a very small list, it is recommended that you leave the addresses hidden. This is the same thing as using the âBcc:â feature discussed in <link xref="mail-composer-several-recipients">Sending a message to several recipients</link>.</p></item>
+<item><p>Click <gui style="button">OK</gui>.</p></item>
+</steps>
+
+<p>The contact list will be added to the chosen address book in Evolution.</p>
+</section>
+
+<section id="create-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>
+
+</page>
diff --git a/help/C/contacts-using-several-addressbooks.page b/help/C/contacts-using-several-addressbooks.page
new file mode 100644
index 0000000..b6ddee8
--- /dev/null
+++ b/help/C/contacts-using-several-addressbooks.page
@@ -0,0 +1,26 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="contacts-using-several-addressbooks">
+
+ <info>
+ <desc>Adding and using more than one address book and different types.</desc>
+
+ <link type="guide" xref="contacts-organizing" />
+
+ <revision pkgversion="3.1.5" version="0.3" date="2011-07-28" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Using several address books</title>
+
+<p>You can have multiple address books. For example, you might have one address book for work related contacts and one for private contacts. The side bar lists those address books, and you can select which address book is shown.</p>
+
+<p>You can also use address books that are not on your computer, such as on the internet (e.g. Google) or in a local network (e.g. LDAP).</p>
+
+</page>
diff --git a/help/C/credits.page b/help/C/credits.page
new file mode 100644
index 0000000..ad14909
--- /dev/null
+++ b/help/C/credits.page
@@ -0,0 +1,95 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="credits">
+
+ <info>
+ <desc>Credits and Acknowledgment.</desc>
+
+ <link type="guide" xref="index#further-reading" />
+
+ <revision pkgversion="2.32.1" version="0.1" date="2010-12-12" status="stub"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Credits and Acknowledgment</title>
+
+<section id="current">
+<title>Authors of the Evolution User Documentation</title>
+<list>
+<item><p>
+Andrà Klapper
+</p></item>
+<item><p>
+April Gonzalez
+</p></item>
+<item><p>
+Barbara M. Tobias
+</p></item>
+<item><p>
+Phil Bull
+</p></item>
+</list>
+</section>
+
+<section id="previous">
+<title>Authors of the previous version</title>
+<list>
+<item><p>
+Aaron Weber
+</p></item>
+<item><p>
+Akhil Laddha
+</p></item>
+<item><p>
+Andrà Klapper
+</p></item>
+<item><p>
+Duncan Mak
+</p></item>
+<item><p>
+Ettore Perazzoli
+</p></item>
+<item><p>
+Francisco Javier F. Serrador
+</p></item>
+<item><p>
+Jessica Prabhakar
+</p></item>
+<item><p>
+Kevin Breit
+</p></item>
+<item><p>
+Mark Moulder
+</p></item>
+<item><p>
+Novell, Inc.
+</p></item>
+<item><p>
+Radhika Nair
+</p></item>
+<item><p>
+Srinivasa Ragavan
+</p></item>
+</list>
+</section>
+
+<section id="contact">
+<title>Contact information</title>
+<p>The GNOME Documentation Project:</p>
+<list>
+<item><p>
+<link href="http://live.gnome.org/DocumentationProject";>Website</link>
+</p></item>
+<item><p>
+<link href="http://mail.gnome.org/mailman/listinfo/gnome-doc-list";>Mailing list</link>
+</p></item>
+</list>
+</section>
+
+</page>
diff --git a/help/C/data-storage.page b/help/C/data-storage.page
new file mode 100644
index 0000000..8ea0af3
--- /dev/null
+++ b/help/C/data-storage.page
@@ -0,0 +1,47 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="data-storage">
+
+ <info>
+ <desc>Where does Evolution store my data on the harddisk?</desc>
+
+ <link type="guide" xref="index#common-other-problems" />
+
+ <revision pkgversion="2.32.1" version="0.2" date="2011-07-21" status="draft"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Data storage locations</title>
+
+<note style="tip">
+<p>This is only interesting for advanced users that want to debug problems.</p>
+</note>
+
+<p>If you run Evolution 2.32.0 or later, data will be stored according to the <link href="http://www.freedesktop.org/wiki/Specifications/basedir-spec";>XDG Base Directory Specification</link>. By default this means:</p>
+
+<terms>
+<item>
+<title>The user's data files</title>
+<p>$HOME/.local/share/evolution</p>
+</item>
+<item>
+<title>Various configuration and state files</title>
+<p>$HOME/.config/evolution</p>
+</item>
+<item>
+<title>Disposable data caches</title>
+<p>$HOME/.cache/evolution</p>
+</item>
+<item>
+<title>Configuration settings in GConf</title>
+<p>$HOME/.gconf/apps/evolution</p>
+</item>
+</terms>
+
+</page>
diff --git a/help/C/default-browser.page b/help/C/default-browser.page
new file mode 100644
index 0000000..8749dc5
--- /dev/null
+++ b/help/C/default-browser.page
@@ -0,0 +1,27 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="default-browser">
+
+ <info>
+ <desc>How to define the default browser to open links with.</desc>
+
+ <link type="guide" xref="index#common-other-problems" />
+
+ <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Setting the default browser</title>
+
+<!-- For GNOME2 the steps are to define the gconf keys /desktop/gnome/url-handlers/http and /https -->
+
+<p>You can set the system-wide default browser in GNOME 3 under <guiseq><gui>Activities</gui><gui>Applications</gui><gui>System Settings</gui><gui>System</gui><gui>System Info</gui><gui>Default Applications</gui></guiseq>.</p>
+<p>If the prefered browser is set as default application but still does not work correctly please contact your distribution via their forum or bug tracker.</p>
+<note><p>GNOME 3 users with a technical background can tweak these settings by defining scheme-handlers in <file>$HOME/.local/share/applications/mimeapps.list</file>.</p></note>
+</page>
diff --git a/help/C/deleting-appointments.page b/help/C/deleting-appointments.page
new file mode 100644
index 0000000..0eff2d1
--- /dev/null
+++ b/help/C/deleting-appointments.page
@@ -0,0 +1,25 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="deleting-appointments">
+
+ <info>
+ <desc>Deleting calendar entries to reduce the size of the mailbox.</desc>
+
+ <link type="guide" xref="deleting-to-free-disk-space" />
+
+ <revision pkgversion="2.32.2" version="0.1" date="2011-07-21" status="candidate"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Deleting old appointments permanently</title>
+
+<p>To Purge old entries in a calendar, go to <guiseq><gui>Actions</gui><gui>Purge</gui></guiseq> in the Calendar view. You will be asked how many days old the events to remove from the calendar should be. The action will be applied to the currently opened calendar (selected in the list of calendars on the left); other calendars remain unchanged.</p>
+
+</page>
+
diff --git a/help/C/deleting-emails.page b/help/C/deleting-emails.page
new file mode 100644
index 0000000..e6a6865
--- /dev/null
+++ b/help/C/deleting-emails.page
@@ -0,0 +1,39 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="deleting-emails">
+
+ <info>
+ <desc>Deleting emails or attachments to reduce the size of the mailbox.</desc>
+
+ <link type="guide" xref="deleting-to-free-disk-space" />
+ <link type="seealso" xref="mail-moving-emails" />
+
+ <revision pkgversion="3.0.2" version="0.2" date="2011-08-01" status="final"/>
+ <credit type="author">
+ <name>April Gonzales</name>
+ <email>loonycookie gmail com</email>
+ </credit>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Deleting emails or attachments permanently</title>
+
+<section id="emails">
+<title>Emails</title>
+<p>Evolution deletes emails on IMAP servers by <em>marking</em> the messages for deletion; space is not freed until you <em>expunge</em> the marked emails. </p>
+
+<p>To Expunge a specific folder, go to <guiseq><gui>Folder</gui><gui>Expunge</gui></guiseq> or press <keyseq><key>Ctrl</key><key>E</key></keyseq>. To Expunge all folders, go to <guiseq><gui>File</gui><gui>Empty Trash</gui></guiseq>. This applies to other types of accounts as well.</p>
+</section>
+
+<section id="attachments">
+<title>Attachments</title>
+<p>To delete the attachments of an email, select the message and click <guiseq><gui>Message</gui><gui>Remove Attachments</gui></guiseq>.</p>
+</section>
+</page>
+
diff --git a/help/C/deleting-to-free-disk-space.page b/help/C/deleting-to-free-disk-space.page
new file mode 100644
index 0000000..776dc05
--- /dev/null
+++ b/help/C/deleting-to-free-disk-space.page
@@ -0,0 +1,23 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="deleting-to-free-disk-space">
+
+ <info>
+ <desc>Deleting emails and calendar entries to reduce the size of the files used by Evolution.</desc>
+
+ <link type="guide" xref="index#common-other-problems" />
+
+ <revision pkgversion="2.32.2" version="0.1" date="2011-07-21" status="candidate"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Freeing disk space by deleting items</title>
+
+</page>
+
diff --git a/help/C/exchange-connectors-overview.page b/help/C/exchange-connectors-overview.page
new file mode 100644
index 0000000..7703786
--- /dev/null
+++ b/help/C/exchange-connectors-overview.page
@@ -0,0 +1,37 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="exchange-connectors-overview">
+
+ <info>
+ <desc>Which additional package to install in order to connect to an Exchange server.</desc>
+
+ <link type="guide" xref="exchange-placeholder"/>
+
+ <revision pkgversion="3.1.5" version="0.2" date="2011-07-28" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Choosing the right connector</title>
+
+<p>Depending on the version of the Microsoft Exchange server that you would like to connect to it is required to make sure that an additional package is installed that provides this functionality.</p>
+
+<p>For Microsoft Exchange 2000 and 2003 (and possibly earlier versions of Exchange that use Outlook Web Access) it is recommended to use the package evolution-exchange. <link action="install:evolution-exchange" href="http://projects.gnome.org/evolution/download";>Install evolution-exchange now.</link>
+</p>
+<p>For Microsoft Exchange 2007 (and possibly earlier versions that support MAPI) it is recommended to use the package evolution-mapi. <link action="install:evolution-mapi" href="http://projects.gnome.org/evolution/download";>Install evolution-mapi now.</link></p>
+<p>For Microsoft Exchange 2010 it is recommended to use the package evolution-ews which is currently still under development and might not be available yet for your distribution. evolution-ews also supports Microsoft Exchange 2007. <link action="install:evolution-ews" href="http://projects.gnome.org/evolution/download";>Install evolution-ews now.</link></p>
+
+<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-2:
+<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/exchange-placeholder.page b/help/C/exchange-placeholder.page
new file mode 100644
index 0000000..6833146
--- /dev/null
+++ b/help/C/exchange-placeholder.page
@@ -0,0 +1,23 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="exchange-placeholder">
+
+ <info>
+ <desc>Connecting to Exchange Servers</desc>
+
+ <link type="guide" xref="index#corporate-environments-exchange" />
+
+ <revision pkgversion="3.0.2" version="0.1" date="2011-07-21" status="stub"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Connecting to Exchange Servers</title>
+
+<p>For topics not covered here please refer to the <link href="http://library.gnome.org/users/evolution/2.32/usage-exchange.html.en";>old Evolution manual</link>.</p>
+</page>
diff --git a/help/C/exporting-data-calendar.page b/help/C/exporting-data-calendar.page
new file mode 100644
index 0000000..fca7460
--- /dev/null
+++ b/help/C/exporting-data-calendar.page
@@ -0,0 +1,25 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="exporting-data-calendar">
+
+ <info>
+ <desc>How to export calendar data from <em>Evolution</em>.</desc>
+
+ <link type="guide" xref="exporting-data" />
+
+ <revision pkgversion="3.1.5" version="0.2" date="2011-07-27" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Exporting calendar data</title>
+
+<p>To export a complete calendar, right-click on the calendar in the list of calendars and click <gui>Save as</gui>. Available formats are iCalendar format (ICS, recommended), comma seperated values (CSV), and RDF format.</p>
+<p>If you want to export only one appointment, right-click on the appointment and click <gui>Save as iCalendar...</gui>.</p>
+
+</page>
diff --git a/help/C/exporting-data-contacts.page b/help/C/exporting-data-contacts.page
new file mode 100644
index 0000000..0f61cfb
--- /dev/null
+++ b/help/C/exporting-data-contacts.page
@@ -0,0 +1,29 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="exporting-data-contacts">
+
+ <info>
+ <desc>How to export contacts data from <em>Evolution</em>.</desc>
+
+ <link type="guide" xref="exporting-data" />
+
+ <revision pkgversion="3.1.4" version="0.1" date="2011-07-27" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mainwindow-starting.html.en#fourth-step -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Exporting contacts data</title>
+
+<p>Contacts files are stored in a database, but can be saved as a vCard file.</p>
+<p>To export a complete address book, click <guiseq><gui>File</gui><gui>Save Address Book As vCard</gui></guiseq>.</p>
+<p>If you want to export only one contact, click <guiseq><gui>File</gui><gui>Save Contact as VCard</gui></guiseq> or right-click on the contact and click <gui>Save as vCard</gui>.</p>
+
+</page>
diff --git a/help/C/exporting-data-mail.page b/help/C/exporting-data-mail.page
new file mode 100644
index 0000000..27772b4
--- /dev/null
+++ b/help/C/exporting-data-mail.page
@@ -0,0 +1,27 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="exporting-data-mail">
+
+ <info>
+ <desc>How to export mail data from <em>Evolution</em>.</desc>
+
+ <link type="guide" xref="exporting-data" />
+
+ <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Exporting mail data</title>
+
+<p>To save an email to a file in <link href="https://secure.wikimedia.org/wikipedia/en/wiki/Mbox";>mbox</link> format, select an email and click <guiseq><gui>File</gui><gui>Save as mbox...</gui></guiseq> or right-click on the message and click <gui>Save as mbox...</gui>.</p>
+
+<p>The same steps apply to save a complete mail folder, but you have to mark all messages in it first.</p>
+<p>You can select all messages in a folder by clicking <guiseq><gui>Edit</gui><gui>Select All</gui></guiseq> or pressing <keyseq><key>Ctrl</key><key>A</key></keyseq>.</p>
+
+</page>
diff --git a/help/C/exporting-data.page b/help/C/exporting-data.page
new file mode 100644
index 0000000..109ce84
--- /dev/null
+++ b/help/C/exporting-data.page
@@ -0,0 +1,22 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="exporting-data">
+
+ <info>
+ <desc>How to export data from <em>Evolution</em>.</desc>
+
+ <link type="guide" xref="index#data-migration-and-sync" />
+
+ <revision pkgversion="2.28.3" version="0.1" date="2010-12-09" status="stub"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Exporting data from <em>Evolution</em></title>
+
+</page>
diff --git a/help/C/express-mode.page b/help/C/express-mode.page
new file mode 100644
index 0000000..41257ec
--- /dev/null
+++ b/help/C/express-mode.page
@@ -0,0 +1,25 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="express-mode">
+
+ <info>
+ <desc>What to do when using a small screen or netbook.</desc>
+
+ <link type="guide" xref="index#common-other-problems" />
+
+ <revision pkgversion="3.0.2" version="0.1" date="2011-07-25" status="draft"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Some windows are too large for small screens.</title>
+
+<p>This is a known problem and hard to solve for a complex application with many settings such as Evolution.</p>
+<p>You can use the Express version which is targeted for mobile and small-screen devices. This is available from version 2.30 on and can be enabled by starting <code>evolution --express</code> from the terminal window.</p>
+
+</page>
diff --git a/help/C/figures/color-204a87.png b/help/C/figures/color-204a87.png
new file mode 100644
index 0000000..56496ca
Binary files /dev/null and b/help/C/figures/color-204a87.png differ
diff --git a/help/C/figures/color-2e3436.png b/help/C/figures/color-2e3436.png
new file mode 100644
index 0000000..102928c
Binary files /dev/null and b/help/C/figures/color-2e3436.png differ
diff --git a/help/C/figures/color-4e9a06.png b/help/C/figures/color-4e9a06.png
new file mode 100644
index 0000000..04398e3
Binary files /dev/null and b/help/C/figures/color-4e9a06.png differ
diff --git a/help/C/figures/color-5c3566.png b/help/C/figures/color-5c3566.png
new file mode 100644
index 0000000..ffeee15
Binary files /dev/null and b/help/C/figures/color-5c3566.png differ
diff --git a/help/C/figures/color-8f5902.png b/help/C/figures/color-8f5902.png
new file mode 100644
index 0000000..a133832
Binary files /dev/null and b/help/C/figures/color-8f5902.png differ
diff --git a/help/C/figures/color-a40000.png b/help/C/figures/color-a40000.png
new file mode 100644
index 0000000..463e289
Binary files /dev/null and b/help/C/figures/color-a40000.png differ
diff --git a/help/C/figures/color-c4a000.png b/help/C/figures/color-c4a000.png
new file mode 100644
index 0000000..aeb131e
Binary files /dev/null and b/help/C/figures/color-c4a000.png differ
diff --git a/help/C/figures/color-ce5c00.png b/help/C/figures/color-ce5c00.png
new file mode 100644
index 0000000..070781e
Binary files /dev/null and b/help/C/figures/color-ce5c00.png differ
diff --git a/help/C/figures/evolutionlogo.png b/help/C/figures/evolutionlogo.png
new file mode 100644
index 0000000..929964b
Binary files /dev/null and b/help/C/figures/evolutionlogo.png differ
diff --git a/help/C/figures/minus.png b/help/C/figures/minus-icon.png
similarity index 100%
rename from help/C/figures/minus.png
rename to help/C/figures/minus-icon.png
diff --git a/help/C/figures/new-mail-notification.png b/help/C/figures/new-mail-notification.png
new file mode 100644
index 0000000..fdd8b50
Binary files /dev/null and b/help/C/figures/new-mail-notification.png differ
diff --git a/help/C/figures/new-mail-switcher.png b/help/C/figures/new-mail-switcher.png
new file mode 100644
index 0000000..eee3f4c
Binary files /dev/null and b/help/C/figures/new-mail-switcher.png differ
diff --git a/help/C/figures/plus.png b/help/C/figures/plus-icon.png
similarity index 100%
rename from help/C/figures/plus.png
rename to help/C/figures/plus-icon.png
diff --git a/help/C/figures/stock_search.png b/help/C/figures/search-icon.png
similarity index 100%
rename from help/C/figures/stock_search.png
rename to help/C/figures/search-icon.png
diff --git a/help/C/figures/window-overview-layers.png b/help/C/figures/window-overview-layers.png
new file mode 100644
index 0000000..bdbd79b
Binary files /dev/null and b/help/C/figures/window-overview-layers.png differ
diff --git a/help/C/google-services.page b/help/C/google-services.page
new file mode 100644
index 0000000..5efea6e
--- /dev/null
+++ b/help/C/google-services.page
@@ -0,0 +1,20 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="google-services">
+
+ <info>
+ <desc>Using Google services.</desc>
+
+ <revision pkgversion="3.0.1" version="0.1" date="2011-07-22" status="draft"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Using Google services</title>
+
+</page>
diff --git a/help/C/groupwise-placeholder.page b/help/C/groupwise-placeholder.page
new file mode 100644
index 0000000..46127a3
--- /dev/null
+++ b/help/C/groupwise-placeholder.page
@@ -0,0 +1,23 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="groupwise-placeholder">
+
+ <info>
+ <desc>Connecting to GroupWise</desc>
+
+ <link type="guide" xref="index#corporate-environments-groupwise" />
+
+ <revision pkgversion="3.0.2" version="0.1" date="2011-07-21" status="stub"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Connecting to GroupWise</title>
+
+<p>For topics not covered here please refer to the <link href="http://library.gnome.org/users/evolution/2.32/usage-groupwise.html.en";>old Evolution manual</link>.</p>
+</page>
diff --git a/help/C/import-apps-mozilla.page b/help/C/import-apps-mozilla.page
new file mode 100644
index 0000000..7ba4cfa
--- /dev/null
+++ b/help/C/import-apps-mozilla.page
@@ -0,0 +1,30 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="import-apps-mozilla">
+
+ <info>
+ <desc>Importing data from Mozilla Thunderbird.</desc>
+
+ <link type="guide" xref="import-data#import-from-apps" />
+
+ <revision pkgversion="2.32.2" version="0.2" date="2011-07-30" status="draft"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <title>Mozilla</title>
+<!-- TODO:DEVELOPERS: Does <guiseq><gui>File</gui><gui>Import</gui><gui>Import data and settings from older programs</gui></guiseq> recognize Outlook and Thunderbird? If yes, "Evolution searches for old mail programs and, if possible, imports the data from them." -->
+<!-- TODO: This really needs some testing in 3.1 -->
+<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 Thunderbird files that you would like to import.</p><p>The file type will be automatically determined.</p></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>
+</page>
diff --git a/help/C/import-apps-outlook.page b/help/C/import-apps-outlook.page
new file mode 100644
index 0000000..1b9a242
--- /dev/null
+++ b/help/C/import-apps-outlook.page
@@ -0,0 +1,69 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="import-apps-outlook">
+
+ <info>
+ <desc>Importing data from Microsoft Outlook.</desc>
+
+ <link type="guide" xref="import-data#import-from-apps" />
+
+ <revision pkgversion="3.0.2" version="0.4" date="2011-08-02" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/outlook-migration-mail.html.en -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <title>Outlook</title>
+<!-- "Import data and settings from older programs" cannot recognize Outlook, as there obviously is no default storage location for Outlook *under Linux* -->
+
+<p>These steps refer to locally stored data such as POP accounts. For remote data (like IMAP) this is not necessary, since the data is still on the server and does not need to be manually transfered. You can set up the corresponding account in Evolution and the data will be downloaded.</p>
+
+<section id="prerequisites">
+<title>Prerequisites under Windows</title>
+<p>First, while using Microsoft Windows, prepare your messages for import:</p>
+<steps>
+<item><p>Find your Outlook files (they normally have the file ending <file>.pst</file> or <file>.ost</file>):</p>
+<table frame="all" rules="all">
+ <tr>
+ <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>
+ </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>
+ </tr>
+</table>
+<p>(Replace "username" by your username.)</p>
+</item>
+<!-- File locations taken from http://support.microsoft.com/kb/2291280 and http://answers.microsoft.com/en-us/windows/forum/windows_7-files/where-is-location-of-outlookpst-file-in-windows-7/3a4c03c3-e8ad-4912-9e37-f1c62057d1f9 -->
+<item><p>Copy the Outlook files to the system or partition that Evolution is installed on.</p>
+<p>As your Windows hard drive is probably in the NTFS format, some Linux systems cannot read it without additional software. You might find it simpler to copy the mail folders to a USB drive or to burn a CD.</p></item>
+<item><p>Mount your Windows drive or the disk where you saved the mail files.</p></item>
+<item><p>Copy all the mail files into your home directory or another convenient place.</p></item>
+<item><p>Start Evolution.</p></item>
+<item><p>Optionally select <guiseq><gui>File</gui><gui>New</gui><gui>Mail Folder</gui></guiseq> to create the <link xref="mail-folders">folders</link> you want.</p></item>
+</steps>
+</section>
+
+<section id="prerequisites">
+<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>
+<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><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>
+
+</section>
+
+</page>
diff --git a/help/C/import-data.page b/help/C/import-data.page
new file mode 100644
index 0000000..79a930e
--- /dev/null
+++ b/help/C/import-data.page
@@ -0,0 +1,26 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="import-data">
+
+ <info>
+ <desc>Importing data from another application.</desc>
+
+ <link type="guide" xref="index#data-migration-and-sync"/>
+
+ <revision pkgversion="2.32.1" version="0.2" date="2011-07-21" status="draft"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <title>Importing data from another application</title>
+
+ <section id="import-from-apps" style="2column">
+ <title>Applications</title>
+ </section>
+
+</page>
diff --git a/help/C/import-single-files.page b/help/C/import-single-files.page
new file mode 100644
index 0000000..6c87d45
--- /dev/null
+++ b/help/C/import-single-files.page
@@ -0,0 +1,32 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="import-single-files">
+
+ <info>
+ <desc>Importing single files.</desc>
+
+ <link type="guide" xref="import-data" />
+
+ <revision pkgversion="2.32.2" version="0.1" date="2011-07-21" status="draft"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <title>Importing single files</title>
+
+<p>To import single files (mail, calendar data or contacts):</p>
+<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 file.</p><p>The file type will be automatically determined.</p></item>
+<item><p>Choose the destination (e.g. the folder in Evolution) for the imported data.</p></item>
+</steps>
+
+<note style="tip"><p>You can also import contacts that you have received as a vCard attachment of an email from its attachment menu.</p></note>
+
+</page>
diff --git a/help/C/import-supported-file-formats.page b/help/C/import-supported-file-formats.page
new file mode 100644
index 0000000..31eee35
--- /dev/null
+++ b/help/C/import-supported-file-formats.page
@@ -0,0 +1,87 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="import-supported-file-formats">
+
+ <info>
+ <desc>Supported file formats for importing data.</desc>
+
+ <link type="guide" xref="import-data" />
+
+ <revision pkgversion="3.0.2" version="0.2" date="2011-07-31" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/importing-mail-and-settings.html.en#importing-mail -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <title>Supported file formats</title>
+
+<p>Evolution can import the following types of files:</p>
+
+<section id="mail">
+<title>Mail</title>
+<list>
+<item><p>
+Berkeley Mailbox (.mbox or no extension):</p>
+<p>The email format used by Mozilla, Netscape, Evolution (for local folders until version 2.32), Eudora, and many other email clients.
+</p></item>
+<item><p>
+Maildir (no extension):</p>
+<p>The format used by Evolution (for local folders since version 3.0). There is no need to import Maildir files as you can <link xref="mail-account-manage-maildir-format-directories">configure a Maildir account</link> in Evolution and point to the folder where the Maildir files are stored.
+</p></item>
+<item><p>
+Outlook Express 5/6 Personal Folders (.dbx):</p>
+<p>The email file format used by Microsoft Outlook Express 5/6. For newer versions PST import is recommended.
+</p></item>
+</list>
+</section>
+
+<section id="calendar">
+<title>Calendar</title>
+<list>
+<item><p>
+vCalendar (.vcs):</p>
+<p>A format for storing calendar files, which is generally used by Evolution, Microsoft Outlook, Sunbird, and Korganizer.
+</p></item>
+<item><p>
+iCalendar or iCal (.ics):</p>
+<p>A format for storing calendar files. iCalendar is used by Evolution, Microsoft Outlook, Palm OS handhelds, and others.
+</p></item>
+</list>
+</section>
+
+<section id="contacts">
+<title>Contacts</title>
+<list>
+<item><p>
+LDAP Data Interchange Format (.ldif):</p>
+<p>A standard data format for contact cards.
+</p></item>
+<item><p>
+vCard (.vcf, .gcrd):</p>
+<p>The address book format used by the GNOME, KDE, and many other contact management applications. You should be able to export to vCard format from any address book application.
+</p></item>
+</list>
+</section>
+
+<section id="misc">
+<title>Miscelleanous</title>
+<list>
+<item><p>
+Evolution/Mozilla/Outlook CSV/Tab (.csv, .tab):</p>
+<p>CSV (Comma-separated values) or Tabulator files saved by using Evolution, Microsoft Outlook and Mozilla.
+</p></item>
+<item><p>
+Personal Storage Table (.pst):</p>
+<p>A file format used to store local copies of messages, calendar events, and other items within Microsoft software such as Microsoft Exchange Client, Windows Messaging, and Microsoft Outlook.
+</p></item>
+</list>
+</section>
+
+</page>
diff --git a/help/C/index.page b/help/C/index.page
new file mode 100644
index 0000000..0303827
--- /dev/null
+++ b/help/C/index.page
@@ -0,0 +1,91 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="index">
+
+ <info>
+ <desc>Evolution</desc>
+
+ <revision pkgversion="3.2.0" version="0.4" date="2011-07-21" status="draft"/>
+ <credit type="author">
+ <name>Phil Bull</name>
+ <email>philbull gmail com</email>
+ </credit>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title><media type="image" src="./figures/evolutionlogo.png">Evolution logo</media>
+Evolution Mail and Calendar</title>
+
+ <section id="getting-started" style="2column">
+ <title>Getting Started</title>
+ </section>
+
+ <section id="mail-basic" style="2column">
+ <title>Mail Management</title>
+ <section id="mail-advanced" style="2column">
+ <title>Advanced Mail Management</title>
+ <section id="mail-advanced-imap" style="2column">
+ <title>IMAP</title>
+ </section>
+ </section>
+ </section>
+
+ <section id="mail-composing" style="2column">
+ <title>Mail Composing</title>
+ <section id="mail-composing-advanced" style="2column">
+ <title>Advanced Mail Composing</title>
+ </section>
+ </section>
+
+ <section id="calendar" style="2column">
+ <title>Calendar Management</title>
+ <section id="calendar-advanced" style="2column">
+ <title>Advanced Calendar Management</title>
+ </section>
+ </section>
+
+ <section id="contacts" style="2column">
+ <title>Contacts Management</title>
+ </section>
+
+ <section id="memos-and-tasks" style="2column">
+ <title>Memos and Tasks Management</title>
+ </section>
+
+ <section id="data-migration-and-sync" style="2column">
+ <title>Data Migration and Synchronization</title>
+ </section>
+
+ <section id="corporate-environments" style="2column">
+ <title>Corporate Environments</title>
+ <section id="corporate-environments-exchange" style="2column">
+ <title>Microsoft Exchange</title>
+ </section>
+ <section id="corporate-environments-groupwise" style="2column">
+ <title>Novell Groupwise</title>
+ </section>
+ </section>
+
+ <section id="tracking-down-problems" style="2column">
+ <title>Tracking down Problems</title>
+ </section>
+
+ <section id="common-mail-problems" style="2column">
+ <title>Common Mail Questions and Problems</title>
+ </section>
+
+ <section id="common-other-problems" style="2column">
+ <title>Common Other Questions and Problems</title>
+ </section>
+
+ <section id="further-reading" style="2column">
+ <title>Further reading</title>
+ </section>
+
+</page>
diff --git a/help/C/intro-first-run.page b/help/C/intro-first-run.page
new file mode 100644
index 0000000..92b5613
--- /dev/null
+++ b/help/C/intro-first-run.page
@@ -0,0 +1,108 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="intro-first-run">
+
+ <info>
+ <desc>Running Evolution for the very first time.</desc>
+
+ <link type="guide" xref="index#getting-started"/>
+
+ <revision pkgversion="2.30.2" version="0.1" date="2010-12-09" status="stub"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <title>Starting <em>Evolution</em> for the first time</title>
+
+<p>The first time you run Evolution, it opens the First-Run Assistant to help you set up email accounts and <link xref="import-data">import data from other applications.</link></p>
+
+<section id="identity">
+<title>Identity</title>
+<p>Here you define your name and your email address.</p>
+<p>Optionally you can make this account your default account (e.g. when writing emails), set a Reply-To email address (if you want replies to messages sent to a different address), and set an organization (the company where you work, or the organization you represent when you send email from this account).</p>
+</section>
+
+<section id="restore">
+<title>Restore from backup</title>
+<p>You will get asked whether to restore from a backup of a previous version. If you have such a backup, continue <link xref="backup-restore#restore">here</link>. Otherwise, go to the next page.</p>
+</section>
+
+<section id="receiving">
+<title>Receiving Email</title>
+<p>First, choose the server type from the <gui>Server Type</gui> dropdown-list.</p>
+<p>If you are unsure about the type of server to choose, ask your system administrator or Internet Service Provider.</p>
+
+
+<section id="common-server-types">
+<title>Common server types</title>
+<p>The most common available server types for normal users are:</p>
+<list>
+<item><p>None: If you do not plan to use Evolution for receiving email.</p><p>Continue <link xref="#sending">here</link> for configuration.</p></item>
+<item><p>IMAP: Keeps the mail on the server so you can access your mail from multiple systems.</p><p>Continue <link xref="mail-receiving-options-imap">here</link> for configuration.</p></item>
+<!-- TODO:DEVELOPERS: So what's the difference between IMAP and IMAP+, and what is recommended, dear developers? -->
+<item><p>IMAP+: Keeps the mail on the server so you can access your mail from multiple systems.</p><p>Continue <link xref="mail-receiving-options-imap-plus">here</link> for configuration.</p></item>
+<item><p>POP: Downloads your email to your hard disk.</p><p>Continue <link xref="mail-receiving-options-pop">here</link> for configuration.</p></item>
+<item><p>USENET News: Connects to a news server and downloads a list of available news digests.</p><p>Continue <link xref="mail-receiving-options-usenet-news">here</link> for configuration.</p></item>
+</list>
+</section>
+
+<section id="corporate-server-types">
+<title>Corporate server types</title>
+<p>Available server types for corporate users are:</p>
+<!-- TODO:POST-3-2: Add evolution-ews once it is stable -->
+<list>
+<item><p>Exchange MAPI: For connecting to a Microsoft Exchange 2007/2010 or OpenChange server.</p><p>Continue <link xref="mail-receiving-options-exchange-mapi">here</link> for configuration.</p>
+<note style="tip"><p>This requires having the evolution-mapi package installed. <link action="install:evolution-mapi" href="http://ftp.gnome.org/pub/gnome/sources/evolution-mapi/";>Install evolution-mapi now.</link></p></note>
+</item>
+<item><p>Microsoft Exchange: For connecting to a Microsoft Exchange 2000 or 2003 server.</p><p>Continue <link xref="mail-receiving-options-evolution-exchange">here</link> for configuration.</p>
+<note style="tip"><p>This requires having the evolution-exchange package installed. <link action="install:evolution-exchange" href="http://ftp.gnome.org/pub/gnome/sources/evolution-exchange/";>Install evolution-exchange now.</link></p></note>
+</item>
+<item><p>Novell Groupwise: For connecting to a Novell GroupWise server.</p><p>Continue <link xref="mail-receiving-options-novell-groupwise">here</link> for configuration.</p></item>
+</list>
+</section>
+
+<section id="local-account-server-types">
+<title>Local account server types</title>
+<p>Available local account server types for advanced users are:</p>
+<list>
+<item><p>Local delivery: If you want to move email from the spool (the location where mail waits for delivery) and store it in your home directory. You need to provide the path to the mail spool you want to use. If you want to leave email in your system's spool files, choose the <gui>Standard Unix Mbox Spool</gui> option instead.</p><p>Continue <link xref="mail-receiving-options-local-delivery">here</link> for configuration.</p></item>
+
+<item><p>MH-Format Mail Directories: For downloading email using MH or another MH-style program.</p><p>You need to provide the path to the directory you want to use.</p><p>Continue <link xref="mail-receiving-options-mh-format-directories">here</link> for configuration.</p></item>
+
+<item><p>Maildir-Format Mail Directories: For downloading your email using Qmail or another Maildir-style program.</p><p>You need to provide the path to the directory you want to use.</p><p>Continue <link xref="mail-receiving-options-maildir-format-directories">here</link> for configuration.</p></item>
+
+<item><p>Standard Unix mbox spool file: For reading and storing email in the mail spool file on your local system.</p><p>Continue <link xref="mail-receiving-options-unix-mbox-spool-file">here</link> for configuration.</p><p>You need to provide the path to the mail spool file you want to use.</p></item>
+
+<item><p>Standard Unix mbox spool directory: For reading and storing email in the mail spool directory on your local system.</p><p>You need to provide the path to the directory you want to use.</p><p>Continue <link xref="mail-receiving-options-unix-mbox-spool-directory">here</link> for configuration.</p></item>
+</list>
+
+<note style="tip"><p>Later on, if you want to change an account, or if you want to create another one, go to <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui></guiseq>. Select the account you want to change, then click <gui style="button">Edit</gui>. Alternately, add a new account by clicking <gui style="button">Add</gui>.</p></note>
+</section>
+
+</section>
+
+<section id="sending"> <!-- Do not rename, we link to it from the subpages -->
+<title>Sending mail</title>
+<p>Available server types are:</p>
+<list>
+<item><p>SMTP: Sends mail using an outbound mail server. This is the most common choice for sending mail.</p><p>Continue <link xref="mail-sending-options-smtp">here</link> for configuration.</p></item>
+<item><p>Sendmail: Uses the Sendmail program to send mail from your system. It is not easy to configure, so you should select this option only if you know how to set up a Sendmail service.</p></item>
+</list>
+</section>
+
+<section id="account-information">
+<title>Account Information</title>
+<p>Give the account any name you prefer.</p>
+</section>
+
+<section id="account-import">
+<title>Importing Mail (Optional)</title>
+<p>Continue with <link xref="import-data">Importing data from another application</link>.</p>
+</section>
+
+</page>
diff --git a/help/C/intro-main-window.page b/help/C/intro-main-window.page
new file mode 100644
index 0000000..bae6b59
--- /dev/null
+++ b/help/C/intro-main-window.page
@@ -0,0 +1,158 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="intro-main-window">
+
+ <info>
+ <desc>An explanation of the areas shown in the Evolution window.</desc>
+
+ <link type="guide" xref="index#getting-started"/>
+ <link type="seealso" xref="calendar-layout"/>
+ <link type="seealso" xref="mail-layout-changing"/>
+
+ <revision pkgversion="2.32.1" version="0.2" date="2011-01-06" status="draft"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Barbara M. Tobias</name>
+ <email>barbtobias09 gmail com</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/ui-intro.html.en -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <title>The <em>Evolution</em> main window</title>
+
+<section id="e-mail">
+<title>E-Mail</title>
+
+<media type="image" src="./figures/window-overview-layers.png" width="600">
+ <p>The Evolution mail main window</p>
+</media>
+
+<p>Corresponding elements in the mail main window:</p>
+<table frame="all" rules="all">
+ <tr>
+ <td colspan="2"><p><media type="image" src="./figures/color-c4a000.png" width="10"/> Menu bar</p></td>
+ </tr>
+ <tr>
+ <td colspan="2"><p><media type="image" src="./figures/color-ce5c00.png" width="10" /> Tool bar</p></td>
+ </tr>
+ <tr>
+ <td rowspan="2"><p><media type="image" src="./figures/color-8f5902.png" width="10" /> Folder list</p></td>
+ <td><p><media type="image" src="./figures/color-4e9a06.png" width="10" /> Search bar</p></td>
+ </tr>
+ <tr>
+ <td><p><media type="image" src="./figures/color-204a87.png" width="10" /> Message list</p></td>
+ </tr>
+ <tr>
+ <td><p><media type="image" src="./figures/color-a40000.png" width="10" /> Switcher</p></td>
+ <td><p><media type="image" src="./figures/color-5c3566.png" width="10" /> Preview pane</p></td>
+ </tr>
+ <tr>
+ <td colspan="2"><p><media type="image" src="./figures/color-2e3436.png" width="10" /> Status bar</p></td>
+ </tr>
+</table>
+
+<terms>
+<item>
+<title>Folder list</title>
+<p>The folder list gives you a list of the available folders for each account. To see the contents of a folder, click the folder name and its contents are displayed in the message list.</p>
+<note style="tip"><p>For more information see <link xref="mail-folders">Using Folders</link>.</p></note>
+</item>
+<item>
+<title>Message List</title>
+<p>The message list displays all the read and unread messages that you have in the chosen folder. To view an email in the preview pane, click the message in the message list.</p>
+</item>
+<item>
+<title>Switcher</title>
+<p>The switcher at the bottom of the side bar lets you switch between the Evolution tools: Mail, Contacts, Calendars, Memos and Tasks.</p><p>For more information see <link xref="change-switcher-appearance">Changing the Switcher appearance</link>.</p>
+<note style="tip"><p>You can disable the folder list and the switcher side bar by toggling <guiseq><gui>View</gui><gui>Layout</gui><gui>Show Side Bar</gui></guiseq>.</p></note>
+</item>
+<item>
+<title>Preview Pane</title>
+<p>The preview pane displays the message that is currently chosen in the message list.</p>
+<note style="tip"><p>You can disable the preview pane by toggling <guiseq><gui>View</gui><gui>Preview</gui><gui>Show Message Preview</gui></guiseq>.</p></note>
+</item>
+</terms>
+</section>
+
+<section id="calendar">
+<title>Calendar</title>
+<p>Elements in the calendar main window:</p>
+<table frame="all" rules="all">
+ <tr>
+ <td colspan="3"><p><media type="image" src="./figures/color-c4a000.png" width="10"/> Menu bar</p></td>
+ </tr>
+ <tr>
+ <td colspan="3"><p><media type="image" src="./figures/color-ce5c00.png" width="10" /> Tool bar</p></td>
+ </tr>
+ <tr>
+ <td rowspan="2"><p><media type="image" src="./figures/color-8f5902.png" width="10" /> Folder list</p></td>
+ <td colspan="2"><p><media type="image" src="./figures/color-4e9a06.png" width="10" /> Search bar</p></td>
+ </tr>
+ <tr>
+ <td rowspan="3"><p><media type="image" src="./figures/color-204a87.png" width="10" /> Appointment list</p></td>
+ <td><p>Task list</p></td>
+ </tr>
+ <tr>
+ <td><p>Month pane</p></td>
+ <td rowspan="2"><p>Memo list</p></td>
+ </tr>
+ <tr>
+ <td><p><media type="image" src="./figures/color-a40000.png" width="10" /> Switcher</p></td>
+ </tr>
+ <tr>
+ <td colspan="3"><p><media type="image" src="./figures/color-2e3436.png" width="10" /> Status bar</p></td>
+ </tr>
+</table>
+<terms>
+<item>
+<title>Appointment List</title>
+<p>The appointment list displays all your scheduled appointments in the time frame selected.</p>
+</item>
+<item>
+<title>Month Pane</title>
+<p>The month pane is a small view of a calendar month. To display additional months, drag the column border to the right. You can also select a range of days in the month pane to display a custom range of days in the appointment list.</p>
+</item>
+<item>
+<title>Task list and Memo list</title>
+<p>Tasks and memos are just displayed for your convience and are not associated to any appointments. Use the <gui>switcher</gui> to go to their main windows.</p>
+</item>
+</terms>
+
+</section>
+
+<section id="contacts">
+<title>Contacts</title>
+<p>Elements in the calendar main window:</p>
+<table frame="all" rules="all">
+ <tr>
+ <td colspan="2"><p><media type="image" src="./figures/color-c4a000.png" width="10"/> Menu bar</p></td>
+ </tr>
+ <tr>
+ <td colspan="2"><p><media type="image" src="./figures/color-ce5c00.png" width="10" /> Tool bar</p></td>
+ </tr>
+ <tr>
+ <td rowspan="2"><p><media type="image" src="./figures/color-8f5902.png" width="10" /> Folder list</p></td>
+ <td><p><media type="image" src="./figures/color-4e9a06.png" width="10" /> Search bar</p></td>
+ </tr>
+ <tr>
+ <td><p><media type="image" src="./figures/color-204a87.png" width="10" /> Contacts list</p></td>
+ </tr>
+ <tr>
+ <td><p><media type="image" src="./figures/color-a40000.png" width="10" /> Switcher</p></td>
+ <td><p><media type="image" src="./figures/color-5c3566.png" width="10" /> Contact preview</p></td>
+ </tr>
+ <tr>
+ <td colspan="2"><p><media type="image" src="./figures/color-2e3436.png" width="10" /> Status bar</p></td>
+ </tr>
+</table>
+<note style="tip"><p>You can disable the contact preview by toggling <guiseq><gui>View</gui><gui>Preview</gui><gui>Contact Preview</gui></guiseq>.</p></note>
+</section>
+</page>
diff --git a/help/C/mail-access-gmail-imap-account.page b/help/C/mail-access-gmail-imap-account.page
new file mode 100644
index 0000000..810c598
--- /dev/null
+++ b/help/C/mail-access-gmail-imap-account.page
@@ -0,0 +1,30 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="email-access-gmail-imap-account">
+
+ <info>
+ <desc>How to set up a GMail IMAP Account.</desc>
+
+ <link type="guide" xref="index#common-mail-problems" />
+ <link type="guide" xref="google-services"/>
+ <link type="seealso" xref="mail-account-manage-imap"/>
+
+ <revision pkgversion="3.1.5" version="0.2" date="2011-07-30" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<!-- Page only exists for the <note>, apart from that nothing special. -->
+
+<title>Access a GMail IMAP Account via Evolution</title>
+
+<p>Please refer to the <link xref="mail-account-manage-imap">IMAP mail account settings</link>.</p>
+
+<note><p>To access GMail via IMAP you must turn on IMAP in your Google account. See the <link href="https://mail.google.com/support/bin/answer.py?answer=77695";>GMail Help</link> for more information.</p></note>
+</page>
+
diff --git a/help/C/mail-access-gmail-pop-account.page b/help/C/mail-access-gmail-pop-account.page
new file mode 100644
index 0000000..c624502
--- /dev/null
+++ b/help/C/mail-access-gmail-pop-account.page
@@ -0,0 +1,43 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="email-access-gmail-pop-account">
+
+ <info>
+ <desc>How to set up a GMail POP Account.</desc>
+
+ <link type="guide" xref="index#common-mail-problems" />
+ <link type="guide" xref="google-services"/>
+ <link type="seealso" xref="mail-account-manage-pop"/>
+
+ <revision pkgversion="2.28.3" version="0.1" date="2010-10-16" status="review"/>
+ <credit type="author">
+ <name>April Gonzales</name>
+ <email>loonycookie gmail com</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+
+
+<title>Access a GMail POP Account via Evolution</title>
+
+<p>Follow these steps to set up your GMail POP Account in Evolution:</p>
+
+<steps>
+<item><p>Log in to your gmail account.</p></item>
+<item><p>Go to <guiseq><gui>Settings</gui><gui>Forwarding and POP/IMAP</gui></guiseq>. Refer to the POP Download section.</p></item>
+<item><p>Enable the POP download feature by ticking the radio button that corresponds to either of these options:</p>
+ <list>
+ <item><p>Enable POP for all mail (even mail that's already been downloaded)</p></item>
+ <item><p>Enable POP for mail that arrives from now on</p></item>
+ </list>
+</item>
+<item><p>Specify the other required settings for this Gmail feature.</p></item>
+<item><p>To know the Gmail Account settings, click on <guiseq><gui>Configuration instructions</gui><gui>Other</gui><gui>Standard Instructions</gui></guiseq>.</p></item>
+<item><p>On your Evolution client, go to <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui></guiseq>. Click <gui style="button">Add</gui>. </p></item>
+<item><p>Provide the required information. For the account settings, refer to Step 5 </p></item>
+</steps>
+</page>
+
diff --git a/help/C/mail-account-manage-imap-plus.page b/help/C/mail-account-manage-imap-plus.page
new file mode 100644
index 0000000..5de420b
--- /dev/null
+++ b/help/C/mail-account-manage-imap-plus.page
@@ -0,0 +1,60 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="mail-account-manage-imap-plus">
+
+ <info>
+ <desc>Add and edit an IMAP+ mail account in Evolution.</desc>
+
+ <link type="guide" xref="mail-account-management#mail-common-account-types"/>
+
+ <revision pkgversion="2.30.2" version="0.2" date="2011-01-06" status="stub"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <title>IMAP+ mail account settings</title>
+
+<section id="account-editor">
+<title>Account Editor</title>
+<p>Mail accounts can be added via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Add</gui></guiseq>. The steps are mostly the same as for the <link xref="intro-first-run">First-Run Assistant</link>, except for not getting asked whether to import data from other applications or to restore from a backup file.</p>
+<p>Mail accounts can be edited via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui></guiseq>. The following settings are available when editing an existing account:</p>
+
+<section id="identity">
+<title>Identity</title>
+<!-- TODO:XINCLUDE: Quite ugly to copy this text into all account type's, but it's not really worth a separate topic page for it, plus it would make the intro-first-run.page even more complex. Maybe later replace this text by a single instance by doing some content sharing with xinclude and xpointer in the other mail-account-manage-*.page files and in intro-first-run.page. <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. Also see https://bugzilla.gnome.org/show_bug.cgi?id=638866 -->
+<p>Here you define your name and your email address.</p>
+<p>Optionally you can make this account your default account (e.g. when writing emails), set a Reply-To email address (if you want replies to messages sent to a different address), and set an organization (the company where you work, or the organization you represent when you send email from this account).</p>
+</section>
+
+<section id="receiving-email">
+<title>Receiving Email and Receiving options</title>
+</section>
+
+<section id="sending-email">
+<title>Sending Email</title>
+</section>
+
+<section id="defaults">
+<title>Defaults</title>
+</section>
+
+<section id="security">
+<title>Security</title>
+</section>
+
+<!-- TODO:DEVELOPERS: No "IMAP Headers" tab for IMAP+ under Edit>Prefs>MailAccounts>Edit existing in 3.1.4. Is that intended? IMAP provides it. -->
+
+</section> <!-- end "account editor" section, now list any account settings stuff related to this account type outside of it -->
+
+<section id="other-settings">
+<title>Other settings</title>
+<p>Other account related settings that are not located in the <gui>Account Editor</gui>:</p>
+</section>
+
+<!-- TODO:DEVELOPERS: Find out if there are any different settings between IMAP and IMAP+. If not, merge with mail-account-manage-imap! -->
+</page>
diff --git a/help/C/mail-account-manage-imap.page b/help/C/mail-account-manage-imap.page
new file mode 100644
index 0000000..5437b7e
--- /dev/null
+++ b/help/C/mail-account-manage-imap.page
@@ -0,0 +1,61 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="mail-account-manage-imap">
+
+ <info>
+ <desc>Add and edit an IMAP mail account in Evolution.</desc>
+
+ <link type="guide" xref="mail-account-management#mail-common-account-types"/>
+
+ <revision pkgversion="3.1.5" version="0.3" date="2011-07-29" status="draft"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <title>IMAP mail account settings</title>
+
+<section id="account-editor">
+<title>Account Editor</title>
+<p>Mail accounts can be added via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Add</gui></guiseq>. The steps are mostly the same as for the <link xref="intro-first-run">First-Run Assistant</link>, except for not getting asked whether to import data from other applications or to restore from a backup file.</p>
+<p>Mail accounts can be edited via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui></guiseq>. The following settings are available when editing an existing account:</p>
+
+<section id="identity">
+<title>Identity</title>
+<!-- TODO:XINCLUDE: Quite ugly to copy this text into all account type's, but it's not really worth a separate topic page for it, plus it would make the intro-first-run.page even more complex. Maybe later replace this text by a single instance by doing some content sharing with xinclude and xpointer in the other mail-account-manage-*.page files and in intro-first-run.page. <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. Also see https://bugzilla.gnome.org/show_bug.cgi?id=638866 -->
+<p>Here you define your name and your email address.</p>
+<p>Optionally you can make this account your default account (e.g. when writing emails), set a Reply-To email address (if you want replies to messages sent to a different address), and set an organization (the company where you work, or the organization you represent when you send email from this account).</p>
+</section>
+
+<section id="receiving-email">
+<title>Receiving Email and Receiving options</title>
+</section>
+
+<section id="sending-email">
+<title>Sending Email</title>
+</section>
+
+<section id="defaults">
+<title>Defaults</title>
+</section>
+
+<section id="security">
+<title>Security</title>
+</section>
+
+<section id="imap-headers">
+<title>IMAP Headers</title>
+</section>
+
+</section> <!-- end "account editor" section, now list any account settings stuff related to this account type outside of it -->
+
+<section id="other-settings">
+<title>Other settings</title>
+<p>Other account related settings that are not located in the <gui>Account Editor</gui>:</p>
+</section>
+
+</page>
diff --git a/help/C/mail-account-manage-local-delivery.page b/help/C/mail-account-manage-local-delivery.page
new file mode 100644
index 0000000..697c941
--- /dev/null
+++ b/help/C/mail-account-manage-local-delivery.page
@@ -0,0 +1,57 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="mail-account-manage-local-delivery">
+
+ <info>
+ <desc>Add and edit a Local Delivery account in Evolution.</desc>
+
+ <link type="guide" xref="mail-account-management#mail-local-account-types"/>
+
+ <revision pkgversion="2.30.2" version="0.2" date="2011-01-06" status="stub"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <title>Local Delivery account settings</title>
+
+<section id="account-editor">
+<title>Account Editor</title>
+<p>Mail accounts can be added via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Add</gui></guiseq>. The steps are mostly the same as for the <link xref="intro-first-run">First-Run Assistant</link>, except for not getting asked whether to import data from other applications or to restore from a backup file.</p>
+<p>Mail accounts can be edited via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui></guiseq>. The following settings are available when editing an existing account:</p>
+
+<section id="identity">
+<title>Identity</title>
+<!-- TODO:XINCLUDE: Quite ugly to copy this text into all account type's, but it's not really worth a separate topic page for it, plus it would make the intro-first-run.page even more complex. Maybe later replace this text by a single instance by doing some content sharing with xinclude and xpointer in the other mail-account-manage-*.page files and in intro-first-run.page. <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. Also see https://bugzilla.gnome.org/show_bug.cgi?id=638866 -->
+<p>Here you define your name and your email address.</p>
+<p>Optionally you can make this account your default account (e.g. when writing emails), set a Reply-To email address (if you want replies to messages sent to a different address), and set an organization (the company where you work, or the organization you represent when you send email from this account).</p>
+</section>
+
+<section id="receiving-email">
+<title>Receiving Email and Receiving options</title>
+</section>
+
+<section id="sending-email">
+<title>Sending Email</title>
+</section>
+
+<section id="defaults">
+<title>Defaults</title>
+</section>
+
+<section id="security">
+<title>Security</title>
+</section>
+
+</section> <!-- end "account editor" section, now list any account settings stuff related to this account type outside of it -->
+
+<section id="other-settings">
+<title>Other settings</title>
+<p>Other account related settings that are not located in the <gui>Account Editor</gui>:</p>
+</section>
+
+</page>
diff --git a/help/C/mail-account-manage-maildir-format-directories.page b/help/C/mail-account-manage-maildir-format-directories.page
new file mode 100644
index 0000000..547118e
--- /dev/null
+++ b/help/C/mail-account-manage-maildir-format-directories.page
@@ -0,0 +1,57 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="mail-account-manage-maildir-format-directories">
+
+ <info>
+ <desc>Add and edit a Maildir Format Mail Directories account in Evolution.</desc>
+
+ <link type="guide" xref="mail-account-management#mail-local-account-types"/>
+
+ <revision pkgversion="2.30.2" version="0.2" date="2011-01-06" status="stub"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <title>Maildir Format Mail Directories account settings</title>
+
+<section id="account-editor">
+<title>Account Editor</title>
+<p>Mail accounts can be added via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Add</gui></guiseq>. The steps are mostly the same as for the <link xref="intro-first-run">First-Run Assistant</link>, except for not getting asked whether to import data from other applications or to restore from a backup file.</p>
+<p>Mail accounts can be edited via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui>Edit</gui></guiseq>. The following settings are available when editing an existing account:</p>
+
+<section id="identity">
+<title>Identity</title>
+<!-- TODO:XINCLUDE: Quite ugly to copy this text into all account type's, but it's not really worth a separate topic page for it, plus it would make the intro-first-run.page even more complex. Maybe later replace this text by a single instance by doing some content sharing with xinclude and xpointer in the other mail-account-manage-*.page files and in intro-first-run.page. <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. Also see https://bugzilla.gnome.org/show_bug.cgi?id=638866 -->
+<p>Here you define your name and your email address.</p>
+<p>Optionally you can make this account your default account (e.g. when writing emails), set a Reply-To email address (if you want replies to messages sent to a different address), and set an organization (the company where you work, or the organization you represent when you send email from this account).</p>
+</section>
+
+<section id="receiving-email">
+<title>Receiving Email and Receiving options</title>
+</section>
+
+<section id="sending-email">
+<title>Sending Email</title>
+</section>
+
+<section id="defaults">
+<title>Defaults</title>
+</section>
+
+<section id="security">
+<title>Security</title>
+</section>
+
+</section> <!-- end "account editor" section, now list any account settings stuff related to this account type outside of it -->
+
+<section id="other-settings">
+<title>Other settings</title>
+<p>Other account related settings that are not located in the <gui>Account Editor</gui>:</p>
+</section>
+
+</page>
diff --git a/help/C/mail-account-manage-mh-format-directories.page b/help/C/mail-account-manage-mh-format-directories.page
new file mode 100644
index 0000000..637d6d3
--- /dev/null
+++ b/help/C/mail-account-manage-mh-format-directories.page
@@ -0,0 +1,57 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="mail-account-manage-mh-format-directories">
+
+ <info>
+ <desc>Add and edit a MH Format Mail Directories account in Evolution.</desc>
+
+ <link type="guide" xref="mail-account-management#mail-local-account-types"/>
+
+ <revision pkgversion="2.30.2" version="0.2" date="2011-01-06" status="stub"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <title>MH Format Mail Directories account settings</title>
+
+<section id="account-editor">
+<title>Account Editor</title>
+<p>Mail accounts can be added via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Add</gui></guiseq>. The steps are mostly the same as for the <link xref="intro-first-run">First-Run Assistant</link>, except for not getting asked whether to import data from other applications or to restore from a backup file.</p>
+<p>Mail accounts can be edited via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui></guiseq>. The following settings are available when editing an existing account:</p>
+
+<section id="identity">
+<title>Identity</title>
+<!-- TODO:XINCLUDE: Quite ugly to copy this text into all account type's, but it's not really worth a separate topic page for it, plus it would make the intro-first-run.page even more complex. Maybe later replace this text by a single instance by doing some content sharing with xinclude and xpointer in the other mail-account-manage-*.page files and in intro-first-run.page. <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. Also see https://bugzilla.gnome.org/show_bug.cgi?id=638866 -->
+<p>Here you define your name and your email address.</p>
+<p>Optionally you can make this account your default account (e.g. when writing emails), set a Reply-To email address (if you want replies to messages sent to a different address), and set an organization (the company where you work, or the organization you represent when you send email from this account).</p>
+</section>
+
+<section id="receiving-email">
+<title>Receiving Email and Receiving options</title>
+</section>
+
+<section id="sending-email">
+<title>Sending Email</title>
+</section>
+
+<section id="defaults">
+<title>Defaults</title>
+</section>
+
+<section id="security">
+<title>Security</title>
+</section>
+
+</section> <!-- end "account editor" section, now list any account settings stuff related to this account type outside of it -->
+
+<section id="other-settings">
+<title>Other settings</title>
+<p>Other account related settings that are not located in the <gui>Account Editor</gui>:</p>
+</section>
+
+</page>
diff --git a/help/C/mail-account-manage-microsoft-exchange-evo-ews.page b/help/C/mail-account-manage-microsoft-exchange-evo-ews.page
new file mode 100644
index 0000000..606dd78
--- /dev/null
+++ b/help/C/mail-account-manage-microsoft-exchange-evo-ews.page
@@ -0,0 +1,24 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="mail-account-manage-microsoft-exchange-evo-ews">
+
+ <info>
+ <desc>Add and edit a Microsoft Exchange 2010 account in Evolution.</desc>
+
+ <link type="guide" xref="mail-account-manage-microsoft-exchange"/>
+
+ <revision pkgversion="3.1.5" version="0.1" date="2011-07-30" status="stub"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <title>Exchange Web Services account settings</title>
+<!-- TODO: Write once evo-ews is stable. Copy structure from other Exchange account types if applicable. -->
+
+<p>This documentation section will be added once the currently developed evolution-ews has become stable and mature.</p>
+</page>
diff --git a/help/C/mail-account-manage-microsoft-exchange-evo-exchange.page b/help/C/mail-account-manage-microsoft-exchange-evo-exchange.page
new file mode 100644
index 0000000..66510e7
--- /dev/null
+++ b/help/C/mail-account-manage-microsoft-exchange-evo-exchange.page
@@ -0,0 +1,59 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="mail-account-manage-microsoft-exchange-evo-exchange">
+
+ <info>
+ <desc>Add and edit a Microsoft Exchange 2000/2003 account in Evolution.</desc>
+
+ <link type="guide" xref="mail-account-manage-microsoft-exchange"/>
+
+ <revision pkgversion="3.0.2" version="0.4" date="2011-07-30" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <title>Microsoft Exchange account settings</title>
+
+<section id="account-editor">
+<title>Account Editor</title>
+
+<p>Mail accounts can be added via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Add</gui></guiseq>. The steps are mostly the same as for the <link xref="intro-first-run">First-Run Assistant</link>, except for not getting asked whether to import data from other applications or to restore from a backup file.</p>
+<p>Mail accounts can be edited via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui></guiseq>. The following settings are available when editing an existing account:</p>
+
+<section id="identity">
+<title>Identity</title>
+<!-- TODO:XINCLUDE: Quite ugly to copy this text into all account type's, but it's not really worth a separate topic page for it, plus it would make the intro-first-run.page even more complex. Maybe later replace this text by a single instance by doing some content sharing with xinclude and xpointer in the other mail-account-manage-*.page files and in intro-first-run.page. <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. Also see https://bugzilla.gnome.org/show_bug.cgi?id=638866 -->
+<p>Here you define your name and your email address.</p>
+<p>Optionally you can make this account your default account (e.g. when writing emails), set a Reply-To email address (if you want replies to messages sent to a different address), and set an organization (the company where you work, or the organization you represent when you send email from this account).</p>
+</section>
+
+<section id="receiving-email">
+<title>Receiving Email and Receiving options</title>
+</section>
+
+<section id="defaults">
+<title>Defaults</title>
+</section>
+
+<section id="exchange-settings">
+<title>Exchange Settings</title>
+<p>In this section you can define your "Out of Office" status, change the password for your Exchange account, and manage the delegation settings.</p><p>You can also view the size of all Exchange folders.</p>
+</section>
+
+<section id="security">
+<title>Security</title>
+</section>
+
+</section> <!-- end "account editor" section, now list any account settings stuff related to this account type outside of it -->
+
+<!-- <section id="other-settings">
+<title>Other settings</title>
+<p>Other account related settings that are not located in the <gui>Account Editor</gui>:</p>
+</section> -->
+
+</page>
diff --git a/help/C/mail-account-manage-microsoft-exchange-evo-mapi.page b/help/C/mail-account-manage-microsoft-exchange-evo-mapi.page
new file mode 100644
index 0000000..fc6c478
--- /dev/null
+++ b/help/C/mail-account-manage-microsoft-exchange-evo-mapi.page
@@ -0,0 +1,59 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="mail-account-manage-microsoft-exchange-evo-mapi">
+
+ <info>
+ <desc>Add and edit a Microsoft Exchange 2007 account in Evolution.</desc>
+
+ <link type="guide" xref="mail-account-manage-microsoft-exchange"/>
+
+ <revision pkgversion="3.0.2" version="0.4" date="2011-07-30" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <title>Exchange MAPI account settings</title>
+
+<section id="account-editor">
+<title>Account Editor</title>
+
+<p>Mail accounts can be added via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Add</gui></guiseq>. The steps are mostly the same as for the <link xref="intro-first-run">First-Run Assistant</link>, except for not getting asked whether to import data from other applications or to restore from a backup file.</p>
+<p>Mail accounts can be edited via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui></guiseq>. The following settings are available when editing an existing account:</p>
+
+<section id="identity">
+<title>Identity</title>
+<!-- TODO:XINCLUDE: Quite ugly to copy this text into all account type's, but it's not really worth a separate topic page for it, plus it would make the intro-first-run.page even more complex. Maybe later replace this text by a single instance by doing some content sharing with xinclude and xpointer in the other mail-account-manage-*.page files and in intro-first-run.page. <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. Also see https://bugzilla.gnome.org/show_bug.cgi?id=638866 -->
+<p>Here you define your name and your email address.</p>
+<p>Optionally you can make this account your default account (e.g. when writing emails), set a Reply-To email address (if you want replies to messages sent to a different address), and set an organization (the company where you work, or the organization you represent when you send email from this account).</p>
+</section>
+
+<section id="receiving-email">
+<title>Receiving Email and Receiving options</title>
+</section>
+
+<section id="defaults">
+<title>Defaults</title>
+</section>
+
+<section id="exchange-settings">
+<title>Exchange Settings</title>
+<p>In this section you can view the size of all Exchange folders.</p>
+</section>
+
+<section id="security">
+<title>Security</title>
+</section>
+
+</section> <!-- end "account editor" section, now list any account settings stuff related to this account type outside of it -->
+
+<!-- <section id="other-settings">
+<title>Other settings</title>
+<p>Other account related settings that are not located in the <gui>Account Editor</gui>:</p>
+</section> -->
+
+</page>
diff --git a/help/C/mail-account-manage-microsoft-exchange.page b/help/C/mail-account-manage-microsoft-exchange.page
new file mode 100644
index 0000000..4bfb902
--- /dev/null
+++ b/help/C/mail-account-manage-microsoft-exchange.page
@@ -0,0 +1,25 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="mail-account-manage-microsoft-exchange">
+
+ <info>
+ <desc>Add and edit a Microsoft Exchange account in Evolution.</desc>
+
+ <link type="guide" xref="mail-account-management#mail-corporate-account-types"/>
+ <link type="guide" xref="exchange-placeholder"/>
+
+ <revision pkgversion="2.30.2" version="0.3" date="2011-07-30" status="draft"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <title>Microsoft Exchange account settings</title>
+
+<note><p>Please first read <link xref="exchange-connectors-overview">Choosing the right connector</link> to find out about the right Exchange account type for you.</p></note>
+
+</page>
diff --git a/help/C/mail-account-manage-novell-groupwise.page b/help/C/mail-account-manage-novell-groupwise.page
new file mode 100644
index 0000000..3273a0a
--- /dev/null
+++ b/help/C/mail-account-manage-novell-groupwise.page
@@ -0,0 +1,61 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="mail-account-manage-novell-groupwise">
+
+ <info>
+ <desc>Add and edit a Novell Groupwise account in Evolution.</desc>
+
+ <link type="guide" xref="mail-account-management#mail-corporate-account-types"/>
+ <link type="guide" xref="groupwise-placeholder"/>
+
+ <revision pkgversion="3.0.2" version="0.4" date="2011-07-30" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <title>Novell Groupwise account settings</title>
+
+<section id="account-editor">
+<title>Account Editor</title>
+<p>Mail accounts can be added via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Add</gui></guiseq>. The steps are mostly the same as for the <link xref="intro-first-run">First-Run Assistant</link>, except for not getting asked whether to import data from other applications or to restore from a backup file.</p>
+<p>Mail accounts can be edited via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui></guiseq>. The following settings are available when editing an existing account:</p>
+
+<section id="identity">
+<title>Identity</title>
+<!-- TODO:XINCLUDE: Quite ugly to copy this text into all account type's, but it's not really worth a separate topic page for it, plus it would make the intro-first-run.page even more complex. Maybe later replace this text by a single instance by doing some content sharing with xinclude and xpointer in the other mail-account-manage-*.page files and in intro-first-run.page. <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. Also see https://bugzilla.gnome.org/show_bug.cgi?id=638866 -->
+<p>Here you define your name and your email address.</p>
+<p>Optionally you can make this account your default account (e.g. when writing emails), set a Reply-To email address (if you want replies to messages sent to a different address), and set an organization (the company where you work, or the organization you represent when you send email from this account).</p>
+</section>
+
+<section id="receiving-email">
+<title>Receiving Email and Receiving options</title>
+</section>
+
+<section id="defaults">
+<title>Defaults</title>
+<!-- TODO:NOACCESS: Cannot document Advanced Send Options stuff as this needs an active Groupwise account. -->
+</section>
+
+<section id="security">
+<title>Security</title>
+</section>
+
+<section id="proxy">
+<title>Proxy</title>
+<p>Settings for having somebody else handle your account.</p>
+<!-- TODO:NOACCESS: Cannot document Proxy stuff as this needs an active Groupwise account. -->
+</section>
+
+</section> <!-- end "account editor" section, now list any account settings stuff related to this account type outside of it -->
+
+<!-- <section id="other-settings">
+<title>Other settings</title>
+<p>Other account related settings that are not located in the <gui>Account Editor</gui>:</p>
+</section> -->
+
+</page>
diff --git a/help/C/mail-account-manage-pop.page b/help/C/mail-account-manage-pop.page
new file mode 100644
index 0000000..d1f3957
--- /dev/null
+++ b/help/C/mail-account-manage-pop.page
@@ -0,0 +1,57 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="mail-account-manage-pop">
+
+ <info>
+ <desc>Add and edit a POP mail account in Evolution.</desc>
+
+ <link type="guide" xref="mail-account-management#mail-common-account-types"/>
+
+ <revision pkgversion="2.30.2" version="0.2" date="2011-01-06" status="stub"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <title>POP mail account settings</title>
+
+<section id="account-editor">
+<title>Account Editor</title>
+<p>Mail accounts can be added via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Add</gui></guiseq>. The steps are mostly the same as for the <link xref="intro-first-run">First-Run Assistant</link>, except for not getting asked whether to import data from other applications or to restore from a backup file.</p>
+<p>Mail accounts can be edited via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui></guiseq>. The following settings are available when editing an existing account:</p>
+
+<section id="identity">
+<title>Identity</title>
+<!-- TODO:XINCLUDE: Quite ugly to copy this text into all account type's, but it's not really worth a separate topic page for it, plus it would make the intro-first-run.page even more complex. Maybe later replace this text by a single instance by doing some content sharing with xinclude and xpointer in the other mail-account-manage-*.page files and in intro-first-run.page. <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. Also see https://bugzilla.gnome.org/show_bug.cgi?id=638866 -->
+<p>Here you define your name and your email address.</p>
+<p>Optionally you can make this account your default account (e.g. when writing emails), set a Reply-To email address (if you want replies to messages sent to a different address), and set an organization (the company where you work, or the organization you represent when you send email from this account).</p>
+</section>
+
+<section id="receiving-email">
+<title>Receiving Email and Receiving options</title>
+</section>
+
+<section id="sending-email">
+<title>Sending Email</title>
+</section>
+
+<section id="defaults">
+<title>Defaults</title>
+</section>
+
+<section id="security">
+<title>Security</title>
+</section>
+
+</section> <!-- end "account editor" section, now list any account settings stuff related to this account type outside of it -->
+
+<section id="other-settings">
+<title>Other settings</title>
+<p>Other account related settings that are not located in the <gui>Account Editor</gui>:</p>
+</section>
+
+</page>
diff --git a/help/C/mail-account-manage-unix-mbox-spool-directory.page b/help/C/mail-account-manage-unix-mbox-spool-directory.page
new file mode 100644
index 0000000..be7a7ad
--- /dev/null
+++ b/help/C/mail-account-manage-unix-mbox-spool-directory.page
@@ -0,0 +1,57 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="mail-account-manage-unix-mbox-spool-directory">
+
+ <info>
+ <desc>Add and edit a Standard Unix mbox Spool Directory account in Evolution.</desc>
+
+ <link type="guide" xref="mail-account-management#mail-local-account-types"/>
+
+ <revision pkgversion="2.30.2" version="0.2" date="2011-01-06" status="stub"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <title>Standard Unix mbox Spool Directory account settings</title>
+
+<section id="account-editor">
+<title>Account Editor</title>
+<p>Mail accounts can be added via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Add</gui></guiseq>. The steps are mostly the same as for the <link xref="intro-first-run">First-Run Assistant</link>, except for not getting asked whether to import data from other applications or to restore from a backup file.</p>
+<p>Mail accounts can be edited via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui></guiseq>. The following settings are available when editing an existing account:</p>
+
+<section id="identity">
+<title>Identity</title>
+<!-- TODO:XINCLUDE: Quite ugly to copy this text into all account type's, but it's not really worth a separate topic page for it, plus it would make the intro-first-run.page even more complex. Maybe later replace this text by a single instance by doing some content sharing with xinclude and xpointer in the other mail-account-manage-*.page files and in intro-first-run.page. <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. Also see https://bugzilla.gnome.org/show_bug.cgi?id=638866 -->
+<p>Here you define your name and your email address.</p>
+<p>Optionally you can make this account your default account (e.g. when writing emails), set a Reply-To email address (if you want replies to messages sent to a different address), and set an organization (the company where you work, or the organization you represent when you send email from this account).</p>
+</section>
+
+<section id="receiving-email">
+<title>Receiving Email and Receiving options</title>
+</section>
+
+<section id="sending-email">
+<title>Sending Email</title>
+</section>
+
+<section id="defaults">
+<title>Defaults</title>
+</section>
+
+<section id="security">
+<title>Security</title>
+</section>
+
+</section> <!-- end "account editor" section, now list any account settings stuff related to this account type outside of it -->
+
+<section id="other-settings">
+<title>Other settings</title>
+<p>Other account related settings that are not located in the <gui>Account Editor</gui>:</p>
+</section>
+
+</page>
diff --git a/help/C/mail-account-manage-unix-mbox-spool-file.page b/help/C/mail-account-manage-unix-mbox-spool-file.page
new file mode 100644
index 0000000..98cfc74
--- /dev/null
+++ b/help/C/mail-account-manage-unix-mbox-spool-file.page
@@ -0,0 +1,57 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="mail-account-manage-unix-mbox-spool-file">
+
+ <info>
+ <desc>Add and edit a Standard Unix mbox Spool File account in Evolution.</desc>
+
+ <link type="guide" xref="mail-account-management#mail-local-account-types"/>
+
+ <revision pkgversion="2.30.2" version="0.2" date="2011-01-06" status="stub"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <title>Standard Unix mbox Spool File account settings</title>
+
+<section id="account-editor">
+<title>Account Editor</title>
+<p>Mail accounts can be added via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Add</gui></guiseq>. The steps are mostly the same as for the <link xref="intro-first-run">First-Run Assistant</link>, except for not getting asked whether to import data from other applications or to restore from a backup file.</p>
+<p>Mail accounts can be edited via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui></guiseq>. The following settings are available when editing an existing account:</p>
+
+<section id="identity">
+<title>Identity</title>
+<!-- TODO:XINCLUDE: Quite ugly to copy this text into all account type's, but it's not really worth a separate topic page for it, plus it would make the intro-first-run.page even more complex. Maybe later replace this text by a single instance by doing some content sharing with xinclude and xpointer in the other mail-account-manage-*.page files and in intro-first-run.page. <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. Also see https://bugzilla.gnome.org/show_bug.cgi?id=638866 -->
+<p>Here you define your name and your email address.</p>
+<p>Optionally you can make this account your default account (e.g. when writing emails), set a Reply-To email address (if you want replies to messages sent to a different address), and set an organization (the company where you work, or the organization you represent when you send email from this account).</p>
+</section>
+
+<section id="receiving-email">
+<title>Receiving Email and Receiving options</title>
+</section>
+
+<section id="sending-email">
+<title>Sending Email</title>
+</section>
+
+<section id="defaults">
+<title>Defaults</title>
+</section>
+
+<section id="security">
+<title>Security</title>
+</section>
+
+</section> <!-- end "account editor" section, now list any account settings stuff related to this account type outside of it -->
+
+<section id="other-settings">
+<title>Other settings</title>
+<p>Other account related settings that are not located in the <gui>Account Editor</gui>:</p>
+</section>
+
+</page>
diff --git a/help/C/mail-account-manage-usenet-news.page b/help/C/mail-account-manage-usenet-news.page
new file mode 100644
index 0000000..7a95b14
--- /dev/null
+++ b/help/C/mail-account-manage-usenet-news.page
@@ -0,0 +1,57 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="mail-account-manage-usenet-news">
+
+ <info>
+ <desc>Add and edit a Usenet news account in Evolution.</desc>
+
+ <link type="guide" xref="mail-account-management#mail-common-account-types"/>
+
+ <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <title>Usenet news account settings</title>
+
+<section id="account-editor">
+<title>Account Editor</title>
+<p>Mail accounts can be added via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Add</gui></guiseq>. The steps are mostly the same as for the <link xref="intro-first-run">First-Run Assistant</link>, except for not getting asked whether to import data from other applications or to restore from a backup file.</p>
+<p>Mail accounts can be edited via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui></guiseq>. The following settings are available when editing an existing account:</p>
+
+<section id="identity">
+<title>Identity</title>
+<!-- TODO:XINCLUDE: Quite ugly to copy this text into all account type's, but it's not really worth a separate topic page for it, plus it would make the intro-first-run.page even more complex. Maybe later replace this text by a single instance by doing some content sharing with xinclude and xpointer in the other mail-account-manage-*.page files and in intro-first-run.page. <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. Also see https://bugzilla.gnome.org/show_bug.cgi?id=638866 -->
+<p>Here you define your name and your email address.</p>
+<p>Optionally you can make this account your default account (e.g. when writing emails), set a Reply-To email address (if you want replies to messages sent to a different address), and set an organization (the company where you work, or the organization you represent when you send email from this account).</p>
+</section>
+
+<section id="receiving-email">
+<title>Receiving Email and Receiving options</title>
+</section>
+
+<section id="sending-email">
+<title>Sending Email</title>
+</section>
+
+<section id="defaults">
+<title>Defaults</title>
+</section>
+
+<section id="security">
+<title>Security</title>
+</section>
+
+</section> <!-- end "account editor" section, now list any account settings stuff related to this account type outside of it -->
+
+<section id="other-settings">
+<title>Other settings</title>
+<p>Other account related settings that are not located in the <gui>Account Editor</gui>:</p>
+</section>
+
+</page>
diff --git a/help/C/mail-account-management.page b/help/C/mail-account-management.page
new file mode 100644
index 0000000..4e6bf0c
--- /dev/null
+++ b/help/C/mail-account-management.page
@@ -0,0 +1,34 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="mail-account-management">
+
+ <info>
+ <desc>Adding, editing and managing mail accounts.</desc>
+
+ <link type="guide" xref="index#mail-basic" />
+
+ <revision pkgversion="2.28.3" version="0.3" date="2010-12-09" status="stub"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Account Management</title>
+
+ <section id="mail-common-account-types" style="2column">
+ <title>Common Account Types</title>
+ </section>
+
+ <section id="mail-local-account-types" style="2column">
+ <title>Local Account Types</title>
+ </section>
+
+ <section id="mail-corporate-account-types" style="2column">
+ <title>Corporate Account Types</title>
+ </section>
+
+</page>
diff --git a/help/C/mail-attachments-received.page b/help/C/mail-attachments-received.page
new file mode 100644
index 0000000..610a498
--- /dev/null
+++ b/help/C/mail-attachments-received.page
@@ -0,0 +1,34 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="mail-attachments-received">
+
+ <info>
+ <desc>Saving and opening files that are attached to received emails.</desc>
+
+ <link type="guide" xref="mail-displaying-message" />
+ <link type="guide" xref="mail-attachments" />
+
+ <revision pkgversion="3.0.2" version="0.2" date="2011-07-31" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from Reuse http://library.gnome.org/users/evolution/2.32/usage-mail-getnsend-read.html.en#usage-mail-getnsend-get-attach-actions -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Handling attachments in received mail</title>
+
+<p>If you receive an email message with one or more file attachments, Evolution displays the number of attachments and a <gui style="button">Save</gui> or <gui style="button">Save All</gui> button between the email header and the content of the email.</p>
+
+<p>A list of attachments is also available at the bottom of the email.</p>
+<p>To save an attachment to disk, click the down-arrow next to the attachment icon and click <gui>Save As</gui>.</p>
+<p>To open an attachment in another application, click the down-arrow next to the attachment icon and choose one of the available applications.</p>
+
+<p>The options available for an attachment vary depending on the type of attachment and the applications that are installed on your system. For example, image files can be opened in the <gui>Image Viewer</gui> application or in the <gui>GIMP</gui> graphics editor.</p>
+
+</page>
diff --git a/help/C/mail-attachments-sending.page b/help/C/mail-attachments-sending.page
new file mode 100644
index 0000000..35ad0bd
--- /dev/null
+++ b/help/C/mail-attachments-sending.page
@@ -0,0 +1,55 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="mail-attachments-sending">
+
+ <info>
+ <desc>Attaching files to emails you want to send.</desc>
+
+ <link type="guide" xref="index#mail-composing" />
+ <link type="guide" xref="mail-attachments" />
+
+ <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-getnsend-send.html.en#usage-mail-getnsend-send-compose and http://library.gnome.org/users/evolution/2.32/usage-mail-getnsend-send.html.en#b17rcxmf -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Adding attachments to an email</title>
+
+<section id="attaching">
+<title>Attaching files</title>
+<p>To attach a file to your email in the composer:</p>
+<steps>
+<item><p>Click <gui>Add Attachment...</gui>, or click <guiseq><gui>Insert</gui><gui>Attachment</gui></guiseq>, or press <keyseq><key>Ctrl</key><key>M</key></keyseq>.</p></item>
+<item><p>Select the file you want to attach.</p></item>
+<item><p>Click <gui style="button">OK</gui>.</p></item>
+</steps>
+<p>You can also drag a file to the attachment bar of the composer window.</p>
+
+<p>When you send the message, a copy of the attached file goes with it. Be aware that large attachments can take a long time to send and receive.</p>
+</section>
+
+<section id="reminders">
+<title>Attachment Reminder</title>
+
+<p>Evolution has an Attachment Reminder plugin you can use to remind yourself to attach a file to an email. If it determines that you have not attached the file, it displays a reminder window before the email is sent.</p>
+
+<p>To enable the Attachment Reminder:</p>
+<steps>
+<item><p>Select <guiseq><gui>Edit</gui><gui>Plugins</gui></guiseq>.</p></item>
+<item><p>Enable <gui>Attachment Reminder</gui>.</p></item>
+<item><p>Click the <gui>Configuration</gui> tab.</p></item>
+<item><p>Click <gui style="button">Add</gui>, then enter keywords in your language such as "Attach" or "enclosed".</p></item>
+</steps>
+<p>Based on the keywords you have added, Evolution searches the text of every mail you are going to send. If it finds any of the keywords in your email and there is no actual attached file, the reminder window is displayed.</p>
+
+</section>
+
+</page>
diff --git a/help/C/mail-attachments.page b/help/C/mail-attachments.page
new file mode 100644
index 0000000..27e7b9f
--- /dev/null
+++ b/help/C/mail-attachments.page
@@ -0,0 +1,20 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="mail-attachments">
+
+ <info>
+ <desc>Handling of file attachments for writing and reading mail</desc>
+
+ <revision pkgversion="2.32.1" version="0.1" date="2011-05-02" status="stub"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Managing attachments</title>
+
+</page>
diff --git a/help/C/mail-calendar-sending-invitations.page b/help/C/mail-calendar-sending-invitations.page
new file mode 100644
index 0000000..b181431
--- /dev/null
+++ b/help/C/mail-calendar-sending-invitations.page
@@ -0,0 +1,44 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-calendar-sending-invitations">
+
+ <info>
+ <desc>Sending invitations for appointments to contacts via email.</desc>
+
+ <link type="guide" xref="index#mail-advanced" />
+ <link type="guide" xref="index#calendar" />
+ <!-- TODO:POST-3-2: Finding a better place to link this against would be welcome. -->
+
+ <revision pkgversion="2.32.1" version="0.1" date="2011-07-21" status="draft"/>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/rsvp-stuff.html.en -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Sending invitations by email</title>
+
+<p>If you create an event in the calendar component, you can then send invitations to the attendee list through the Evolution email tool. The invitation card is sent as an attachment in iCal format.</p>
+
+<p>To send an invitation, right-click on the entry in the calendar and choose <gui>Forward as iCalendar</gui>.</p>
+
+<p>When you receive an invitation, you have several options:</p>
+
+<list>
+<item><p>
+Accept:</p><p>Indicates you will attend the meeting. When you click the OK button, the meeting is entered into your calendar.
+</p></item>
+<item><p>
+Tentatively Accept:</p><p>Indicates you will probably attend the meeting. When you click the OK button, the meeting is entered into your calendar, but is marked as tentative.
+</p></item>
+<item><p>
+Decline:</p><p>Indicates you are unable to attend the meeting. The meeting is not entered into your calendar when you click OK, although your response is sent to the meeting host if you have selected the Send reply to sender option.
+</p></item>
+<item><p>
+Send reply to sender:</p><p>Select this option if you want your response sent to the meeting organizers.
+</p></item>
+</list>
+
+</page>
diff --git a/help/C/mail-cannot-see.page b/help/C/mail-cannot-see.page
new file mode 100644
index 0000000..086b27c
--- /dev/null
+++ b/help/C/mail-cannot-see.page
@@ -0,0 +1,45 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-cannot-see">
+
+ <info>
+ <desc>If you received or sent an email, but you cannot find it anywhere.</desc>
+
+ <link type="guide" xref="index#common-mail-problems" />
+
+ <revision pkgversion="2.28.3" version="0.1" date="2010-10-09" status="candidate"/>
+ <credit type="author">
+ <name>Phil Bull</name>
+ <email>philbull gmail com</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>I cannot see some emails, where are they?</title>
+
+<list>
+ <item>
+ <p>Check whether you are using filters on incoming (or outgoing) messages. These could be automatically moving your messages to another destination.</p>
+ </item>
+ <item>
+ <p>Check your search view in the search bar right above the message list. Perhaps the <gui>Show</gui> dropdown list is set to a filter like <gui>Read Messages</gui>, or the text input filed contains some value. Click the broom icon to clear the search field.</p>
+ </item>
+ <item>
+ <p>If you cannot see any emails at all in a folder, check that you have not maximized the message preview (so the message list pane is hidden). To do this, click <guiseq><gui>View</gui><gui>Preview</gui><gui>Show Message Preview</gui></guiseq>.</p>
+ </item>
+ <item>
+ <p>Look in the <gui>Junk</gui> folder. Messages that are marked as Junk disappear from the original folder and are moved to the Junk folder.
+ </p>
+ </item>
+ <!-- Does the following option still exist? -->
+ <item>
+ <p>Click <guiseq><gui>Edit</gui><gui>Show Hidden Messages</gui></guiseq> to make sure all messages are visible.</p>
+ </item>
+ <item>
+ <p>Check your default folder under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Email Accounts</gui><gui>Edit</gui><gui>Defaults</gui></guiseq>. Perhaps it is set to some other folder then the folder you thought of.</p>
+ </item>
+</list>
+
+</page>
diff --git a/help/C/mail-change-columns-in-message-list.page b/help/C/mail-change-columns-in-message-list.page
new file mode 100644
index 0000000..8dc7600
--- /dev/null
+++ b/help/C/mail-change-columns-in-message-list.page
@@ -0,0 +1,25 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-change-columns-in-message-list">
+
+ <info>
+ <desc>Editing the columns displayed in the list of messages.</desc>
+
+ <link type="guide" xref="mail-layout-changing" />
+
+ <revision pkgversion="2.32.2" version="0.2" date="2011-07-21" status="stub"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <title>Changing the message list columns</title>
+
+<p>If you want to change the columns in the mail message list, right-click on the column headers and choose either <gui>Add a Column...</gui> or <gui>Remove This Column</gui>.</p>
+<note style="tip"><p>If you have a small display, you can replace the <gui>Subject</gui> column by the <gui>Subject - Trimmed</gui> which will remove prefixes such as "Re:", or you can replace the <gui>From</gui> column which displays the sender's name and email address by the <gui>Sender</gui> column which will only display the sender's name.</p></note>
+
+</page>
diff --git a/help/C/mail-change-time-format.page b/help/C/mail-change-time-format.page
new file mode 100644
index 0000000..494994e
--- /dev/null
+++ b/help/C/mail-change-time-format.page
@@ -0,0 +1,23 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-change-time-format">
+
+ <info>
+ <desc>Changing the date and time format in the message list.</desc>
+ <link type="guide" xref="mail-layout-changing" />
+
+ <revision pkgversion="2.32.2" version="0.1" date="2011-07-22" status="draft"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <title>Format of dates and time</title>
+<p>You can change the format of the <gui>Date</gui> column by setting your prefered format under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>Headers</gui><gui>Date/Time format</gui></guiseq>.</p><p>The placeholders in the format expression are strftime variables.</p>
+<!-- TODO:POST-3-2: Where to get a list of strftime variables? -->
+<!-- TODO: Time formats settings for Calendar (calendar-layout-appointment-display), Contacts (Edit>Prefs>Contacts) are split everywhere, probably introduce a guide page linking to these three pages -->
+</page>
diff --git a/help/C/mail-composer-change-quotation-string.page b/help/C/mail-composer-change-quotation-string.page
new file mode 100644
index 0000000..0ba34cd
--- /dev/null
+++ b/help/C/mail-composer-change-quotation-string.page
@@ -0,0 +1,27 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-composer-change-quotation-string">
+
+ <info>
+ <desc>It is not possible to change the quotation introduction added when answering mail.</desc>
+
+ <link type="guide" xref="index#common-mail-problems" />
+ <link type="seealso" xref="mail-composer-reply" />
+ <link type="seealso" xref="mail-composer-forward" />
+
+ <revision pkgversion="2.32.1" version="0.2" date="2010-12-15" status="draft"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Changing the "On <em>date, person</em> wrote:" string when replying</title>
+
+<p>Advanced users can change this string by editing the gconf key <file>/apps/evolution/mail/composer/message_attribution</file> via gconf-editor.<!-- Codebase: evolution/mail/em-composer-utils.c --></p>
+<!-- TODO: Outdated once Evolution switches to GSettings -->
+</page>
+
diff --git a/help/C/mail-composer-custom-header-lines.page b/help/C/mail-composer-custom-header-lines.page
new file mode 100644
index 0000000..1ba4545
--- /dev/null
+++ b/help/C/mail-composer-custom-header-lines.page
@@ -0,0 +1,49 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="mail-composer-custom-header-lines">
+
+ <info>
+ <desc>Using custom fields in the header of composed messages</desc>
+
+ <link type="guide" xref="index#mail-composing-advanced" />
+
+ <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- http://library.gnome.org/users/evolution/2.32/usage-mail-getnsend-send.html.en#b1a5azam -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Custom Header Lines</title>
+
+<p>You can add arbitrary header lines to outgoing emails.</p>
+
+<section id="managing">
+<title>Enabling and managing custom headers</title>
+<p>To set up the Custom Header plugin:</p>
+<steps>
+<item><p>Select <guiseq><gui>Edit</gui><gui>Plugins</gui></guiseq>.</p></item>
+<item><p>Enable <gui>Custom Header</gui>.</p></item>
+<item><p>Click the <gui>Configuration</gui> tab.</p></item>
+<item><p>You can add, edit, or remove the header fields. For every header field you add, you can specify the keys and values. The key is used as the title of the Custom Header. You can enter multiple values for the keys. You must use a semicolon to separate every value you enter.</p></item>
+</steps>
+</section>
+
+<section id="inserting">
+<title>Inserting custom headers in a message</title>
+<steps>
+<item><p>Click <guiseq><gui>New</gui><gui>Mail Message</gui></guiseq> or press <keyseq><key>Shift</key><key>Ctrl</key><key>M</key></keyseq> to open the message composer window.</p></item>
+<item><p>Select <guiseq><gui>Insert</gui><gui>Custom Header</gui></guiseq>.</p>
+<p>In the <gui>Email Custom Header</gui> window, you can view all the defined header fields and values.</p></item>
+<item><p>Set the values for the header fields by using the dropdown list.</p></item>
+<item><p>Click <gui style="button">OK</gui>.</p></item>
+</steps>
+</section>
+
+</page>
diff --git a/help/C/mail-composer-forward-as-attachment.page b/help/C/mail-composer-forward-as-attachment.page
new file mode 100644
index 0000000..a0b1a00
--- /dev/null
+++ b/help/C/mail-composer-forward-as-attachment.page
@@ -0,0 +1,29 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-composer-forward-as-attachment">
+
+ <info>
+ <desc>How to forward a message with its attachments.</desc>
+
+ <link type="guide" xref="index#common-mail-problems" />
+ <link type="seealso" xref="mail-composer-forward" />
+
+ <revision pkgversion="2.30.2" version="0.2" date="2010-12-08" status="draft"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Forwarding a message with its attachments</title>
+
+<p>Click <guiseq><gui>Message</gui><gui>Forward as...</gui></guiseq> and choose <gui>Attachment</gui>, so the forwarded email and also its attachments get attached to the email you want to send.</p>
+
+<note>
+<p>If you want to have this setting by default, set <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Composer Preferences</gui><gui>Forward Style</gui></guiseq> to <gui>Attachment</gui>.</p>
+</note>
+</page>
+
diff --git a/help/C/mail-composer-forward.page b/help/C/mail-composer-forward.page
new file mode 100644
index 0000000..3a51868
--- /dev/null
+++ b/help/C/mail-composer-forward.page
@@ -0,0 +1,45 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-composer-forward">
+
+ <info>
+ <desc>Forwarding a received email to somebody.</desc>
+
+ <link type="guide" xref="index#mail-composing" />
+
+ <revision pkgversion="3.1.5" version="0.3" date="2011-07-27" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-getnsend-send.html.en#usage-mail-getnsend-fwd -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Forwarding a message</title>
+
+<p>When you receive an email, you can forward it to other individuals or groups that might be interested.</p>
+<p>You can forward a message as an attachment to a new message (this is the default setting, see <link xref="#default-settings">Default settings</link>), inline (in your message without the > character before each line), or quoted (with > character before each line).</p>
+<p>Attachment forwarding is best if you want to send the full, unaltered message to someone else. Inline or Quoted forwarding is best if you want to send portions of a message, or if you have a large number of comments on different sections of the message you are forwarding.</p>
+
+<p>To forward a message that you are reading:</p>
+<steps>
+<item><p>Click <guiseq><gui>Message</gui><gui>Forward</gui></guiseq>, the <gui>Forward</gui> button in the toolbar, or press <keyseq><key>Ctrl</key><key>F</key></keyseq> to use the default forwarding method. In case you want to use a different forward method, click <guiseq><gui>Message</gui><gui>Forward as</gui></guiseq> or the small dropdown arrow next to the <gui>Forward</gui> button in the toolbar to choose the method.</p></item>
+<item><p>Select a recipient for the message. The subject is already entered, although you can alter it if you want.</p></item>
+<item><p>Add your comments on the message in the text field.</p></item>
+<item><p>Click <gui style="button">Send</gui> or press <keyseq><key>Ctrl</key><key>Return</key></keyseq>.</p></item>
+</steps>
+
+<p>Attachments to a message you are forwarding are forwarded only when you send the original message as an attachment. Inline messages do not forward any attachments.</p>
+
+<section id="default-settings">
+<title>Default settings</title>
+<p>The default settings for replying and forwarding can be changed under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Composer Preferences</gui><gui>General</gui><gui>Replies and Forwards</gui><gui>Forward style</gui></guiseq>.</p>
+</section>
+
+</page>
+
diff --git a/help/C/mail-composer-html-image.page b/help/C/mail-composer-html-image.page
new file mode 100644
index 0000000..44e4d71
--- /dev/null
+++ b/help/C/mail-composer-html-image.page
@@ -0,0 +1,33 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-composer-html-image">
+
+ <info>
+ <desc>Embed a picture in the mail composer.</desc>
+ <link type="guide" xref="mail-composer-html#formatting-options" />
+
+ <revision pkgversion="3.1.5" version="0.3" date="2011-07-28" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-getnsend-send.html.en#bsait2b -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+ </info>
+
+<title>Inserting an Image in HTML</title>
+
+<p>You can insert an image into the email (at the current position of the cursor):</p>
+<steps>
+<item><p>Click <guiseq><gui>Insert</gui><gui>Image...</gui></guiseq> in the menubar.</p></item>
+<item><p>Browse to and select the file.</p></item>
+<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>
+
+</page>
+
diff --git a/help/C/mail-composer-html-link.page b/help/C/mail-composer-html-link.page
new file mode 100644
index 0000000..309d43f
--- /dev/null
+++ b/help/C/mail-composer-html-link.page
@@ -0,0 +1,34 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-composer-html-link">
+
+ <info>
+ <desc>Insert a link to a website in the mail composer.</desc>
+ <link type="guide" xref="mail-composer-html#formatting-options" />
+
+ <revision pkgversion="3.1.5" version="0.2" date="2011-07-29" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-getnsend-send.html.en#bsait2a -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+ </info>
+
+<title>Inserting a Link in HTML</title>
+
+
+<p>You can insert links into the email:</p>
+<steps>
+<item><p>Select the text that you want to turn into a link.</p></item>
+<item><p>Either click <guiseq><gui>Insert</gui><gui>Link...</gui></guiseq> in the menubar, or right-click on the selected text and click <gui>Insert Link</gui>.</p></item>
+<item><p>Enter the address in the <gui>URL</gui> field.</p></item>
+<item><p>Click <gui>Close</gui>.</p></item>
+</steps>
+
+<p>If you do not want a special link text you can just enter the address of the link directly. It will be automatically recognized as a link.</p>
+</page>
+
diff --git a/help/C/mail-composer-html-rule.page b/help/C/mail-composer-html-rule.page
new file mode 100644
index 0000000..026a9da
--- /dev/null
+++ b/help/C/mail-composer-html-rule.page
@@ -0,0 +1,32 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-composer-html-rule">
+
+ <info>
+ <desc>Insert a horizontal line in the mail composer.</desc>
+ <link type="guide" xref="mail-composer-html#formatting-options" />
+
+ <revision pkgversion="3.1.5" version="0.2" date="2011-07-29" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-getnsend-send.html.en#bsait2c -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+ </info>
+
+<title>Inserting a Rule in HTML</title>
+
+<p>You can insert a horizontal line into the email (at the current position of the cursor) to help divide two sections:</p>
+<steps>
+<item><p>Click <guiseq><gui>Insert</gui><gui>Rule...</gui></guiseq> in the menubar.</p></item>
+<item><p>Select width, size, and alignment.</p></item>
+<item><p>Select <gui>Shaded</gui> if wanted.</p></item>
+<item><p>Click <gui>Close</gui>.</p></item>
+</steps>
+
+</page>
+
diff --git a/help/C/mail-composer-html-table.page b/help/C/mail-composer-html-table.page
new file mode 100644
index 0000000..fd58dc3
--- /dev/null
+++ b/help/C/mail-composer-html-table.page
@@ -0,0 +1,33 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-composer-html-table">
+
+ <info>
+ <desc>Insert a table in the mail composer.</desc>
+ <link type="guide" xref="mail-composer-html#formatting-options" />
+
+ <revision pkgversion="3.1.5" version="0.2" date="2011-07-29" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-getnsend-send.html.en#bsait2d -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+ </info>
+
+<title>Inserting a Table in HTML</title>
+
+<p>You can insert a table into the email (at the current position of the cursor):</p>
+<steps>
+<item><p>Click <guiseq><gui>Insert</gui><gui>Table...</gui></guiseq> in the menubar.</p></item>
+<item><p>Select the number of rows and columns.</p></item>
+<item><p>Define the type of layout for the table.</p></item>
+<item><p>Optionally: Select a background color or image for the table.</p></item>
+<item><p>Click <gui>Close</gui>.</p></item>
+</steps>
+
+</page>
+
diff --git a/help/C/mail-composer-html-text.page b/help/C/mail-composer-html-text.page
new file mode 100644
index 0000000..11b8fbd
--- /dev/null
+++ b/help/C/mail-composer-html-text.page
@@ -0,0 +1,82 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-composer-html-text">
+
+ <info>
+ <desc>Format Text in the mail composer.</desc>
+ <link type="guide" xref="mail-composer-html#formatting-options" />
+
+ <revision pkgversion="3.0.2" version="0.3" date="2011-08-01" status="draft"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-getnsend-send.html.en#usage-mail-getnsend-send-html -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+ </info>
+
+<title>Formatting Text in HTML</title>
+
+<!-- TODO: These instructions are partially WRONG in 3.0.2 as the tool bar has been split into two. Needs an update. Maybe we also need a way to describe the non-HTML-only functions for plain text mail somewhere. -->
+
+ <p>HTML formatting tools are located in the two tool bars just above the area where you actually write the message. They also appear in the <gui>Insert</gui> and <gui>Format</gui> menus.</p>
+ <p>The icons in the tool bar are explained in tooltips which appear when you hold your mouse pointer over the buttons. The buttons fall into five categories:</p>
+
+<section id="headers-and-lists">
+ <title>Headers and Lists:</title>
+ <p>At the left of the upper tool bar, you can choose <gui>Normal</gui> for a default text style or <gui>Header 1</gui> through <gui>Header 6</gui> for varying sizes of header from large (1) to tiny (6). Other styles include <gui>Preformat</gui>, to use the HTML tag for preformatted blocks of text, and three types of bullet points for lists.</p>
+ <p>For instance, instead of using asterisks to mark a bulleted list, you can use the <gui>Bulleted List</gui> style from the style dropdown list. Evolution uses different bullet styles, and handles word wrap and multiple levels of indentation.</p>
+</section>
+
+<section id="alignment">
+ <title>Alignment:</title>
+ <p>Located next to the Headers and Lists dropdown, the three paragraph icons should be familiar to users of most word processing software. The left-most button aligns your text to the left, the center button centers text, and the right button aligns the text to the right.</p>
+</section>
+
+<section id="indentation-rules">
+ <title>Indentation Rules:</title>
+ <p>The button with the arrow pointing left decreases a paragraph's indentation, and the right arrow increases its indentation.</p>
+</section>
+
+<section id="text-styles">
+ <title>Text Styles:</title>
+ <p>Use these buttons in the lower tool bar to determine the way your email looks. If you have text selected, the style applies to the selected text. If you do not have text selected, the style applies to whatever you type next.</p>
+
+<table frame="all" rules="all">
+ <tr>
+ <td><p>Button</p></td>
+ <td><p>Description</p></td>
+ </tr>
+ <tr>
+ <td><p>TT</p></td>
+ <td><p>Typewriter text, which is similar to a monospace font.</p></td>
+ </tr>
+ <tr>
+ <td><p>Bold A</p></td>
+ <td><p>Bolds the text.</p></td>
+ </tr>
+ <tr>
+ <td><p>Italic A</p></td>
+ <td><p>Italicizes the text.</p></td>
+ </tr>
+ <tr>
+ <td><p>Underlined A</p></td>
+ <td><p>Underlines the text.</p></td>
+ </tr>
+ <tr>
+ <td><p>Strike through A</p></td>
+ <td><p>Marks a line through the text.</p></td>
+ </tr>
+</table>
+</section>
+
+<section id="color-selection">
+ <title>Color Selection:</title>
+ <p>At the left in the lower tool bar is the color section tool, where a box displays the current text color. To choose a new color, click the arrow button to the right. If you have text selected, the color applies to the selected text. If you do not have text selected, the color applies to whatever you type next. You can select a background color or image by right-clicking the message background, then selecting <guiseq><gui>Style</gui><gui>Page Style</gui></guiseq>.</p>
+</section>
+
+</page>
+
diff --git a/help/C/mail-composer-html.page b/help/C/mail-composer-html.page
new file mode 100644
index 0000000..520b726
--- /dev/null
+++ b/help/C/mail-composer-html.page
@@ -0,0 +1,35 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="mail-composer-html">
+
+ <info>
+ <desc>Format emails by using HTML instead of plain text.</desc>
+ <link type="guide" xref="index#mail-composing" />
+
+ <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-getnsend-send.html.en#usage-mail-getnsend-send-html -->
+ </credit>
+ </info>
+
+<title>Using HTML format to enhance emails</title>
+
+<p>Normally, you cannot set text styles or insert pictures in email. However, most newer email programs can display images and text styles in addition to basic alignment and paragraph formatting. They do this with HTML, just like web pages do.</p>
+
+<p>Some people do not have HTML-capable mail clients, or prefer not to receive HTML-enhanced mail because it is slower to download and display. Because of this, Evolution sends plain text unless you explicitly ask for HTML.</p>
+
+<p>You can change the format of an email message from plain text to HTML by choosing <guiseq><gui>Format</gui><gui>HTML</gui></guiseq> from the menu bar.</p>
+<p>To send all your mail as HTML by default, enable <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Composer Preferences</gui><gui>Default Behavior</gui><gui>Format messages in HTML</gui></guiseq>.</p>
+
+ <section id="formatting-options" style="2column">
+ <title>HTML Formatting Options</title>
+ </section>
+
+</page>
+
diff --git a/help/C/mail-composer-mail-signatures-manage.page b/help/C/mail-composer-mail-signatures-manage.page
new file mode 100644
index 0000000..4a57031
--- /dev/null
+++ b/help/C/mail-composer-mail-signatures-manage.page
@@ -0,0 +1,25 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-composer-mail-signatures-manage">
+
+ <info>
+ <desc>Add, change, edit or delete email signatures.</desc>
+
+ <link type="guide" xref="mail-composer-mail-signatures" />
+
+ <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Managing signatures</title>
+
+<p>You can add, edit and delete all your signatures under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Composer preferences</gui><gui>Signatures</gui></guiseq>.</p>
+<p>Assigning a default signature to an email account has to be done in the <link xref="mail-composer-mail-signatures-per-account">account settings</link>.</p>
+
+</page>
diff --git a/help/C/mail-composer-mail-signatures-per-account.page b/help/C/mail-composer-mail-signatures-per-account.page
new file mode 100644
index 0000000..e68b5ab
--- /dev/null
+++ b/help/C/mail-composer-mail-signatures-per-account.page
@@ -0,0 +1,38 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-composer-mail-signatures-per-account">
+
+ <info>
+ <desc>Setting a default signature for an email account.</desc>
+
+ <link type="guide" xref="mail-composer-mail-signatures" />
+ <link type="guide" xref="mail-account-manage-imap#identity"/>
+ <link type="guide" xref="mail-account-manage-imap-plus#identity"/>
+ <link type="guide" xref="mail-account-manage-local-delivery#identity"/>
+ <link type="guide" xref="mail-account-manage-maildir-format-directories#identity"/>
+ <link type="guide" xref="mail-account-manage-mh-format-directories#identity"/>
+ <link type="guide" xref="mail-account-manage-microsoft-exchange#identity"/>
+ <link type="guide" xref="mail-account-manage-novell-groupwise#identity"/>
+ <link type="guide" xref="mail-account-manage-pop#identity"/>
+ <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 -->
+
+ <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Default account signature</title>
+
+<p>You can define a default <link xref="mail-composer-mail-signatures">signature</link> for each of your mail accounts. This can be edited under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui>Edit</gui><gui>Identity</gui><gui>Optional Information</gui></guiseq>.</p>
+
+<p>If you have a signature for your account defined but exceptionally do not want to use it for one message, or want to use a different signature, you can change it via the dropdown menu in the right upper corner in the email composer window.</p>
+
+</page>
diff --git a/help/C/mail-composer-mail-signatures.page b/help/C/mail-composer-mail-signatures.page
new file mode 100644
index 0000000..1c8e60a
--- /dev/null
+++ b/help/C/mail-composer-mail-signatures.page
@@ -0,0 +1,26 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="mail-composer-mail-signatures">
+
+ <info>
+ <desc>Using email signatures at the bottom of a message you send.</desc>
+
+ <link type="guide" xref="index#mail-composing" />
+
+ <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+
+<title>Working with email signatures</title>
+
+<p>A signature consists of one or more lines of text (or even a picture) that will be added at the end of an email that you send. It can contain contact information or other things. A signature always begins with two dashes and a space (<code>-- </code>).</p>
+<note><p>The term "signature" is also differently used in terms of <link xref="mail-encryption">encryption</link>.</p></note>
+</page>
+
diff --git a/help/C/mail-composer-message-templates.page b/help/C/mail-composer-message-templates.page
new file mode 100644
index 0000000..9b593c2
--- /dev/null
+++ b/help/C/mail-composer-message-templates.page
@@ -0,0 +1,99 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+type="topic" id="mail-composer-message-templates">
+
+ <info>
+ <desc>Message templates to reuse in the composer.</desc>
+
+ <link type="guide" xref="index#mail-composing-advanced" />
+
+ <revision pkgversion="2.32.2" version="0.1" date="2011-07-21" status="stub"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/b1dlaazl.html.en -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Message Templates</title>
+<p>A message template is a standard message that you can use at any time to send mail with the same pattern.</p>
+<p>To enable the Message Template Plugin, click <guiseq><gui>Edit</gui><gui>Plugins</gui></guiseq> and enable <gui>Templates</gui>.</p>
+
+<!-- TODO: Check correctness of all these steps in 3.1. -->
+<!-- TODO:POST-3-2: Split this into subpages maybe, and turn this into a guide page! -->
+
+<section id="create">
+<title>Creating a Message Template from an existing Message</title>
+<steps>
+ <item><p>Select the message.</p></item>
+ <item><p>Right-click the message and choose <gui>Move to folder</gui> or <gui>Copy to folder</gui>.</p></item>
+ <item><p>Select the <gui>Templates</gui> folder under <gui>On This Computer</gui>.</p></item>
+</steps>
+<p>You can also edit an existing message and save it as a template:</p>
+<steps>
+ <item><p>Open the message and click <gui>Reply</gui>.</p></item>
+ <item><p>Edit the message body or the addresses according to your requirements.</p></item>
+ <item><p>Select <guiseq><gui>File</gui><gui>Save as Template</gui></guiseq>.</p></item>
+ </steps>
+</section>
+
+<section id="save">
+ <title>Saving a New Message as a Template</title>
+ <steps>
+ <item>
+<p>Click <gui>New</gui> and enter in the composer window what you need for the template.</p>
+ </item>
+ <item>
+<p>Select <guiseq><gui>File</gui><gui>Save as Template</gui></guiseq>.</p>
+ </item>
+ </steps>
+</section>
+
+<section id="reply">
+ <title>Using a Message Template as a Reply</title>
+ <steps>
+ <item>
+<p>Right-click the message you are replying to, then click <gui>Templates</gui>.</p>
+<p>This option lists all the message templates in the <gui>Templates</gui> folder.</p>
+ </item>
+ <item>
+<p>Select the message template of your choice. Make changes if required in the email composer window that will open.</p>
+ </item>
+ <item>
+<p>Click <gui>Send</gui>.</p>
+<p>When you select a message template for replying, the subject of the reply is preserved.</p>
+ </item>
+ </steps>
+</section>
+
+<section id="configure">
+<title>Configuring Message Templates</title>
+<steps>
+<item><p>Select <guiseq><gui>Edit</gui><gui>Plugins</gui></guiseq>.</p></item>
+<item><p>Click <gui>Templates</gui>.</p></item>
+<item><p>Click the <gui>Configuration</gui> tab.</p></item>
+<item><p>You can add, edit or remove the key-value pairs. You can specify any number of key-value pairs.</p></item>
+</steps>
+ <p>In any template, the occurrence of every $key is replaced by the value it has in the configuration. For example, if you set the key to Manager and the value to Harry, any occurrence of $Manager is replaced by Harry in the message.</p>
+ <p>Assume that you have 1000 message templates with your current manager's name in them. When the current manager is replaced by a new one, it is not easy for you to manually replace the manager's name in all the 1000 messages. If the messages have a $Manager key value, you can reset the value in the Configuration tab of this plugin.</p>
+ <p>By default, the entire environment variables are used as a key-value pair. An occurrence of $env_variable is replaced by the value it carries. For example, an occurrence of $PATH in your template is replaced by its value when the template is used.</p>
+ <p>The replacement process uses the following order of precedence:</p>
+ <steps>
+ <item>
+<p>$key is replaced by the value set for it in the Configuration tab of the Templates plugin.</p>
+ </item>
+ <item>
+<p>If the key is not found, it is then replaced with the value of its environment variable.</p>
+ </item>
+ <item>
+<p>If key is neither a configuration option nor an environment variable, no changes are made.</p>
+ </item>
+ </steps>
+</section>
+
+</page>
diff --git a/help/C/mail-composer-priority.page b/help/C/mail-composer-priority.page
new file mode 100644
index 0000000..6f984da
--- /dev/null
+++ b/help/C/mail-composer-priority.page
@@ -0,0 +1,29 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="mail-composer-priority">
+
+ <info>
+ <desc>Setting a priority for messages to be sent.</desc>
+
+ <link type="guide" xref="index#mail-composing-advanced" />
+
+ <revision pkgversion="2.32.2" version="0.1" date="2011-07-22" status="draft"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-getnsend-send.html.en#BJEHCDFA -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Prioritizing outgoing messages</title>
+
+<p>You can prioritize a message to be sent, so that the recipient sees its relative importance. To prioritize a message, click <guiseq><gui>Insert</gui><gui>Prioritize Message</gui></guiseq> in the composer window.</p>
+
+<note style="tip"><p>Evolution will ignore the message priority of incoming messages because the recipient should decide whether the message is important or not. You can set the "Important" flag for any messages.</p></note>
+
+</page>
diff --git a/help/C/mail-composer-reply.page b/help/C/mail-composer-reply.page
new file mode 100644
index 0000000..e8a0b8c
--- /dev/null
+++ b/help/C/mail-composer-reply.page
@@ -0,0 +1,58 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-composer-reply">
+
+ <info>
+ <desc>Answering a received email.</desc>
+
+ <link type="guide" xref="index#mail-composing" />
+
+ <revision pkgversion="3.1.5" version="0.3" date="2011-07-27" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-getnsend-send.html.en#usage-mail-getnsend-send-reply -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Replying to a message</title>
+
+<section id="keyboard-shortcuts">
+<title>Replying to Email Messages</title>
+<p>To reply to a message, select the message to reply to in the message list and click the Reply button in the toolbar, or right-click within the message and select Reply to Sender. This opens the message composer. The <gui>To:</gui> and <gui>Subject:</gui> fields are already filled, although you can alter them if you prefer. In addition, the full text of the old message is inserted into the new message, either in grey with a blue line on one side (for HTML display) or with the > character before each line (in plain text mode), to indicate that it is part of the previous message.</p>
+<p>If you are reading a message with several recipients, you can use <gui>Reply to All</gui> instead of <gui>Reply</gui>. If there are large numbers of people in the <gui>Cc:</gui> or <gui>To:</gui> fields, this can save substantial amounts of time.</p>
+</section>
+
+<section id="reply-to-all">
+<title>Using the Reply To All Feature</title>
+<p>Susan sends an email to a client and sends copies to Tim and to an internal company mailing list of co-workers. If Tim wants to make a comment for all of them to read, he uses <gui>Reply to All</gui>, but if he just wants to tell Susan that he agrees with her, he uses <gui>Reply</gui>. His reply does not reach anyone that Susan put on her Bcc list, because that list is not shared with anyone.</p>
+<p>If you subscribe to a mailing list, and want your reply to go just to the list rather than to the sender, select <gui>Reply to List</gui> instead of <gui>Reply</gui> or <gui>Reply to All</gui>.</p>
+</section>
+
+<section id="keyboard-shortcuts">
+<title>Keyboard shortcuts</title>
+<table frame="all" rules="all">
+ <tr>
+ <td><p>Action</p></td><td><p>Shortcut keys</p></td>
+ </tr><tr>
+ <td><p>Reply to Sender</p></td><td><p><keyseq><key>Ctrl</key><key>R</key></keyseq></p></td>
+ </tr><tr>
+ <td><p>Reply to Mailing List</p></td><td><p><keyseq><key>Ctrl</key><key>L</key></keyseq></p></td>
+ </tr><tr>
+ <td><p>Reply to All</p></td><td><p><keyseq><key>Shift</key><key>Ctrl</key><key>R</key></keyseq></p></td>
+ </tr>
+</table>
+</section>
+
+<section id="default-settings">
+<title>Default settings</title>
+<p>The default settings for replying and forwarding can be changed under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Composer Preferences</gui><gui>General</gui><gui>Replies and Forwards</gui><gui>Forward style</gui></guiseq>.</p>
+</section>
+
+</page>
+
diff --git a/help/C/mail-composer-search.page b/help/C/mail-composer-search.page
new file mode 100644
index 0000000..4e1d87d
--- /dev/null
+++ b/help/C/mail-composer-search.page
@@ -0,0 +1,42 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-composer-search">
+
+ <info>
+ <desc>Searching for text in the mail composer.</desc>
+
+ <link type="guide" xref="index#mail-composing" />
+ <link type="guide" xref="searching-items" />
+
+ <revision pkgversion="3.1.5" version="0.2" date="2011-07-29" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Searching in the mail composer</title>
+
+<p>Under the <gui>Edit</gui> menu in the message composer there are several text searching features available.</p>
+
+<list>
+<item><p><gui>Find</gui>:
+</p><p>
+Enter a word or phrase, and Evolution finds it in your message.</p></item>
+
+<item><p><gui>Find Again</gui>:
+</p><p>
+Select this item to repeat the last search you performed.</p></item>
+
+<item><p><gui>Replace</gui>:
+</p><p>
+Find a word or phrase, and replace it with something else.</p></item>
+</list>
+
+<p>For all of these menu items you can choose whether to search backwards in the document from the point where your cursor is. You can also determine whether the search is to be case sensitive in determining a match</p>
+<p>If you have a technical background you can also select the option to use <link href="https://secure.wikimedia.org/wikipedia/en/wiki/Regular_expression";>Regular expressions</link> for searching.</p>
+
+</page>
diff --git a/help/C/mail-composer-several-recipients.page b/help/C/mail-composer-several-recipients.page
new file mode 100644
index 0000000..9c3bc29
--- /dev/null
+++ b/help/C/mail-composer-several-recipients.page
@@ -0,0 +1,51 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-composer-several-recipients">
+
+ <info>
+ <desc>Sending to more than one person and using CC or BCC.</desc>
+
+ <link type="guide" xref="index#mail-composing" />
+ <link type="seealso" xref="mail-composer-reply" />
+ <link type="seealso" xref="mail-composer-forward" />
+ <link type="seealso" xref="mail-composer-write-new-message" />
+
+ <revision pkgversion="3.1.5" version="0.3" date="2011-07-27" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-getnsend-send.html.en#usage-mail-getnsend-send-to-types and http://library.gnome.org/users/evolution/2.32/usage-mail-getnsend-send.html.en#usage-mail-getnsend-send-to -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Sending a message to several recipients</title>
+
+<p>To send a message to more than one person, enter the addresses in the composer by seperating them with commas or semicolons.</p>
+
+<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>
+
+<p>Addresses in the <gui>Bcc:</gui> text field are hidden from the other recipients of the message. It can be used to send mail to large groups of people, especially if they do not know each other or if privacy is a concern. If the <gui>Bcc:</gui> text field is not shown, click <guiseq><gui>View</gui><gui>Bcc Field</gui></guiseq>.</p>
+</section>
+
+<section id="autocompletion">
+<title>Autocompletion</title>
+<p>It is recommended to use the <link xref="contacts-autocompletion">Autocompletion</link> feature of the Evolution address book for entering addresses. By using this you avoid typos and save time.</p>
+</section>
+
+<section id="to-cc-bcc-buttons">
+<title>Using the buttons</title>
+
+<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-composer-spellcheck.page b/help/C/mail-composer-spellcheck.page
new file mode 100644
index 0000000..0e344a3
--- /dev/null
+++ b/help/C/mail-composer-spellcheck.page
@@ -0,0 +1,44 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-composer-spellcheck">
+
+ <info>
+ <desc>On spell checking your mail in the composer.</desc>
+
+ <link type="guide" xref="index#mail-composing" />
+
+ <revision pkgversion="3.0.2" version="0.3" date="2011-07-29" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Spell checking</title>
+
+<!-- Instructions are only valid from Evolution 2.24 on -->
+
+<section id="required-packages">
+<title>Prerequirements</title>
+<p>To use spell checking for the emails that you write you first need to make sure that the <em>hunspell</em> package for your specific language and the <em>enchant</em> package are installed via the software management tool of your distribution.</p>
+<p><link action="install:hunspell" href="http://hunspell.sourceforge.net/";>Install hunspell now.</link></p>
+<p><link action="install:enchant" href="http://www.abisource.com/projects/enchant/";>Install enchant now.</link></p>
+</section>
+
+<section id="global-preferences">
+<title>Global Preferences</title>
+
+<p>Under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Composer Preferences</gui><gui>Spell Checking</gui><gui>Options</gui></guiseq> you can define whether your spelling is checked while you type and which color is used for underlining words that are misspelled.</p>
+
+<p>You can also define which installed languages are used for spell checking in the list available under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Composer Preferences</gui><gui>Spell Checking</gui><gui>Languages</gui></guiseq>.</p>
+</section>
+
+<section id="composer">
+<title>Manual spell checking in the composer</title>
+<p>If you do not have <gui>Checking spelling while I type</gui> enabled in the <link xref="#global-preferences">Composer Preferences</link> you can run a spell check in the email composer by clicking <guiseq><gui>Edit</gui><gui>Spell Checking</gui></guiseq> or by pressing <key>F7</key>.</p>
+</section>
+
+</page>
diff --git a/help/C/mail-composer-write-new-message.page b/help/C/mail-composer-write-new-message.page
new file mode 100644
index 0000000..8c8746f
--- /dev/null
+++ b/help/C/mail-composer-write-new-message.page
@@ -0,0 +1,31 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-composer-write-new-message">
+
+ <info>
+ <desc>Writing a new email to send to a recipient.</desc>
+
+ <link type="guide" xref="index#mail-composing" />
+
+ <revision pkgversion="3.1.5" version="0.2" date="2011-07-27" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-getnsend-send.html.en -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Composing a new message</title>
+
+<p>You can start writing a new email message by clicking <guiseq><gui>File</gui><gui>New</gui><gui>Mail Message</gui></guiseq>, by pressing <keyseq><key>Shift</key><key>Ctrl</key><key>M</key></keyseq>, or by clicking <gui>New</gui> in the toolbar.</p>
+
+<p>Enter an email address in the <gui>To:</gui> field. If you want to enter multiple addresses, separate them by commas. See <link xref="mail-composer-several-recipients"></link> for more information on sending messages to more than one person.</p>
+
+<p>After you have written your message, click <gui>Send</gui> or press <keyseq><key>Ctrl</key><key>Return</key></keyseq>.</p>
+</page>
+
diff --git a/help/C/mail-default-CC-and-BCC.page b/help/C/mail-default-CC-and-BCC.page
new file mode 100644
index 0000000..9eb4bc7
--- /dev/null
+++ b/help/C/mail-default-CC-and-BCC.page
@@ -0,0 +1,32 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-default-CC-and-BCC">
+
+ <info>
+ <desc>Make somebody always receive copies of your sent mail.</desc>
+
+ <link type="guide" xref="mail-account-manage-imap#defaults"/>
+ <link type="guide" xref="mail-account-manage-imap-plus#defaults"/>
+ <link type="guide" xref="mail-account-manage-local-delivery#defaults"/>
+ <link type="guide" xref="mail-account-manage-maildir-format-directories#defaults"/>
+ <link type="guide" xref="mail-account-manage-mh-format-directories#defaults"/>
+ <link type="guide" xref="mail-account-manage-pop#defaults"/>
+ <link type="guide" xref="mail-account-manage-unix-mbox-spool-directory#defaults"/>
+ <link type="guide" xref="mail-account-manage-unix-mbox-spool-file#defaults"/>
+ <link type="guide" xref="mail-account-manage-usenet-news#defaults"/>
+ <revision pkgversion="2.32.1" version="0.1" date="2011-01-06" status="draft"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <title>Default CC and BCC</title>
+
+<p>You can set email addresses that should always receive copies of your sent mail (either as CC visible for all recipients, or BCC not visible for other recipients) in the <gui>Defaults</gui> section of the mail account editor (<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Defaults</gui></guiseq>).</p>
+
+
+</page>
diff --git a/help/C/mail-default-folder-locations.page b/help/C/mail-default-folder-locations.page
new file mode 100644
index 0000000..675ede3
--- /dev/null
+++ b/help/C/mail-default-folder-locations.page
@@ -0,0 +1,36 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-default-folder-locations">
+
+ <info>
+ <desc>Changing the location of the Draft folder and Sent folder.</desc>
+
+ <link type="guide" xref="mail-account-manage-imap#defaults"/>
+ <link type="guide" xref="mail-account-manage-imap-plus#defaults"/>
+ <link type="guide" xref="mail-account-manage-local-delivery#defaults"/>
+ <link type="guide" xref="mail-account-manage-maildir-format-directories#defaults"/>
+ <link type="guide" xref="mail-account-manage-mh-format-directories#defaults"/>
+ <link type="guide" xref="mail-account-manage-pop#defaults"/>
+ <link type="guide" xref="mail-account-manage-unix-mbox-spool-directory#defaults"/>
+ <link type="guide" xref="mail-account-manage-unix-mbox-spool-file#defaults"/>
+ <link type="guide" xref="mail-account-manage-usenet-news#defaults"/>
+ <link type="guide" xref="mail-account-manage-microsoft-exchange-evo-mapi#defaults"/>
+ <link type="guide" xref="mail-account-manage-microsoft-exchange-evo-exchange#defaults"/>
+ <link type="guide" xref="mail-account-manage-novell-groupwise#defaults"/>
+
+ <revision pkgversion="2.32.1" version="0.1" date="2011-01-06" status="draft"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <title>Mail folder locations</title>
+
+<p>You can set a different place where to store messages in your Draft folder and Sent folder in the <gui>Defaults</gui> section of the mail account editor (<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Defaults</gui></guiseq>).</p>
+<p>For remote account types (accounts such as IMAP) you can also set a Trash folder and Junk folder on the mail server so Evolution's local virtual folders will not be used for it, but folders on the mail server.</p>
+
+</page>
diff --git a/help/C/mail-delete-and-undelete.page b/help/C/mail-delete-and-undelete.page
new file mode 100644
index 0000000..a21fdb3
--- /dev/null
+++ b/help/C/mail-delete-and-undelete.page
@@ -0,0 +1,45 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="mail-delete-and-undelete">
+
+ <info>
+ <desc>Deleting, expunging, and undeleting mail.</desc>
+
+ <link type="guide" xref="index#mail-basic" />
+ <link type="seealso" xref="mail-moving-emails" />
+ <link type="seealso" xref="deleting-emails" />
+
+ <revision pkgversion="3.0.2" version="0.2" date="2011-07-31" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-getnsend-read.html.en#usage-mail-getnsend-delete and http://library.gnome.org/users/evolution/2.32/usage-mail-getnsend-read.html.en#usage-mail-getnsend-undelete -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Deleting and undeleting messages</title>
+
+<section id="delete">
+<title>Deleting Messages</title>
+
+<p>To delete a message, select it and press the <key>Delete</key> key, or click the <gui style="button">Delete</gui> button in the toolbar, or press <keyseq><key>Ctrl</key><key>D</key></keyseq>, or right-click the message and click <gui>Delete</gui>.</p>
+
+<p>When you press Delete or click the Trash folder, your mail is not actually deleted, but is marked for deletion. You can see all message marked for deletion in the Trash folder. To show deleted messages, click <guiseq><gui>View</gui><gui>Show Deleted Messages</gui></guiseq>. You can view the messages striken off for later deletion.</p>
+
+<p>To permanently erase all the deleted messages in a folder, click <guiseq><gui>Folder</gui><gui>Expunge</gui></guiseq> or press <keyseq><key>Ctrl</key><key>E</key></keyseq>.</p>
+</section>
+
+<section id="undelete">
+<title>Undeleting Messages</title>
+
+<p>You can undelete a message that has been deleted but not expunged yet. To undelete a message, select the message, click <guiseq><gui>Edit</gui><gui>Undelete message</gui></guiseq>. Note that <guiseq><gui>View</gui><gui>Show Deleted Messages</gui></guiseq> must be enabled for this.</p>
+
+<p>If you have marked a message for deletion, undeleting it unmarks it, and the message is not shown anymore in the Trash folder.</p>
+</section>
+
+</page>
diff --git a/help/C/mail-displaying-character-encodings.page b/help/C/mail-displaying-character-encodings.page
new file mode 100644
index 0000000..56330b8
--- /dev/null
+++ b/help/C/mail-displaying-character-encodings.page
@@ -0,0 +1,27 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-displaying-character-encodings">
+
+ <info>
+ <desc>When characters in an email are not shown correctly or missing.</desc>
+
+ <link type="guide" xref="mail-displaying-message" />
+
+ <revision pkgversion="3.0.2" version="0.3" date="2011-08-02" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Character Encodings and Sets</title>
+
+<!-- TODO: Recheck once https://bugzilla.gnome.org/show_bug.cgi?id=655021 is fixed -->
+
+<p>If the email program of the sender is broken or misconfigured, plain text emails might not include information about the character encoding used. If you receive such messages, choose <guiseq><gui>View</gui><gui>Character Encoding</gui></guiseq> from the main menu and change the currently chosen character encoding to an appropriate one that might be the encoding used by the sender. You have to make this change every time you view the message.</p>
+<p>To constantly change this setting, go to <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>General</gui><gui>Message Display</gui><gui>Default character encoding</gui></guiseq>.</p>
+
+</page>
diff --git a/help/C/mail-displaying-collapsible-headers.page b/help/C/mail-displaying-collapsible-headers.page
new file mode 100644
index 0000000..59ae299
--- /dev/null
+++ b/help/C/mail-displaying-collapsible-headers.page
@@ -0,0 +1,31 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-displaying-collapsible-headers">
+
+ <info>
+ <desc>Display less email recipients of a specific message.</desc>
+
+ <link type="guide" xref="mail-displaying-message" />
+
+ <revision pkgversion="3.1.5" version="0.2" date="2011-07-28" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-getnsend-read.html.en#b131oj36 though the setting itself has been removed in 3.1 -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Collapsible Message Headers</title>
+
+<p>Evolution compresses the To, Cc and Bcc headers of received mail and shows only five addresses in the message preview.</p>
+
+<p>To see all recipients, click the <media type="image" src="./figures/plus-icon.png"></media> icon next to the <gui>To:</gui> or <gui>Cc:</gui> line, or click the ellipsis (...) at the end of the five displayed addresses.</p>
+
+<p>To collapse all of the message headers and just display the subject and sender in one line, click the icon <media type="image" src="./figures/minus-icon.png"></media> next to the <gui>From:</gui> line. This is helpful on small screens.</p>
+
+</page>
diff --git a/help/C/mail-displaying-images-in-html.page b/help/C/mail-displaying-images-in-html.page
new file mode 100644
index 0000000..d911c52
--- /dev/null
+++ b/help/C/mail-displaying-images-in-html.page
@@ -0,0 +1,55 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-displaying-images-in-html">
+
+ <info>
+ <desc>On embedded pictures in received HTML messages.</desc>
+
+ <link type="guide" xref="mail-displaying-message" />
+ <link type="seealso" xref="mail-downloading-images" />
+
+ <revision pkgversion="3.1.5" version="0.3" date="2011-07-31" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>April Gonzales</name>
+ <email>loonycookie gmail com</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-getnsend-read.html.en#usage-mail-getnsend-get-attach-html -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Images in HTML messages</title>
+
+<p>When someone sends you HTML mail that includes an image in the body of the message (for example, the welcome message in your Inbox), Evolution displays the image inside the message.</p>
+
+<section id="loading">
+<title>Loading images</title>
+<p>Some images are links in a message, rather than being part of the message. Evolution can download those images from the Internet, but does not do so unless you request it. This is because remotely hosted images can be slow to load and display, and can even be used by spammers to track who reads the email. Not automatically loading images helps protect your privacy.</p>
+
+<p>To load the images for one message, click <guiseq><gui>View</gui><gui>Load Images</gui></guiseq> or press <keyseq><key>Ctrl</key><key>I</key></keyseq>.</p>
+
+<p>To set the default action for loading images, go to <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>HTML Messages</gui><gui>Loading Images</gui></guiseq>.</p>
+</section>
+
+<section id="automatically-download">
+<title>Automatically download images in emails from people you know</title>
+
+<p>You can download images from emails sent by your contacts. To do this, go to <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>HTML Messages</gui><gui>Loading Images</gui></guiseq>. Enable the <gui>Load images only in messages from contacts</gui> option.</p>
+
+<p>Next, go to <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Contacts</gui><gui>Autocompletion</gui></guiseq>. Enable autocompletion by ticking the <gui>Always show address of the autocompleted contact</gui> checkbox.</p>
+</section>
+
+<section id="saving">
+<title>Saving images</title>
+<p>You currently cannot save images to disk that are embedded in HTML emails.</p>
+<!-- TODO: Fix once https://bugzilla.gnome.org/show_bug.cgi?id=655669 is fixed -->
+</section>
+
+</page>
diff --git a/help/C/mail-displaying-message.page b/help/C/mail-displaying-message.page
new file mode 100644
index 0000000..02b3562
--- /dev/null
+++ b/help/C/mail-displaying-message.page
@@ -0,0 +1,22 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="mail-displaying-message">
+
+ <info>
+ <desc>Rendering an email and handling its attachments.</desc>
+
+ <link type="guide" xref="index#mail-basic" />
+
+ <revision pkgversion="2.32.2" version="0.1" date="2011-07-21" status="draft"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Display of a message</title>
+
+</page>
diff --git a/help/C/mail-displaying-no-css.page b/help/C/mail-displaying-no-css.page
new file mode 100644
index 0000000..10be900
--- /dev/null
+++ b/help/C/mail-displaying-no-css.page
@@ -0,0 +1,29 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-displaying-no-css">
+
+ <info>
+ <desc>When a received message looks weird or is hard to read.</desc>
+
+ <link type="guide" xref="index#common-mail-problems" />
+ <link type="seealso" xref="mail-displaying-message" />
+
+ <revision pkgversion="3.2.0" version="0.1" date="2011-07-25" status="draft"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>HTML emails are not correctly displayed</title>
+
+<p>If an HTML message is not correctly displayed in Evolution it might be that the formatting of the message is specified as <link href="http://en.wikipedia.org/wiki/Cascading_Style_Sheets";>CSS</link>. CSS is currently not supported by gtkhtml (the part that is used to display HTML).</p>
+<p>This will likely be fixed in version 3.2 or 3.4.</p>
+<p>For developers only: In future versions, Evolution will use WebKit instead of gtkhtml for displaying HTML. There is a branch named "<link href="http://git.gnome.org/browse/evolution?h=webkit";>webkit</link>" in Evolution's code repository to test.</p>
+
+<note style="tip"><p>For missing characters in emails, see <link xref="mail-displaying-character-encodings">Character Encodings and Sets</link>.</p></note>
+
+</page>
diff --git a/help/C/mail-displaying-sender-photograph.page b/help/C/mail-displaying-sender-photograph.page
new file mode 100644
index 0000000..e709585
--- /dev/null
+++ b/help/C/mail-displaying-sender-photograph.page
@@ -0,0 +1,34 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-displaying-sender-photograph">
+
+ <info>
+ <desc>Display a picture of the sender in the message header area.</desc>
+
+ <link type="guide" xref="mail-displaying-message" />
+
+ <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/config-prefs-mail.html.en#mail-prefs-headers -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Photograph Message Headers</title>
+
+<!-- TODO: Check and describe whether this requires enabling <guiseq><gui>Edit</gui><gui>Plugins</gui><gui>Face</gui></guiseq>! -->
+
+<p>The photograph of the sender of an email can be shown at the right side of the message preview if the sender is in one of your address books and has a photograph.</p>
+
+<p>To enable this functionality, select <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>Headers</gui><gui>Show the photograph of sender in the message preview</gui></guiseq>.</p>
+
+<p>By default only local address books are used for searching the photograph as accessing remote address books can cause delays. You can disable this by deselecting the option <gui>Search for sender photograph only in local address books</gui>.</p>
+
+<p>If there are multiple matches for a contact, the first one is always used.</p>
+</page>
diff --git a/help/C/mail-duplicates.page b/help/C/mail-duplicates.page
new file mode 100644
index 0000000..88a5370
--- /dev/null
+++ b/help/C/mail-duplicates.page
@@ -0,0 +1,43 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-duplicates">
+
+ <info>
+ <desc>How to handle duplicated email messages</desc>
+
+ <link type="guide" xref="index#common-mail-problems" />
+
+ <revision pkgversion="3.0.2" version="0.4" date="2011-08-01" status="final"/>
+ <credit type="author">
+ <name>April Gonzales</name>
+ <email>loonycookie gmail com</email>
+ </credit>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Duplicate emails get downloaded</title>
+
+<section id="remove">
+<title>Removing duplicate emails</title>
+<p>To remove duplicate emails in a folder, click <guiseq><gui>Message</gui><gui>Remove Duplicate Messages</gui></guiseq>.</p>
+<!-- available by default since 2.91, as per http://mail.gnome.org/archives/evolution-list/2011-August/msg00000.html -->
+</section>
+
+<section id="reasons">
+<title>Reasons</title>
+<p>Downloading duplicate emails may be due to one of the following reasons:</p>
+<list>
+<item><p>There are several copies of the same message in the mailbox</p></item>
+<item><p>Evolution is having a problem with the UIDL extension.</p></item>
+<item><p>The cache files located at <file>$HOME/.local/share/evolution/mail/pop/</file> are not writable.</p></item>
+</list>
+</section>
+
+</page>
+
diff --git a/help/C/mail-encryption-gpg-create-key.page b/help/C/mail-encryption-gpg-create-key.page
new file mode 100644
index 0000000..a99004a
--- /dev/null
+++ b/help/C/mail-encryption-gpg-create-key.page
@@ -0,0 +1,53 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-encryption-gpg-create-key">
+
+ <info>
+ <desc>Signing or encrypting messages via GPG that you send.</desc>
+
+ <link type="guide" xref="mail-encryption#gpg"/>
+
+ <revision pkgversion="2.32.1" version="0.2" date="2011-07-27" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/encryption.html.en#encryption-keygen -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <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>
+<!-- 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>
+<steps>
+<item><p>Open a terminal window and enter <code>gpg --gen-key</code>.</p></item>
+<item><p>Select an algorithm, then press Enter.</p></item>
+<item><p>Select a key length, then press Enter.</p></item>
+<item><p>Enter how long your key should be valid for.</p></item>
+<item><p>Type your real name, then press Enter.</p></item>
+<item><p>Type your email address, then press Enter.</p></item>
+<item><p>(Optional) Type a comment, then press Enter.</p></item>
+<item><p>Review your selected user ID. If it is correct, press O.</p></item>
+<item><p>Type a passphrase, then press Enter.</p></item>
+<item><p>Move your mouse randomly to generate the keys.</p></item>
+</steps>
+
+<p>After the keys are generated, you can view your key information by entering <code>gpg --list-keys</code>. You should see something similar to this: <code> /home/you/.gnupg/pubring.gpg ---------------------------- pub 1024D/32j38dk2 2001-06-20 you <you example com> sub 1024g/289sklj3 2011-06-20 [expires: 2012-11-14]</code></p>
+<p>GPG creates one list, or keyring, for your public keys and one for your private keys. All the public keys you know are stored in the file <file>~/.gnupg/pubring.gpg</file>. If you want to give other people your key, send them that file.</p>
+<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>
+</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>
+<p>If you don't have a key to unlock or encrypt a message, you can set your encryption tool to look it up automatically. If it cannot find the key, an error message appears.</p>
+
+</page>
diff --git a/help/C/mail-encryption-gpg-decrypting.page b/help/C/mail-encryption-gpg-decrypting.page
new file mode 100644
index 0000000..f5649e6
--- /dev/null
+++ b/help/C/mail-encryption-gpg-decrypting.page
@@ -0,0 +1,36 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-encryption-gpg-decrypting">
+
+ <info>
+ <desc>Decrypting and checking the signature of received GPG messages.</desc>
+
+ <link type="guide" xref="mail-encryption#gpg"/>
+
+ <revision pkgversion="2.32.1" version="0.1" date="2011-01-05" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/encryption.html.en#unencrypting -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <title>Receiving messages encrypted or signed via GPG</title>
+
+<section id="decryption">
+<title>Decrypting a received message</title>
+<p>If you receive an encrypted message, you need to decrypt it before you can read it.</p>
+<p>When you view the message, Evolution prompts you for your PGP password. Enter it, and the unencrypted message is displayed.</p>
+<note style="tip"><p>Senders must have your GPG public key before they can send you an encrypted message.</p></note>
+</section>
+
+<section id="signature">
+<title>Checking the signature of a received message</title>
+<p>To check the sender's signature of a received message, scroll down to the bottom of the message and click the logo. Evolution will display <gui>Security Information</gui> for the message.</p>
+</section>
+</page>
diff --git a/help/C/mail-encryption-gpg-getting-keys.page b/help/C/mail-encryption-gpg-getting-keys.page
new file mode 100644
index 0000000..9613fca
--- /dev/null
+++ b/help/C/mail-encryption-gpg-getting-keys.page
@@ -0,0 +1,31 @@
+ <page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-encryption-gpg-getting-keys">
+
+ <info>
+ <desc>Getting and Using GPG Public Keys.</desc>
+
+ <link type="guide" xref="mail-encryption#gpg"/>
+
+ <revision pkgversion="2.32.1" version="0.2" date="2011-07-27" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/encryption.html.en#encrypt-getting-key -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </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. -->
+
+<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>
+
+<p>To get public keys from a public key server, enter the command <code>gpg --recv-keys --keyserver wwwkeys.pgp.net keyid</code>, substituting <code>keyid</code> by your recipient's ID. You need to enter your password, and the ID is automatically added to your keyring.</p>
+
+<p>If someone sends you a public key directly, save it as a plain text file and enter the command <code>gpg --import</code> to add it to your keyring.</p>
+</page>
diff --git a/help/C/mail-encryption-gpg-set-up.page b/help/C/mail-encryption-gpg-set-up.page
new file mode 100644
index 0000000..d1bc94b
--- /dev/null
+++ b/help/C/mail-encryption-gpg-set-up.page
@@ -0,0 +1,39 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-encryption-gpg-set-up">
+
+ <info>
+ <desc>Setting up GPG for your mail account to sign and/or encrypt and decrypt messages.</desc>
+
+ <link type="guide" xref="mail-encryption#gpg"/>
+
+ <revision pkgversion="2.32.1" version="0.2" date="2011-07-27" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/encryption.html.en#encrypt-evo-integ -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </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. -->
+
+<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>
+
+<steps>
+<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>
+<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><p>Click <gui style="button">OK</gui>.</p></item>
+<item><p>Click <gui style="button">Close</gui>.</p></item>
+</steps>
+<p>Evolution requires that you know your key ID. If you do not remember it, you can find it by typing <code>gpg --list-keys</code> in a terminal window. Your key ID is an eight-character string with random numbers and letters.</p>
+
+</page>
diff --git a/help/C/mail-encryption-gpg-signing-encrypting.page b/help/C/mail-encryption-gpg-signing-encrypting.page
new file mode 100644
index 0000000..1df6896
--- /dev/null
+++ b/help/C/mail-encryption-gpg-signing-encrypting.page
@@ -0,0 +1,39 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-encryption-gpg-signing-encrypting">
+
+ <info>
+ <desc>Signing or encrypting messages via GPG that you send.</desc>
+
+ <link type="guide" xref="mail-encryption#gpg"/>
+
+ <revision pkgversion="2.32.1" version="0.2" date="2011-07-27" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/encryption.html.en#bspya9p -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <title>Signing or encrypting messages</title>
+
+<p>After you have <link xref="mail-encryption-gpg-set-up">set up your GPG key</link>, you can sign or encrypt a message by clicking <guiseq><gui>Options</gui><gui>PGP Sign</gui></guiseq> or <gui>PGP Encrypt</gui> from the message composer menu.</p>
+<note style="tip"><p>The Subject line of the message will not be encrypted and should not be used for sensitive information.</p></note>
+
+<p>To have every message signed or encrypted:</p>
+<steps>
+<item><p>Select <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui></guiseq>.</p></item>
+<item><p>Select the mail account to encrypt the messages in.</p></item>
+<item><p>Click <gui style="button">Edit</gui>.</p></item>
+<item><p>Click <gui>Security</gui>.</p></item>
+<item><p>Select <gui>Always sign outgoing messages when using this account</gui>.</p></item>
+<item><p>Click <gui style="button">OK</gui>.</p></item>
+<item><p>Click <gui style="button">Close</gui>.</p></item>
+</steps>
+
+</page>
diff --git a/help/C/mail-encryption-s-mime-manage.page b/help/C/mail-encryption-s-mime-manage.page
new file mode 100644
index 0000000..f146fb7
--- /dev/null
+++ b/help/C/mail-encryption-s-mime-manage.page
@@ -0,0 +1,30 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-encryption-s-mime-manage">
+
+ <info>
+ <desc>Adding, editing, viewing and deleting S/MIME certificates.</desc>
+
+ <link type="guide" xref="mail-encryption#s-mime"/>
+
+ <revision pkgversion="2.32.1" version="0.1" date="2011-01-05" status="draft"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/bshoty0.html.en -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <title>Managing S/MIME certificates</title>
+
+<p>Certificates allow you to communicate with others securely over an encrypted connection, or sign a message confirming your identity to the contact. These settings only apply to S/MIME encryption.</p>
+<p>You can import, view, edit (except for your own certificates), and delete your certificates under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Certificates</gui></guiseq>.</p>
+<p><gui>Your Certificates</gui> displays a list of certificates that you own. To add a signing certificate, click <gui style="button">Import</gui>, select the file to import, then click <gui style="button">Open</gui> and enter a password.</p>
+<p><gui>Contact Certificates</gui> displays a list of certificates that you have for contacts. These certificates allow you to decrypt messages as well verify signed messages.</p>
+<p><gui>Authorities</gui> displays a list of trusted certificate authorities who verify that your own certificate is valid.</p>
+</page>
diff --git a/help/C/mail-encryption-s-mime-signing-encrypting.page b/help/C/mail-encryption-s-mime-signing-encrypting.page
new file mode 100644
index 0000000..a976bb8
--- /dev/null
+++ b/help/C/mail-encryption-s-mime-signing-encrypting.page
@@ -0,0 +1,37 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-encryption-s-mime-signing-encrypting">
+
+ <info>
+ <desc>Signing or encrypting messages via S/MIME that you send.</desc>
+
+ <link type="guide" xref="mail-encryption#s-mime"/>
+
+ <revision pkgversion="2.32.1" version="0.1" date="2011-01-05" status="draft"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/encryption.html.en#bsqbdkv -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <title>Signing or encrypting messages</title>
+
+<p>After you have <link xref="mail-encryption-s-mime-manage">added your certificate</link>, you can sign or encrypt a message by clicking <guiseq><gui>Options</gui><gui>S/MIME Sign</gui></guiseq> or <gui>S/MIME Encrypt</gui> from the message composer menu.</p>
+<p>To have every message signed or encrypted:</p>
+<steps>
+<item><p>Select <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui></guiseq>.</p></item>
+<item><p>Select the mail account to encrypt the messages in.</p></item>
+<item><p>Click <gui style="button">Edit</gui>.</p></item>
+<item><p>Click <gui>Security</gui>.</p></item>
+<item><p>In the <gui>Secure MIME (S/MIME)</gui> section, click <gui style="button">Select</gui> next to <gui>Signing Certificate</gui> and specify the path to your signing certificate, or click <gui style="button">Select</gui> next to <gui>Encryption Certificate</gui> and specify the path to your encryption certificate.</p></item>
+<item><p>Select the appropriate options.</p></item>
+<item><p>Click <gui style="button">OK</gui>.</p></item>
+</steps>
+<note style="tip"><p>The Subject line of the message will not be encrypted and should not be used for sensitive information.</p></note>
+</page>
diff --git a/help/C/mail-encryption.page b/help/C/mail-encryption.page
new file mode 100644
index 0000000..65d8b33
--- /dev/null
+++ b/help/C/mail-encryption.page
@@ -0,0 +1,45 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="mail-encryption">
+
+ <info>
+ <desc>Sending and receiving encrypted mail.</desc>
+
+ <link type="guide" xref="index#mail-advanced"/>
+ <link type="guide" xref="mail-account-manage-imap#security"/>
+ <link type="guide" xref="mail-account-manage-imap-plus#security"/>
+ <link type="guide" xref="mail-account-manage-local-delivery#security"/>
+ <link type="guide" xref="mail-account-manage-maildir-format-directories#security"/>
+ <link type="guide" xref="mail-account-manage-mh-format-directories#security"/>
+ <link type="guide" xref="mail-account-manage-microsoft-exchange#security"/>
+ <link type="guide" xref="mail-account-manage-novell-groupwise#security"/>
+ <link type="guide" xref="mail-account-manage-pop#security"/>
+ <link type="guide" xref="mail-account-manage-unix-mbox-spool-directory#security"/>
+ <link type="guide" xref="mail-account-manage-unix-mbox-spool-file#security"/>
+ <link type="guide" xref="mail-account-manage-usenet-news#security"/>
+ <link type="guide" xref="mail-account-manage-microsoft-exchange-evo-mapi#security"/>
+ <link type="guide" xref="mail-account-manage-microsoft-exchange-evo-exchange#security"/>
+
+ <revision pkgversion="2.32.1" version="0.3" date="2011-01-06" status="candidate"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <title>Mail encryption and certificates</title>
+
+<p>Evolution offers GPG Encryption and S/MIME Encryption for signing and encrypting email messages. S/MIME is used most often in corporate environments.</p>
+
+ <section id="gpg" style="2column">
+ <title>GPG</title>
+ </section>
+
+ <section id="s-mime" style="2column">
+ <title>S/MIME</title>
+ </section>
+
+</page>
diff --git a/help/C/mail-error-failed-to-append-to-sent-folder.page b/help/C/mail-error-failed-to-append-to-sent-folder.page
new file mode 100644
index 0000000..7cc5923
--- /dev/null
+++ b/help/C/mail-error-failed-to-append-to-sent-folder.page
@@ -0,0 +1,32 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-error-failed-to-append-to-sent-folder">
+
+ <info>
+ <desc>What to do when this error is shown.</desc>
+
+ <link type="guide" xref="index#common-mail-problems" />
+
+ <revision pkgversion="3.0.2" version="0.1" date="2011-07-21" status="final"/>
+ <credit type="author">
+ <name>April Gonzales</name>
+ <email>loonycookie gmail com</email>
+ </credit>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Error message "Failed to append to..." after sending message</title>
+
+<p>If the error message "Your message was sent, but an error occurred during post-processing. The reported error was "Failed to append to mbox:///home/user/.local/share/evolution/mail/local#Sent: Cannot get folder 'Sent': folder does not exist. Appending to local 'Sent' folder instead."." is shown, you can fix the problem by editing your default folder settings under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Defaults</gui><gui>Folder for sent messages</gui></guiseq>.</p>
+<p>This bug is fixed in Evolution versions higher than 3.0.2 (stable series) and 3.1.3 (unstable development series). If this is not the case, please add a comment to the corresponding <link href="https://bugzilla.gnome.org/show_bug.cgi?id=638307";>bug report</link>.</p>
+
+
+
+</page>
+
diff --git a/help/C/mail-error-folder-mismatch.page b/help/C/mail-error-folder-mismatch.page
new file mode 100644
index 0000000..8154e4b
--- /dev/null
+++ b/help/C/mail-error-folder-mismatch.page
@@ -0,0 +1,52 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-error-folder-mismatch">
+
+ <info>
+ <desc>What to do when this error is shown.</desc>
+
+ <link type="guide" xref="index#common-mail-problems" />
+
+ <revision pkgversion="3.1.5" version="0.4" date="2011-07-28" status="final"/>
+ <credit type="author">
+ <name>April Gonzales</name>
+ <email>loonycookie gmail com</email>
+ </credit>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Error message "Summary and folder mismatch" after synchronizing folders</title>
+
+<p>If the error message: <gui>Error while Expunging folder. Error storing `~/.local/share/evolution/mail/local/Inbox (mbox)': Summary and folder mismatch, even after a sync.</gui> pops up, perform the following steps:</p>
+
+<note><p>These steps apply to the versions 3.0 and 3.2. Note that Evolution's file locations in 2.30 and 2.32 are different (<file>~/.evolution/mail/local/</file> instead of <file>~/.local/share/evolution/mail/local/</file>).</p></note>
+
+<list>
+<item><p>Open the Terminal application (category <gui>System Tools</gui>) and type in the command <code>evolution --force-shutdown</code>. This command stops Evolution and all the processes related to it.</p></item>
+<item><p>Remove the files ending in:</p>
+ <list>
+ <item><p><file>.ev-summary</file></p></item>
+ <item><p><file>.ibex.index</file></p></item>
+ </list>
+ <p>To do this, navigate to the hidden directory <file>~/.local/share/evolution/mail/local/</file> and locate the specified files. You can do this in the GNOME File Manager (Nautilus) by either showing hidden files, or by entering the directory via <guiseq><gui>Go</gui><gui>Location...</gui></guiseq> from the menu bar.</p>
+</item>
+
+<item><p>Restart Evolution. Note that restarting the application may take some time since it will need to rebuild the indexes deleted in the previous step.</p></item>
+</list>
+
+<note>
+<p>You may lose your mail labels when performing this operation.</p>
+</note>
+
+<note>
+<p>This problem is expected to be fixed in version 3.0 according to the corresponding <link href="https://bugzilla.gnome.org/show_bug.cgi?id=550414";>bug report</link>. Please add a comment if this is not the case.</p> <!-- TODO:POST-3-2: Remove from docs once really fixed -->
+</note>
+
+</page>
+
diff --git a/help/C/mail-error-no-provider-available.page b/help/C/mail-error-no-provider-available.page
new file mode 100644
index 0000000..308a5ff
--- /dev/null
+++ b/help/C/mail-error-no-provider-available.page
@@ -0,0 +1,49 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-error-no-provider-available">
+
+ <info>
+ <desc>What to do when this error is shown.</desc>
+
+ <link type="guide" xref="index#common-mail-problems" />
+
+ <revision pkgversion="2.28.3" version="0.2" date="2010-12-08" status="review"/>
+ <credit type="author">
+ <name>April Gonzales</name>
+ <email>loonycookie gmail com</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Error message "No provider available for protocol email"</title>
+
+<p>This error message may be displayed for a number of reasons:</p>
+<list>
+
+<item>
+<p>The filters used do not match the account they are associated with.</p>
+<p>This happens when the <file>filters.xml</file> file is copied and used on a fresh install of Evolution on a new machine.</p>
+<p>Accounts have unique ID numbers, and filters refer to these accounts directly. Simply copying the <file>filters.xml</file> file will cause a version mismatch with Evolution, affecting the filter rules.</p>
+
+</item>
+<item><p>The account settings may not have been copied properly.</p></item>
+<item><p>The account settings were modified.</p></item>
+</list>
+
+<p>To fix this problem, edit the email filters and re-select the folder for each Copy/Move filter. To do this:</p>
+<steps>
+<item><p>Go to <guiseq><gui>Edit</gui><gui>Message Filters</gui></guiseq>.</p></item>
+<item><p>Select the Copy/Move filter and click <gui>Edit</gui>.</p></item>
+<item><p>Refer to the list of folders associated with that particular filter. Click on the button that allows you to modify the folders assigned for that filter. Set the folders again. </p></item>
+</steps>
+
+<note>
+<p>Advanced users may also be interested in this write up: <link href="https://thomas.apestaart.org/thomas/trac/wiki/Evolution";>How to keep the Evolution filters in sync on multiple machines by Thomas Vander Stichele </link>
+</p>
+</note>
+
+<!-- The guide referenced above might make a useful addition to the docs. We should consider asking Thomas for permission to include it, if it seems suitable. -->
+
+</page>
diff --git a/help/C/mail-filters-actions.page b/help/C/mail-filters-actions.page
new file mode 100644
index 0000000..2c8fccd
--- /dev/null
+++ b/help/C/mail-filters-actions.page
@@ -0,0 +1,72 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-filters-actions">
+
+ <info>
+ <desc>Available actions for setting up filtering.</desc>
+
+ <link type="seealso" xref="mail-filters"/>
+
+ <revision pkgversion="3.0.2" version="0.1" date="2011-08-01" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-organize-filters.html.en#usage-mail-org-filters-new -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <title>Available Filter conditions</title>
+
+<list>
+<item><p>Move to Folder:</p>
+<p>Moves the message into a folder you specify.</p></item>
+
+<item><p>Copy to Folder:</p>
+<p>Puts a copy of the message into a folder you specify.</p></item>
+
+<item><p>Delete:</p>
+<p>Marks the message for deletion. The message can be undeleted until you expunge or empty the trash.</p></item>
+
+<item><p>Stop Processing:</p>
+<p>Select this if you want to all other filters ignore this message. Note that only filters listed after this particular rule will be ignored.</p></item>
+
+<item><p>Set Label:</p>
+<p>Adds a label to a message.</p></item>
+
+<item><p>Assign Color:</p>
+<p>Marks the message with a color of your choice.</p></item>
+
+<item><p>Assign Score:</p>
+<p>Assigns the message a numeric score.</p></item>
+
+<item><p>Adjust Score:</p>
+<p>Changes the numeric score by the amount you set.</p></item>
+
+<item><p>Set Status:</p>
+<p>Sets the status of the message. The status can be Replied To, Draft, Important, Read, or Junk.</p></item>
+
+<item><p>Unset Status:</p>
+<p>If the message has a status value, unsets it. If a status value is not set, it does nothing.</p></item>
+
+<item><p>Beep:</p>
+<p>Makes the system beep.</p></item>
+
+<item><p>Play Sound:</p>
+<p>Select a sound file for Evolution to play.</p></item>
+
+<item><p>Run Program:</p>
+<p>Evolution runs an application.</p></item>
+
+<item><p>Pipe to Program:</p>
+<p>Sends the message to a program of your choice. No return value is expected. This feature can be used to create automatic Web postings from email messages or to perform additional message post processing not supported by Evolution.</p></item>
+
+<item><p>Forward to:</p>
+<p>Forwards the message to another email address.</p></item>
+
+</list>
+</page>
diff --git a/help/C/mail-filters-conditions.page b/help/C/mail-filters-conditions.page
new file mode 100644
index 0000000..f068d32
--- /dev/null
+++ b/help/C/mail-filters-conditions.page
@@ -0,0 +1,97 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-filters-conditions">
+
+ <info>
+ <desc>Available conditions for setting up filtering.</desc>
+
+ <link type="seealso" xref="mail-filters"/>
+
+ <revision pkgversion="3.0.2" version="0.1" date="2011-08-01" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-organize-filters.html.en#usage-mail-org-filters-new -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <title>Available Filter conditions</title>
+
+<list>
+<item><p>Sender:</p>
+<p>The sender's email address or the name of the sender.</p></item>
+
+<item><p>Recipients:</p>
+<p>The recipients of the message.</p></item>
+
+<item><p>CC:</p>
+<p>Only the CC recipients of the message.</p></item>
+
+<item><p>BCC:</p>
+<p>Only the BCC recipients of the message. Obviously this can only be applied to outgoing filters.</p></item>
+
+<item><p>Sender or Recipients:</p>
+<p>The sender's email address or the name of the sender or the recipients of the message.</p></item>
+
+<item><p>Subject:</p>
+<p>The subject line of the message.</p></item>
+
+<item><p>Specific Header:</p>
+<p>Any header including <link xref="mail-composer-custom-header-lines">custom ones</link>.</p>
+<p>If a message uses a header more than once, Evolution pays attention only to the first instance, even if the message defines the header differently the second time. For example, if a message declares the Resent-From: header as "engineering example com" and then restates it as "marketing example com", Evolution filters as though the second declaration did not occur. To filter on messages that use headers multiple times, use a regular expression.</p></item>
+
+<item><p>Message Body:</p>
+<p>Searches in the actual text of the message.</p></item>
+
+<item><p>Expression:</p>
+<p>(For programmers only) Match a message according to an expression you write in the Scheme language used to define <link xref="mail-filters">filters</link> in Evolution.</p></item>
+
+<item><p>Date sent:</p>
+<p>Filters messages according to the date on which they were sent. First, choose the conditions you want a message to meet, such as before a given time or after a given time. Then choose the time. The filter compares the message's time stamp to the system clock when the filter is run, or to a specific time and date you choose from a calendar. You can also have it look for a message within a range of time relative to the filter, such as two to four days ago.</p></item>
+
+<item><p>Date received:</p>
+<p>This works the same way as the Date Sent option, except that it compares the time you received the message with the dates you specify.</p></item>
+
+<item><p>Label:</p>
+<p>Messages can have <link xref="mail-labels">labels</link> of Important, Work, Personal, To Do, or Later. You can set labels with other filters or manually.</p></item>
+
+<item><p>Score:</p>
+<p>Sets the message score to any whole number greater than 0. You can have one filter set or change a message score, and then set up another filter to move the messages you have scored. A message score is not based on anything in particular: it is simply a number you can assign to messages so other filters can process them.</p></item>
+
+<item><p>Size (kB):</p>
+<p>Sorts based on the size of the message in kilobytes.</p></item>
+
+<item><p>Status:</p>
+<p>Filters according to the status of a message. The status can be Replied To, Draft, Important, Read, or Junk.</p></item>
+
+<item><p>Follow Up:</p>
+<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>
+
+<item><p>Attachments:</p>
+<p>Checks whether there is an attachment for the email.</p></item>
+
+<item><p>Mailing List</p>
+<p>Filters based on the mailing list the message came from. This filter might miss messages from some list servers, because it checks for the X-BeenThere header, which is used to identify mailing lists or other redistributors of mail. Mail from list servers that do not set X-BeenThere properly are not be caught by these filters.</p></item>
+
+<item><p>Regex Match:</p>
+<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 grep command.</p></item>
+
+<item><p>Source Account:</p>
+<p>Filters messages according the server you got them from. This is most useful if you use multiple POP mail accounts.</p></item>
+
+<item><p>Pipe to Program:</p>
+<p>Evolution can use an external command to process a message, then process it based on the return value. Commands used in this way must return an integer. This is most commonly used to add an external junk mail filter.</p></item>
+
+<item><p>Junk Test:</p>
+<p>Filters based on the results of the <link xref="mail-spam">junk mail</link> test.</p></item>
+
+<item><p>Match All:</p></item>
+</list>
+</page>
diff --git a/help/C/mail-filters-not-working.page b/help/C/mail-filters-not-working.page
new file mode 100644
index 0000000..111cf46
--- /dev/null
+++ b/help/C/mail-filters-not-working.page
@@ -0,0 +1,46 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-filters-not-working">
+
+ <info>
+ <desc>Fix problems with mail filters that do not sort and organize mail as expected.</desc>
+
+ <link type="guide" xref="index#common-mail-problems" />
+ <link type="seealso" xref="mail-filters" />
+
+ <revision pkgversion="2.28.3" version="0.1" date="2011-07-21" status="draft"/>
+ <credit type="author">
+ <name>April Gonzales</name>
+ <email>loonycookie gmail com</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Mail filters are not working</title>
+<p>Your mail filters are probably working, however, they could be ordered in an inefficient way. This will make your filters run slowly, so it may seem like they are not working.</p>
+
+<p>The order of email filters is very important. If your first filter has a <gui>Stop Processing</gui> rule, then all the email messages that match this filter will ignore all the succeeding filters. </p>
+
+<p>To check if a filter has a <gui>Stop Processing</gui> rule:</p>
+
+<steps>
+<item><p>Go to <guiseq><gui>Edit</gui><gui>Message Filters</gui></guiseq>.</p></item>
+<item><p>Select the filter and refer to the list of actions for that particular filter. </p></item>
+<item><p>The <gui>Stop Processing</gui> rule should be listed under the list of <gui>Actions</gui> if it is enabled. </p></item>
+</steps>
+
+
+<p>Another thing you have to keep in mind is that filters depend on the "new" flag that is set 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>
+
+<note>
+<p>Applying the <gui>Stop Processing</gui> rule to an email message will cause all succeeding filters to ignore that message.</p>
+
+<!--<item><p>TODO: "flag" is a technical term, and might need explanation. A link to a glossary item, or a "what is a flag?" topic would suffice, like for example: For more information on flags, please see <link href="link to guide">this page</link></p></item> -->
+</note>
+
+</page>
+
+
+
diff --git a/help/C/mail-filters.page b/help/C/mail-filters.page
new file mode 100644
index 0000000..04857d4
--- /dev/null
+++ b/help/C/mail-filters.page
@@ -0,0 +1,73 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-filters">
+
+ <info>
+ <desc>Use filter rules to sort your mail automatically into folders.</desc>
+
+ <link type="guide" xref="mail-organizing"/>
+
+ <revision pkgversion="3.0.2" version="0.4" date="2011-07-30" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-organize-filters.html.en -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <title>Using Filters</title>
+
+<p>Message filters apply actions on messages based on conditions that you have defined. You can define filters for both incoming and outgoing emails.</p>
+
+<p>Filters will be automatically applied to incoming messages for local accounts (such as POP). Mail serves for remote accounts (such as IMAP) often already filter mail directly on the server as this is faster. If you want to apply your Evolution filters to remote accounts, you can enable this under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui>Edit</gui><gui>Receiving Options</gui><gui>Options</gui><gui>Apply filters to new messages in Inbox on this server</gui></guiseq>.</p>
+
+<p>To manually apply filters on messages in a folder, select the messages and click <guiseq><gui>Message</gui><gui>Apply Filters</gui></guiseq> or press <keyseq><key>Ctrl</key><key>Y</key></keyseq>.</p>
+<p>You can select all messages in a folder by clicking <guiseq><gui>Edit</gui><gui>Select All</gui></guiseq> or pressing <keyseq><key>Ctrl</key><key>A</key></keyseq>.</p>
+
+<section id="adding">
+<title>Creating a Filter</title>
+
+<steps>
+<item><p>Click <guiseq><gui>Edit</gui><gui>Message Filters</gui></guiseq>, or click <guiseq><gui>Message</gui><gui>Create Rule</gui></guiseq> and select the criterion the filter will be based on.</p></item>
+<item><p>Click <gui style="button">Add</gui>.</p></item>
+<item><p>Enter a name in the <gui>Rule name</gui> field.</p></item>
+<item><p>Define the conditions for the rule. For each condition, you first select which part of the message will be checked and then define the comparison.</p><p>For more information on the available conditions see <link xref="mail-filters-conditions">Available Filter conditions</link>.</p></item>
+<item><p>If you want to define multiple conditions, define under <gui>Find items</gui> if any or if all conditions have to apply, and click <gui style="button">Add Condition</gui> and repeat the previous step.</p></item>
+<item><p>Select the Actions for the Filter in the <gui>Then</gui> section.</p><p>For more information on the available actions see <link xref="mail-filters-actions">Available Filter actions</link>.</p></item>
+<item><p>If you want to define multiple actions, click <gui style="button">Add Action</gui> and repeat the previous step. For example, if you want no other existing filters to be applied choose <gui>Stop Processing</gui> as the second action in the list.</p></item>
+<item><p>Click <gui style="button">OK</gui>.</p></item>
+</steps>
+
+</section>
+
+<section id="editing">
+<title>Editing Filters</title>
+<steps>
+<item><p>Click <guiseq><gui>Edit</gui><gui>Message Filters</gui></guiseq>.</p></item>
+<item><p>Select the filter.</p></item>
+<item><p>Click <gui style="button">Edit</gui>.</p></item>
+<item><p>Make the desired corrections, then click <gui style="button">OK</gui> twice.</p></item>
+</steps>
+</section>
+
+<section id="deleting">
+<title>Deleting Filters</title>
+<steps>
+<item><p>Click <guiseq><gui>Edit</gui><gui>Message Filters</gui></guiseq>.</p></item>
+<item><p>Select the filter.</p></item>
+<item><p>Click <gui style="button">Remove</gui>.</p></item>
+<item><p>Click <gui style="button">OK</gui>.</p></item>
+</steps>
+</section>
+
+
+
+
+<p></p>
+
+</page>
diff --git a/help/C/mail-folders.page b/help/C/mail-folders.page
new file mode 100644
index 0000000..2c9f162
--- /dev/null
+++ b/help/C/mail-folders.page
@@ -0,0 +1,67 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-folders">
+
+ <info>
+ <desc>Use folders to organize your mail.</desc>
+
+ <link type="guide" xref="mail-organizing"/>
+ <link type="seealso" xref="mail-filters"/>
+
+ <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>April Gonzales</name>
+ <email>loonycookie gmail com</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-organize-folders.html.en -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <title>Using Folders</title>
+
+<p>Evolution, like most mail systems, uses folders to store email messages. You start out with a few mail folders such as the Inbox, Outbox, and Drafts. You can, however, create more folders if required.</p>
+
+<section id="create-folder">
+<title>Creating A Folder</title>
+<p>To create a folder:</p>
+<steps>
+<item><p>Click on <gui>Folder</gui> and select <gui>New</gui>. You can also right-click anywhere on the folder list and select the <gui>New Folder</gui> option.</p></item>
+<item><p>Specify the name and the location of the folder.</p></item>
+<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>
+</section>
+
+<section id="use-folder">
+<title>Moving Messages to New Folders</title>
+<p>You can move messages into folders by using one of the following methods:</p>
+<list>
+<item><p>Drag and drop the messages into the folder.</p></item>
+<item><p>Right-click on the message and select the <gui>Move to Folder</gui> option.</p></item>
+<item><p>Select a message and press <keyseq><key>Shift</key><key>Ctrl</key><key>V</key></keyseq>.</p></item>
+<item><p>Select a message and click on <guiseq><gui>Message</gui><gui>Move to Folder</gui></guiseq>.</p></item>
+</list>
+
+<p>The steps for copying are similar.</p>
+
+<note><p>Moving files can be done automatically by setting up <link xref="mail-filters">filters</link>.</p></note>
+
+</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-follow-up-flag.page b/help/C/mail-follow-up-flag.page
new file mode 100644
index 0000000..b6d489d
--- /dev/null
+++ b/help/C/mail-follow-up-flag.page
@@ -0,0 +1,45 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-follow-up-flag">
+
+ <info>
+ <desc>Using flags to remind you of actions.</desc>
+
+ <link type="guide" xref="mail-organizing#advanced"/>
+
+ <revision pkgversion="3.0.2" version="0.1" date="2011-08-01" status="candidate"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/stable/usage-mail-organize-columns.html.en#usage-mail-organize-columns-followup -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Follow up flags for emails</title>
+
+<p>To make sure you do not forget about a message, you can use the follow-up feature.</p>
+<steps>
+<item><p>Select one or more messages.</p></item>
+<item><p>Right-click one of the messages.</p></item>
+<item><p>Click <gui>Mark for Follow Up...</gui></p></item>
+</steps>
+<p>You can also do this by selecting the message(s) and clicking <guiseq><gui>Message</gui><gui>Mark as</gui><gui>Follow Up...</gui></guiseq> or by pressing <keyseq><key>Shift</key><key>Ctrl</key><key>G</key></keyseq>.</p>
+
+<p>A window opens to allow you to set the type of flag and the due date.</p>
+
+<p>The flag itself is the action you want to remind yourself about, such as Call, Forward and Reply.</p>
+
+<p>After you have added a flag, you can mark it as complete or remove it entirely by right-clicking the message and clicking either <gui>Flag Completed</gui> or <gui>Clear Flag</gui>.</p>
+
+<p>When you read a flagged message, its flag status is displayed at the top, before the message headers. An overdue message might tell you "Overdue: Call by April 07, 2012, 5:00 PM."</p>
+
+<p>Flags can help you organize your work in a number of ways. For example, you might <link xref="mail-change-columns-in-message-list">add a Flag Status column</link> to your message list and sort that way. Alternately, you could create a <link xref="mail-search-folders">search folder</link> that displays all your flagged messages, then clear the flags when you're done, so the search folder contains only messages with upcoming deadlines.</p>
+
+<note><p>If you prefer a simpler way to remind yourself about messages, you can mark them as important by right-clicking the message, then click <gui>Mark as Important</gui>, or by selecting <guiseq><gui>Message</gui><gui>Mark as</gui><gui>Important</gui></guiseq> from the menubar.</p></note>
+
+</page>
diff --git a/help/C/mail-imap-headers.page b/help/C/mail-imap-headers.page
new file mode 100644
index 0000000..fd6316b
--- /dev/null
+++ b/help/C/mail-imap-headers.page
@@ -0,0 +1,47 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-imap-headers">
+
+ <info>
+ <desc>Define which mail headers to download when using IMAP.</desc>
+
+ <link type="guide" xref="index#mail-advanced-imap" />
+ <link type="guide" xref="mail-account-manage-imap#imap-headers"/>
+
+ <revision pkgversion="3.1.5" version="0.3" date="2011-07-29" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/b15fx7uz.html.en -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+
+<title>IMAP Headers</title>
+
+<note><p>The <gui>IMAP Headers</gui> tab is only displayed in the <gui>Account Editor</gui> if <guiseq><gui>Edit</gui><gui>Plugins</gui><gui>IMAP Features</gui></guiseq> is enabled.</p></note>
+
+<p>Evolution allows you for IMAP accounts to choose the headers that you want to download so that you can reduce the download time and filter or move your mail around the way you like it. The IMAP Mail header options are as follows:</p>
+<list>
+<item><p>Fetch All Headers:</p><p>All available IMAP mail headers for all the messages will be downloaded.</p></item>
+<item><p>Basic Headers (Fastest):</p><p>This will include Date, From, To, CC, Subject, Preferences, In-Reply-To, Message-ID, Mime-Version, and Content-Type. If you want to just fetch and see messages without having to categorically filter messages based on your mailing lists, choose this option. This will make Evolution work faster and is generally recommended for common users.</p></item>
+<item><p>Basic and Mailing List Headers (Default):</p><p>Enable this option to have filters based on mailing list headers (like list ID) so that in addition to the basic headers, the headers that correspond to mailing-lists are also fetched. Mailing list headers will have the informations such as the mailinglist-ID, owner of the mailing list, and so on with which you can create mailing list filters.</p><p>This is the default Header preference that comes with Evolution. When this option is chosen, Evolution will download a basic set of headers (as described above) along with a set of headers that are needed for client-side filters based on mailing lists. If you do not have any filters on Evolution, it is recommended to switch to the <gui>Basic Headers</gui> option.</p></item>
+</list>
+
+<p>To set the IMAP Mail headers:</p>
+<steps>
+<item><p>Select <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui></guiseq>.</p></item>
+<item><p>Select the IMAP account.</p></item>
+<item><p>Click <gui>Edit</gui>.</p></item>
+<item><p>Click the <gui>IMAP Headers</gui> tab.</p></item>
+<item><p>Optionally: If you want to define extra headers to download you can add these in the <gui>Custom Headers</gui> section.</p></item>
+</steps>
+
+<note><p>The option to define IMAP Headers is currently only available for IMAP accounts, but not for IMAP+ accounts.</p></note><!-- TODO:DEVELOPERS: Recheck this once https://bugzilla.gnome.org/show_bug.cgi?id=655519 has been fixed -->
+</page>
+
diff --git a/help/C/mail-imap-subscriptions.page b/help/C/mail-imap-subscriptions.page
new file mode 100644
index 0000000..711922f
--- /dev/null
+++ b/help/C/mail-imap-subscriptions.page
@@ -0,0 +1,38 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-imap-subscriptions">
+
+ <info>
+ <desc>IMAP folder subscriptions.</desc>
+
+ <link type="guide" xref="index#mail-advanced-imap" />
+ <link type="guide" xref="mail-account-manage-imap#other-settings"/>
+ <link type="guide" xref="mail-account-manage-imap-plus#other-settings"/>
+
+ <revision pkgversion="3.0.2" version="0.2" date="2011-07-29" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-subscriptions.html.en -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+
+<title>IMAP Subscriptions</title>
+
+<p>As opening many IMAP folders on the server takes time you can define which IMAP folders to check and display in Evolution, and which ones to ignore for the time being, via the <gui>IMAP Subscriptions Manager</gui>.</p>
+<steps>
+<item><p>Select <guiseq><gui>Folder</gui><gui>Subscriptions</gui></guiseq>.</p></item>
+<item><p>If you have accounts on multiple servers, select the server where you want to manage your subscriptions.</p></item>
+<item><p>Evolution displays a list of files and folders available on the IMAP server.</p></item>
+<item><p>Select a file or folder by clicking it.</p>
+<p>You should select at least the Inbox folder. Depending upon the way your IMAP server is configured, the list of available files might include non-mail folders. If it does, you can ignore them.</p></item>
+<item><p>Click a folder's checkbox to add a folder to your subscriptions.</p></item>
+</steps>
+
+</page>
diff --git a/help/C/mail-labels.page b/help/C/mail-labels.page
new file mode 100644
index 0000000..527da2a
--- /dev/null
+++ b/help/C/mail-labels.page
@@ -0,0 +1,38 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-labels">
+
+ <info>
+ <desc>Use labels to categorize your mail while keeping it in their folders.</desc>
+
+ <link type="guide" xref="mail-organizing#advanced"/>
+ <link type="seealso" xref="using-categories"/>
+
+ <revision pkgversion="3.0.2" version="0.3" date="2011-07-30" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <title>Using Labels</title>
+
+<p>You can add colored labels to emails in order to categorize them. This is similar to <link xref="using-categories">Categories</link> in the other Evolution windows.</p>
+
+<p>You can search for messages with specific labels by using the <link xref="mail-searching">quick search dropdown</link>. Also, <link xref="mail-search-folders">search folders</link> can be created based on labels.</p>
+
+<section id="add">
+<title>Adding a label to a message</title>
+<p>To assign a label to a message, right-click the message, click <gui>Label</gui>, and choose the label to apply.</p>
+<p>You can also quickly add a new label by choosing <gui>New Label</gui>.</p>
+</section>
+
+<section id="manage">
+<title>Managing labels</title>
+<p>You can add, edit and delete all labels under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>Labels</gui></guiseq>. Note that you cannot remove the default labels.</p>
+</section>
+
+</page>
diff --git a/help/C/mail-layout-changing.page b/help/C/mail-layout-changing.page
new file mode 100644
index 0000000..0a9e521
--- /dev/null
+++ b/help/C/mail-layout-changing.page
@@ -0,0 +1,22 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="mail-layout-changing">
+
+ <info>
+ <desc>Changing the display of the mail window (message list columns and widescreen).</desc>
+
+ <link type="guide" xref="index#mail-basic"/>
+
+ <revision pkgversion="3.0.0" version="0.1" date="2011-07-21" status="draft"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <title>Changing the mail window layout</title>
+
+</page>
diff --git a/help/C/mail-moving-emails.page b/help/C/mail-moving-emails.page
new file mode 100644
index 0000000..65e1691
--- /dev/null
+++ b/help/C/mail-moving-emails.page
@@ -0,0 +1,33 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-moving-emails">
+
+ <info>
+ <desc>Moving emails from one folder to another.</desc>
+
+ <link type="guide" xref="index#common-mail-problems" />
+
+ <revision pkgversion="2.28.3" version="0.2" date="2011-08-01" status="draft"/>
+ <credit type="author">
+ <name>April Gonzales</name>
+ <email>loonycookie gmail com</email>
+ </credit>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Moved emails are still shown in the original folder</title>
+
+<p>IMAP has no "move" feature. Evolution "moves" messages by copying and deleting emails. Deleting means "marking messages for deletion" so all the original messages are retained until you Expunge the emails marked for deletion.</p>
+
+<p>See the topic on <link xref="mail-delete-and-undelete">deleting emails</link> for instructions on how to expunge email messages. Note that this applies to other types of accounts as well.</p>
+
+</page>
+
+
+
diff --git a/help/C/mail-not-sent.page b/help/C/mail-not-sent.page
new file mode 100644
index 0000000..87979ef
--- /dev/null
+++ b/help/C/mail-not-sent.page
@@ -0,0 +1,35 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-not-sent">
+
+ <info>
+ <desc>Possible reasons why emails are not sent.</desc>
+
+ <link type="guide" xref="index#common-mail-problems" />
+
+ <revision pkgversion="2.28.3" version="0.1" date="2010-10-16" status="review"/>
+ <credit type="author">
+ <name>April Gonzales</name>
+ <email>loonycookie gmail com</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+</info>
+
+<title>Mail is not sent</title>
+
+<p>There can be several reasons why emails are not sent:</p>
+
+<list>
+<item><p>Invalid email address. Check if all the addresses listed as mail recipients are correct. If the message contains a wrong or invalid email address, the message will not be sent.</p></item>
+<item><p>Incorrect SMTP settings. Verify if the settings used for outgoing messages is correct. Using the incorrect server address or authentication method may prevent emails from being sent</p></item>
+<item><p>Offline status. Evolution may be offline. Check on the <gui style="button">Send and Receive</gui> button; if it is greyed out, then you are offline. To go online, go to <guiseq><gui>File</gui><gui>Work online</gui></guiseq>. You should now be able to use the <gui style="button">Send and Receive</gui> button.</p></item>
+</list>
+
+
+</page>
+
+
+
+
diff --git a/help/C/mail-organizing.page b/help/C/mail-organizing.page
new file mode 100644
index 0000000..46e4294
--- /dev/null
+++ b/help/C/mail-organizing.page
@@ -0,0 +1,28 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="mail-organizing">
+
+ <info>
+ <desc>On folders, sorting, searching, filters, search folders, and labels.</desc>
+
+ <link type="guide" xref="index#mail-basic" />
+ <link type="guide" xref="organizing" />
+
+ <revision pkgversion="2.32.1" version="0.1" date="2011-01-05" status="stub"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Sorting and organizing mail</title>
+
+ <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-read-receipts.page b/help/C/mail-read-receipts.page
new file mode 100644
index 0000000..e0cfaaa
--- /dev/null
+++ b/help/C/mail-read-receipts.page
@@ -0,0 +1,41 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-read-receipts">
+
+ <info>
+ <desc>How to enable requesting read receipts.</desc>
+
+ <link type="guide" xref="index#mail-advanced" />
+ <link type="guide" xref="mail-account-manage-imap#defaults"/>
+ <link type="guide" xref="mail-account-manage-imap-plus#defaults"/>
+ <link type="guide" xref="mail-account-manage-local-delivery#defaults"/>
+ <link type="guide" xref="mail-account-manage-maildir-format-directories#defaults"/>
+ <link type="guide" xref="mail-account-manage-mh-format-directories#defaults"/>
+ <link type="guide" xref="mail-account-manage-pop#defaults"/>
+ <link type="guide" xref="mail-account-manage-unix-mbox-spool-directory#defaults"/>
+ <link type="guide" xref="mail-account-manage-unix-mbox-spool-file#defaults"/>
+ <link type="guide" xref="mail-account-manage-usenet-news#defaults"/>
+
+ <revision pkgversion="2.32.1" version="0.2" date="2011-01-06" status="candidate"/>
+ <credit type="author">
+ <name>April Gonzales</name>
+ <email>loonycookie gmail com</email>
+ </credit>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Read receipts for emails</title>
+
+<p>Read receipts are a way for people to acknowledge that they have received your email. The recipient can normally choose whether to acknowledge the receipt or not, so they are not a completely reliable way of checking if your emails have been received by someone.</p>
+
+<p>You can request read receipts by enabling this option in the email composer's menu. To do so, go to <guiseq><gui>Options</gui><gui>Request Read Receipt</gui></guiseq>.</p>
+
+<p>For read receipts that you receive you can define Evolution's behavior by going to <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Defaults</gui><gui>Message Receipts</gui></guiseq>.</p>
+
+</page>
diff --git a/help/C/mail-reading-keyboard-shortcuts.page b/help/C/mail-reading-keyboard-shortcuts.page
new file mode 100644
index 0000000..a42710b
--- /dev/null
+++ b/help/C/mail-reading-keyboard-shortcuts.page
@@ -0,0 +1,62 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-reading-keyboard-shortcuts">
+
+ <info>
+ <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 ? -->
+
+ <revision pkgversion="3.1.5" version="0.2" date="2011-07-29" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-getnsend-read.html.en -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Using shortcut keys to read mail</title>
+
+<section id="view-email">
+<title>Viewing an email</title>
+<p>In the Mail window you read a message by selecting it in the message list. If you would like to see the message in its own window, either double-click it, press <key>Enter</key>, or press <keyseq><key>Ctrl</key><key>O</key></keyseq>.</p>
+</section>
+
+<section id="inside-message">
+<title>Navigating in a message</title>
+<p>To read mail with the keyboard, you can click the <key>Spacebar</key> to page down and press <key>Backspace</key> to page up while reading an email. Ensure that you use the keys when the message list is focused.</p>
+</section>
+
+<section id="inside-folder">
+<title>Navigating in a folder in the message list</title>
+<p>Navigate in the message list by using the arrow keys on the keyboard.</p>
+</section>
+
+<section id="inside-folder-unread">
+<title>Navigating in a folder's unread mail in the message list</title>
+<p>To go to the next or previous unread messages, press the period (<key>.</key>) or comma (<key>,</key>) keys. On some keyboards, these keys are also marked with the <key>></key> and <key><</key> symbols, which is a convenient way to remember that they move you forward and backward in your message list. You can also use the right square bracket (<key>]</key>) for the next unread message, and the left square bracket (<key>[</key>) for the previous unread message.</p>
+</section>
+
+<section id="unread-across-folders">
+<title>Navigating in unread mail across folders</title>
+
+<p>You can easily read the unread messages in all the mail folders by using the <key>Spacebar</key>.</p>
+
+<p>When you are in the Mail window, the Spacebar has the following behavior:</p>
+<list>
+<item><p>When you press the Spacebar for the first time, it takes you to the next unread message.</p></item>
+<item><p>If the message is more than one screen long, the Spacebar works as <key>Page Down</key>.</p></item>
+<item><p>If you press the Spacebar after you reach the bottom of the page, it takes you to the next unread message.</p></item>
+<item><p>If there are no more unread messages in the mailbox, pressing the Spacebar takes you to the next unread message in the next folder.</p></item>
+<item><p>If new messages arrive in a number of folders, the Spacebar toggles between those folders. This feature allows you to switch to the next unread message in a different folder without clicking the folder.</p></item>
+</list>
+</section>
+
+</page>
+
diff --git a/help/C/mail-received-notification.page b/help/C/mail-received-notification.page
new file mode 100644
index 0000000..10327b1
--- /dev/null
+++ b/help/C/mail-received-notification.page
@@ -0,0 +1,35 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-received-notification">
+
+ <info>
+ <desc>Options on notifications of newly received mail.</desc>
+
+ <link type="guide" xref="mail-send-and-receive" />
+
+ <revision pkgversion="3.0.2" version="0.2" date="2011-08-01" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Getting notified of new mail</title>
+
+<p>Evolution always notifies you of new messages by adding a yellow star to the mailer icon in the window <link xref="change-switcher-appearance.page">switcher</link>.</p>
+<media type="image" src="./figures/new-mail-switcher.png" width="256">
+ <p>Switcher layout when a new message has arrived</p>
+</media>
+
+<p>In order to get also notified of new messages in the GNOME Notification area at the bottom of the screen, make sure that <guiseq><gui>Edit</gui><gui>Plugins</gui><gui>Mail Notification</gui></guiseq> is enabled and that you have set your prefered options in the <gui>Configuration</gui> tab.</p>
+<media type="image" src="./figures/new-mail-notification.png" width="512">
+ <p>Switcher layout when a new message has arrived</p>
+</media>
+
+<!-- TODO: Quite short; plus recheck once https://bugzilla.gnome.org/show_bug.cgi?id=653699 is fixed -->
+
+</page>
+
diff --git a/help/C/mail-receiving-options-evolution-exchange.page b/help/C/mail-receiving-options-evolution-exchange.page
new file mode 100644
index 0000000..cc92cf4
--- /dev/null
+++ b/help/C/mail-receiving-options-evolution-exchange.page
@@ -0,0 +1,49 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-receiving-options-evolution-exchange">
+
+ <info>
+ <desc>Receiving options for Evolution Exchange accounts.</desc>
+
+ <link type="guide" xref="mail-receiving-options#corporate-server-types"/>
+ <link type="guide" xref="mail-account-manage-microsoft-exchange-evo-exchange#receiving-email"/>
+ <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mainwindow-starting.html.en#bstgjve -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <title>Evolution Exchange receiving options</title>
+
+<p>On the <gui>Receiving Email</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Email</gui></guiseq>):</p>
+
+<list>
+<item><p>Enter your username for that server.</p></item>
+<item><p>Enter the OWA URL for that server.</p></item>
+<item><p>Select if the mailbox name is different from the username. If it is, enter the mailbox name.</p>
+<note style="tip"><p>If you are in an organizational environment, you may want to contact your system administrator for more information.</p></note></item>
+<item><p>Select your authentication type in the Authentication list, or click <gui style="button">Check for Supported Types</gui> to have Evolution check for supported authentication mechanisms. Some servers do not announce the authentication mechanisms they support, so clicking this button is not a guarantee that available mechanisms actually work.</p></item>
+<item><p>Click <gui style="button">Authenticate</gui> and enter your password.</p></item>
+</list>
+
+<p>On the <gui>Receiving Options</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Options</gui></guiseq>):</p>
+<list>
+<item><p>If you want Evolution to check automatically for new messages, click the <gui>Check for new messages every ... minutes</gui> option and select the frequency in minutes.</p></item>
+
+<item><p>You can also define if Evolution checks for new messages in all folders.</p></item>
+
+<item><p>In the section <gui>Global Address List/Active Directory</gui>, specify the name of the Global Catalog server. The Global Catalog Server contains the user information for users.</p></item>
+<item><p>Select if you want to limit the number of Global Address List (GAL) responses as this may increase speed. The GAL contains a list of all email addresses.</p></item>
+<item><p>You also have to define the Authentication type, and whether you want groups of contacts in GAL to be represented in the Evolution address book by <link xref="contacts-using-contact-lists">contact lists</link>.</p></item>
+</list>
+<!-- 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. -->
+<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>
+
+</page>
diff --git a/help/C/mail-receiving-options-exchange-mapi.page b/help/C/mail-receiving-options-exchange-mapi.page
new file mode 100644
index 0000000..b68a13f
--- /dev/null
+++ b/help/C/mail-receiving-options-exchange-mapi.page
@@ -0,0 +1,42 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-receiving-options-exchange-mapi">
+
+ <info>
+ <desc>Receiving options for Exchange MAPI accounts.</desc>
+
+ <link type="guide" xref="mail-receiving-options#corporate-server-types"/>
+ <link type="guide" xref="mail-account-manage-microsoft-exchange-evo-mapi#receiving-email"/>
+ <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <title>Exchange MAPI receiving options</title>
+
+<p>On the <gui>Receiving Email</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Email</gui></guiseq>):</p>
+
+<list>
+<item><p>Enter the address of the email server in the <gui>Server</gui> field and enter your username for that server.</p></item>
+<item><p>Enter the Domain name for that server.</p>
+<note style="tip"><p>If you are in an organizational environment, you may want to contact your system administrator for more information.</p></note></item>
+<item><p>Select your authentication type in the Authentication list, or click <gui style="button">Check for Supported Types</gui> to have Evolution check for supported authentication mechanisms. Some servers do not announce the authentication mechanisms they support, so clicking this button is not a guarantee that available mechanisms actually work.</p></item>
+<item><p>Select if you want to use a secure connection (SSL or TLS).</p></item>
+<item><p>Click <gui style="button">Authenticate</gui> and enter your password.</p></item>
+</list>
+
+<p>On the <gui>Receiving Options</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Options</gui></guiseq>):</p>
+<list>
+<item><p>If you want Evolution to check automatically for new messages, click the <gui>Check for new messages every ... minutes</gui> option and select the frequency in minutes.</p></item>
+
+<item><p>You can also define if Evolution checks for new messages in all folders.</p></item>
+</list>
+<!-- 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. -->
+<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>
+
+</page>
diff --git a/help/C/mail-receiving-options-imap-plus.page b/help/C/mail-receiving-options-imap-plus.page
new file mode 100644
index 0000000..f3b8de8
--- /dev/null
+++ b/help/C/mail-receiving-options-imap-plus.page
@@ -0,0 +1,47 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-receiving-options-imap-plus">
+
+ <info>
+ <desc>Receiving options for IMAP+ accounts.</desc>
+
+ <link type="guide" xref="mail-receiving-options#common-server-types"/>
+ <link type="guide" xref="mail-account-manage-imap-plus#receiving-email"/>
+ <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mainwindow-starting.html.en#bstggh0 -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <title>IMAP+ receiving options</title>
+
+<p>On the <gui>Receiving Email</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Email</gui></guiseq>):</p>
+<list>
+<item><p>Enter the address of the email server in the <gui>Server</gui> field and enter your username for that server.</p></item>
+<item><p>Select if you want to use a secure connection (SSL or TLS).</p><p>You should enable this option if your server supports it.</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>Select your authentication type in the Authentication list, or click <gui style="button">Check for Supported Types</gui> to have Evolution check for supported authentication mechanisms. Some servers do not announce the authentication mechanisms they support, so clicking this button is not a guarantee that available mechanisms actually work.</p></item>
+<item><p>Select if you want Evolution to remember your password.</p></item>
+</list>
+
+<p>On the <gui>Receiving Options</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Options</gui></guiseq>):</p>
+<list>
+<item><p>If you want Evolution to check automatically for new messages, click the <gui>Check for new messages every ... minutes</gui> option and select the frequency in minutes.</p></item>
+<item><p>Select "Use Quick Resync" if the IMAP server supports <link href="http://tools.ietf.org/html/rfc5162";>IMAP4 Extensions for Quick Mailbox Resynchronization</link>.</p></item>
+<item><p>You can also define if Evolution checks for new messages in all folders, or only in subscribed folders.</p></item>
+<item><p>Select if you want Evolution to use custom commands to connect to the IMAP server.</p></item>
+<item><p>Select if you want Evolution to show only <link xref="mail-imap-subscriptions">subscribed folders</link>.</p></item>
+<item><p>Select if you want Evolution to override server-supplied folder namespaces.</p></item>
+</list>
+
+<!-- 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. -->
+<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>
+
+</page>
diff --git a/help/C/mail-receiving-options-imap.page b/help/C/mail-receiving-options-imap.page
new file mode 100644
index 0000000..33ee9bb
--- /dev/null
+++ b/help/C/mail-receiving-options-imap.page
@@ -0,0 +1,47 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-receiving-options-imap">
+
+ <info>
+ <desc>Receiving options for IMAP accounts.</desc>
+
+ <link type="guide" xref="mail-receiving-options#common-server-types"/>
+ <link type="guide" xref="mail-account-manage-imap#receiving-email"/>
+ <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mainwindow-starting.html.en#bstggh0 -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <title>IMAP receiving options</title>
+
+<p>On the <gui>Receiving Email</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Email</gui></guiseq>):</p>
+<list>
+<item><p>Enter the address of the email server in the <gui>Server</gui> field and enter your username for that server.</p></item>
+<item><p>Select if you want to use a secure connection (SSL or TLS).</p><p>You should enable this option if your server supports it.</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>Select your authentication type in the Authentication list, or click <gui style="button">Check for Supported Types</gui> to have Evolution check for supported authentication mechanisms. Some servers do not announce the authentication mechanisms they support, so clicking this button is not a guarantee that available mechanisms actually work.</p></item>
+<item><p>Select if you want Evolution to remember your password.</p></item>
+</list>
+
+<p>On the <gui>Receiving Options</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Options</gui></guiseq>):</p>
+
+<list>
+<item><p>If you want Evolution to check automatically for new messages, click the <gui>Check for new messages every ... minutes</gui> option and select the frequency in minutes.</p></item>
+<item><p>You can also define if Evolution checks for new messages in all folders, or only in subscribed folders.</p></item>
+<item><p>Select if you want Evolution to use custom commands to connect to the IMAP server.</p></item>
+<item><p>Select if you want Evolution to show only <link xref="mail-imap-subscriptions">subscribed folders</link>.</p></item>
+<item><p>Select if you want Evolution to override server-supplied folder namespaces.</p></item>
+</list>
+
+<!-- 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. -->
+<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>
+
+</page>
diff --git a/help/C/mail-receiving-options-local-delivery.page b/help/C/mail-receiving-options-local-delivery.page
new file mode 100644
index 0000000..b2d0956
--- /dev/null
+++ b/help/C/mail-receiving-options-local-delivery.page
@@ -0,0 +1,34 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-receiving-options-local-delivery">
+
+ <info>
+ <desc>Receiving options for Local delivery accounts.</desc>
+
+ <link type="guide" xref="mail-receiving-options#local-account-server-types"/>
+ <link type="guide" xref="mail-account-manage-local-delivery#receiving-email"/>
+ <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <title>Local delivery receiving options</title>
+
+<p>On the <gui>Receiving Email</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Email</gui></guiseq>):</p>
+
+<p>Choose the file by clicking on the button next to <gui>Path</gui> in the <gui>Configuration</gui> section. This will open a file chooser window.</p>
+<!-- TODO: Fix after https://bugzilla.gnome.org/show_bug.cgi?id=655629 is fixed - Calling this file a "Path" is just plain wrong. -->
+
+<p>On the <gui>Receiving Options</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Options</gui></guiseq>):</p>
+
+<p>If you want Evolution to check automatically for new messages, click the <gui>Check for new messages every ... minutes</gui> option and select the frequency in minutes.</p>
+
+<!-- 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. -->
+<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>
+
+</page>
diff --git a/help/C/mail-receiving-options-maildir-format-directories.page b/help/C/mail-receiving-options-maildir-format-directories.page
new file mode 100644
index 0000000..135e437
--- /dev/null
+++ b/help/C/mail-receiving-options-maildir-format-directories.page
@@ -0,0 +1,34 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-receiving-options-maildir-format-directories">
+
+ <info>
+ <desc>Receiving options for Maildir-format mail directories accounts.</desc>
+
+ <link type="guide" xref="mail-receiving-options#local-account-server-types"/>
+ <link type="guide" xref="mail-account-manage-maildir-format-directories#receiving-email"/>
+ <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <title>Maildir-format mail directories receiving options</title>
+
+<p>On the <gui>Receiving Email</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Email</gui></guiseq>):</p>
+
+<p>Choose the directory by clicking on the button next to <gui>Path</gui> in the <gui>Configuration</gui> section. Some default folders are available in the list. If the directory is not among those folders, choose the last option <gui>Other...</gui>. This will open a directory chooser window.</p>
+
+<p>On the <gui>Receiving Options</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Options</gui></guiseq>):</p>
+
+<p>If you want Evolution to check automatically for new messages, click the <gui>Check for new messages every ... minutes</gui> option and select the frequency in minutes.</p>
+<p>If you want <link xref="mail-filters">Filters</link> to be automatically used for new messages in your inbox, enable <gui>Apply filters to new messages in INBOX</gui>.</p>
+
+<!-- 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. -->
+<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>
+
+</page>
diff --git a/help/C/mail-receiving-options-mh-format-directories.page b/help/C/mail-receiving-options-mh-format-directories.page
new file mode 100644
index 0000000..56e878e
--- /dev/null
+++ b/help/C/mail-receiving-options-mh-format-directories.page
@@ -0,0 +1,33 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-receiving-options-mh-format-directories">
+
+ <info>
+ <desc>Receiving options for MH-format mail directories accounts.</desc>
+
+ <link type="guide" xref="mail-receiving-options#local-account-server-types"/>
+ <link type="guide" xref="mail-account-manage-mh-format-directories#receiving-email"/>
+ <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <title>MH-format mail directories receiving options</title>
+
+<p>On the <gui>Receiving Email</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Email</gui></guiseq>):</p>
+
+<p>Choose the directory by clicking on the button next to <gui>Path</gui> in the <gui>Configuration</gui> section. Some default folders are available in the list. If the directory is not among those folders, choose the last option <gui>Other...</gui>. This will open a directory chooser window.</p>
+
+<p>On the <gui>Receiving Options</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Options</gui></guiseq>):</p>
+
+<p>If you want Evolution to check automatically for new messages, click the <gui>Check for new messages every ... minutes</gui> option and select the frequency in minutes.</p>
+
+<!-- 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. -->
+<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>
+
+</page>
diff --git a/help/C/mail-receiving-options-novell-groupwise.page b/help/C/mail-receiving-options-novell-groupwise.page
new file mode 100644
index 0000000..decf934
--- /dev/null
+++ b/help/C/mail-receiving-options-novell-groupwise.page
@@ -0,0 +1,47 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-receiving-options-novell-groupwise">
+
+ <info>
+ <desc>Receiving options for Novell Groupwise accounts.</desc>
+
+ <link type="guide" xref="mail-receiving-options#corporate-server-types"/>
+ <link type="guide" xref="mail-account-manage-novell-groupwise#receiving-email"/>
+
+ <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <title>Novell Groupwise receiving options</title>
+
+<p>On the <gui>Receiving Email</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Email</gui></guiseq>):</p>
+<list>
+<item><p>Enter the address of the email server in the <gui>Server</gui> field and enter your username for that server.</p></item>
+<item><p>Select if you want to use a secure connection (SSL or TLS).</p><p>You should enable this option if your server supports it.</p>
+<note style="tip"><p>If you are in an organizational environment, you may want to contact your system administrator for more information.</p></note></item>
+<item><p>Select your authentication type in the Authentication list, or click <gui style="button">Check for Supported Types</gui> to have Evolution check for supported authentication mechanisms. Some servers do not announce the authentication mechanisms they support, so clicking this button is not a guarantee that available mechanisms actually work.</p></item>
+<item><p>Select if you want Evolution to remember your password.</p></item>
+</list>
+
+<p>On the <gui>Receiving Options</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Options</gui></guiseq>):</p>
+<list>
+<item><p>If you want Evolution to check automatically for new messages, click the <gui>Check for new messages every ... minutes</gui> option and select the frequency in minutes.</p></item>
+
+<item><p>If you want the messages to remain on the server for a period of time, click the <gui>Leave messages on server</gui> option and the <gui>Delete after ... days</gui> option and select the number of days to allow messages to remain on the server.</p></item>
+
+<item><p>Enter the Post Office Agent SOAP port.</p>
+<p>If you are unsure what your Post Office Agent SOAP port is, contact your system administrator.</p></item>
+</list>
+<!-- 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. -->
+<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>
+
+</page>
diff --git a/help/C/mail-receiving-options-pop.page b/help/C/mail-receiving-options-pop.page
new file mode 100644
index 0000000..da76e46
--- /dev/null
+++ b/help/C/mail-receiving-options-pop.page
@@ -0,0 +1,50 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-receiving-options-pop">
+
+ <info>
+ <desc>Receiving options for POP accounts.</desc>
+
+ <link type="guide" xref="mail-receiving-options#common-server-types"/>
+ <link type="guide" xref="mail-account-manage-pop#receiving-email"/>
+ <revision pkgversion="3.1.5" version="0.3" date="2011-07-27" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Barbara Tobias</name>
+ <email>barbtobias09 gmail com</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mainwindow-starting.html.en -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <title>POP receiving options</title>
+
+<p>On the <gui>Receiving Email</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Email</gui></guiseq>):</p>
+<list>
+<item><p>Enter the address of the email server in the <gui>Server</gui> field and enter your username for that server.</p></item>
+<item><p>Select if you want to use a secure connection (SSL or TLS).</p><p>You should enable this option if your server supports it.</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>Select your authentication type in the Authentication list, or click <gui style="button">Check for Supported Types</gui> to have Evolution check for supported authentication mechanisms. Some servers do not announce the authentication mechanisms they support, so clicking this button is not a guarantee that available mechanisms actually work.</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>Select if you want Evolution to remember your password.</p></item>
+</list>
+
+<p>On the <gui>Receiving Options</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Options</gui></guiseq>):</p>
+
+<p>If you want Evolution to check automatically for new messages, click the <gui>Check for new messages every ... minutes</gui> option and select the frequency in minutes.</p>
+
+<p>If you want the messages to remain on the server for a period of time, click the <gui>Leave messages on server</gui> option and the <gui>Delete after ... days</gui> option and select the number of days to allow messages to remain on the server.</p>
+
+<p>The option <gui>Disable support for all POP3 extensions</gui> is only useful when accessing old or misconfigured mail servers. Such POP3 extensions provide enhanced functionality, however only some servers support them. In case of problems with receiving mail, enabling this setting might help.</p>
+
+<!-- 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. -->
+<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>
+
+</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
new file mode 100644
index 0000000..08874db
--- /dev/null
+++ b/help/C/mail-receiving-options-unix-mbox-spool-directory.page
@@ -0,0 +1,33 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-receiving-options-unix-mbox-spool-directory">
+
+ <info>
+ <desc>Receiving options for standard Unix mbox spool directory accounts.</desc>
+
+ <link type="guide" xref="mail-receiving-options#local-account-server-types"/>
+ <link type="guide" xref="mail-account-manage-unix-mbox-spool-directory#receiving-email"/>
+ <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <title>Standard Unix mbox spool directory receiving options</title>
+
+<p>On the <gui>Receiving Email</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Email</gui></guiseq>):</p>
+
+<p>Choose the directory by clicking on the button next to <gui>Path</gui> in the <gui>Configuration</gui> section. Some default folders are available in the list. If the directory is not among those folders, choose the last option <gui>Other...</gui>. This will open a directory chooser window.</p>
+
+<p>On the <gui>Receiving Options</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Options</gui></guiseq>):</p>
+
+<p>If you want <link xref="mail-filters">Filters</link> to be automatically used for new messages in your inbox, enable <gui>Apply filters to new messages in INBOX</gui>.</p>
+
+<!-- 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. -->
+<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>
+
+</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
new file mode 100644
index 0000000..d908579
--- /dev/null
+++ b/help/C/mail-receiving-options-unix-mbox-spool-file.page
@@ -0,0 +1,35 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-receiving-options-unix-mbox-spool-file">
+
+ <info>
+ <desc>Receiving options for standard Unix mbox spool file accounts.</desc>
+
+ <link type="guide" xref="mail-receiving-options#local-account-server-types"/>
+ <link type="guide" xref="mail-account-manage-unix-mbox-spool-file#receiving-email"/>
+ <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <title>Standard Unix mbox spool file receiving options</title>
+
+<p>On the <gui>Receiving Email</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Email</gui></guiseq>):</p>
+
+<p>Choose the file by clicking on the button next to <gui>Path</gui> in the <gui>Configuration</gui> section. This will open a file chooser window.</p>
+<!-- TODO: Fix after https://bugzilla.gnome.org/show_bug.cgi?id=655629 is fixed - Calling this file a "Path" is just plain wrong. -->
+
+<p>On the <gui>Receiving Options</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Options</gui></guiseq>):</p>
+
+<p>If you want Evolution to check automatically for new messages, click the <gui>Check for new messages every ... minutes</gui> option and select the frequency in minutes.</p>
+<p>If you want <link xref="mail-filters">Filters</link> to be automatically used for new messages in your inbox, enable <gui>Apply filters to new messages in INBOX</gui>.</p>
+
+<!-- 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. -->
+<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>
+
+</page>
diff --git a/help/C/mail-receiving-options-usenet-news.page b/help/C/mail-receiving-options-usenet-news.page
new file mode 100644
index 0000000..697e3bf
--- /dev/null
+++ b/help/C/mail-receiving-options-usenet-news.page
@@ -0,0 +1,45 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-receiving-options-usenet-news">
+
+ <info>
+ <desc>Receiving options for Usenet news accounts.</desc>
+
+ <link type="guide" xref="mail-receiving-options#common-server-types"/>
+ <link type="guide" xref="mail-account-manage-usenet-news#receiving-email"/>
+ <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mainwindow-starting.html.en#bsthqql -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <title>Usenet news receiving options</title>
+
+<p>On the <gui>Receiving Email</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Email</gui></guiseq>):</p>
+<list>
+<item><p>Enter the address of the email server in the <gui>Server</gui> field and enter your username for that server.</p></item>
+<item><p>Select if you want to use a secure connection (SSL or TLS).</p><p>You should enable this option if your server supports it.</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>Select your authentication type in the Authentication list, or click <gui style="button">Check for Supported Types</gui> to have Evolution check for supported authentication mechanisms. Some servers do not announce the authentication mechanisms they support, so clicking this button is not a guarantee that available mechanisms actually work.</p></item>
+<item><p>Select if you want Evolution to remember your password.</p></item>
+</list>
+
+<p>On the <gui>Receiving Options</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Options</gui></guiseq>):</p>
+<list>
+<item><p>If you want Evolution to check automatically for new messages, click the <gui>Check for new messages every ... minutes</gui> option and select the frequency in minutes.</p></item>
+<item><p>Select if you want to show folders in short notation.</p>
+<p>For example, comp.os.linux would appear as c.o.linux.</p></item>
+<item><p>Select if you want to show relative folder names in the <link xref="mail-imap-subscriptions">subscriptions window</link>.</p>
+<p>If you select to show relative folder names, only the name of the folder is displayed. For example the folder evolution.mail would appear as evolution.</p></item>
+</list>
+<!-- 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. -->
+<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>
+
+</page>
diff --git a/help/C/mail-receiving-options.page b/help/C/mail-receiving-options.page
new file mode 100644
index 0000000..212bf93
--- /dev/null
+++ b/help/C/mail-receiving-options.page
@@ -0,0 +1,31 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="mail-receiving-options">
+
+ <info>
+ <desc>Available mail receiving options for several server types.</desc>
+
+ <revision pkgversion="2.28.3" version="0.1" date="2010-12-09" status="stub"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Mail Receiving Options</title>
+<!-- Please keep sorting and categorization in sync with intro-first-run.page! -->
+ <section id="common-server-types" style="2column">
+ <title>Common server types</title>
+ </section>
+ <section id="corporate-server-types" style="2column">
+ <title>Corporate server types</title>
+ </section>
+ <section id="local-account-server-types" style="2column">
+ <title>Local account server types</title>
+ </section>
+
+
+</page>
diff --git a/help/C/mail-recognized-thread-related-headers.page b/help/C/mail-recognized-thread-related-headers.page
new file mode 100644
index 0000000..c58e8d9
--- /dev/null
+++ b/help/C/mail-recognized-thread-related-headers.page
@@ -0,0 +1,31 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-recognized-thread-related-headers">
+
+ <info>
+ <desc>Which thread-related headers are recognized by Evolution.</desc>
+
+ <link type="guide" xref="index#common-mail-problems" />
+
+ <revision pkgversion="2.28.3" version="0.1" date="2010-10-16" status="review"/>
+ <credit type="author">
+ <name>April Gonzales</name>
+ <email>loonycookie gmail com</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Thread related headers recognized by Evolution</title>
+
+<p>Evolution supports the following headers:</p>
+<list>
+<item><p>References</p></item>
+<item><p>In-Reply-To</p></item>
+</list>
+
+
+<p><gui>Thread-*</gui> headers are Microsoft's proprietary headers and not supported.</p>
+</page>
+
diff --git a/help/C/mail-refresh-folders.page b/help/C/mail-refresh-folders.page
new file mode 100644
index 0000000..b612b3a
--- /dev/null
+++ b/help/C/mail-refresh-folders.page
@@ -0,0 +1,26 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-refresh-folders">
+
+ <info>
+ <desc>Ways to update your Evolution folders.</desc>
+
+ <link type="guide" xref="index#common-mail-problems" />
+
+ <revision pkgversion="2.28.3" version="0.1" date="2010-10-09" status="final"/>
+ <credit type="author">
+ <name>April Gonzales</name>
+ <email>loonycookie gmail com</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Updating/refreshing the folders on the mail server</title>
+
+<p>To make sure that your local email folders are updated, go to <guiseq><gui>Folder</gui><gui>Refresh</gui></guiseq>. This will ensure that all of your emails have been downloaded from the mail server onto your computer so that you can read them all, and that the read status is synced with the mail server.</p>
+
+<p>You can also double-click on the folder name to refresh it, or press <key>F5</key>.</p>
+
+</page>
diff --git a/help/C/mail-search-folders-add.page b/help/C/mail-search-folders-add.page
new file mode 100644
index 0000000..723364f
--- /dev/null
+++ b/help/C/mail-search-folders-add.page
@@ -0,0 +1,51 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-search-folders-add">
+
+ <info>
+ <desc>Setting up a search folder.</desc>
+
+ <link type="guide" xref="mail-search-folders" />
+
+ <revision pkgversion="3.0.2" version="0.1" date="2011-07-30" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-organize-vfolders.html.en -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Creating A Search Folder</title>
+
+<steps>
+<item><p>Click <guiseq><gui>Edit</gui><gui>Search Folders</gui></guiseq>, or click <guiseq><gui>Message</gui><gui>Create Rule</gui></guiseq> and select the criterion the search folder will be based on, or if you have run a search, click <guiseq><gui>Search</gui><gui>Create Search Folder From Search...</gui></guiseq>.</p></item>
+<item><p>Click <gui style="button">Add</gui>.</p></item>
+<item><p>Enter a name in the <gui>Rule name</gui> field.</p></item>
+<item><p>Define the conditions for the rule. For each condition, you first select which part of the message will be checked and then define the comparison.</p><p>For more information on the available conditions see <link xref="mail-search-folders-conditions">Available Search Folder conditions</link>.</p></item>
+<item><p>If you want to define multiple conditions, define under <gui>Find items</gui> if any or if all conditions have to apply, and click <gui style="button">Add Condition</gui> and repeat the previous step.</p></item>
+<item><p>Select which folders will be used for the search folder in the section <gui>Search Folder Sources</gui>. Options are:</p>
+<list>
+ <item><p>All local folders:</p>
+ <p>Uses all local folders for the search folder source in addition to individual folders that are selected.</p></item>
+
+ <item><p>All active remote folders:</p>
+ <p>Remote folders are considered active if you are connected to the server; you must be connected to your mail server for the search folder to include any messages from that source in addition to individual folders that are selected.</p></item>
+
+ <item><p>All local and active remote folders:</p>
+ <p>Uses all local and active remote folders for the search folder source in addition to individual folders that are selected.</p></item>
+
+ <item><p>Specific folders only:</p>
+ <p>Uses individual folders for the search folder source. In this case, click the <gui style="button">Add</gui> to select folders.</p></item>
+</list>
+</item>
+<item><p>Click <gui style="button">OK</gui>.</p></item>
+</steps>
+
+</page>
+
+
diff --git a/help/C/mail-search-folders-conditions.page b/help/C/mail-search-folders-conditions.page
new file mode 100644
index 0000000..7d53794
--- /dev/null
+++ b/help/C/mail-search-folders-conditions.page
@@ -0,0 +1,90 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-search-folders-conditions">
+
+ <info>
+ <desc>Available conditions for setting up search folders.</desc>
+
+ <link type="seealso" xref="mail-search-folders"/>
+
+ <revision pkgversion="3.0.2" version="0.1" date="2011-08-01" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-organize-vfolders.html.en -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <title>Available Search folder conditions</title>
+
+<list>
+<item><p>Sender:</p>
+<p>The sender's email address or the name of the sender.</p></item>
+
+<item><p>Recipients:</p>
+<p>The recipients of the message.</p></item>
+
+<item><p>CC:</p>
+<p>Only the CC recipients of the message.</p></item>
+
+<item><p>BCC:</p>
+<p>Only the BCC recipients of the message. Obviously this can only be applied to outgoing filters.</p></item>
+
+<item><p>Sender or Recipients:</p>
+<p>The sender's email address or the name of the sender or the recipients of the message.</p></item>
+
+<item><p>Subject:</p>
+<p>The subject line of the message.</p></item>
+
+<item><p>Specific Header:</p>
+<p>Any header including <link xref="mail-composer-custom-header-lines">custom ones</link>.</p>
+<p>If a message uses a header more than once, Evolution pays attention only to the first instance, even if the message defines the header differently the second time. For example, if a message declares the Resent-From: header as "engineering example com" and then restates it as "marketing example com", Evolution filters as though the second declaration did not occur. To filter on messages that use headers multiple times, use a regular expression.</p></item>
+
+<item><p>Message Body:</p>
+<p>Searches in the actual text of the message.</p></item>
+
+<item><p>Expression:</p>
+<p>(For programmers only) Match a message according to an expression you write in the Scheme language used to define <link xref="mail-filters">filters</link> in Evolution.</p></item>
+
+<item><p>Date sent:</p>
+<p>Filters messages according to the date on which they were sent. First, choose the conditions you want a message to meet, such as before a given time or after a given time. Then choose the time. The filter compares the message's time stamp to the system clock when the filter is run, or to a specific time and date you choose from a calendar. You can also have it look for a message within a range of time relative to the filter, such as two to four days ago.</p></item>
+
+<item><p>Date received:</p>
+<p>This works the same way as the Date Sent option, except that it compares the time you received the message with the dates you specify.</p></item>
+
+<item><p>Label:</p>
+<p>Messages can have <link xref="mail-labels">labels</link> of Important, Work, Personal, To Do, or Later. You can set labels with other filters or manually.</p></item>
+
+<item><p>Score:</p>
+<p>Sets the message score to any whole number greater than 0. You can have one filter set or change a message score, and then set up another filter to move the messages you have scored. A message score is not based on anything in particular: it is simply a number you can assign to messages so other filters can process them.</p></item>
+
+<item><p>Size (kB):</p>
+<p>Sorts based on the size of the message in kilobytes.</p></item>
+
+<item><p>Status:</p>
+<p>Filters according to the status of a message. The status can be Replied To, Draft, Important, Read, or Junk.</p></item>
+
+<item><p>Follow Up:</p>
+<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>
+
+<item><p>Attachments:</p>
+<p>Checks whether there is an attachment for the email.</p></item>
+
+<item><p>Mailing List</p>
+<p>Filters based on the mailing list the message came from. This filter might miss messages from some list servers, because it checks for the X-BeenThere header, which is used to identify mailing lists or other redistributors of mail. Mail from list servers that do not set X-BeenThere properly are not be caught by these filters.</p></item>
+
+<item><p>Regex Match:</p>
+<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 grep command.</p></item>
+
+<item><p>Message Location:</p></item>
+
+<item><p>Match All:</p></item>
+</list>
+</page>
diff --git a/help/C/mail-search-folders-refresh.page b/help/C/mail-search-folders-refresh.page
new file mode 100644
index 0000000..bf87a67
--- /dev/null
+++ b/help/C/mail-search-folders-refresh.page
@@ -0,0 +1,33 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-search-folders-refresh">
+
+ <info>
+ <desc>Ways of updating Search folders.</desc>
+
+ <link type="guide" xref="mail-search-folders" />
+
+ <revision pkgversion="2.32.2" version="0.2" date="2011-07-22" status="draft"/>
+ <credit type="author">
+ <name>April Gonzales</name>
+ <email>loonycookie gmail com</email>
+ </credit>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Updating/refreshing Search folders</title>
+
+<p>It might happen that one of your Search folders has not updated since some new email arrived or since an email was deleted, for example. This will mean that the list of emails in the folder is not up-to-date.</p>
+
+<p>You can get an updated view of the search folder either by switching to another folder and then back again, or by right-clicking on the search folder and choosing <gui>Refresh</gui>.</p>
+
+
+</page>
+
+
diff --git a/help/C/mail-search-folders.page b/help/C/mail-search-folders.page
new file mode 100644
index 0000000..59cf5e4
--- /dev/null
+++ b/help/C/mail-search-folders.page
@@ -0,0 +1,34 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="mail-search-folders">
+
+ <info>
+ <desc>Use search folders to see messages in one folder while still keeping them in their original folders.</desc>
+
+ <link type="guide" xref="mail-organizing#advanced"/>
+
+ <revision pkgversion="3.0.2" version="0.3" date="2011-07-30" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-organize-vfolders.html.en -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+ </info>
+
+ <title>Using Search folders</title>
+
+<p>If <link xref="mail-filters">filters</link> are not flexible enough, or you find yourself performing the same <link xref="mail-searching">search</link> again and again, consider a search folder.</p>
+
+<p>A search folder looks like a <link xref="mail-folders">folder</link>, it acts like a <link xref="mail-searching">search</link>, and you set it up like a <link xref="mail-filters">filter</link>. While a conventional folder actually contains messages, a search folder is a view of messages that might be in several different folders. The messages it contains are determined on the fly using a set of criteria that you have chosen when setting up the search folder.</p>
+
+<p>Evolution automatically updates the search folder contents when new messages are received or message are deleted.</p>
+
+<p>The <gui>Unmatched</gui> search folder is the opposite of other search folders: it displays all messages that do not appear in other search folders.</p>
+
+<p>If you use remote email storage like IMAP, and have created search folders to search through them, the <gui>Unmatched</gui> search folder also searches the remote folders. If you do not create any search folders that search remote mail stores, the <gui>Unmatched</gui> search folder does not search in them either.</p>
+
+</page>
diff --git a/help/C/mail-searching-attachment-type.page b/help/C/mail-searching-attachment-type.page
new file mode 100644
index 0000000..d92c9d1
--- /dev/null
+++ b/help/C/mail-searching-attachment-type.page
@@ -0,0 +1,25 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-searching-attachment-type">
+
+ <info>
+ <desc>Unfortunately this is not possible.</desc>
+
+ <link type="guide" xref="index#common-mail-problems" />
+ <link type="seealso" xref="mail-searching" />
+
+ <revision pkgversion="3.0.2" version="0.1" date="2011-07-25" status="draft"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Searching for emails with a specific attachment type</title>
+
+<p>There currently is no way to do search for emails with a specific type of attachment (for example searching for all emails that have a PDF attachment).</p>
+
+</page>
diff --git a/help/C/mail-searching.page b/help/C/mail-searching.page
new file mode 100644
index 0000000..9d1d53b
--- /dev/null
+++ b/help/C/mail-searching.page
@@ -0,0 +1,76 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-searching">
+
+ <info>
+ <desc>Searching messages.</desc>
+
+ <link type="guide" xref="searching-items" />
+ <link type="guide" xref="mail-organizing" />
+
+ <revision pkgversion="2.32.1" version="0.2" date="2010-10-12" status="draft" />
+ <credit type="author">
+ <name>Max Vorobuov</name>
+ <email>vmax0770 gmail com</email>
+ </credit>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Searching Mail</title>
+<section id="quick-search">
+<title>Quick Search</title>
+<p>In the mail view, you can quickly search for messages by defining conditions.</p>
+<steps>
+<item><p>Click on the search icon <media type="image" mime="image/png" src="figures/search-icon.png"/> to expand the drop-down list.</p></item>
+<item><p>Select the search condition from the list.</p></item>
+<item><p>Select the scope from the drop-down list right to the text box.</p></item>
+<item><p>Enter the text you want to search for and press <key>Enter</key>.</p></item>
+<item><p>Evolution displays the search results.</p></item>
+</steps>
+<note style="tip"><p>If you start directly from the fourth step, text will be searched in mail's subjects and addresses and scope will be "Current folder".</p></note>
+<note style="tip"><p>If you search for messages that are not in the same folder rather often you might want to create a search folder instead; see <link xref="mail-search-folders">Using Search Folders</link> for more detail.</p></note>
+<p>If you want to set several search conditions, you should use an Advanced search, which is described below.</p>
+</section>
+
+<section id="advanced-search">
+<title>Advanced Search:</title>
+<steps>
+<item><p>Select the <guiseq><gui>Search</gui><gui>Advanced Search</gui></guiseq> menu to open the dialog box.</p></item>
+<item><p>Click <gui style="button">Add Condition</gui> to add any number of rules.</p></item>
+<item><p>Select the condition from the dropdown list, and then type a search entry in the field.</p></item>
+<item><p>Click <gui style="button">OK</gui> to get the search results displayed.</p></item>
+</steps>
+</section>
+
+<!-- TODO:XINCLUDE: Needs refactoring as clearing-search and saved-searches are totally identical in all *-searching.page files -->
+<section id="clearing-search">
+<title>Clearing the Search results</title>
+<p>To clear your search view and get back to the default view, click the <gui>Clear</gui> icon in the search string field, or choose <guiseq><gui>Search</gui><gui>Clear</gui></guiseq> from the menubar. You can also press <keyseq><key>Shift</key><key>Ctrl</key><key>Q</key></keyseq> to clear the search.</p>
+</section>
+
+<section id="saved-searches">
+<title>Saved Searches</title>
+<p>If you search for something rather often, you will prefer not to type it many times. In this case you can use saved searches.</p>
+<p>To save your search results, either click <gui>Save</gui> instead of <gui>OK</gui> in the Search dialog, or in case the search results are already displayed, select <guiseq><gui>Search</gui><gui>Save Search</gui></guiseq>. From now on this search will be directly available from the <gui>Search</gui> menu.</p>
+</section>
+
+<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>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>
+</steps>
+</section>
+
+</page>
diff --git a/help/C/mail-send-and-receive-automatically.page b/help/C/mail-send-and-receive-automatically.page
new file mode 100644
index 0000000..2a1ea30
--- /dev/null
+++ b/help/C/mail-send-and-receive-automatically.page
@@ -0,0 +1,24 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-send-and-receive-automatically">
+
+ <info>
+ <desc>Check automatically and regularly for new received mail.</desc>
+
+ <link type="guide" xref="mail-send-and-receive" />
+
+ <revision pkgversion="3.0.2" version="0.2" date="2011-08-01" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Automatically check for new mail</title>
+<p>If you want Evolution to check automatically for new messages, enable the option <gui>Check for new messages every ... minutes</gui> in the <gui>Receiving Email</gui> page of the mail account settings (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Email</gui></guiseq>) and select the frequency in minutes.</p>
+
+</page>
+
diff --git a/help/C/mail-send-and-receive-manual.page b/help/C/mail-send-and-receive-manual.page
new file mode 100644
index 0000000..f075fed
--- /dev/null
+++ b/help/C/mail-send-and-receive-manual.page
@@ -0,0 +1,25 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-send-and-receive-manual">
+
+ <info>
+ <desc>Force sending and receiving emails.</desc>
+
+ <link type="guide" xref="mail-send-and-receive" />
+
+ <revision pkgversion="3.0.2" version="0.2" date="2011-08-01" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Manually send and receive message</title>
+<p>To receive new messages from the mail server and to send messages you have written that are in the local Outbox, click the <gui style="button">Send / Receive</gui> button in the toolbar, or press <key>F9</key>, or choose <guiseq><gui>File</gui><gui>Send / Receive </gui></guiseq> from the main menu.</p>
+<p>To send and receive only for one of your mail accounts, or to only send or only receive, click the small down-arrow next to the <gui style="button">Send / Receive</gui> button and choose the corresponding option.</p>
+
+</page>
+
diff --git a/help/C/mail-send-and-receive.page b/help/C/mail-send-and-receive.page
new file mode 100644
index 0000000..3c14186
--- /dev/null
+++ b/help/C/mail-send-and-receive.page
@@ -0,0 +1,24 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="mail-send-and-receive">
+
+ <info>
+ <desc>On receiving mail and sending written emails.</desc>
+
+ <link type="guide" xref="index#mail-basic" />
+
+ <revision pkgversion="3.0.2" version="0.2" date="2011-07-31" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<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>
+
+</page>
diff --git a/help/C/mail-sending-options-smtp.page b/help/C/mail-sending-options-smtp.page
new file mode 100644
index 0000000..18149e1
--- /dev/null
+++ b/help/C/mail-sending-options-smtp.page
@@ -0,0 +1,44 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-sending-options-smtp">
+
+ <info>
+ <desc>Sending options for SMTP.</desc>
+
+ <link type="guide" xref="mail-account-manage-imap#sending-email"/>
+ <link type="guide" xref="mail-account-manage-imap-plus#sending-email"/>
+ <link type="guide" xref="mail-account-manage-local-delivery#sending-email"/>
+ <link type="guide" xref="mail-account-manage-maildir-format-directories#sending-email"/>
+ <link type="guide" xref="mail-account-manage-mh-format-directories#sending-email"/>
+ <link type="guide" xref="mail-account-manage-pop#sending-email"/>
+ <link type="guide" xref="mail-account-manage-unix-mbox-spool-directory#sending-email"/>
+ <link type="guide" xref="mail-account-manage-unix-mbox-spool-file#sending-email"/>
+ <link type="guide" xref="mail-account-manage-usenet-news#sending-email"/>
+ <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <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>
+<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><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>
+ <item><p>Enter your username.</p></item>
+</steps>
+</item>
+<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. -->
+<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-several-pop-accounts.page b/help/C/mail-several-pop-accounts.page
new file mode 100644
index 0000000..53251b8
--- /dev/null
+++ b/help/C/mail-several-pop-accounts.page
@@ -0,0 +1,29 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-several-pop-accounts">
+
+ <info>
+ <desc>How to split and sort mail when using more than one local account.</desc>
+
+ <link type="guide" xref="index#common-mail-problems" />
+ <link type="seealso" xref="mail-organizing" />
+ <link type="seealso" xref="mail-receiving-options-pop" />
+
+ <revision pkgversion="3.0.2" version="0.1" date="2011-07-25" status="draft"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Separating POP mail for more than one account</title>
+
+<p>It is not possible to have separate accounts in the accounts and folder list pane. Evolution only has one unique inbox for incoming email.</p>
+<p>You can either use IMAP instead of POP, or move incoming emails into different folders by <link xref="mail-folders">creating folders</link> and <link xref="mail-filters">creating filters</link>: Create a new folder and create two subfolders (for incoming and for sent mail of that account). Now set up an incoming filter via <guiseq><gui>Edit</gui><gui>Message Filters...</gui><gui style="button">Add</gui></guiseq> to move incoming mail to the incoming folder by filtering on the recipient's address and set up an outgoing filter to move outgoing mail to the sent folder by filtering on the sender's address.</p>
+
+<!-- https://bugzilla.gnome.org/show_bug.cgi?id=447425 -->
+
+</page>
diff --git a/help/C/mail-sorting-message-list.page b/help/C/mail-sorting-message-list.page
new file mode 100644
index 0000000..44f19fb
--- /dev/null
+++ b/help/C/mail-sorting-message-list.page
@@ -0,0 +1,119 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-sorting-message-list">
+
+ <info>
+ <desc>Sorting the message list of a mail folder.</desc>
+
+ <link type="guide" xref="mail-organizing"/>
+
+
+ <revision pkgversion="2.32.1" version="0.2" date="2011-07-31" status="review"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>April Gonzales</name>
+ <email>loonycookie gmail com</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-organize-columns.html.en -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <title>Sorting the message list</title>
+
+<p>Evolution lets you organize your emails by letting you sort messages.</p>
+<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">
+<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>
+<p>When a new message arrives, it will be added below the parent message. Threads are sorted and displayed based on the date of the most recent message received.</p>
+<note style="tip"><p>For Advanced Users: There is a GConf key that allows you to toggle between the collapsed and expanded state of the email threads. The collapsed state is enabled by default and may be modified at /apps/evolution/mail/display/thread_expand.</p>
+</note>
+</section>
+
+<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>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">
+<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>
+ <title>Sort By</title>
+ <p>You can also sort email messages using the <gui>Sort By</gui> list.</p>
+ <steps>
+ <item><p>Right-click on the message list column headers.</p></item>
+ <item><p>Select the <gui>Sort By</gui> option.</p><p>This brings up this list of criteria for sorting email messages:</p>
+ <list>
+ <item><p>Subject - Trimmed</p></item>
+ <item><p>Labels</p></item>
+ <item><p>Recipients</p></item>
+ <item><p>Sender</p></item>
+ <item><p>Location</p></item>
+ <item><p>Due By</p></item>
+ <item><p><link xref="mail-follow-up-flag">Follow Up Flag</link></p></item>
+ <item><p>Flag Status</p></item>
+ <item><p>Size</p></item>
+ <item><p>To</p></item>
+ <item><p>Received</p></item>
+ <item><p>Date</p></item>
+ <item><p>Subject</p></item>
+ <item><p>From</p></item>
+ <item><p>Attachment</p></item>
+ <item><p>Flagged</p></item>
+ <item><p>Status</p></item>
+ <item><p>Custom</p></item>
+ </list>
+ </item>
+ <item><p>Select the option you wish to use in sorting email messages.</p></item>
+ </steps>
+ </section>
+
+ <section>
+ <title>Sort Ascending</title>
+ <steps>
+ <item><p>Right-click on the message list column headers.</p></item>
+ <item><p>Select the <gui>Sort Ascending</gui> option.</p></item>
+ </steps>
+ <p>The messages will be displayed with the most recent at the bottom.</p>
+ </section>
+
+ <section>
+ <title>Sort Descending</title>
+ <steps>
+ <item><p>Right-click on the message list column headers.</p></item>
+ <item><p>Select the <gui>Sort Descending</gui> option.</p></item>
+ </steps>
+ <p>The messages will be displayed with the most recent at the top.</p>
+ </section>
+
+ <section>
+ <title>Unsort</title>
+ <steps>
+ <item><p>Right-click on the message list column headers.</p></item>
+ <item><p>Select the <gui>Unsort</gui> option.</p></item>
+ </steps>
+ <p>This removes sorting from the column, reverting to the order of messages as they were added to the folder.</p>
+ </section>
+</section>
+
+</page>
+
+
diff --git a/help/C/mail-spam-groupwise-add-to-list.page b/help/C/mail-spam-groupwise-add-to-list.page
new file mode 100644
index 0000000..b90aa4e
--- /dev/null
+++ b/help/C/mail-spam-groupwise-add-to-list.page
@@ -0,0 +1,36 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-spam-groupwise-add-to-list">
+
+ <info>
+ <desc>How to add an email address to your junk mail list in Novell Groupwise.</desc>
+
+ <link type="guide" xref="mail-spam#mail-spam-groupwise" />
+
+ <revision pkgversion="2.28.3" version="0.1" date="2011-01-21" status="review"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>April Gonzales</name>
+ <email>loonycookie gmail com</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/bxqwde6.html.en#bxqwjg6 -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Adding an Email Address to Your Junk List</title>
+<steps>
+<item><p>Right-click on a message and select the <gui>Junk Mail Settings</gui> option.</p></item>
+<item><p>Type in the email address you wish to block in the <gui>Email</gui> field.</p></item>
+<item><p>Click <gui style="button">Add</gui> and then click on the <gui style="button">OK</gui> button.</p></item>
+</steps>
+
+<note><p>Remember, when you mark an item as junk in GroupWise, that item is added to your junk list in the GroupWise system. The settings in the GroupWise system are applied from computer to computer.</p></note>
+
+</page>
diff --git a/help/C/mail-spam-groupwise-manage-list.page b/help/C/mail-spam-groupwise-manage-list.page
new file mode 100644
index 0000000..3082ca3
--- /dev/null
+++ b/help/C/mail-spam-groupwise-manage-list.page
@@ -0,0 +1,34 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-spam-groupwise-manage-list">
+
+ <info>
+ <desc>How to manage your junk mail list in Novell Groupwise.</desc>
+
+ <link type="guide" xref="mail-spam#mail-spam-groupwise" />
+
+ <revision pkgversion="2.28.3" version="0.1" date="2011-01-21" status="review"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>April Gonzales</name>
+ <email>loonycookie gmail com</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/bxqwde6.html.en#bxqwfgd -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Enabling or Disabling Your Junk Mail List</title>
+<steps>
+<item><p>Right-click on a message and select the <gui>Junk Mail Settings</gui> option.</p></item>
+<item><p>Specify whether you wish to Enable or Disable junk mail handling.</p></item>
+<item><p>Click on the <gui style="button">OK</gui> button.</p></item>
+</steps>
+
+</page>
diff --git a/help/C/mail-spam-groupwise-mark-message.page b/help/C/mail-spam-groupwise-mark-message.page
new file mode 100644
index 0000000..5157dd2
--- /dev/null
+++ b/help/C/mail-spam-groupwise-mark-message.page
@@ -0,0 +1,28 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-spam-groupwise-mark-message">
+
+ <info>
+ <desc>How to mark a message in Novell Groupwise as junk.</desc>
+
+ <link type="guide" xref="mail-spam#mail-spam-groupwise" />
+
+ <revision pkgversion="2.28.3" version="0.2" date="2011-07-28" status="draft"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/bxqwde6.html.en#bxqwfae -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Marking a Message As Junk Mail</title>
+
+<p>Select the message to mark as junk, then click the <gui>Junk</gui> button or press <keyseq><key>Ctrl</key><key>J</key></keyseq>.</p>
+<p>The message is moved to your Junk Mail folder and the user is added to your junk list.</p>
+
+</page>
diff --git a/help/C/mail-spam-groupwise-remove-from-list.page b/help/C/mail-spam-groupwise-remove-from-list.page
new file mode 100644
index 0000000..348274f
--- /dev/null
+++ b/help/C/mail-spam-groupwise-remove-from-list.page
@@ -0,0 +1,30 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-spam-groupwise-remove-from-list">
+
+ <info>
+ <desc>How to remove an email address from your junk mail list in Novell Groupwise.</desc>
+
+ <link type="guide" xref="mail-spam#mail-spam-groupwise" />
+
+ <revision pkgversion="2.28.3" version="0.2" date="2011-07-28" status="draft"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/bxqwde6.html.en#bxqwk0f -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Removing an Email Address from Your Junk List</title>
+
+<steps>
+<item><p>Right-click a message, then click <gui>Junk Mail Settings</gui>.</p></item>
+<item><p>Select the email address to remove, then click <gui>Remove</gui>.</p></item>
+<item><p>Click <gui style="button">OK</gui>.</p></item>
+</steps>
+</page>
diff --git a/help/C/mail-spam-groupwise-unmark-message.page b/help/C/mail-spam-groupwise-unmark-message.page
new file mode 100644
index 0000000..b342a54
--- /dev/null
+++ b/help/C/mail-spam-groupwise-unmark-message.page
@@ -0,0 +1,32 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-spam-groupwise-unmark-message">
+
+ <info>
+ <desc>How to mark a message in Novell Groupwise as not junk.</desc>
+
+ <link type="guide" xref="mail-spam#mail-spam-groupwise" />
+
+ <revision pkgversion="2.28.3" version="0.2" date="2011-07-28" status="draft"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/bxqwde6.html.en#bxqwhft -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Marking a Message As Not Junk Mail</title>
+
+<steps>
+<item><p>Select the message to mark as not junk in your Junk Mail folder.</p></item>
+<item><p>Right-click the message, then click <gui>Mark as Not Junk</gui>, or select the message and press <keyseq><key>Shift</key><key>Ctrl</key><key>J</key></keyseq>.</p></item>
+</steps>
+
+<p>The message is moved to your Mailbox folder and the name is removed from your junk list.</p>
+
+</page>
diff --git a/help/C/mail-spam-marking.page b/help/C/mail-spam-marking.page
new file mode 100644
index 0000000..9ec9b61
--- /dev/null
+++ b/help/C/mail-spam-marking.page
@@ -0,0 +1,33 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-spam-marking">
+
+ <info>
+ <desc>How to mark unwanted junk and spam mail.</desc>
+
+ <link type="guide" xref="mail-spam" />
+
+ <revision pkgversion="2.32.1" version="0.2" date="2011-01-04" status="draft"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Barbara Tobias</name>
+ <email>barbtobias09 gmail com</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-organize-spam.html.en -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Marking Junk Mail</title>
+<p>Evolution can check for junk mail for you. Evolution uses SpamAssassin and/or Bogofilter with trainable Bayesian filters to perform the spam check. When the software detects mail that appears to be junk mail, it will flag it and hide it from your view. Messages that are flagged as junk mail are displayed only in the Junk folder.</p>
+<p>The junk mail filter can learn which kinds of mail are legitimate and which are not if you train it by marking as junk incoming mail that you determine is spam. When you first start using junk mail blocking, check the Junk folder frequently to be sure that legitimate mail doesn't get flagged as junk mail.</p>
+<p>If legitimate mail is incorrectly flagged, remove it from the Junk folder by right-clicking it and selecting <gui>Mark as Not Junk</gui> or pressing <keyseq><key>Shift</key><key>Ctrl</key><key>J</key></keyseq>. If Evolution misses junk mail, right-click the message, then click Mark as Junk or press <keyseq><key>Ctrl</key><key>J</key></keyseq>. When you correct it, the filter can recognize similar messages in the future, and becomes more accurate as time goes on.</p>
+<p>You can also flag mail as junk by selecting it and clicking the Junk icon in the menu bar; you can flag mail in the junk folder as "Not Junk" by selecting it and clicking the <gui>Not Junk</gui> icon.</p>
+<p>Each time you flag a message as Junk, the sender is added to your Spam List; each time you flag a message as Not Junk, the sender is removed from your Spam List.</p>
+</page>
diff --git a/help/C/mail-spam-settings.page b/help/C/mail-spam-settings.page
new file mode 100644
index 0000000..b49dda6
--- /dev/null
+++ b/help/C/mail-spam-settings.page
@@ -0,0 +1,61 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-spam-settings">
+
+ <info>
+ <desc>How to set up handling unwanted junk and spam mail.</desc>
+
+ <link type="guide" xref="mail-spam" />
+ <link type="seealso" xref="mail-spam-marking"/>
+
+ <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>April Gonzales</name>
+ <email>loonycookie gmail com</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/config-prefs-mail.html.en#mail-prefs-junk -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Junk Mail Settings</title>
+
+<p>Evolution lets you check for unwanted junk or spam emails by using the Bogofilter or SpamAssassin tools. To use these tools, you need to make sure that they are installed via the software management tool of your distribution and you need enable their respective plugins.</p>
+<p><link action="install:bogofilter" href="http://bogofilter.sourceforge.net/";>Install bogofilter now.</link></p>
+<p><link action="install:spamassassin" href="http://spamassassin.apache.org/";>Install spamassassin now.</link></p>
+
+<p>To enable the plugins:</p>
+<steps>
+<item><p>Click <guiseq><gui>Edit</gui><gui>Plugins</gui></guiseq>.</p></item>
+<item><p>Select the plugins you wish to enable. You can select either Bogofilter or SpamAssassin, or both.</p></item>
+<item><p>Click <gui>Close</gui>.</p></item>
+</steps>
+
+<section id="preferences">
+<title>Junk Mail Preferences</title>
+<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>
+<item><p>Select <gui>Mail Preferences</gui>.</p></item>
+<item><p>Click on the <gui>Junk</gui> tab. Here, you can specify the following:</p>
+<list>
+<item><p>Checking incoming mail for junk messages.</p></item>
+<item><p>Deleting junk messages upon exit, and how often junk messages are to be deleted.</p></item>
+<item><p>Checking custom headers for junk.</p></item>
+<item><p>Marking messages as junk if the sender is in the address book.</p></item>
+<item><p>The default junk filter.</p></item>
+<item><p>Bogofilter and SpamAssassin options. These options are available only if the plugins are enabled.</p></item>
+</list>
+</item>
+</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/mail-spam.page b/help/C/mail-spam.page
new file mode 100644
index 0000000..4ce3b8f
--- /dev/null
+++ b/help/C/mail-spam.page
@@ -0,0 +1,27 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="mail-spam">
+
+ <info>
+ <desc>How to automatically handle unwanted mail.</desc>
+
+ <link type="guide" xref="index#mail-basic" />
+
+ <revision pkgversion="2.28.3" version="0.1" date="2010-12-09" status="stub"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Junk and Spam Mail Handling</title>
+
+ <section id="mail-spam-groupwise" style="2column">
+ <title>Novell Groupwise specific differences</title>
+<!-- TODO:POST-3-2: Not sure if that is a good place for Groupwise stuff, plus should depend on whether Groupwise is actually installed -->
+ </section>
+
+</page>
diff --git a/help/C/mail-two-trash-folders.page b/help/C/mail-two-trash-folders.page
new file mode 100644
index 0000000..38090f1
--- /dev/null
+++ b/help/C/mail-two-trash-folders.page
@@ -0,0 +1,32 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-two-trash-folders">
+
+ <info>
+ <desc>An explanation for the problem that two trash folders are present in Evolution.</desc>
+
+ <link type="guide" xref="index#common-mail-problems" />
+
+ <revision pkgversion="2.28.3" version="0.1" date="2010-10-09" status="final"/>
+ <credit type="author">
+ <name>April Gonzales</name>
+ <email>loonycookie gmail com</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Two Trash folders shown for the same account</title>
+
+<p>You may have created another Trash folder to hold all your deleted email messages. This can happen when you use another email client together with Evolution.</p>
+
+<p>Evolution's <gui>Trash</gui> folder is a <link xref="mail-search-folders">Search folder</link>. It does not really exist but simply displays all the messages that are marked for deletion in any folders of that account.</p>
+
+<p>You can easily tell the two Trash folders apart by looking at their icons. The Evolution <gui>Trash</gui> folder has a special icon whereas the other physical Trash folder looks like any other folder.</p>
+
+<note>
+<p>Note that the <gui>Junk</gui> folder is also a search folder and may also appear twice.</p>
+</note>
+
+</page>
diff --git a/help/C/mail-usenet-subscriptions.page b/help/C/mail-usenet-subscriptions.page
new file mode 100644
index 0000000..e2c552d
--- /dev/null
+++ b/help/C/mail-usenet-subscriptions.page
@@ -0,0 +1,35 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-usenet-subscriptions">
+
+ <info>
+ <desc>Subscribing to Usenet newsgroups.</desc>
+
+ <link type="guide" xref="mail-account-manage-usenet-news#other-settings"/>
+ <link type="seealso" xref="mail-imap-subscriptions"/>
+
+ <revision pkgversion="3.1.5" version="0.2" date="2011-07-28" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-getnsend-read.html.en#usage-mail-getnsend-get-news -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+
+<title>Newsgroups Subscriptions</title>
+
+<p>When you create a newsgroup account, you are not subscribed to any groups. To subscribe to a newsgroup:</p>
+<steps>
+<item><p>Select <guiseq><gui>Folder</gui><gui>Subscriptions</gui></guiseq>.</p></item>
+<item><p>If you have accounts on multiple servers, select the server where you want to manage your subscriptions.</p></item>
+<item><p>Click a group's checkbox to add a folder to your subscriptions.</p></item>
+</steps>
+
+</page>
+
diff --git a/help/C/mail-vertical-view.page b/help/C/mail-vertical-view.page
new file mode 100644
index 0000000..32bd1bd
--- /dev/null
+++ b/help/C/mail-vertical-view.page
@@ -0,0 +1,32 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-vertical-view">
+
+ <info>
+ <desc>Changing the mail view for widescreen displays.</desc>
+ <link type="guide" xref="mail-layout-changing" />
+
+ <revision pkgversion="3.1.5" version="0.3" date="2011-07-28" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-getnsend-read.html.en#b131ni8g -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <title>Vertical view</title>
+
+<p>Evolution provides a vertical view in addition to the classical view. In the vertical view, the message preview pane is located at the right side of the message list when compared to the classical view where the message preview pane is placed below the message list. Vertical view enables you to use the extra width of wide screen monitors.</p>
+
+<p>To switch to vertical view, click <guiseq><gui>View</gui><gui>Preview</gui><gui>Vertical View</gui></guiseq>.</p>
+
+<p>In vertical view, the message list contains double lines of compressed headers, which enables you to consume the extra width in the preview column. The compressed columns have Sender Name and Email, Attachment Icon, Date and Subject in the second line.</p>
+
+<p>To switch back to classical view, click <guiseq><gui>View</gui><gui>Preview</gui><gui>Classical View</gui></guiseq>.</p>
+
+</page>
diff --git a/help/C/mail-word-wrap.page b/help/C/mail-word-wrap.page
new file mode 100644
index 0000000..361d39b
--- /dev/null
+++ b/help/C/mail-word-wrap.page
@@ -0,0 +1,25 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-word-wrap">
+
+ <info>
+ <desc>Words are wrapped in outgoing mails at 72 characters.</desc>
+
+ <link type="guide" xref="index#common-mail-problems" />
+
+ <revision pkgversion="3.0.2" version="0.1" date="2011-07-25" status="draft"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Words are wrapped in outgoing mails at 72 characters</title>
+
+<p>For better readability lines are wrapped after 72 characters. This value is hardcoded and cannot be changed.</p>
+<p>To avoid line breaks within a paragraph, mark the paragraph and choose <guiseq><gui>Format</gui><gui>Paragraph Style</gui><gui>Preformatted</gui></guiseq> in the mail composer.</p>
+
+</page>
diff --git a/help/C/mail-working-offline.page b/help/C/mail-working-offline.page
new file mode 100644
index 0000000..df21f87
--- /dev/null
+++ b/help/C/mail-working-offline.page
@@ -0,0 +1,49 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-working-offline">
+
+ <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? -->
+ <link type="guide" xref="index#mail-basic" />
+
+ <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-getnsend-send.html.en#usage-mail-getnsend-offline -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Working Offline</title>
+
+<p>Offline mode helps you communicate with remote mail storage systems like GroupWise, IMAP or Exchange, in situations where you are not connected to the network at all times. Evolution keeps a local copy of one or more folders to allow you to compose messages, storing them in your Outbox to be sent the next time you connect.</p>
+
+<p>POP mail downloads all messages to your local system, but other connections usually download just the headers, and get the rest only when you want to read the message. Before you go offline, Evolution downloads the unread messages from the folders you have chosen to store.</p>
+
+<section id="mark-folders">
+<title>Marking folders for offline usage</title>
+<p>To mark a mail folder for offline use,</p>
+<steps>
+<item><p>Right-click the folder, then click <gui>Properties</gui>.</p></item>
+<item><p>Click <gui>Copy folder content locally for offline operation</gui>.</p></item>
+</steps>
+</section>
+
+<section id="sync-for-offline">
+<title>Syncing messages for offline usage</title>
+<p>Your connection status is shown by the small icon in the lower left corner of the Evolution main window. When you are online, it displays two connected cables. When you go offline via clicking the icon or via <guiseq><gui>File</gui><gui>Work Offline</gui></guiseq>, the cables separate. You will be asked whether you want to go offline immediately or synchronize folders locally before you go offline.</p>
+<p>To download Messages for Offline Operations without immediately going offline, select <guiseq><gui>File</gui><gui>Download Messages for Offline Usage</gui></guiseq>.</p>
+</section>
+
+<section id="network-manager-integration">
+<title>Automatic Network State Handling</title>
+<p>Evolution automatically understands the network state and acts accordingly. For instance, Evolution switches to offline mode when the network goes down and automatically switches on when the network is up again. Ensure that your system has Network Manager installed on to enable this feature.</p>
+</section>
+
+</page>
diff --git a/help/C/mail-wrong-fonts-in-3-0.page b/help/C/mail-wrong-fonts-in-3-0.page
new file mode 100644
index 0000000..7d0d8e5
--- /dev/null
+++ b/help/C/mail-wrong-fonts-in-3-0.page
@@ -0,0 +1,27 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="mail-wrong-fonts-in-3-0">
+
+ <info>
+ <desc>A known problem that is fixed in newer versions.</desc>
+
+ <link type="guide" xref="index#common-mail-problems" />
+ <link type="seealso" xref="mail-displaying-message" />
+
+ <revision pkgversion="3.0.2" version="0.1" date="2011-07-25" status="draft"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Message fonts are not the same fonts as in other applications</title>
+
+<p>It can happen that <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>Message Fonts</gui><gui>Use the same fonts as other applications</gui></guiseq> is enabled but Evolution still uses different fonts than other parts of the system.</p>
+
+<p>This bug is fixed in Evolution versions higher than 3.0.2 (stable series) and 3.1.3 (unstable development series). If this is not the case, please add a comment to the corresponding <link href="https://bugzilla.gnome.org/show_bug.cgi?id=655002";>bug report</link>.</p>
+
+</page>
diff --git a/help/C/memos-searching.page b/help/C/memos-searching.page
new file mode 100644
index 0000000..3d3b5e0
--- /dev/null
+++ b/help/C/memos-searching.page
@@ -0,0 +1,80 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="memos-searching">
+
+ <info>
+ <desc>Searching memos.</desc>
+
+ <link type="guide" xref="searching-items" />
+ <link type="guide" xref="tasks-organizing" />
+
+ <revision pkgversion="2.32.1" version="0.2" date="2010-10-12" status="draft"/>
+ <credit type="author">
+ <name>Max Vorobuov</name>
+ <email>vmax0770 gmail com</email>
+ </credit>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Searching Memos</title>
+<section id="quick-search">
+<title>Quick Search</title>
+<p>In the Memos view, you can quickly search for memos either by summary or by category.</p>
+<p>Searching by summary:</p>
+<steps>
+<item><p>Click the search icon <media type="image" mime="image/png" src="figures/search-icon.png"/> to expand the drop-down list.</p></item>
+<item><p>Select the search condition from the list.</p></item>
+<item><p>Enter the text you want to search for and press <key>Enter</key>.</p></item>
+<item><p>Evolution displays the search results.</p></item>
+</steps>
+<p>Searching by category:</p>
+<steps>
+<item><p>Click the <gui>Show</gui> drop-down list.</p></item>
+<item><p>Select the category from the list.</p></item>
+<item><p>Evolution displays the search results.</p></item>
+</steps>
+<p>If you want to set several search conditions, you should use an Advanced search, which is described below.</p>
+</section>
+
+<section id="advanced-search">
+<title>Advanced Search</title>
+<steps>
+<item><p>Select the <guiseq><gui>Search</gui><gui>Advanced Search</gui></guiseq> menu to open the dialog box.</p></item>
+<item><p>Click <gui style="button">Add Condition</gui> to add any number of rules.</p></item>
+<item><p>Select the condition from the dropdown list, and then type a search entry in the field.</p></item>
+<item><p>Click <gui style="button">OK</gui> to get the search results displayed.</p></item>
+</steps>
+</section>
+
+<!-- TODO:XINCLUDE: Needs refactoring as clearing-search and saved-searches are totally identical in all *-searching.page files -->
+<section id="clearing-search">
+<title>Clearing the Search results</title>
+<p>To clear your search view and get back to the default view, click the <gui>Clear</gui> icon in the search string field, or choose <guiseq><gui>Search</gui><gui>Clear</gui></guiseq> from the menubar. You can also press <keyseq><key>Shift</key><key>Ctrl</key><key>Q</key></keyseq> to clear the search.</p>
+</section>
+
+<section id="saved-searches">
+<title>Saved Searches</title>
+<p>If you search for something rather often, you will prefer not to type it many times. In this case you can use saved searches.</p>
+<p>To save your search results, either click <gui>Save</gui> instead of <gui>OK</gui> in the Search dialog, or in case the search results are already displayed, select <guiseq><gui>Search</gui><gui>Save Search</gui></guiseq>. From now on this search will be directly available from the <gui>Search</gui> menu.</p>
+</section>
+
+<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>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>
+</steps>
+</section>
+
+</page>
diff --git a/help/C/memos-usage-add-memo.page b/help/C/memos-usage-add-memo.page
new file mode 100644
index 0000000..68dc446
--- /dev/null
+++ b/help/C/memos-usage-add-memo.page
@@ -0,0 +1,53 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="memos-usage-add-memo">
+
+ <info>
+ <desc>Adding a memo to your memo list.</desc>
+
+ <link type="guide" xref="memos-usage" />
+
+ <revision pkgversion="3.0.2" version="0.1" date="2011-08-01" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/b15iirao.html.en -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Adding a Memo</title>
+
+<steps>
+<item><p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Memo</gui></guiseq>, or press <keyseq><key>Shift</key><key>Ctrl</key><key>O</key></keyseq>.</p></item>
+<item><p>Select a memo list in the <gui>List</gui> dropdown list.</p></item>
+<item><p>Enter the memo information.</p></item>
+<item><p>Click the <gui style="button">Save</gui> button, or <guiseq><gui>File</gui><gui>Save</gui></guiseq>.</p></item>
+</steps>
+
+<p>If you just want to quickly add a memo by entering a summary you can directly enter it in the list of memos.</p>
+
+<note><p>You can also define a <link xref="using-categories">category</link>, or a <link xref="calendar-classifications">classification</link> for the memo, or add an attachment.</p></note>
+
+<section id="shared-memos">
+<title>Shared Memos</title>
+
+<p>Shared Memos are like mail messages except they are scheduled for a particular day and appear on the calendar for that date. You can use shared memos to show vacations, holidays, pay days, birthdays, and so on. Posted shared memos are placed in your Calendar on the date you specify. They are not placed in your Mailbox or in any other user's Mailbox.</p>
+
+<p>To send a Shared Memo,</p>
+<steps>
+<item><p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Shared Memo</gui></guiseq>, or press <keyseq><key>Shift</key><key>Ctrl</key><key>H</key></keyseq>.</p></item>
+<item><p>Select the Organizer's account name from the drop-down list given next to the Organizer field.</p></item>
+<item><p>In the To field, type a username, then press Enter. Repeat this for additional users.</p></item>
+<item><p>Select the task list (under <gui>List</gui>) in which you would like to create the entry.</p></item>
+<item><p>Enter a brief summary in the Summary field.</p></item>
+<item><p>In the Start Date field, type the date this shared memo should appear in the recipients' calendars.</p></item>
+<item><p>Click the <gui style="button">Save</gui> button, or <guiseq><gui>File</gui><gui>Save</gui></guiseq>.</p></item>
+</steps>
+</section>
+
+</page>
diff --git a/help/C/memos-usage-delete-memo.page b/help/C/memos-usage-delete-memo.page
new file mode 100644
index 0000000..cfb8748
--- /dev/null
+++ b/help/C/memos-usage-delete-memo.page
@@ -0,0 +1,24 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="memos-usage-delete-memo">
+
+ <info>
+ <desc>Deleting a memo from your memo list.</desc>
+
+ <link type="guide" xref="memos-usage" />
+
+ <revision pkgversion="3.0.2" version="0.1" date="2011-08-01" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Deleting a Memo</title>
+
+<p>If you want to delete a memo in your memo lists, right-click on the memo and select <gui>Delete</gui>, or click on the task and click <gui>Delete</gui> in the tool bar, or click <guiseq><gui>Edit</gui><gui>Delete Memo</gui></guiseq>.</p>
+
+</page>
diff --git a/help/C/memos-usage-edit-memo.page b/help/C/memos-usage-edit-memo.page
new file mode 100644
index 0000000..5dacae9
--- /dev/null
+++ b/help/C/memos-usage-edit-memo.page
@@ -0,0 +1,29 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="memos-usage-edit-memo">
+
+ <info>
+ <desc>Editing a memo in your memo list.</desc>
+
+ <link type="guide" xref="memos-usage" />
+
+ <revision pkgversion="3.0.2" version="0.1" date="2011-08-01" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Editing a Memo</title>
+
+<p>If you want to change a memo that already exists in your memo lists,</p>
+
+<steps>
+<item><p>Double-click on the memo that you want to edit in the list of contacts, or right-click on the task and click <key>Open Memo</key>.</p></item>
+<item><p>Edit the memo information.</p></item>
+<item><p>Click the <gui style="button">Save</gui> button, or <guiseq><gui>File</gui><gui>Save</gui></guiseq>.</p></item>
+</steps>
+</page>
diff --git a/help/C/memos-usage.page b/help/C/memos-usage.page
new file mode 100644
index 0000000..fe83460
--- /dev/null
+++ b/help/C/memos-usage.page
@@ -0,0 +1,25 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="memos-usage">
+
+ <info>
+ <desc>On adding, editing, and deleting memos.</desc>
+
+ <link type="guide" xref="index#memos-and-tasks" />
+
+ <revision pkgversion="2.32.1" version="0.1" date="2010-10-12" status="stub"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Add, Edit and Delete Memos</title>
+
+<note style="tip"><p>Currently there is no support for syncing memos with the Tomboy or Gnote applications.</p></note>
+<!-- TODO:POST-3-2: Periodically recheck status of https://bugzilla.gnome.org/show_bug.cgi?id=469217 -->
+
+</page>
diff --git a/help/C/minimize-to-system-tray.page b/help/C/minimize-to-system-tray.page
new file mode 100644
index 0000000..f8ec4be
--- /dev/null
+++ b/help/C/minimize-to-system-tray.page
@@ -0,0 +1,31 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="minimize-to-system-tray">
+
+ <info>
+ <desc>On minimizing Evolution to the notification area.</desc>
+
+ <link type="guide" xref="index#common-other-problems" />
+
+ <revision pkgversion="3.0.2" version="0.3" date="2011-07-30" status="final"/>
+ <credit type="author">
+ <name>April Gonzales</name>
+ <email>loonycookie gmail com</email>
+ </credit>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+
+<title>Minimizing Evolution to the system tray</title>
+
+<p>GNOME, by default, has a <link xref="mail-received-notification">notification area</link> which includes an applet that informs users of any system updates, changes, or events. This includes the arrival of email messages on Evolution. You can refer to this built-in feature of GNOME for any email notifications.</p>
+
+<p>In GNOME version 2 you may modify the notification area and set it up to become a system tray by using external software such as <link href="http://alltray.trausch.us/";> Alltray</link> that might be available for installation in the software management tool of your distribution. This is not possible in GNOME 3 anymore.</p>
+</page>
+
diff --git a/help/C/organizing.page b/help/C/organizing.page
new file mode 100644
index 0000000..01ac26b
--- /dev/null
+++ b/help/C/organizing.page
@@ -0,0 +1,20 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="organizing">
+
+ <info>
+ <desc>On organizing and finding your data in Evolution.</desc>
+
+ <revision pkgversion="2.32.1" version="0.1" date="2011-01-05" status="stub"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Sorting and organizing</title>
+
+</page>
diff --git a/help/C/problems-debug-how-to.page b/help/C/problems-debug-how-to.page
new file mode 100644
index 0000000..2a67490
--- /dev/null
+++ b/help/C/problems-debug-how-to.page
@@ -0,0 +1,31 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="problems-debug-how-to">
+
+ <info>
+ <desc>How to provide good information when tracking down a problem.</desc>
+
+ <link type="guide" xref="index#tracking-down-problems" />
+ <link type="seealso" xref="problems-getting-help" />
+
+ <revision pkgversion="3.0.2" version="0.3" date="2011-07-30" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>How to track down a problem</title>
+
+<p>As a first hint, error messages will be either displayed in the statusbar or between the tool bar and the search bar.</p>
+
+<p>To further track down a problem, some debug options are listed on the <link href="http://projects.gnome.org/evolution/bugs.shtml";>Evolution project website</link>.</p>
+
+<p>To contact the Evolution community for help, please see <link xref="problems-getting-help">How to get help</link>.</p>
+
+<!-- Debug logs as described in http://library.gnome.org/users/evolution/2.32/b1a4ol61.html.en do not exist anymore in 3.0 -->
+</page>
+
diff --git a/help/C/problems-getting-help.page b/help/C/problems-getting-help.page
new file mode 100644
index 0000000..be2eef1
--- /dev/null
+++ b/help/C/problems-getting-help.page
@@ -0,0 +1,27 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="problems-getting-help">
+
+ <info>
+ <desc>How to get help for problems.</desc>
+
+ <link type="guide" xref="index#tracking-down-problems" />
+ <link type="seealso" xref="problems-reporting-bugs" />
+
+ <revision pkgversion="2.32.1" version="0.3" date="2011-07-21" status="draft"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+
+<title>How to get help</title>
+
+<p>To receive help on problems you can send an email to the <link href="http://mail.gnome.org/mailman/listinfo/evolution-list";>Evolution mailing list</link> or ask a message in the IRC chat channel #evolution on the server irc.gimp.net.</p>
+
+</page>
+
diff --git a/help/C/problems-reporting-bugs.page b/help/C/problems-reporting-bugs.page
new file mode 100644
index 0000000..eaa8349
--- /dev/null
+++ b/help/C/problems-reporting-bugs.page
@@ -0,0 +1,25 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="problems-reporting-bugs">
+
+ <info>
+ <desc>How to report bugs.</desc>
+
+ <link type="guide" xref="index#tracking-down-problems"/>
+ <link type="seealso" xref="problems-debug-how-to" />
+
+ <revision pkgversion="3.1.5" version="0.4" date="2011-08-01" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+ <title>How to report bugs</title>
+
+<p>If you do not need help for configuration but you are sure that you have found a bug in the Evolution software, or if you want to request a feature you can file a bug report in the <link href="http://bugzilla.gnome.org";>GNOME bug tracking system</link>. Note that this requires registration first. Please try to avoid filing duplicates and check the <link href="https://bugzilla.gnome.org/page.cgi?id=bug-writing.html";>bug writing guidelines</link> first.</p><p>Also note that GNOME distributions sometimes introduce their own changes in Evolution that are not included in GNOME Evolution. This is hard to recognize for users but if you are aware of it please file a bug report in <link xref="https://live.gnome.org/Bugsquad/TriageGuide/NonGnome#Bug_trackers_for_distributions";>the bug tracker of your GNOME distribution</link> instead.</p>
+
+</page>
diff --git a/help/C/searching-items.page b/help/C/searching-items.page
new file mode 100644
index 0000000..1c2c7f4
--- /dev/null
+++ b/help/C/searching-items.page
@@ -0,0 +1,20 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="searching-items">
+
+ <info>
+ <desc>Searching content and data within <em>Evolution</em>.</desc>
+
+ <revision pkgversion="2.32.1" version="0.1" date="2010-12-12" status="stub"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Searching items</title>
+
+</page>
diff --git a/help/C/sync-with-other-devices.page b/help/C/sync-with-other-devices.page
new file mode 100644
index 0000000..4f5397b
--- /dev/null
+++ b/help/C/sync-with-other-devices.page
@@ -0,0 +1,66 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="sync-with-other-devices">
+
+ <info>
+ <desc>Synchronize Evolution data with handheld devices and mobile phones.</desc>
+
+ <link type="guide" xref="index#data-migration-and-sync"/>
+
+ <revision pkgversion="2.30.2" version="0.2" date="2010-12-11" status="draft"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/config-sync.html.en -->
+ </credit>
+ <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? -->
+ </info>
+
+ <title>Synchronize <em>Evolution</em> with other devices</title>
+
+<p>There are currently no "recommended instructions" for users.</p>
+
+<p>Many distributions provide the application <link href="http://syncevolution.org/";>SyncEvolution</link> that can be used in combination with devices that support <link href="https://secure.wikimedia.org/wikipedia/en/wiki/SyncML";>SyncML</link>.<!-- Buteo development seems to have slowed down, hence commenting this section - AndreKlapper, 2011/05/14: Also <link href="http://wiki.meego.com/Buteo";>Buteo</link> aims to provide that functionality. A technical comparison of Buteo with SyncEvolution can be found <link href="http://meego.com/sites/all/files/meego-sync-linuxcon-2010.pdf";>here on slide #18</link>. --></p>
+
+<p>Another option might be to use applications and devices that both support the <link href="https://secure.wikimedia.org/wikipedia/en/wiki/ActiveSync";>ActiveSync protocol</link>. A <link href="https://secure.wikimedia.org/wikipedia/en/wiki/List_of_collaborative_software";>list of collaborative software</link> is available on Wikipedia.</p>
+
+ <p>If you can provide good practices or more information on this topic feel free to file a bug report in <link href="https://bugzilla.gnome.org/enter_bug.cgi?product=evolution&component=User%20Documentation";>GNOME's bug tracking system</link>.</p>
+
+ <section id="palm">
+ <title>Palm</title>
+<p>To synchronize with a Palm OS device like the PalmPilot(TM) and the Handspring Visor several steps are needed: First, you need to enable synchronization. Second, your computer needs to recognize and access your handheld. Third, you should decide what sort of synchronization behavior you want.</p>
+ <section id="sync-enabling-palm">
+ <title>Enabling Synchronization</title>
+ <p>If you have not used a handheld device with your computer before, you need to configure it via <guiseq><gui>Edit</gui><gui>GNOME Pilot Synchronization...</gui></guiseq>. Make sure that you have read and write permissions on the device, which is normally in <file>/dev/pilot</file>. If that does not work, check in <file>/dev/ttyS0</file> if you have a serial connection, or in <file>/dev/ttyUSB1</file> for a USB connection. You can do this by becoming root user and adding your username to the group that owns this device node. For a USB device on sync, two device nodes are created, <file>ttyUSB0</file> and <file>ttyUSB1</file>. The second node is the one to be used in configuring the device.</p>
+ </section>
+ <section id="sync-selecting-conduits-">
+ <title>Selecting Conduits</title>
+ <p>After your computer and your Palm OS device are communicating, select the conduits you want under the <gui>Pilot Conduits</gui> section. You can use conduits to synchronize data with several applications; the Evolution conduits are labeled <gui>EAddress</gui> for the contacts in your address book; <gui>ECalendar</gui> for your calendar; and <gui>ETodo</gui> for your task list.</p>
+ <p>Click <gui>Enable</gui>, then click <gui>Settings</gui> to change what the conduit does when activated. Your options can vary depending on the conduit, but typically they are as follows:</p>
+ <list>
+ <item><p><gui>Disabled</gui>: Do nothing.</p></item>
+ <item><p><gui>Synchronize</gui>: Copy new data from the computer to the handheld, and from the handheld to the computer. Remove items that were on both systems but have been deleted on one.</p></item>
+ <item><p><gui>Copy From Pilot</gui>: If there is any new data on the handheld device, copy it to the computer.</p></item>
+ <item><p><gui>Copy To Pilot</gui>: Copy new data from the computer to the handheld.</p></item>
+ </list>
+ <p>Select the behavior you want for each conduit you choose to use. If you're not sure, use <gui>Synchronize</gui>.</p>
+ </section>
+
+ <section id="sync-information">
+ <title>Synchronizing Information</title>
+ <p>Use the following procedure to synchronize the data on your Palm OS device with the data you store in Evolution.</p>
+ <list>
+ <item><p>If you want to back up your information before synchronizing, make a copy of the <file>.local/share/evolution</file> directory inside your home directory.</p></item>
+ <item><p>Put your handheld device in its cradle and press the <gui style="button">HotSync</gui> button.</p></item>
+ <item><p>If you use Palm OS version 4.0 and have password protection turned on for your handheld device, you might encounter trouble synchronizing. If this happens, try turning off password protection on your handheld, synchronize it with your desktop computer, and then re-enable password protection on your handheld.</p></item>
+ </list>
+ <p>Now your Palm OS device will synchronize data with Evolution.</p>
+ </section>
+
+ </section>
+
+</page>
diff --git a/help/C/tasks-caldav.page b/help/C/tasks-caldav.page
new file mode 100644
index 0000000..b81f119
--- /dev/null
+++ b/help/C/tasks-caldav.page
@@ -0,0 +1,37 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="tasks-caldav">
+
+ <info>
+ <desc>Using an online CalDAV task list or memo list.</desc>
+
+ <link type="guide" xref="tasks-using-several-tasklists"/>
+
+ <revision pkgversion="3.1.5" version="0.3" date="2011-07-28" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Using a CalDAV task or memo list</title>
+
+<p>To add such a task list or memo list to Evolution, perform the following steps:</p>
+<steps>
+<item><p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Task List</gui></guiseq> or <guiseq><gui>File</gui><gui>New</gui><gui>Memo List</gui></guiseq>.</p></item>
+<item><p>Select the type <gui>On the Web</gui>.</p></item>
+<item><p>Enter a name that you prefer.</p></item>
+<item><p>Optionally choose a color that you prefer.</p></item>
+<item><p>Choose if you want to be able to view the content also when being offline.</p></item>
+<item><p>Enter the address of the list in the <gui>URL</gui> field.</p></item>
+<item><p>Choose <gui>Use secure connection</gui> if you want to connect securely.</p></item>
+<item><p>Enter your username and your email address.</p></item>
+<item><p>Click <gui style="button">Apply</gui>.</p></item>
+</steps>
+
+<p>The task list will be added to the list of task lists in Evolution.</p>
+
+</page>
diff --git a/help/C/tasks-display-settings.page b/help/C/tasks-display-settings.page
new file mode 100644
index 0000000..586a0d1
--- /dev/null
+++ b/help/C/tasks-display-settings.page
@@ -0,0 +1,40 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="tasks-display-settings">
+
+ <info>
+ <desc>Options for displaying task completion and due dates.</desc>
+
+ <link type="guide" xref="index#memos-and-tasks"/>
+
+ <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/config-prefs-cal.html.en#bshpsxa -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<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: Update once https://bugzilla.gnome.org/show_bug.cgi?id=655666 is fixed -->
+
+<p>The following task-related options are available under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Calendar and Tasks</gui><gui>Display</gui><gui>Task List</gui></guiseq>.</p>
+
+<list>
+<item><p>Tasks due today:</p>
+<p>Select the color for tasks due today.</p></item>
+<item><p>Overdue tasks:</p>
+<p>Select the color for overdue tasks.</p></item>
+<item><p>Hide completed tasks after:</p>
+<p>Select this option to have completed tasks hidden after a period of time measured in days, hours, or minutes. If you do not select this option, completed tasks remain in your task list, marked as complete.</p></item>
+</list>
+
+</page>
diff --git a/help/C/tasks-local.page b/help/C/tasks-local.page
new file mode 100644
index 0000000..d2859d5
--- /dev/null
+++ b/help/C/tasks-local.page
@@ -0,0 +1,33 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="tasks-local">
+
+ <info>
+ <desc>Adding another local task or memo list.</desc>
+
+ <link type="guide" xref="tasks-using-several-tasklists"/>
+
+ <revision pkgversion="3.1.5" version="0.3" date="2011-07-28" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Adding another local task or memo list</title>
+
+<p>To add another local task list to Evolution, perform the following steps:</p>
+<steps>
+<item><p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Task List</gui></guiseq> or <guiseq><gui>File</gui><gui>New</gui><gui>Memo List</gui></guiseq>.</p></item>
+<item><p>Select the type <gui>On This Computer</gui>.</p></item>
+<item><p>Enter a name that you prefer.</p></item>
+<item><p>Optionally choose a color that you prefer.</p></item>
+<item><p>Click <gui style="button">Apply</gui>.</p></item>
+</steps>
+
+<p>The task list will be added to the list of task lists in Evolution.</p>
+
+</page>
diff --git a/help/C/tasks-organizing.page b/help/C/tasks-organizing.page
new file mode 100644
index 0000000..d0000db
--- /dev/null
+++ b/help/C/tasks-organizing.page
@@ -0,0 +1,23 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="tasks-organizing">
+
+ <info>
+ <desc>On task and memo lists, searching, and categories.</desc>
+
+ <link type="guide" xref="index#memos-and-tasks" />
+ <link type="guide" xref="organizing" />
+
+ <revision pkgversion="2.32.1" version="0.1" date="2011-01-05" status="stub"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Sorting and organizing tasks and memos</title>
+
+</page>
diff --git a/help/C/tasks-searching.page b/help/C/tasks-searching.page
new file mode 100644
index 0000000..29d6cdd
--- /dev/null
+++ b/help/C/tasks-searching.page
@@ -0,0 +1,80 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="tasks-searching">
+
+ <info>
+ <desc>Searching tasks.</desc>
+
+ <link type="guide" xref="searching-items" />
+ <link type="guide" xref="tasks-organizing" />
+
+ <revision pkgversion="2.32.1" version="0.2" date="2010-10-12" status="draft"/>
+ <credit type="author">
+ <name>Max Vorobuov</name>
+ <email>vmax0770 gmail com</email>
+ </credit>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Searching Tasks</title>
+<section id="quick-search">
+<title>Quick Search</title>
+<p>In the Tasks view, you can quickly search for tasks either by summary or by category.</p>
+<p>Searching by summary:</p>
+<steps>
+<item><p>Click the search icon <media type="image" mime="image/png" src="figures/search-icon.png"/> to expand the drop-down list.</p></item>
+<item><p>Select the search condition from the list.</p></item>
+<item><p>Enter the text you want to search for and press <key>Enter</key>.</p></item>
+<item><p>Evolution displays the search results.</p></item>
+</steps>
+<p>Searching by category:</p>
+<steps>
+<item><p>Click the <gui>Show</gui> drop-down list.</p></item>
+<item><p>Select the category from the list.</p></item>
+<item><p>Evolution displays the search results.</p></item>
+</steps>
+<p>If you want to set several search conditions, you should use an Advanced search, which is described below.</p>
+</section>
+
+<section id="advanced-search">
+<title>Advanced Search</title>
+<steps>
+<item><p>Select the <guiseq><gui>Search</gui><gui>Advanced Search</gui></guiseq> menu to open the dialog box.</p></item>
+<item><p>Click <gui style="button">Add Condition</gui> to add any number of rules.</p></item>
+<item><p>Select the condition from the dropdown list, and then type a search entry in the field.</p></item>
+<item><p>Click <gui style="button">OK</gui> to get the search results displayed.</p></item>
+</steps>
+</section>
+
+<!-- TODO:XINCLUDE: Needs refactoring as clearing-search and saved-searches are totally identical in all *-searching.page files -->
+<section id="clearing-search">
+<title>Clearing the Search results</title>
+<p>To clear your search view and get back to the default view, click the <gui>Clear</gui> icon in the search string field, or choose <guiseq><gui>Search</gui><gui>Clear</gui></guiseq> from the menubar. You can also press <keyseq><key>Shift</key><key>Ctrl</key><key>Q</key></keyseq> to clear the search.</p>
+</section>
+
+<section id="saved-searches">
+<title>Saved Searches</title>
+<p>If you search for something rather often, you will prefer not to type it many times. In this case you can use saved searches.</p>
+<p>To save your search results, either click <gui>Save</gui> instead of <gui>OK</gui> in the Search dialog, or in case the search results are already displayed, select <guiseq><gui>Search</gui><gui>Save Search</gui></guiseq>. From now on this search will be directly available from the <gui>Search</gui> menu.</p>
+</section>
+
+<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>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>
+</steps>
+</section>
+
+</page>
diff --git a/help/C/tasks-usage-add-task.page b/help/C/tasks-usage-add-task.page
new file mode 100644
index 0000000..d573bfd
--- /dev/null
+++ b/help/C/tasks-usage-add-task.page
@@ -0,0 +1,45 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="tasks-usage-add-task">
+
+ <info>
+ <desc>Adding a task to your task list.</desc>
+
+ <link type="guide" xref="tasks-usage" />
+
+ <revision pkgversion="3.0.2" version="0.1" date="2011-08-01" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/stable/usage-calendar-todo.html.en#b1012vcx -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Adding a Task</title>
+
+<steps>
+<item><p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Task</gui></guiseq>, or press <keyseq><key>Shift</key><key>Ctrl</key><key>T</key></keyseq>.</p></item>
+<item><p>Select a task list in the <gui>List</gui> dropdown list.</p></item>
+<item><p>Enter the task information.</p></item>
+<item><p>Click the <gui style="button">Save</gui> button, or <guiseq><gui>File</gui><gui>Save</gui></guiseq>.</p></item>
+</steps>
+
+<p>If you just want to quickly add a task by entering a summary you can directly enter it in the list of tasks.</p>
+
+<note><p>You can also define a <link xref="calendar-timezones">time zone</link>, a <link xref="using-categories">category</link>, or a <link xref="calendar-classifications">classification</link> for the task, or add an attachment.</p></note>
+
+<section id="assigned-tasks">
+<title>Assigned Tasks</title>
+
+<p>Evolution can be used to assign a task to multiple people.</p>
+<p>When you assign a task, you can specify the attendees in several categories, such as "chair" or "required". When you save the task, each attendee is sent an email with the task information, which also gives them the option to respond.</p>
+<p>This is similar to <link xref="calendar-meetings-sending-invitation">meetings</link>.</p>
+<p>To create an Assigned Task, click <guiseq><gui>File</gui><gui>New</gui><gui>Assigned Task</gui></guiseq>.</p>
+</section>
+
+</page>
diff --git a/help/C/tasks-usage-delete-task.page b/help/C/tasks-usage-delete-task.page
new file mode 100644
index 0000000..abde9fa
--- /dev/null
+++ b/help/C/tasks-usage-delete-task.page
@@ -0,0 +1,24 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="tasks-usage-delete-task">
+
+ <info>
+ <desc>Deleting a task from your task list.</desc>
+
+ <link type="guide" xref="tasks-usage" />
+
+ <revision pkgversion="3.0.2" version="0.1" date="2011-08-01" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Deleting a Task</title>
+
+<p>If you want to delete a task in your task lists, right-click on the task and select <gui>Delete</gui>, or click on the task and click <gui>Delete</gui> in the tool bar or press <keyseq><key>Ctrl</key><key>D</key></keyseq>, or click <guiseq><gui>Edit</gui><gui>Delete Task</gui></guiseq>.</p>
+
+</page>
diff --git a/help/C/tasks-usage-edit-task.page b/help/C/tasks-usage-edit-task.page
new file mode 100644
index 0000000..0ccf108
--- /dev/null
+++ b/help/C/tasks-usage-edit-task.page
@@ -0,0 +1,30 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="tasks-usage-edit-task">
+
+ <info>
+ <desc>Editing a task in your task list.</desc>
+
+ <link type="guide" xref="tasks-usage" />
+
+ <revision pkgversion="3.0.2" version="0.1" date="2011-08-01" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Editing a Task</title>
+
+<p>If you want to change a task that already exists in your task lists,</p>
+
+<steps>
+<item><p>Double-click on the task that you want to edit in the list of contacts, or right-click on the task and click <key>Open Task</key>.</p></item>
+<item><p>Edit the task information.</p></item>
+<item><p>Click the <gui style="button">Save</gui> button, or <guiseq><gui>File</gui><gui>Save</gui></guiseq>.</p></item>
+</steps>
+
+</page>
diff --git a/help/C/tasks-usage.page b/help/C/tasks-usage.page
new file mode 100644
index 0000000..669f986
--- /dev/null
+++ b/help/C/tasks-usage.page
@@ -0,0 +1,22 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="tasks-usage">
+
+ <info>
+ <desc>On adding, editing, and deleting tasks.</desc>
+
+ <link type="guide" xref="index#memos-and-tasks" />
+
+ <revision pkgversion="2.32.1" version="0.1" date="2010-10-12" status="stub"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Add, Edit, and Delete Tasks</title>
+
+</page>
diff --git a/help/C/tasks-using-several-tasklists.page b/help/C/tasks-using-several-tasklists.page
new file mode 100644
index 0000000..4726a5f
--- /dev/null
+++ b/help/C/tasks-using-several-tasklists.page
@@ -0,0 +1,28 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="guide" id="tasks-using-several-tasklists">
+
+ <info>
+ <desc>Adding and using more than one task list or memo list.</desc>
+
+ <link type="guide" xref="tasks-organizing" />
+
+ <revision pkgversion="3.1.5" version="0.2" date="2011-07-28" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Using several task lists or memo lists</title>
+
+<p>You can have multiple task or memo lists and overlay them one over the next. For example, you might have tasks for work, tasks for home, and tasks for the singing club that you are a member of. The side bar lists those lists, and you can select or deselect the boxes next to them to show and hide the tasks or memos in your view.</p>
+
+<p>Tasks and memos for each task or memo list appear as a different color.</p>
+
+<p>You can also use lists that are not on your computer, such as on the internet.</p>
+
+</page>
diff --git a/help/C/tasks-webdav.page b/help/C/tasks-webdav.page
new file mode 100644
index 0000000..cec7953
--- /dev/null
+++ b/help/C/tasks-webdav.page
@@ -0,0 +1,39 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="tasks-webdav">
+
+ <info>
+ <desc>Using an online WebDAV task list or memo list.</desc>
+
+ <link type="guide" xref="tasks-using-several-tasklists"/>
+
+ <revision pkgversion="3.1.5" version="0.3" date="2011-07-28" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Using a WebDAV task or memo list</title>
+
+<p>Lists of this type are read-only.</p>
+
+<p>To add such a task list or memo list to Evolution, perform the following steps:</p>
+<steps>
+<item><p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Task List</gui></guiseq> or <guiseq><gui>File</gui><gui>New</gui><gui>Memo List</gui></guiseq>.</p></item>
+<item><p>Select the type <gui>On the Web</gui>.</p></item>
+<item><p>Enter a name that you prefer.</p></item>
+<item><p>Optionally choose a color that you prefer.</p></item>
+<item><p>Choose if you want to be able to view the content also when being offline.</p></item>
+<item><p>Enter the address of the list in the <gui>URL</gui> field.</p></item>
+<item><p>Choose <gui>Use secure connection</gui> if you want to connect securely.</p></item>
+<item><p>Enter your username.</p></item>
+<item><p>Click <gui style="button">Apply</gui>.</p></item>
+</steps>
+
+<p>The calendar will be added to the list of calendars in Evolution.</p>
+
+</page>
diff --git a/help/C/using-categories.page b/help/C/using-categories.page
new file mode 100644
index 0000000..fe9e8b9
--- /dev/null
+++ b/help/C/using-categories.page
@@ -0,0 +1,59 @@
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+ type="topic" id="using-categories">
+
+ <info>
+ <desc>Using and managing categories for appointments, contacts, memos and tasks.</desc>
+
+ <link type="guide" xref="contacts-organizing" />
+ <link type="guide" xref="tasks-organizing" />
+ <link type="guide" xref="calendar-organizing" />
+
+ <revision pkgversion="3.1.5" version="0.5" date="2011-08-01" status="final"/>
+ <credit type="author">
+ <name>Andre Klapper</name>
+ <email>ak-47 gmx net</email>
+ </credit>
+ <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-contact-organize.html.en#usage-contact-organize-group-category -->
+ </credit>
+ <license>
+ <p>Creative Commons Share Alike 3.0</p>
+ </license>
+
+ </info>
+
+<title>Using Categories</title>
+
+<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>
+
+<section id="set-category-for-object">
+<title>Setting categories for an object</title>
+
+<p>To mark an object as belonging to a category,</p>
+<steps>
+<item><p>Double-click the object to bring up the corresponding editor.</p></item>
+<item><p>Click <gui style="button">Categories...</gui>. (If this button is not available, select <guiseq><gui>View</gui><gui>Categories</gui></guiseq>.)</p></item>
+<item><p>Select the category from the list. You can select as many or as few categories as you like.</p></item>
+</steps>
+
+</section>
+
+<section id="managing-categories">
+<title>Adding and managing categories</title>
+
+<p>If the default list of categories does not suit your needs, you can add your own categories either directly via <guiseq><gui>Edit</gui><gui>Available Categories</gui></guiseq>, or indirectly when editing an object:</p>
+<steps>
+<item><p>Double-click any object to bring up th corresponding editor.</p></item>
+<item><p>Click <gui style="button">Categories...</gui>. (If this button is not available, select <guiseq><gui>View</gui><gui>Categories</gui></guiseq>.)</p></item>
+<item><p>Enter the new category in the entry box at the top.</p></item>
+<item><p>Click <gui style="button">OK</gui>.</p></item>
+<item><p>You can now see the category in the <gui>Categories</gui> text field in the editor.</p></item>
+<item><p>Click <gui style="button">OK</gui>.</p></item>
+</steps>
+
+<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>
diff --git a/help/Makefile.am b/help/Makefile.am
index a76ec77..50f2c75 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,81 +1,238 @@
-# Suppress the Posix / GNU Make Warnings
-AUTOMAKE_OPTIONS=-Wno-portability
-
SUBDIRS = quickref
include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
-
-DOC_MODULE = evolution
-DOC_ENTITIES =
-DOC_INCLUDES =
-DOC_FIGURES = \
- figures/attach_reminder_a.png \
- figures/calendar_preference_display.png \
- figures/categories_a.png \
- figures/contacts_mainwindow_a.png \
- figures/delgt-add.png \
- figures/evo_adv_search_a.png \
- figures/evo_attachreminder_plugin.png \
- figures/evo_blink.png \
- figures/evo_cal_callout_a.png \
- figures/evo_calender_appointmnt.png \
- figures/evo_calstatus_a.png \
- figures/evo_caltasks_a.png \
- figures/evo_contacteditor_a.png \
- figures/evo_delegate_permission_a.png \
- figures/evo_dialog-info.png \
- figures/evo_dialog-warning.png \
- figures/evo_edit_search.png \
- figures/evo_exchng_mapi.png \
- figures/evo_flag_follow_up_a.png \
- figures/evo_gwreceive_a.png \
- figures/evo_gwstatustrack.png \
- figures/evo_imapreceive_a.png \
- figures/evo_label_a.png \
- figures/evo_labels_a.png \
- figures/evo_mail_a.png \
- figures/evo_mail_callout_a.png \
- figures/evo_maildirreceive_a.png \
- figures/evo_mboxreceive_a.png \
- figures/evo_memo_a.png \
- figures/evo_mhreceive_a.png \
- figures/evo_memo_a.png \
- figures/evo_newmess_a.png \
- figures/evo_newmail.png \
- figures/evo_popreceive_a.png \
- figures/evo_proxyadd_a.png \
- figures/evo_rule_a.png \
- figures/evo_send_option_a.png \
- figures/evo_send_setup_a.png \
- figures/evo_sendstatus_a.png \
- figures/evo_shd_memo_a.png \
- figures/evo_usereceive_a.png \
- figures/evo_junk_a.png \
- figures/evo_offline.png \
- figures/evo_Wcal_prop_a.png \
- figures/evolution_contact_preference.png\
- figures/evolution_mail_preference.png \
- figures/exchng-rec-mails.png \
- figures/exchng-rec-options.png \
- figures/filter-new-fig.png \
- figures/folder_plus.png \
- figures/google_cal_view.png \
- figures/groupwise_resend.png \
- figures/groupwise_resend_retract.png \
- figures/local_ics_calendar.png \
- figures/mailer_preferences.png \
- figures/meeting.png \
- figures/minus.png \
- figures/plus.png \
- figures/quick_add_a.png \
- figures/quick_reference.png \
- figures/stock_search.png \
- figures/ver_view_a.png
-DOC_LINGUAS = cs de el en_GB es eu fr gl oc ru sl sv mk zh_CN
+DOC_ID = evolution
+DOC_FIGURES = \
+ figures/color-204a87.png \
+ figures/color-2e3436.png \
+ figures/color-4e9a06.png \
+ figures/color-5c3566.png \
+ figures/color-8f5902.png \
+ figures/color-a40000.png \
+ figures/color-c4a000.png \
+ figures/color-ce5c00.png \
+ figures/evolutionlogo.png \
+ figures/minus-icon.png \
+ figures/new-mail-notification.png \
+ figures/new-mail-switcher.png \
+ figures/plus-icon.png \
+ figures/search-icon.png \
+ figures/window-overview-layers.png
-check:
- xmllint --valid --noout $(top_srcdir)/help/C/evolution.xml
+DOC_PAGES = \
+ backup-restore.page \
+ calendar-alarms-and-reminders.page \
+ calendar-caldav.page \
+ calendar-classifications.page \
+ calendar-free-busy.page \
+ calendar-google.page \
+ calendar-layout-appointment-display.page \
+ calendar-layout-general-formatting.page \
+ calendar-layout.page \
+ calendar-layout-views.page \
+ calendar-local.page \
+ calendar-marcus-bains-line.page \
+ calendar-meetings-delegating.page \
+ calendar-meetings.page \
+ calendar-meetings-replying-to-invitation.page \
+ calendar-meetings-sending-invitation.page \
+ calendar-organizing.page \
+ calendar-publishing.page \
+ calendar-recurrence.page \
+ calendar-searching.page \
+ calendar-sharing-information.page \
+ calendar-timezones.page \
+ calendar-usage-add-appointment.page \
+ calendar-usage-delete-appointment.page \
+ calendar-usage-edit-appointment.page \
+ calendar-usage.page \
+ calendar-using-several-calendars.page \
+ calendar-weather.page \
+ calendar-webdav.page \
+ change-switcher-appearance.page \
+ contacts-add-automatically.page \
+ contacts-autocompletion.page \
+ contacts-google.page \
+ contacts-ldap.page \
+ contacts-local.page \
+ contacts-organizing.page \
+ contacts-searching.page \
+ contacts-usage-add-contact.page \
+ contacts-usage-delete-contact.page \
+ contacts-usage-edit-contact.page \
+ contacts-usage.page \
+ contacts-using-contact-lists.page \
+ contacts-using-several-addressbooks.page \
+ credits.page \
+ data-storage.page \
+ default-browser.page \
+ deleting-appointments.page \
+ deleting-emails.page \
+ deleting-to-free-disk-space.page \
+ exchange-connectors-overview.page \
+ exchange-placeholder.page \
+ exporting-data-calendar.page \
+ exporting-data-contacts.page \
+ exporting-data-mail.page \
+ exporting-data.page \
+ express-mode.page \
+ google-services.page \
+ groupwise-placeholder.page \
+ import-apps-mozilla.page \
+ import-apps-outlook.page \
+ import-data.page \
+ import-single-files.page \
+ import-supported-file-formats.page \
+ index.page \
+ intro-first-run.page \
+ intro-main-window.page \
+ mail-access-gmail-imap-account.page \
+ mail-access-gmail-pop-account.page \
+ mail-account-manage-imap.page \
+ mail-account-manage-imap-plus.page \
+ mail-account-manage-local-delivery.page \
+ mail-account-manage-maildir-format-directories.page \
+ mail-account-management.page \
+ mail-account-manage-mh-format-directories.page \
+ mail-account-manage-microsoft-exchange-evo-ews.page \
+ mail-account-manage-microsoft-exchange-evo-exchange.page \
+ mail-account-manage-microsoft-exchange-evo-mapi.page \
+ mail-account-manage-microsoft-exchange.page \
+ mail-account-manage-novell-groupwise.page \
+ mail-account-manage-pop.page \
+ mail-account-manage-unix-mbox-spool-directory.page \
+ mail-account-manage-unix-mbox-spool-file.page \
+ mail-account-manage-usenet-news.page \
+ mail-attachments.page \
+ mail-attachments-received.page \
+ mail-attachments-sending.page \
+ mail-calendar-sending-invitations.page \
+ mail-cannot-see.page \
+ mail-change-columns-in-message-list.page \
+ mail-change-time-format.page \
+ mail-composer-change-quotation-string.page \
+ mail-composer-custom-header-lines.page \
+ mail-composer-forward-as-attachment.page \
+ mail-composer-forward.page \
+ mail-composer-html-image.page \
+ mail-composer-html-link.page \
+ mail-composer-html.page \
+ mail-composer-html-rule.page \
+ mail-composer-html-table.page \
+ mail-composer-html-text.page \
+ mail-composer-mail-signatures-manage.page \
+ mail-composer-mail-signatures.page \
+ mail-composer-mail-signatures-per-account.page \
+ mail-composer-message-templates.page \
+ mail-composer-priority.page \
+ mail-composer-reply.page \
+ mail-composer-search.page \
+ mail-composer-several-recipients.page \
+ mail-composer-spellcheck.page \
+ mail-composer-write-new-message.page \
+ mail-default-CC-and-BCC.page \
+ mail-default-folder-locations.page \
+ mail-delete-and-undelete.page \
+ mail-displaying-character-encodings.page \
+ mail-displaying-collapsible-headers.page \
+ mail-displaying-images-in-html.page \
+ mail-displaying-message.page \
+ mail-displaying-no-css.page \
+ mail-displaying-sender-photograph.page \
+ mail-duplicates.page \
+ mail-encryption-gpg-create-key.page \
+ mail-encryption-gpg-decrypting.page \
+ mail-encryption-gpg-getting-keys.page \
+ mail-encryption-gpg-set-up.page \
+ mail-encryption-gpg-signing-encrypting.page \
+ mail-encryption.page \
+ mail-encryption-s-mime-manage.page \
+ mail-encryption-s-mime-signing-encrypting.page \
+ mail-error-failed-to-append-to-sent-folder.page \
+ mail-error-folder-mismatch.page \
+ mail-error-no-provider-available.page \
+ mail-filters-actions.page \
+ mail-filters-conditions.page \
+ mail-filters-not-working.page \
+ mail-filters.page \
+ mail-folders.page \
+ mail-follow-up-flag.page \
+ mail-imap-headers.page \
+ mail-imap-subscriptions.page \
+ mail-labels.page \
+ mail-layout-changing.page \
+ mail-moving-emails.page \
+ mail-not-sent.page \
+ mail-organizing.page \
+ mail-reading-keyboard-shortcuts.page \
+ mail-read-receipts.page \
+ mail-received-notification.page \
+ mail-receiving-options-evolution-exchange.page \
+ mail-receiving-options-exchange-mapi.page \
+ mail-receiving-options-imap.page \
+ mail-receiving-options-imap-plus.page \
+ mail-receiving-options-local-delivery.page \
+ mail-receiving-options-maildir-format-directories.page \
+ mail-receiving-options-mh-format-directories.page \
+ mail-receiving-options-novell-groupwise.page \
+ mail-receiving-options.page \
+ mail-receiving-options-pop.page \
+ mail-receiving-options-unix-mbox-spool-directory.page \
+ mail-receiving-options-unix-mbox-spool-file.page \
+ mail-receiving-options-usenet-news.page \
+ mail-recognized-thread-related-headers.page \
+ mail-refresh-folders.page \
+ mail-search-folders-add.page \
+ mail-search-folders-conditions.page \
+ mail-search-folders.page \
+ mail-search-folders-refresh.page \
+ mail-searching-attachment-type.page \
+ mail-searching.page \
+ mail-send-and-receive-automatically.page \
+ mail-send-and-receive-manual.page \
+ mail-send-and-receive.page \
+ mail-sending-options-smtp.page \
+ mail-several-pop-accounts.page \
+ mail-sorting-message-list.page \
+ mail-spam-groupwise-add-to-list.page \
+ mail-spam-groupwise-manage-list.page \
+ mail-spam-groupwise-mark-message.page \
+ mail-spam-groupwise-remove-from-list.page \
+ mail-spam-groupwise-unmark-message.page \
+ mail-spam-marking.page \
+ mail-spam.page \
+ mail-spam-settings.page \
+ mail-two-trash-folders.page \
+ mail-usenet-subscriptions.page \
+ mail-vertical-view.page \
+ mail-word-wrap.page \
+ mail-working-offline.page \
+ mail-wrong-fonts-in-3-0.page \
+ memos-searching.page \
+ memos-usage-add-memo.page \
+ memos-usage-delete-memo.page \
+ memos-usage-edit-memo.page \
+ memos-usage.page \
+ minimize-to-system-tray.page \
+ organizing.page \
+ problems-debug-how-to.page \
+ problems-getting-help.page \
+ problems-reporting-bugs.page \
+ searching-items.page \
+ sync-with-other-devices.page \
+ tasks-caldav.page \
+ tasks-display-settings.page \
+ tasks-local.page \
+ tasks-organizing.page \
+ tasks-searching.page \
+ tasks-usage-add-task.page \
+ tasks-usage-delete-task.page \
+ tasks-usage-edit-task.page \
+ tasks-usage.page \
+ tasks-using-several-tasklists.page \
+ tasks-webdav.page \
+ using-categories.page
--include $(top_srcdir)/git.mk
+DOC_LINGUAS = cs de el en_GB es eu fr gl oc ru sl sv mk zh_CN
+dist-hook: doc-dist-hook
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
