aboutsummaryrefslogtreecommitdiffstats
path: root/help/C
diff options
context:
space:
mode:
Diffstat (limited to 'help/C')
-rw-r--r--help/C/apx-gloss.xml14
-rw-r--r--help/C/config-prefs.xml6
-rw-r--r--help/C/config-sync.xml4
-rw-r--r--help/C/usage-contact.xml2
-rw-r--r--help/C/usage-exchange.xml16
-rw-r--r--help/C/usage-mail-org.xml4
-rw-r--r--help/C/usage-mail.xml40
-rw-r--r--help/C/usage-mainwindow.xml9
8 files changed, 49 insertions, 46 deletions
diff --git a/help/C/apx-gloss.xml b/help/C/apx-gloss.xml
index e3b945e488..d4f12e1a4c 100644
--- a/help/C/apx-gloss.xml
+++ b/help/C/apx-gloss.xml
@@ -6,7 +6,9 @@
<glossterm>Assistant:</glossterm>
<glossdef>
<para>
- See druid
+ A tool which guides a user through a series of steps,
+ usually to configure or set up a program. Equivalent to "Wizard"
+ and "Druid."
</para>
</glossdef>
</glossentry>
@@ -71,9 +73,7 @@
<glossterm>Druid:</glossterm>
<glossdef>
<para>
- A tool which guides a user through a series of steps, usually to
- configure or set up a program. Equivalent to "Assistant" and
- "Wizard."
+ See "Assistant."
</para>
</glossdef>
</glossentry>
@@ -122,7 +122,7 @@
perversity typical of computer (and especially Unix and Linux)
nomenclature, the top of the tree is called the root directory,
and denoted by <filename>/</filename>.
- The rest of the "branches" spread downwards from the root. Don't
+ The rest of the "branches" spread downward from the root. Don't
confuse the root directory with the root
account, or root's home directory, normally
<filename>/root</filename>.
@@ -441,11 +441,11 @@
</glossentry>
<glossentry id="vcard">
- <glossterm>vCard:</glossterm>
+ <glossterm>VCard:</glossterm>
<glossdef>
<para>
A file format for the exchange of contact information. When you
- get an address card attached to an email, it's probably in vCard
+ get an address card attached to an email, it's probably in VCard
format. Not to be confused with <glossterm
linkend="vfolder">vFolder:</glossterm>.
</para>
diff --git a/help/C/config-prefs.xml b/help/C/config-prefs.xml
index 868815d872..fdae14dac9 100644
--- a/help/C/config-prefs.xml
+++ b/help/C/config-prefs.xml
@@ -291,7 +291,7 @@ smtp.omniport.com:143
<listitem>
<para>Create a Global Address List folder: If you would
- like to have a seperate folder for the Active Directory's
+ like to have a separate folder for the Active Directory's
Global Address List, leave this box checked. </para>
</listitem>
@@ -540,7 +540,7 @@ smtp.omniport.com:143
including the language or languages you will use. Note that you
must install the gnome-spell package, available through Red
Carpet, for spell-checking to be available in
- Evolution. Alternate dictionaries are aslo available through
+ Evolution. Alternate dictionaries are also available through
Red Carpet and are detected automatically if you have installed
them.
</para>
@@ -904,7 +904,7 @@ smtp.omniport.com:143
</listitem>
<listitem>
<para>
- Click <guibutton>OK</guibutton> to permanenty make
+ Click <guibutton>OK</guibutton> to permanently make
changes or <guibutton>Apply</guibutton> to temporarily
set the changes.
</para>
diff --git a/help/C/config-sync.xml b/help/C/config-sync.xml
index 95b0e71603..6a6503a670 100644
--- a/help/C/config-sync.xml
+++ b/help/C/config-sync.xml
@@ -7,7 +7,7 @@
<member>
Your computer needs to recognize and access your handheld.
At this time, <application>Ximian Evolution</application> only
- supports Palm-OS devices like the PalmPilot and the
+ supports Palm-OS devices like the Palm Pilot and the
Handspring Visor.
</member>
<member>
@@ -37,7 +37,7 @@
<guilabel>Pilot Conduits</guilabel> section of the Control
Center. You may use conduits to synchronize data with several
applications; the <application>Ximian Evolution</application>
- conduits are labelled <guilabel>EAddress</guilabel>, for the
+ conduits are labeled <guilabel>EAddress</guilabel>, for the
contacts in your addressbook, <guilabel>ECalendar</guilabel>,
for your calendar, and <guilabel>ETodo</guilabel>, for your
task list.
diff --git a/help/C/usage-contact.xml b/help/C/usage-contact.xml
index 3131118803..fb71d687a7 100644
--- a/help/C/usage-contact.xml
+++ b/help/C/usage-contact.xml
@@ -290,7 +290,7 @@
</listitem>
<listitem>
<para>
- If you want to add more critera, click the <guibutton>Add
+ If you want to add more criteria, click the <guibutton>Add
Criterion</guibutton> button.
</para>
</listitem>
diff --git a/help/C/usage-exchange.xml b/help/C/usage-exchange.xml
index 5fab9d0cc7..0307c70025 100644
--- a/help/C/usage-exchange.xml
+++ b/help/C/usage-exchange.xml
@@ -203,10 +203,10 @@
</listitem>
</varlistentry>
<varlistentry>
- <term>Adding vCards to Address Book</term>
+ <term>Adding VCards to Address Book</term>
<listitem>
<para>
- If you receive a vCard attachment and click
+ If you receive a VCard attachment and click
<guibutton>Save in Address Book</guibutton>, it will
be saved to your <application>Exchange</application>address book.
</para>
@@ -373,7 +373,7 @@ There are, however, some features which are not available:
</listitem>
<listitem>
<para>
- If you wish, select the box labelled
+ If you wish, select the box labeled
<guilabel>Use secure connection
(SSL)</guilabel>, to take advantage of a more
secure connection method. This may allow you to
@@ -385,7 +385,7 @@ There are, however, some features which are not available:
<para>
If you would like
<application>Evolution</application> to
- remember your password, check the box labelled
+ remember your password, check the box labeled
<guilabel>Remember this password</guilabel>.
</para>
</listitem>
@@ -427,7 +427,7 @@ There are, however, some features which are not available:
<para>
Active Directory: If you would like to use the
Global Address List (GAL), check the box
- labelled <guilabel>Create a Global Address
+ labeled <guilabel>Create a Global Address
List folder</guilabel> and enter the name
of the directory server. To avoid strain
on the server, the maximum number of
@@ -575,8 +575,8 @@ There are, however, some features which are not available:
<para>
If you would like to use the Global Address
List (GAL) maintained on your Exchange server,
- click the tab labelled <guilabel>Receiving
- Options</guilabel> and check the box labelled
+ click the tab labeled <guilabel>Receiving
+ Options</guilabel> and check the box labeled
<guilabel>Create a Global Address List
folder</guilabel>. The GAL is maintained by
your system administrator and you cannot add,
@@ -629,7 +629,7 @@ There are, however, some features which are not available:
server, not on your desktop computer. This means that you can
access it from multiple locations. It also means that your
Microsoft <application>Exchange</application>account information
- is in a seperate folder tree from the <guilabel>Local</guilabel>
+ is in a separate folder tree from the <guilabel>Local</guilabel>
tree in your folder bar. You'll see it below the local tree,
with the name you gave the account. If you have multiple
accounts, you will have multiple folder trees.
diff --git a/help/C/usage-mail-org.xml b/help/C/usage-mail-org.xml
index 93aa0881e1..4177688017 100644
--- a/help/C/usage-mail-org.xml
+++ b/help/C/usage-mail-org.xml
@@ -1,4 +1,4 @@
-<chapter id="usage-mail-organize">
+x<chapter id="usage-mail-organize">
<title>Organizing and Managing your Email</title>
<para>
Even if you only get a few email messages a day, you probably
@@ -1024,7 +1024,7 @@
<example id="usage-mail-organize-vfolders-ex">
<title>Using Folders, Searches, and vFolders</title>
<para>
- To organize his mailbox, Jim sets up a virtual volder for emails from
+ To organize his mailbox, Jim sets up a virtual folder for emails from
his friend and co-worker Anna. He has another one for messages that
have ximian.com in the address and <application>Ximian Evolution</application> in the subject line, so he
can keep a record of what people from work send him about
diff --git a/help/C/usage-mail.xml b/help/C/usage-mail.xml
index 50c2245c84..0445285783 100644
--- a/help/C/usage-mail.xml
+++ b/help/C/usage-mail.xml
@@ -35,7 +35,7 @@
<tip id="spaceandbs">
<title>Reading Mail with the Keyboard</title>
<para>
- You can click the spacebar to page down while you're reading
+ You can click the space bar to page down while you're reading
an email, and press backspace to page up in an email. This
may help to make reading your email faster.
</para>
@@ -614,7 +614,7 @@
from the Internet while you work. When you want to
reconnect, choose
<menuchoice><guimenu>File</guimenu><guimenuitem>Work
- Online</guimenuitem></menuchoice>. Alternativly, you
+ Online</guimenuitem></menuchoice>. Alternatively, you
can click the connection button at the bottom left side
of the window.
</para>
@@ -1015,10 +1015,11 @@
<title>Using Bullets to Make Your Email More
Attractive</title>
<para>
- Often times, people use asterisks instead of real bullets.
- Not only do asterisks look nicer, but
- <application>Evolution</application> will word wrap for you,
- which makes your text looks nicer.
+ Instead of using asterisks to mark a bulleted list,
+ try the Bulleted List style from the style dropdown
+ list. <application>Evolution</application> uses
+ more attractive bullets and handles word wrap and
+ multiple levels of indentation.
</para>
</tip>
</listitem>
@@ -1121,7 +1122,7 @@
</para>
<note>
<para>
- If you're typing a webpage address to be automatically formatted, keep in mind that a space terminates the link.
+ If you're typing a web page address to be automatically formatted, keep in mind that a space terminates the link.
</para>
</note>
</listitem>
@@ -1360,7 +1361,7 @@
right-clicking on the message background and selecting
<guimenuitem>Page</guimenuitem>. From that dialog, you may
also select background color and set other general options
- about the html message you are composing.
+ about the HTML message you are composing.
</para>
<sect3 id="html-templates">
<title>HTML Templates</title>
@@ -1667,12 +1668,12 @@
</para>
<para>
This message is not only more attractive, but more
- informative. Each section is broken down into subsctions.
+ informative. Each section is broken down into subsections.
The title for each section is in bold text, with the
following content indented.
</para>
<para>
- You may want to increase the size of your section headlings
+ You may want to increase the size of your section headlines
instead of merely putting them in bold. Header size 4 is
often the best choice, since it is not too large. You can
change your text to size 4 by selecting it and pressing
@@ -1932,7 +1933,7 @@
</para>
<example>
- <title>Sending an Encrypted Messagee</title>
+ <title>Sending an Encrypted Message</title>
<para>
Kevin wants to send an encrypted message to his friend
Rachel. He looks up her public key on a general key
@@ -1996,7 +1997,7 @@
<listitem>
<para>
- Choose the default algorythm, "DSA and ElGamal."
+ Choose the default algorithm, "DSA and ElGamal."
</para>
</listitem>
@@ -2063,7 +2064,7 @@
give other people your key, send them that file.
</para>
<para>
- If you wish, you can upload your keys to a keyserver. Here's
+ If you wish, you can upload your keys to a key server. Here's
how:
<orderedlist>
<listitem>
@@ -2083,14 +2084,14 @@ wwwkeys.pgp.net 32j38dk2</command>. Substitute your key ID for
</orderedlist>
<note id="why-keyserver">
- <title>Why Use a Keyserver?</title>
+ <title>Why Use a Key Server?</title>
<para>
- Keyservers store your public keys for you so that your
+ Key servers store your public keys for you so that your
friends can decrypt your messages. If you choose not to
- use a keyserver, you can manually send your people public
+ use a key server, you can manually send your people public
key, include it in your signature file, or put it on your
own web page. However, it's easier to publish them once,
- and then let people download them from the keyserver when
+ and then let people download them from a central place when
they want.
</para>
<para>
@@ -2175,8 +2176,9 @@ wwwkeys.pgp.net 32j38dk2</command>. Substitute your key ID for
<guimenu>Security</guimenu>
<guimenuitem>PGP Sign</guimenuitem>
</menuchoice>
- . You will be prompted for your PGP password. Once you enter it,
- click <guibutton>OK</guibutton> and your message will be signed.
+ . You will be prompted for your encryption password. Once
+ you enter it, click <guibutton>OK</guibutton> and your message
+ will be signed.
</para>
</sect2>
diff --git a/help/C/usage-mainwindow.xml b/help/C/usage-mainwindow.xml
index 58a5e1f17e..8aec09aabf 100644
--- a/help/C/usage-mainwindow.xml
+++ b/help/C/usage-mainwindow.xml
@@ -808,12 +808,13 @@ the workaround described in the note below.
<inlinemediaobject>
<imageobject>
<imagedata fileref="figures/full-1" format="PNG"/></imageobject></inlinemediaobject>
- <guilabel>Menubar</guilabel>
+ <guilabel>Menu Bar</guilabel>
</para>
<para>
- The <guilabel>Menubar</guilabel> gives you access to nearly all the
- features that can be found in <application>Ximian Evolution</application>.
+ The <guilabel>menu bar</guilabel> gives you access to nearly all
+ the features that can be found in <application>Ximian
+ Evolution</application>.
</para>
<para>
@@ -946,7 +947,7 @@ the workaround described in the note below.
appointments, address cards, and email in a tree that's a lot
like a <glossterm linkend="filetree">file
tree</glossterm>-- it starts small at the top, and branches
- downwards. On most computers, there will be three or four
+ downward. On most computers, there will be three or four
folders at the base. First, of course, is the
<guilabel>Summary</guilabel>, a customizable summary of your
information. Below that are your <guilabel>Local