From 06d760be123616c5e3644559e5bbe4b9c91e2395 Mon Sep 17 00:00:00 2001 From: Alexandre Rostovtsev Date: Mon, 15 Aug 2011 15:38:28 +0200 Subject: Bug #656537 - Fix mallard relaxng validation errors in help pages --- help/C/calendar-layout-appointment-display.page | 2 -- help/C/calendar-searching.page | 2 +- help/C/contacts-ldap.page | 2 +- help/C/contacts-searching.page | 2 +- help/C/contacts-using-contact-lists.page | 2 +- help/C/import-apps-outlook.page | 9 +++++---- help/C/mail-composer-html-image.page | 2 +- help/C/mail-composer-several-recipients.page | 4 ++-- help/C/mail-encryption-gpg-create-key.page | 4 ++-- help/C/mail-encryption-gpg-set-up.page | 3 ++- help/C/mail-filters.page | 1 - help/C/mail-folders.page | 9 +++++---- help/C/mail-organizing.page | 4 ++-- help/C/mail-searching.page | 2 +- help/C/mail-send-and-receive.page | 2 +- help/C/mail-sending-options-smtp.page | 3 ++- help/C/mail-sorting-message-list.page | 16 ++++++++-------- help/C/mail-spam-settings.page | 3 ++- help/C/memos-searching.page | 2 +- help/C/tasks-searching.page | 2 +- help/C/using-categories.page | 4 ++-- 21 files changed, 41 insertions(+), 39 deletions(-) diff --git a/help/C/calendar-layout-appointment-display.page b/help/C/calendar-layout-appointment-display.page index 621cc604fa..f47c2ff59b 100644 --- a/help/C/calendar-layout-appointment-display.page +++ b/help/C/calendar-layout-appointment-display.page @@ -46,9 +46,7 @@
Date/Time Format -

You can change the format of the Date column by setting your preferred format.

The placeholders in the format expression are strftime variables.

-
diff --git a/help/C/calendar-searching.page b/help/C/calendar-searching.page index d60066807c..0b2d44572b 100644 --- a/help/C/calendar-searching.page +++ b/help/C/calendar-searching.page @@ -70,7 +70,7 @@ -
+
Differences to local address books

LDAP address books work like local address books on your computer, with the following exceptions:

diff --git a/help/C/contacts-searching.page b/help/C/contacts-searching.page index e4fbcef836..ab7e826deb 100644 --- a/help/C/contacts-searching.page +++ b/help/C/contacts-searching.page @@ -70,7 +70,7 @@ -
+
Sending messages to a contact list

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 Send Message to List.

diff --git a/help/C/import-apps-outlook.page b/help/C/import-apps-outlook.page index 1b9a242c6d..cee5655d2c 100644 --- a/help/C/import-apps-outlook.page +++ b/help/C/import-apps-outlook.page @@ -35,10 +35,10 @@

Windows 7, Windows Vista

Windows XP

- Outlook 2010

C:\Users\username\My Documents\Outlook Files

C:\Documents and Settings\username\My Documents\Outlook Files

+

Outlook 2010

C:\Users\username\My Documents\Outlook Files

C:\Documents and Settings\username\My Documents\Outlook Files

- Outlook 2007 and earlier

C:\Users\username\AppData\Local\Microsoft\Outlook

C:\Documents and Settings\username\AppData\Local\Microsoft\Outlook

+

Outlook 2007 and earlier

C:\Users\username\AppData\Local\Microsoft\Outlook

C:\Documents and Settings\username\AppData\Local\Microsoft\Outlook

(Replace "username" by your username.)

@@ -53,13 +53,14 @@
-
+
Importing into Evolution

Click FileImport.

In the Importer Type tab, click Import a single file.

 -

Choose the Outlook personal folders (.pst) file that you would like to import.

The file type will be automatically determined.

 +

Choose the Outlook personal folders (.pst) file that you would like to import.

The file type will be automatically determined.

If the option to import Outlook personal folders (.pst files) is not available under FileImportImport single fileFile type, your distribution might have not enabled this functionality.

 +

Choose the destination (e.g. the folder in Evolution) for the imported data.

Repeat the import steps until you have imported all your data.

 diff --git a/help/C/mail-composer-html-image.page b/help/C/mail-composer-html-image.page index 44e4d71c95..825b504fdc 100644 --- a/help/C/mail-composer-html-image.page +++ b/help/C/mail-composer-html-image.page @@ -27,7 +27,7 @@

Click Open.

 -Alternately, you can also drag an image into the text area of the message composer. +

Alternately, you can also drag an image into the text area of the message composer.

 diff --git a/help/C/mail-composer-several-recipients.page b/help/C/mail-composer-several-recipients.page index 16c887643a..00638230ce 100644 --- a/help/C/mail-composer-several-recipients.page +++ b/help/C/mail-composer-several-recipients.page @@ -27,6 +27,8 @@

To send a message to more than one person, enter the addresses in the composer by separating them with commas or semicolons.

+

If you frequently write email to the same groups of people, you can create contact lists to send them mail as though they have a single address.

 +
Recipient types

Email messages can have three different types of recipients. The simplest way is to put the email address or addresses in the To: text field. The Cc: text field is used for recipients that are meant to receive a copy of your message but are not the primary recipients.

@@ -45,7 +47,5 @@

Instead of typing the recipients' names you can also click the To:, Cc:, or Bcc: 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:).

-

If you frequently write email to the same groups of people, you can create contact lists to send them mail as though they have a single address.

 - diff --git a/help/C/mail-encryption-gpg-create-key.page b/help/C/mail-encryption-gpg-create-key.page index a99004abc5..e7997e2819 100644 --- a/help/C/mail-encryption-gpg-create-key.page +++ b/help/C/mail-encryption-gpg-create-key.page @@ -22,7 +22,7 @@ Creating a GPG key -These steps are very technical. For average users we nowadays recommend using the Seahorse application for managing GPG keys. +

These steps are very technical. For average users we nowadays recommend using the Seahorse application for managing GPG keys.

Before you can get or send GPG encrypted mail, you need to generate your public and private keys with GPG.

@@ -44,7 +44,7 @@

If you want, you can upload your keys to a key server:

Check your public key ID with gpg --list-keys. It is the string after 1024D on the line beginning with pub. In the example above, it is 32j38dk2.

 -

Enter the command gpg --send-keys --keyserver wwwkeys.pgp.net 32j38dk2. Substitute your key ID for 32j38dk2. You need your password to do this.

 +

Enter the command gpg --send-keys --keyserver wwwkeys.pgp.net 32j38dk2. Substitute your key ID for 32j38dk2. You need your password to do this.

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.

diff --git a/help/C/mail-encryption-gpg-set-up.page b/help/C/mail-encryption-gpg-set-up.page index d1bc94b51a..c3bc3db5c2 100644 --- a/help/C/mail-encryption-gpg-set-up.page +++ b/help/C/mail-encryption-gpg-set-up.page @@ -29,8 +29,9 @@

Select EditPreferencesMail Accounts.

Select the account you want to use securely, then click Edit.

Click the Security tab.

 -

Specify your key ID in the PGP/GPG Key ID field.

 +

Specify your key ID in the PGP/GPG Key ID field.

Below the field you can choose whether to always sign outgoing messages when using this account, and other options.

 +

Click OK.

Click Close.

 diff --git a/help/C/mail-filters.page b/help/C/mail-filters.page index 04857d4155..e8d902e494 100644 --- a/help/C/mail-filters.page +++ b/help/C/mail-filters.page @@ -68,6 +68,5 @@ -

diff --git a/help/C/mail-folders.page b/help/C/mail-folders.page index 2c9f1620ce..75b57d358e 100644 --- a/help/C/mail-folders.page +++ b/help/C/mail-folders.page @@ -38,6 +38,11 @@

Click on the Create button.

The new folder will be shown in the folder view. You can then move messages into the folder.

+ + +

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.

+ +
@@ -56,10 +61,6 @@
- -

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.

- - diff --git a/help/C/mail-organizing.page b/help/C/mail-organizing.page index 46e4294b3f..9a31798d27 100644 --- a/help/C/mail-organizing.page +++ b/help/C/mail-organizing.page @@ -20,9 +20,9 @@ Sorting and organizing mail +

Evolution provides several options to organize your mail according to your needs.

+
Advanced Options
- -

Evolution provides several options to organize your mail according to your needs.

diff --git a/help/C/mail-searching.page b/help/C/mail-searching.page index 9d1d53b980..636c2c74ad 100644 --- a/help/C/mail-searching.page +++ b/help/C/mail-searching.page @@ -66,7 +66,7 @@