User Docs: Add style hints to notes

23 files changed, 30 insertions, 32 deletions

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 @@
 <p>If you click <gui>Accept</gui> the event is added automatically to the calendar that you have chosen.</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>Calendar and Tasks</gui><gui>Meeting Invitations</gui><gui>Conflict Search</gui></guiseq> you can define which calendars are used for warning you of meeting conflicts.</p></note> <!-- This is the location since 3.1.5, see bug https://bugzilla.gnome.org/show_bug.cgi?id=655494 -->
+<note style="tip"><p>Under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Calendar and Tasks</gui><gui>Meeting Invitations</gui><gui>Conflict Search</gui></guiseq> you can define which calendars are used for warning you of meeting conflicts.</p></note> <!-- This is the location since 3.1.5, see bug https://bugzilla.gnome.org/show_bug.cgi?id=655494 -->
 </page>
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 @@
 
 <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>
+<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><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>
+<note style="tip"><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-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 @@
 <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>
+<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>
 
 </page>
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 @@
 </item>
 </steps>
 
-<note><p>If you are unsure about some settings, ask your system administrator.</p></note>
+<note style="tip"><p>If you are unsure about some settings, ask your system administrator.</p></note>
 
 </section>
 
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 @@
 
 <p>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.</p>
 
-<note style="info package">
+<note style="tip">
   <p>If the error message "Could not open the link: Operation not supported" is shown, you need to install the package <sys>gvfs</sys>.</p>
   <if:choose>
     <if:when test="if:supports('action:install')">
@@ -49,7 +49,7 @@
 
 <section id="advanced-options">
 <title>Advanced options</title>
-<note><p>If you have a technical background you can also tweak these settings by defining scheme-handlers in <file>$HOME/.local/share/applications/mimeapps.list</file>.</p></note>
+<note style="advanced"><p>If you have a technical background you can also tweak these settings by defining scheme-handlers in <file>$HOME/.local/share/applications/mimeapps.list</file>.</p></note>
 </section>
 
 </page>
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 @@
 <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>
 
-<note><p>You can also explicitly open Evolution in a specific component. For the calendar, use <cmd>evolution --express --component=calendar</cmd>.</p></note>
+<note style="advanced"><p>You can also explicitly open Evolution in a specific component. For the calendar, use <cmd>evolution --express --component=calendar</cmd>.</p></note>
 
 </page>
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 @@
 
 <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>
+<note style="important"><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-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 @@
 
   <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>
+<note style="important"><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-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 @@
 
 <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>
+<note style="tip">
 <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-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 @@
 <item><p>Click <gui>Open</gui>.</p></item>
 </steps>
 
-<note><p>Alternately, you can also drag an image into the text area of the message composer.</p></note>
+<p>Alternately, you can also drag an image into the text area of the message composer.</p>
 
 </page>
 
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 @@
 <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>
+<note style="tip"><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-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 @@
 
 <p>To send a message to more than one person, enter the addresses in the composer by separating them with commas or semicolons.</p>
 
-<note><p>If you frequently write email to the same groups of people, you can create <link xref="contacts-using-contact-lists">contact lists</link> to send them mail as though they have a single address.</p></note>
+<note style="tip"><p>If you frequently write email to the same groups of people, you can create <link xref="contacts-using-contact-lists">contact lists</link> to send them mail as though they have a single address.</p></note>
 
 <section id="to-cc-bcc-meaning">
 <title>Recipient types</title>
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 @@
 
   <title>Creating a GPG key</title>
 
-<note><p>These steps are very technical. For average users we nowadays recommend using the Seahorse application for managing GPG keys.</p></note>
+<note style="advanced"><p>These steps are very technical. For average users we nowadays recommend using the Seahorse application for managing GPG keys.</p></note>
 <!-- TODO:POST-3-2: Update and rewrite using Seahorse. Needs a complete rewrite once https://bugzilla.gnome.org/show_bug.cgi?id=508744 is fixed. -->
 
 <p>Before you can get or send GPG encrypted mail, you need to generate your public and private keys with GPG.</p>
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 @@
 <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>
+<note style="advanced">
 <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>
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 @@
 <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>
-<note>
-<p>Note that the order of filters is very important. They are applied to the original message in sequence, like a recipe.</p>
+
+<note style="warning"><p>The order of filters is important. Filters are applied to the original message in sequence, like a recipe.</p>
 <p>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>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.</p>
-</note>
+<p>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.</p></note>
+
 </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>
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 @@
 </steps>
 <p>The new folder will be shown in the folder view. You can then move messages into the folder.</p>
 
-<note>
+<note style="warning">
 <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>
 
@@ -57,7 +57,7 @@
 
 <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>
+<note style="tip"><p>Moving files can be done automatically by setting up <link xref="mail-filters">filters</link>.</p></note>
 
 </section>
 
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 @@
 
 <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>
+<note style="tip"><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
index efa78700d7..cf47fa5aff 100644
--- a/help/C/mail-imap-headers.page
+++ b/help/C/mail-imap-headers.page
@@ -24,7 +24,7 @@
 
 <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>
+<note style="important"><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>
@@ -42,6 +42,6 @@
 <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 -->
+<note style="tip"><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-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 @@
 <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>
+<p>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.</p>
 
 </page>
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 @@
 
 <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>
+<note style="tip"><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/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 @@
 
 <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>
+<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>
 
 <section id="shared-memos">
 <title>Shared Memos</title>
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 @@
 
 <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>
+<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>
 
 <section id="assigned-tasks">
 <title>Assigned Tasks</title>
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 @@
 
 <p>Another way to group contacts, appointments, tasks and memos (summarized by the term "objects" in the following text) is to mark them as belonging to different categories. You can mark an object as being in several categories or no category at all. For example in your address book, you put a friend in the "Business" category because he works with you and the "Friends" category because he is a friend.</p>
 
-<note><p>To display only the objects in a particular category, select the corresponding category in the quick <link xref="searching-items">search</link> bar.</p></note>
+<note style="tip"><p>To display only the objects in a particular category, select the corresponding category in the quick <link xref="searching-items">search</link> bar.</p></note>
 
 <section id="set-category-for-object">
 <title>Setting categories for an object</title>