aboutsummaryrefslogtreecommitdiffstats
path: root/help
diff options
context:
space:
mode:
authorMichael Hill <mdhillca@gmail.com>2011-09-29 19:06:35 +0800
committerAndre Klapper <a9016009@gmx.de>2011-09-29 19:06:35 +0800
commit08fc05b8f9a91c7e86a521ae9c47264bc73ae30d (patch)
treef7bb63997eb0ce7be48508fe953da5bbe82657f9 /help
parentecfb98980beb41d330f46eaa5096255108af4183 (diff)
downloadgsoc2013-evolution-08fc05b8f9a91c7e86a521ae9c47264bc73ae30d.tar
gsoc2013-evolution-08fc05b8f9a91c7e86a521ae9c47264bc73ae30d.tar.gz
gsoc2013-evolution-08fc05b8f9a91c7e86a521ae9c47264bc73ae30d.tar.bz2
gsoc2013-evolution-08fc05b8f9a91c7e86a521ae9c47264bc73ae30d.tar.lz
gsoc2013-evolution-08fc05b8f9a91c7e86a521ae9c47264bc73ae30d.tar.xz
gsoc2013-evolution-08fc05b8f9a91c7e86a521ae9c47264bc73ae30d.tar.zst
gsoc2013-evolution-08fc05b8f9a91c7e86a521ae9c47264bc73ae30d.zip
User Docs: Fix several typos and issues. Fixes bug #658651.
Diffstat (limited to 'help')
-rw-r--r--help/C/backup-restore.page4
-rw-r--r--help/C/contacts-local.page2
-rw-r--r--help/C/data-storage.page2
-rw-r--r--help/C/intro-first-run.page4
-rw-r--r--help/C/mail-access-gmail-imap-account.page6
-rw-r--r--help/C/mail-access-gmail-pop-account.page8
-rw-r--r--help/C/mail-displaying-character-encodings.page2
-rw-r--r--help/C/mail-filters.page2
-rw-r--r--help/C/mail-imap-headers.page2
-rw-r--r--help/C/mail-received-notification.page2
-rw-r--r--help/C/mail-send-and-receive-manual.page2
-rw-r--r--help/C/mail-working-offline.page2
-rw-r--r--help/C/minimize-to-system-tray.page2
-rw-r--r--help/C/problems-reporting-bugs.page4
-rw-r--r--help/C/tasks-caldav.page2
-rw-r--r--help/C/tasks-using-several-tasklists.page2
-rw-r--r--help/C/tasks-webdav.page2
17 files changed, 25 insertions, 25 deletions
diff --git a/help/C/backup-restore.page b/help/C/backup-restore.page
index bbfdbf5dcd..4106b75e28 100644
--- a/help/C/backup-restore.page
+++ b/help/C/backup-restore.page
@@ -27,7 +27,7 @@
<list>
<item><p>Select <guiseq><gui>File</gui><gui>Back up Evolution Data...</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>
+<item><p>You will be asked to close Evolution. Answer with <gui style="button">Yes</gui>.</p></item>
</list>
</section>
@@ -36,7 +36,7 @@
<list>
<item><p>Select <guiseq><gui>File</gui><gui>Restore Evolution Data...</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>
+<item><p>You will be 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>
diff --git a/help/C/contacts-local.page b/help/C/contacts-local.page
index c57a8ebfab..95315b3582 100644
--- a/help/C/contacts-local.page
+++ b/help/C/contacts-local.page
@@ -19,7 +19,7 @@
<title>Adding another local address book</title>
-<p>To add another local calendar to Evolution, perform the following steps:</p>
+<p>To add another local address 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>On This Computer</gui>.</p></item>
diff --git a/help/C/data-storage.page b/help/C/data-storage.page
index 8ea0af392b..929899d1e1 100644
--- a/help/C/data-storage.page
+++ b/help/C/data-storage.page
@@ -20,7 +20,7 @@
<title>Data storage locations</title>
<note style="tip">
-<p>This is only interesting for advanced users that want to debug problems.</p>
+<p>This is only interesting for advanced users who 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>
diff --git a/help/C/intro-first-run.page b/help/C/intro-first-run.page
index 2cc9d26f0f..e611ebde0c 100644
--- a/help/C/intro-first-run.page
+++ b/help/C/intro-first-run.page
@@ -29,12 +29,12 @@
<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>
+<p>You will be 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>First, choose the server type from the <gui>Server Type</gui> drop-down list.</p>
<p>If you are unsure about the type of server to choose, ask your system administrator or Internet Service Provider.</p>
diff --git a/help/C/mail-access-gmail-imap-account.page b/help/C/mail-access-gmail-imap-account.page
index 810c598161..4dcc311176 100644
--- a/help/C/mail-access-gmail-imap-account.page
+++ b/help/C/mail-access-gmail-imap-account.page
@@ -2,7 +2,7 @@
type="topic" id="email-access-gmail-imap-account">
<info>
- <desc>How to set up a GMail IMAP Account.</desc>
+ <desc>How to set up a Gmail IMAP Account.</desc>
<link type="guide" xref="index#common-mail-problems" />
<link type="guide" xref="google-services"/>
@@ -21,10 +21,10 @@
<!-- Page only exists for the <note>, apart from that nothing special. -->
-<title>Access a GMail IMAP Account via Evolution</title>
+<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>
+<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
index c624502715..0bb1cfc3ca 100644
--- a/help/C/mail-access-gmail-pop-account.page
+++ b/help/C/mail-access-gmail-pop-account.page
@@ -2,7 +2,7 @@
type="topic" id="email-access-gmail-pop-account">
<info>
- <desc>How to set up a GMail POP Account.</desc>
+ <desc>How to set up a Gmail POP Account.</desc>
<link type="guide" xref="index#common-mail-problems" />
<link type="guide" xref="google-services"/>
@@ -21,12 +21,12 @@
-<title>Access a GMail POP Account via Evolution</title>
+<title>Access a Gmail POP Account via Evolution</title>
-<p>Follow these steps to set up your GMail POP Account in Evolution:</p>
+<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>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>
diff --git a/help/C/mail-displaying-character-encodings.page b/help/C/mail-displaying-character-encodings.page
index 56330b8f90..ca56374fea 100644
--- a/help/C/mail-displaying-character-encodings.page
+++ b/help/C/mail-displaying-character-encodings.page
@@ -22,6 +22,6 @@
<!-- 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>
+<p>To make this the default 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-filters.page b/help/C/mail-filters.page
index a22768dca6..816627d7ac 100644
--- a/help/C/mail-filters.page
+++ b/help/C/mail-filters.page
@@ -24,7 +24,7 @@
<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>Filters will be automatically applied to incoming messages for local accounts (such as POP). Mail servers 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>
diff --git a/help/C/mail-imap-headers.page b/help/C/mail-imap-headers.page
index fd6316bb36..2ab0d39383 100644
--- a/help/C/mail-imap-headers.page
+++ b/help/C/mail-imap-headers.page
@@ -30,7 +30,7 @@
<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>
+<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 information 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>
diff --git a/help/C/mail-received-notification.page b/help/C/mail-received-notification.page
index 847f9b05f6..b94aeb2f3f 100644
--- a/help/C/mail-received-notification.page
+++ b/help/C/mail-received-notification.page
@@ -25,7 +25,7 @@
<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 preferred options in the <gui>Configuration</gui> tab.</p>
+<p>In order to also be 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 preferred 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>
diff --git a/help/C/mail-send-and-receive-manual.page b/help/C/mail-send-and-receive-manual.page
index 9adcef1414..4893ace50b 100644
--- a/help/C/mail-send-and-receive-manual.page
+++ b/help/C/mail-send-and-receive-manual.page
@@ -17,7 +17,7 @@
</info>
-<title>Manually send and receive message</title>
+<title>Manually send and receive messages</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>
<p>If you just want to send messages which are in your Outbox, you can right-click on the Outbox and click <gui>Flush Outbox</gui>.</p>
diff --git a/help/C/mail-working-offline.page b/help/C/mail-working-offline.page
index df21f876b4..cd94b3fbf8 100644
--- a/help/C/mail-working-offline.page
+++ b/help/C/mail-working-offline.page
@@ -43,7 +43,7 @@
<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>
+<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 to enable this feature.</p>
</section>
</page>
diff --git a/help/C/minimize-to-system-tray.page b/help/C/minimize-to-system-tray.page
index f8ec4be7e5..28e7d8d4b8 100644
--- a/help/C/minimize-to-system-tray.page
+++ b/help/C/minimize-to-system-tray.page
@@ -26,6 +26,6 @@
<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>
+<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 no longer possible in GNOME 3.</p>
</page>
diff --git a/help/C/problems-reporting-bugs.page b/help/C/problems-reporting-bugs.page
index cfc14ca5bb..677dfc882b 100644
--- a/help/C/problems-reporting-bugs.page
+++ b/help/C/problems-reporting-bugs.page
@@ -20,8 +20,8 @@
<title>How to report bugs</title>
-<p>If you do not need help for configuration but you are sure that you have found a mistake or wrong behavior in the Evolution software, or if you want to request a feature you can file a 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>
+<p>If you do not need help for configuration but you are sure that you have found a mistake or wrong behavior in the Evolution software, or if you want to request a feature, you can file a 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>
-<p>When reporting bugs exact information is welcome as it makes it easier for others to reproduce and fix the issue. If possible please include information such as the Evolution version (under <guiseq><gui>Help</gui><gui>Contents</gui></guiseq>), your distribution, and exact steps to reproduce the problem, click by click. See the <link href="https://bugzilla.gnome.org/page.cgi?id=bug-writing.html">Bug Writing Guidelines</link> for more information.</p>
+<p>When reporting bugs exact information is welcome as it makes it easier for others to reproduce and fix the issue. If possible please include information such as the Evolution version (under <guiseq><gui>Help</gui><gui>About</gui></guiseq>), your distribution, and exact steps to reproduce the problem, click by click. See the <link href="https://bugzilla.gnome.org/page.cgi?id=bug-writing.html">Bug Writing Guidelines</link> for more information.</p>
</page>
diff --git a/help/C/tasks-caldav.page b/help/C/tasks-caldav.page
index b81f119b5b..6a248d58dd 100644
--- a/help/C/tasks-caldav.page
+++ b/help/C/tasks-caldav.page
@@ -25,7 +25,7 @@
<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>Choose if you want to be able to view the content also while 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>
diff --git a/help/C/tasks-using-several-tasklists.page b/help/C/tasks-using-several-tasklists.page
index cf4257f4cb..aa94841f9c 100644
--- a/help/C/tasks-using-several-tasklists.page
+++ b/help/C/tasks-using-several-tasklists.page
@@ -19,7 +19,7 @@
<title>Using several task lists or memo lists</title>
-<p>You can have multiple task or memo lists and choose which of your lists get displayed. 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 any of the boxes next to them to show and hide the corresponding tasks or memos in your view.</p>
+<p>You can have multiple task or memo lists and choose which of your lists get displayed. For example, you might have tasks for work, tasks for home, and tasks for the singing club of which you are a member. The side bar shows these lists, and you can select or deselect any of the boxes next to them to show and hide the corresponding tasks or memos in your view.</p>
<p>Tasks and memos from each task or memo list appear as different colors.</p>
diff --git a/help/C/tasks-webdav.page b/help/C/tasks-webdav.page
index 2ca4cb25bc..56ab201f10 100644
--- a/help/C/tasks-webdav.page
+++ b/help/C/tasks-webdav.page
@@ -27,7 +27,7 @@
<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>Choose if you want to be able to view the content also while 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>