From 330b2e0fb9459bdc6fb9d5a8709989a787bee637 Mon Sep 17 00:00:00 2001 From: Andre Klapper Date: Wed, 8 Aug 2012 16:30:19 +0200 Subject: User Docs: Add style hints to notes --- help/C/calendar-meetings-replying-to-invitation.page | 2 +- help/C/calendar-meetings-sending-invitation.page | 4 ++-- help/C/calendar-usage-add-appointment.page | 2 +- help/C/contacts-ldap.page | 2 +- help/C/default-browser.page | 4 ++-- help/C/express-mode.page | 2 +- help/C/mail-access-gmail-imap-account.page | 2 +- help/C/mail-account-manage-microsoft-exchange.page | 2 +- help/C/mail-composer-forward-as-attachment.page | 2 +- help/C/mail-composer-html-image.page | 2 +- help/C/mail-composer-mail-signatures.page | 2 +- help/C/mail-composer-several-recipients.page | 2 +- help/C/mail-encryption-gpg-create-key.page | 2 +- help/C/mail-error-no-provider-available.page | 2 +- help/C/mail-filters.page | 8 ++++---- help/C/mail-folders.page | 4 ++-- help/C/mail-follow-up-flag.page | 2 +- help/C/mail-imap-headers.page | 4 ++-- help/C/mail-spam-groupwise-add-to-list.page | 2 +- help/C/mail-two-trash-folders.page | 4 +--- help/C/memos-usage-add-memo.page | 2 +- help/C/tasks-usage-add-task.page | 2 +- help/C/using-categories.page | 2 +- 23 files changed, 30 insertions(+), 32 deletions(-) (limited to 'help') diff --git a/help/C/calendar-meetings-replying-to-invitation.page b/help/C/calendar-meetings-replying-to-invitation.page index c60791ab5f..b2af90383c 100644 --- a/help/C/calendar-meetings-replying-to-invitation.page +++ b/help/C/calendar-meetings-replying-to-invitation.page @@ -29,5 +29,5 @@

If you click Accept the event is added automatically to the calendar that you have chosen.

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.

-

Under EditPreferencesCalendar and TasksMeeting InvitationsConflict Search you can define which calendars are used for warning you of meeting conflicts.

 +

Under EditPreferencesCalendar and TasksMeeting InvitationsConflict Search you can define which calendars are used for warning you of meeting conflicts.

 diff --git a/help/C/calendar-meetings-sending-invitation.page b/help/C/calendar-meetings-sending-invitation.page index f429675c19..5852445b33 100644 --- a/help/C/calendar-meetings-sending-invitation.page +++ b/help/C/calendar-meetings-sending-invitation.page @@ -45,8 +45,8 @@

An email is sent out to all the recipients, inviting them to your event.

-

You can also define a time zone, a category, a reminder, a recurrence, or a classification for the event, or add an attachment.

 +

You can also define a time zone, a category, a reminder, a recurrence, or a classification for the event, or add an attachment.

-

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.

 +

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.

 diff --git a/help/C/calendar-usage-add-appointment.page b/help/C/calendar-usage-add-appointment.page index 7afc2d031b..aa9dc044b1 100644 --- a/help/C/calendar-usage-add-appointment.page +++ b/help/C/calendar-usage-add-appointment.page @@ -31,6 +31,6 @@

(Optional) Enter a description in the Description field.

To show the time as busy to others, click OptionsShow Time as Busy.

 -

You can also define a time zone, a category, a reminder, a recurrence, or a classification for the event, or add an attachment.

 +

You can also define a time zone, a category, a reminder, a recurrence, or a classification for the event, or add an attachment.

diff --git a/help/C/contacts-ldap.page b/help/C/contacts-ldap.page index 167538d4d7..b485be07ef 100644 --- a/help/C/contacts-ldap.page +++ b/help/C/contacts-ldap.page @@ -57,7 +57,7 @@ -

If you are unsure about some settings, ask your system administrator.

 +

If you are unsure about some settings, ask your system administrator.

 diff --git a/help/C/default-browser.page b/help/C/default-browser.page index fad1e5c268..404fe01f1d 100644 --- a/help/C/default-browser.page +++ b/help/C/default-browser.page @@ -30,7 +30,7 @@

If the preferred browser is set as default application but still does not work correctly please contact your distribution via their forum or bug tracker.

- +

If the error message "Could not open the link: Operation not supported" is shown, you need to install the package gvfs.

@@ -49,7 +49,7 @@
Advanced options -

If you have a technical background you can also tweak these settings by defining scheme-handlers in $HOME/.local/share/applications/mimeapps.list.

 +

If you have a technical background you can also tweak these settings by defining scheme-handlers in $HOME/.local/share/applications/mimeapps.list.
diff --git a/help/C/express-mode.page b/help/C/express-mode.page index c557a5d236..d0f2f9285b 100644 --- a/help/C/express-mode.page +++ b/help/C/express-mode.page @@ -22,6 +22,6 @@

This is a known problem and hard to solve for a complex application with many settings such as Evolution.

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 evolution --express from the terminal window.

-

You can also explicitly open Evolution in a specific component. For the calendar, use evolution --express --component=calendar.

 +

You can also explicitly open Evolution in a specific component. For the calendar, use evolution --express --component=calendar.

 diff --git a/help/C/mail-access-gmail-imap-account.page b/help/C/mail-access-gmail-imap-account.page index 8ee254a8ea..4c968d4a99 100644 --- a/help/C/mail-access-gmail-imap-account.page +++ b/help/C/mail-access-gmail-imap-account.page @@ -25,6 +25,6 @@

Please refer to the IMAP mail account settings.

-

To access Gmail via IMAP you must turn on IMAP in your Google account. See the Gmail Help for more information.

 +

To access Gmail via IMAP you must turn on IMAP in your Google account. See the Gmail Help for more information.

 diff --git a/help/C/mail-account-manage-microsoft-exchange.page b/help/C/mail-account-manage-microsoft-exchange.page index 6f66abab96..0a0a2f326d 100644 --- a/help/C/mail-account-manage-microsoft-exchange.page +++ b/help/C/mail-account-manage-microsoft-exchange.page @@ -20,6 +20,6 @@ Microsoft Exchange account settings -

Please first read Choosing the right connector to find out about the right Exchange account type for you.

 +

Please first read Choosing the right connector to find out about the right Exchange account type for you.

 diff --git a/help/C/mail-composer-forward-as-attachment.page b/help/C/mail-composer-forward-as-attachment.page index 07017bfa59..fa0ee99416 100644 --- a/help/C/mail-composer-forward-as-attachment.page +++ b/help/C/mail-composer-forward-as-attachment.page @@ -22,7 +22,7 @@

Click MessageForward as... and choose Attachment, so the forwarded email and also its attachments get attached to the email you want to send.

- +

If you want to have this setting by default, set EditPreferencesComposer PreferencesForward Style to Attachment.

 diff --git a/help/C/mail-composer-html-image.page b/help/C/mail-composer-html-image.page index 116b15c477..293ba46a55 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-mail-signatures.page b/help/C/mail-composer-mail-signatures.page index bfa513dd92..ffe384a712 100644 --- a/help/C/mail-composer-mail-signatures.page +++ b/help/C/mail-composer-mail-signatures.page @@ -21,6 +21,6 @@ Working with email signatures

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 (-- ).

-

The term "signature" is also differently used in terms of encryption.

 +

The term "signature" is also differently used in terms of encryption.

 diff --git a/help/C/mail-composer-several-recipients.page b/help/C/mail-composer-several-recipients.page index 16b8fd9430..a7f45e69c7 100644 --- a/help/C/mail-composer-several-recipients.page +++ b/help/C/mail-composer-several-recipients.page @@ -27,7 +27,7 @@

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.

 +

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 diff --git a/help/C/mail-encryption-gpg-create-key.page b/help/C/mail-encryption-gpg-create-key.page index 446d677e8c..1ced451ed9 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.

diff --git a/help/C/mail-error-no-provider-available.page b/help/C/mail-error-no-provider-available.page index d12b1ef402..5dc52490ba 100644 --- a/help/C/mail-error-no-provider-available.page +++ b/help/C/mail-error-no-provider-available.page @@ -39,7 +39,7 @@

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.

 - +

Advanced users may also be interested in this write up: How to keep the Evolution filters in sync on multiple machines by Thomas Vander Stichele

diff --git a/help/C/mail-filters.page b/help/C/mail-filters.page index a2e336f60a..2b5198c170 100644 --- a/help/C/mail-filters.page +++ b/help/C/mail-filters.page @@ -40,11 +40,11 @@

If you want to define multiple conditions, define under Find items if any or if all conditions have to apply, and click Add Condition and repeat the previous step.

Select the Actions for the Filter in the Then section.

For more information on the available actions see Available Filter actions.

- -

Note that the order of filters is very important. They are applied to the original message in sequence, like a recipe.

+ +

The order of filters is important. Filters are applied to the original message in sequence, like a recipe.

If your first filter has a Stop Processing rule, then all the email messages that match this filter will ignore all the succeeding filters.

-

When you move a message to another folder, "moving" actually means appending a copy of the message to the destination folder and marking the original message for deletion. So any subsequent filter rules will be applied to the original message that is now marked for deletion. Therefore moving a message should usually appear last in a sequence of filter rules.

- +

When you move a message to another folder, "moving" actually means appending a copy of the message to the destination folder and marking the original message for deletion. So any subsequent filter rules will be applied to the original message that is now marked for deletion. Therefore moving a message should usually appear last in a sequence of filter rules.

 +

If you want to define multiple actions, click Add Action and repeat the previous step. For example, if you want no other existing filters to be applied choose Stop Processing as the second action in the list.

Click OK.

 diff --git a/help/C/mail-folders.page b/help/C/mail-folders.page index 774d3b26e1..af72aaa2f0 100644 --- a/help/C/mail-folders.page +++ b/help/C/mail-folders.page @@ -39,7 +39,7 @@

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.

 @@ -57,7 +57,7 @@

The steps for copying are similar.

-

Moving files can be done automatically by setting up filters.

 +

Moving files can be done automatically by setting up filters.
diff --git a/help/C/mail-follow-up-flag.page b/help/C/mail-follow-up-flag.page index 341d089a73..464da3dd5f 100644 --- a/help/C/mail-follow-up-flag.page +++ b/help/C/mail-follow-up-flag.page @@ -40,6 +40,6 @@

Flags can help you organize your work in a number of ways. For example, you might add a Flag Status column to your message list and sort that way. Alternately, you could create a search folder that displays all your flagged messages, then clear the flags when you're done, so the search folder contains only messages with upcoming deadlines.

-

If you prefer a simpler way to remind yourself about messages, you can mark them as important by right-clicking the message, then click Mark as Important, or by selecting MessageMark asImportant from the menubar.

 +

If you prefer a simpler way to remind yourself about messages, you can mark them as important by right-clicking the message, then click Mark as Important, or by selecting MessageMark asImportant from the menubar.

 diff --git a/help/C/mail-imap-headers.page b/help/C/mail-imap-headers.page index efa78700d7..cf47fa5aff 100644 --- a/help/C/mail-imap-headers.page +++ b/help/C/mail-imap-headers.page @@ -24,7 +24,7 @@ IMAP Headers -

The IMAP Headers tab is only displayed in the Account Editor if EditPluginsIMAP Features is enabled.

 +

The IMAP Headers tab is only displayed in the Account Editor if EditPluginsIMAP Features is enabled.

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:

@@ -42,6 +42,6 @@

Optionally: If you want to define extra headers to download you can add these in the Custom Headers section.

 -

The option to define IMAP Headers is currently only available for IMAP accounts, but not for IMAP+ accounts.

 +

The option to define IMAP Headers is currently only available for IMAP accounts, but not for IMAP+ accounts.

 diff --git a/help/C/mail-spam-groupwise-add-to-list.page b/help/C/mail-spam-groupwise-add-to-list.page index 8767e1e9dd..99e32bde02 100644 --- a/help/C/mail-spam-groupwise-add-to-list.page +++ b/help/C/mail-spam-groupwise-add-to-list.page @@ -31,6 +31,6 @@

Click Add and then click on the OK button.

 -

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.

 +

Note that 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.

diff --git a/help/C/mail-two-trash-folders.page b/help/C/mail-two-trash-folders.page index 1d020973de..a0083226f3 100644 --- a/help/C/mail-two-trash-folders.page +++ b/help/C/mail-two-trash-folders.page @@ -25,8 +25,6 @@

You can easily tell the two Trash folders apart by looking at their icons. The Evolution Trash folder has a special icon whereas the other physical Trash folder looks like any other folder.

- -

Note that the Junk folder is also a search folder and may also appear twice.

- +

Note that the Junk folder is also a search folder and may also appear twice.

 diff --git a/help/C/memos-usage-add-memo.page b/help/C/memos-usage-add-memo.page index 7425602b83..6d20d9afaf 100644 --- a/help/C/memos-usage-add-memo.page +++ b/help/C/memos-usage-add-memo.page @@ -31,7 +31,7 @@

If you just want to quickly add a memo by entering a summary you can directly enter it in the list of memos.

-

You can also define a category, or a classification for the memo, or add an attachment.

 +

You can also define a category, or a classification for the memo, or add an attachment.

Shared Memos diff --git a/help/C/tasks-usage-add-task.page b/help/C/tasks-usage-add-task.page index 6e8016ffdb..34daf1fa4c 100644 --- a/help/C/tasks-usage-add-task.page +++ b/help/C/tasks-usage-add-task.page @@ -31,7 +31,7 @@

If you just want to quickly add a task by entering a summary you can directly enter it in the list of tasks.

-

You can also define a time zone, a category, or a classification for the task, or add an attachment.

 +

You can also define a time zone, a category, or a classification for the task, or add an attachment.

Assigned Tasks diff --git a/help/C/using-categories.page b/help/C/using-categories.page index 027651877a..471f9a81dd 100644 --- a/help/C/using-categories.page +++ b/help/C/using-categories.page @@ -26,7 +26,7 @@

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.

-

To display only the objects in a particular category, select the corresponding category in the quick search bar.

 +

To display only the objects in a particular category, select the corresponding category in the quick search bar.
Setting categories for an object -- cgit