diff --git a/doc/C/apx-gloss.sgml b/doc/C/apx-gloss.sgml
index f13a56106a..7aa5e494dc 100644
--- a/doc/C/apx-gloss.sgml
+++ b/doc/C/apx-gloss.sgml
@@ -63,7 +63,7 @@
Emoticon
- Also called smileys, emoticons are the little sideways faces made
+ Also called "smileys," emoticons are the little sideways faces made
of colons and parentheses which people use to convey emotion in email.
Examples: :-) or ;( .
@@ -89,7 +89,8 @@
executable attachments, but before they can be run, the files must
be marked as executable with a shell or file manager. This
security precaution prevents the automatic or accidental execution
- of malicious programs.
+ of malicious programs. For more information on executables and file
+ permissions, see the documentation for your file manager or shell.
@@ -131,10 +132,9 @@
Haiku
- A Japanese form of poetry. Haiku are unrhymed, and
- three lines long. The first and last lines should have five
- syllables, and the second line seven syllables. The subject
- matter is traditionally related to the seasons.
+ A traditional Japanese form of poetry. The poems are three lines
+ long, with first and last lines having five syllables, and the
+ second line seven syllables.
@@ -144,9 +144,9 @@
Hyper-text Markup Language(HTML) is the layout
- language which all webpages are written in. HTML can be used
- inside of e-mails to insert images, justfiy text different ways,
- and even include webpages inside the e-mail itself.
+ language which all web pages are written in. HTML can be used
+ inside of e-mails to insert images, justify text different ways,
+ and even include web pages inside the e-mail itself.
@@ -191,9 +191,9 @@
LDAP
- LDAP is a protocol which allows a client to search through a
- large database of addresses, phone numbers, and people, as an
- alternative to a physical phone book.
+ LDAP, the Lightweight Directory Access Protocol, allows a client
+ to search through a large database of addresses, phone numbers,
+ and people stored on a server.
@@ -251,12 +251,26 @@
+
+ Protocol
+
+
+ An agreed-upon method of communication, especially one for
+ sending particular types of information between computer systems.
+ Examples include POP (Post Office Protocol), for email, and HTTP
+ (HypterText Transfer Protocol), for web pages.
+
+
+
+
+
+
Regular Expression
A regular expression, or "regex", is a way of describing a
- string of text using metacharacters or wildcard symbols. For
+ string of text using metacharacters or wild-card symbols. For
example, the statement fly*so[a|u]p means
"any phrase beginning with 'fly' and ending in 'soup' or
'soap'". If you searched for that expression, you'd find both
@@ -271,18 +285,37 @@
Script
- A program which is written in an interpreted language, which can
- be executed.
+ A program, which is written in an interpreted (rather than
+ compiled) language. Scripts are more likely to work on multiple
+ platforms, but they require an additional layer of software (the
+ interpreter) which mediates between them and the operating system.
+ Because of this, they typically suffer from relatively sluggish
+ performance, and are limited to smaller tasks.
+
+ Sendmail
+
+
+ As its name implies, sendmail is a
+ program which sends mail. Evolution
+ can use it instead of SMTP; some people
+ prefer it because it offers more flexibility, but is more
+ difficult to set up.
+
+
+
+
+
Shortcut Bar
- The Shortcut Bar is where the user accesses
- all the components of Evolution from.
+ A portion of Evolution which offers
+ users fast access to the most frequently used portions of the
+ application.
@@ -291,22 +324,47 @@
Signature
- Signatures allow a user to specify a message to place at the bottom of
- every email sent. A signature can be anything from a favorite quote to
- a link to a webpage.
+ In email terms, a signature is a piece of text placed at the end
+ of every email sent, like a hand-written signature at the bottom
+ of a written letter. A signature can be anything from a favorite
+ quotation to a link to a web page; courtesy dictates that it be
+ fewer than four lines long.
+
+ SMTP
+
+
+ This is the most common way of transporting mail messages from
+ the client's computer (you) to the server. SMTP stands for
+ Simple Mail Transfer Protocol.
+
+
+
Spam
- Spam: useless, unwanted e-mail. Spam normally comes in forms of
- chain-letters and advertisements for unscrupulous websites or
- services. Messages that are merely useless are called
- "opt-in newsletters."
+ Useless, unwanted e-mail. Spam normally comes in forms of
+ chain-letters and advertisements for unscrupulous web sites or
+ services. Messages that are merely useless are called "opt-in
+ newsletters."
+
+
+ <
+/glossentry>
+
+
+ Virus
+
+
+ A malicious program which inserts itself into others so that it will be
+ executed, allowing it to spread to still more programs and other computers.
+ A virus can cause substantial damage by clogging networks or disk drives,
+ deleting files, or opening security holes.
@@ -315,8 +373,9 @@
vFolder
- vFolders allow an e-mail to be shared among multiple folders, so
- it appears that theres a copy of the e-mail in each folder.
+ An email organization tool. vFolders allows you to create a folder
+ that contains the results of a complex search. Folder contents are
+ are updated dynamically.
diff --git a/doc/C/config-prefs.sgml b/doc/C/config-prefs.sgml
index 7119f13580..7fee2fd340 100644
--- a/doc/C/config-prefs.sgml
+++ b/doc/C/config-prefs.sgml
@@ -22,12 +22,11 @@
preferences are separated into several categories:
- Identies
+ Identities
This allows you to create and alter one or more
- identities for your email: your name, address, and so
- forth.
+ identities for your email.
@@ -58,7 +57,7 @@
If you would like to use
Evolution to read newsgroups,
- you can secify your news server preferences here.
+ you can specify your news server preferences here.
@@ -99,7 +98,8 @@
one address, you will only need to configure one identity. If
you want, however, you can have multiple identities. This
can be useful if you want to keep personal and professional
- email seperate.
+ email separate, or if you wear several hats at work.
+
To add a new identity, simply click
@@ -175,8 +175,10 @@
Mail source type:
- Select from IMAP, POP or Unix-style
- mbox files.
+ Select from IMAP or POP servers, or Unix-style
+ mbox
+ or mh
+ files.
@@ -184,9 +186,9 @@
Server:
- Enter the name of your mail server in this field.
- For example:
- mail.mycompany.com
+ Enter the name of the mail source server in this
+ field. If you use an may or may not be the same as your
+ SMTP server.
@@ -194,10 +196,13 @@
Username:
- Enter your user name here. This is often related to
- your real name, but not always. Examples include
- eltester and
- rupert.
+ Enter the user name for the account you have on the
+ server-- this should the part of your email address
+ before the @. If you use
+ mbox
+ or mh
+ files as your mail source, you do not need to enter
+ a username.
@@ -229,11 +234,13 @@
If you have several mail sources, clicking Get
- Mail will refresh any IMAP or
- mbox listings and check and download
- all POP servers. In other words, Get
- Mail gets your mail, no matter how many
- sources you have, or what types they are.
+ Mail will refresh any IMAP,
+ mh, or
+ mbox
+ listings and check and download mail from all POP servers.
+ In other words, Get Mail gets your
+ mail, no matter how many sources you have, or what types
+ they are.
@@ -252,8 +259,8 @@
To use SMTP, you'll need to enter the
- name of your SMTP server, which should look like:
- smtp.isp.net.
+ name of your SMTP server. It may have the same name as
+ your mail source server.
Evolution can attempt to
@@ -345,9 +352,11 @@
To set your calendar preferences, select
Settings
- Calendar Configuration. This
- will open up the Preferences window.
- It contains four tabs: Time display,
+ Calendar
+ Configuration from the Calendar
+ view. This will open up the
+ Preferences window. It contains four
+ tabs: Time display,
Colors, To Do List
and Alarms. The calendar
preferences window is illustrated in Evolution will only
alert you to events by opening a dialog box. These beeps
- are distict from full-fledged audio alarms.
+ are distinct from full-fledged audio alarms.
@@ -573,11 +582,9 @@
+
-
-
-
-
+
Managing the Contact Manager
To set the behavior of your Contact Manager, click on the
diff --git a/doc/C/config-setupassist.sgml b/doc/C/config-setupassist.sgml
index 966c62cfc2..392a0bbfc1 100644
--- a/doc/C/config-setupassist.sgml
+++ b/doc/C/config-setupassist.sgml
@@ -21,7 +21,8 @@
The setup assistant (sometimes called a
- Druid) will guide you through the
+ Druid, by analogy with the "Wizards"
+ that some other programs use) will guide you through the
network configuration process. It will ask you for some
basic information; your system administrator or ISP should
have the answers you'll need. The mail setup assistant is
@@ -46,15 +47,14 @@
- Name:
- Your
- full name: eg. Eva Lucianne Tester
+ Name:
+ Your full name.
Email address:
- Your email address: eg. eltester@helixcode.com
+ Your complete email address.
@@ -62,10 +62,9 @@
Organization:
- Any organization you represent; often, the company where
- you work. Leave this blank if you wish. One person I
- know always puts "My own bad self" in this box, so
- people know his opinions are his alone.
+ Any organization you represent, or the company where you
+ work. Leave this blank if you wish, or type "My own bad
+ self" so people know your opinions are yours alone.
@@ -77,7 +76,7 @@
A text file appended to any email you send. A signature
file typically consists of your name and email address,
or a quotation you like. It's good form to keep your
- "sig" on the short side: four lines is plenty. Remeber,
+ "sig" on the short side: four lines is plenty. Remember,
this is attached to every email you send.
@@ -87,23 +86,32 @@
Mail source type:
- Evolution supports three mail
- sources: POP servers,
+ Evolution supports several
+ mail sources: POP and
IMAP servers, and UNIX-style
- mbox files. POP servers retrieve
- your mail and store it on your local system so you can
- refer to it even when not connected to a network;
- IMAP servers store the mail on
- the server so you can access it from multiple locations;
- UNIX-style mbox files are used by
- your computer for internal mail, and may be useful if
- you want to switch from another email client such as
- spruce or
- mutt. Ask your system
- administrator which you should use, or keep guessing
- until one works. You may use multiple servers if you
- wish; see for
- more information.
+ mbox and
+ mh files.
+ POP servers retrieve your mail and store it on your
+ local system so you can refer to it even when not
+ connected to a network; IMAP
+ servers store the mail on the server so you can access
+ it from multiple locations;
+ mbox>
+ files are used by your computer for internal mail, and
+ may be useful if you want to switch from another email
+ client such as Spruce or
+ Netscape Communicator. Ask
+ your system administrator which you should use, or keep
+ guessing until one works. You may use multiple sources
+ if you wish; see for more
+ information.
+
+
+ If you decide not to have
+ Evolution use any servers,
+ the remaining items are not relevant; you only need to
+ point to the location of the files you wish to access.
@@ -112,9 +120,10 @@
Server:
- This should be the name of your mail server: it should
- look something like:
- mailserver.organization.org.
+ This should be the name of the server where you check
+ your mail, if you use one. It may be the same as the
+ server where you send your outgoing mail, if you use
+ one.
@@ -123,8 +132,9 @@
Username:
- Normally, this is the part of your email address before
- the @ character, and
+ Enter the username for your mail server account, if you
+ have one. Normally, this is the part of your email
+ address before the @ character, and
Evolution has selected that
value as the default. If you have a different username,
you can enter it here.
diff --git a/doc/C/evolution-guide.sgml b/doc/C/evolution-guide.sgml
index 9cab3a8bf8..8ec98271cc 100644
--- a/doc/C/evolution-guide.sgml
+++ b/doc/C/evolution-guide.sgml
@@ -5,7 +5,6 @@
-
@@ -20,7 +19,11 @@
]>
-
+
@@ -92,7 +95,7 @@
&USAGE-MAIL;
&USAGE-CONTACT;
&USAGE-CALENDAR;
- &USAGE-NOTES;
+
&USAGE-SYNC;
diff --git a/doc/C/menuref.sgml b/doc/C/menuref.sgml
index b4ae8d4f83..a3ba7e7b34 100644
--- a/doc/C/menuref.sgml
+++ b/doc/C/menuref.sgml
@@ -5,10 +5,11 @@
-
- Configure Folder
-
- Another FIXME item, this allows you to set the file format
- in which Evolution stores mail.
-
-
-
-
-
-
@@ -392,7 +405,7 @@
the sort of feature you'll want to use if your company has a
list of vendors and clients that needs constant updating. If
you also share your calendars, people can avoid duplicating
- work and keep up to date on developments within their workgroup
+ work and keep up to date on developments within their work-group
or across the entire company.
@@ -424,19 +437,29 @@
the folder bar, and will work exactly like a local folder of
cards, with the following exceptions:
+
They are only available when you are connected to the network. If
you use a laptop or have a modem connection, you may wish to copy or cache
the network directory and then synchronize your copy with the networked version
periodically.
-
+
+ To prevent excess network traffic,
+ Evolution will not normally
+ load the contents of LDAP folders immediately upon
+ opening. You must click Display
+ All before LDAP folder cards will be loaded
+ from the network. You can change this behavior in the
+ Contact Preferences window.
+
- Your ability to view, change, add or delete contacts
- depends on the settings of the LDAP server. For example, you may
- read all the entries in the public Netcenter directory (available by default in the
- External Directories folder), but you may not change or delete
- any of them.
+ Your ability to view, change, add or delete
+ contacts depends on the settings of the LDAP server.
+ For example, you may read all the entries in the public
+ Netcenter directory (available by default in the
+ External Directories folder), but
+ you may not change or delete any of them.
diff --git a/doc/C/usage-mainwindow.sgml b/doc/C/usage-mainwindow.sgml
index 3dcc38db86..394c634c27 100644
--- a/doc/C/usage-mainwindow.sgml
+++ b/doc/C/usage-mainwindow.sgml
@@ -166,12 +166,12 @@
- If you don't like the shortcut bar, you can use keyboard
- shortcuts, or hot keys. They're shown
- next to their equivalent menu items in the menu bar. You can
- also set your own hot keys for functions that don't have any;
- this is covered in . If you're using the
- keyboard shortcuts you may also want to hide the
+ If you don't like the shortcut bar, you can use the menu bar, or
+ keyboard shortcuts, also called hot keys.
+ They're shown next to their equivalent menu items in the menu
+ bar. You can also set your own hot keys for functions that don't
+ have any; this is covered in . If you're
+ using the keyboard shortcuts you may also want to hide the
shortcut bar by selecting
View Show Shortcut
Bar .
@@ -350,30 +350,25 @@
-
- Tools Menu
- All of your assistants and configuration
- tools go here. For the Inbox, that
- means things like Mail
- Configuration and the vFolder
- Editor. For the
- Calendar and the Contact
- Manager, it's color, network, and layout
- configuration.
+
+ View Menu
+
+ This menu lets you decide how Evolution
+ should look. Some of the features control the appearance of
+ Evolution as a whole, and others
+ the way a particular kind of information appears.
+
- Actions Menu
-
- This menu contains a list of actions you can perform on
- the information you've stored with
- Evolution. The contents vary
- depending on the view, but for the
- Inbox, it contains items like
- Mark All Messages Read and
- Expunge, to erase all the
- messages you've marked for deletion.
-
+ Settings Menu
+ Tools for configuring, changing, and
+ setting up go here. For mail, that means things like
+ Mail Configuration and the
+ vFolder Editor. For the
+ Calendar and the Contact
+ Manager, it's color, network, and layout
+ configuration.
@@ -386,6 +381,14 @@
+
+ Other menus, like Folder,
+ Message, and Actions,
+ appear only occasionally. Message and
+ Folder, for example, have commands that only
+ relate to email, so they're only available when you're looking at
+ email.
+
Once you've familiarized yourself with the main
window you can start doing things with it. We'll
diff --git a/doc/C/usage-notes.sgml b/doc/C/usage-notes.sgml
index 378b9c3866..1ff2283128 100644
--- a/doc/C/usage-notes.sgml
+++ b/doc/C/usage-notes.sgml
@@ -8,19 +8,19 @@
storage. These scraps of paper were called notes. Now, notes
are an almost necessary part of our lives, albeit in electronic
form. It only makes sense, then, that
- Evolution has a Notes feature.
- Evolution can help you take notes in
- the following ways:
+ Evolution will eventually have a
+ Notes feature. Evolution can help
+ you take notes in the following ways:
- You can take down phone numbers, take school notes, take phone
+ Take down phone numbers, take school notes, take phone
messages, or even write poetry.
- You can color code notes to organize them, or just to
+ Color code notes to organize them, or just to
make them look good.
@@ -31,14 +31,16 @@
- Something
+ Write Haiku
- You can start writing notes by clicking Notes in the
- shortcut bar.
+ You can start writing notes by clicking
+ Notes in the shortcut bar. Of course,
+ it's not there yet. But when it is, it'll take you to the
+ notepad.
diff --git a/doc/C/usage-sync.sgml b/doc/C/usage-sync.sgml
index 07325e1848..a6b53e9526 100644
--- a/doc/C/usage-sync.sgml
+++ b/doc/C/usage-sync.sgml
@@ -2,21 +2,19 @@
Synchronizing with a Hand-held Device
- Once you've set up a synchronization system, it pretty much
- takes care of itself. Not only that, it's entirely possible
- that your system administrator has set it up for you. All
- that this chapter covers is how to use that system once it's
- installed and configured. If you need to set it up, consult
- .
+ This chapter covers is how to synchronize data
+ installed and configured. If you need information on how to
+ set up a synchronization system, consult .
-
-
- If you've already got Gnome-pilot set up to use
- Evolution, put
- your hand-held device on the cradle and press the HotSync
- button.
-
-
+
+ Using HotSync
+
+ Put your hand-held device on its cradle and press the
+ HotSync button.
+
+
No, really. That's all there is to it.
-
+
+
\ No newline at end of file
diff --git a/help/C/apx-gloss.sgml b/help/C/apx-gloss.sgml
index f13a56106a..7aa5e494dc 100644
--- a/help/C/apx-gloss.sgml
+++ b/help/C/apx-gloss.sgml
@@ -63,7 +63,7 @@
Emoticon
- Also called smileys, emoticons are the little sideways faces made
+ Also called "smileys," emoticons are the little sideways faces made
of colons and parentheses which people use to convey emotion in email.
Examples: :-) or ;( .
@@ -89,7 +89,8 @@
executable attachments, but before they can be run, the files must
be marked as executable with a shell or file manager. This
security precaution prevents the automatic or accidental execution
- of malicious programs.
+ of malicious programs. For more information on executables and file
+ permissions, see the documentation for your file manager or shell.
@@ -131,10 +132,9 @@
Haiku
- A Japanese form of poetry. Haiku are unrhymed, and
- three lines long. The first and last lines should have five
- syllables, and the second line seven syllables. The subject
- matter is traditionally related to the seasons.
+ A traditional Japanese form of poetry. The poems are three lines
+ long, with first and last lines having five syllables, and the
+ second line seven syllables.
@@ -144,9 +144,9 @@
Hyper-text Markup Language(HTML) is the layout
- language which all webpages are written in. HTML can be used
- inside of e-mails to insert images, justfiy text different ways,
- and even include webpages inside the e-mail itself.
+ language which all web pages are written in. HTML can be used
+ inside of e-mails to insert images, justify text different ways,
+ and even include web pages inside the e-mail itself.
@@ -191,9 +191,9 @@
LDAP
- LDAP is a protocol which allows a client to search through a
- large database of addresses, phone numbers, and people, as an
- alternative to a physical phone book.
+ LDAP, the Lightweight Directory Access Protocol, allows a client
+ to search through a large database of addresses, phone numbers,
+ and people stored on a server.
@@ -251,12 +251,26 @@
+
+ Protocol
+
+
+ An agreed-upon method of communication, especially one for
+ sending particular types of information between computer systems.
+ Examples include POP (Post Office Protocol), for email, and HTTP
+ (HypterText Transfer Protocol), for web pages.
+
+
+
+
+
+
Regular Expression
A regular expression, or "regex", is a way of describing a
- string of text using metacharacters or wildcard symbols. For
+ string of text using metacharacters or wild-card symbols. For
example, the statement fly*so[a|u]p means
"any phrase beginning with 'fly' and ending in 'soup' or
'soap'". If you searched for that expression, you'd find both
@@ -271,18 +285,37 @@
Script
- A program which is written in an interpreted language, which can
- be executed.
+ A program, which is written in an interpreted (rather than
+ compiled) language. Scripts are more likely to work on multiple
+ platforms, but they require an additional layer of software (the
+ interpreter) which mediates between them and the operating system.
+ Because of this, they typically suffer from relatively sluggish
+ performance, and are limited to smaller tasks.
+
+ Sendmail
+
+
+ As its name implies, sendmail is a
+ program which sends mail. Evolution
+ can use it instead of SMTP; some people
+ prefer it because it offers more flexibility, but is more
+ difficult to set up.
+
+
+
+
+
Shortcut Bar
- The Shortcut Bar is where the user accesses
- all the components of Evolution from.
+ A portion of Evolution which offers
+ users fast access to the most frequently used portions of the
+ application.
@@ -291,22 +324,47 @@
Signature
- Signatures allow a user to specify a message to place at the bottom of
- every email sent. A signature can be anything from a favorite quote to
- a link to a webpage.
+ In email terms, a signature is a piece of text placed at the end
+ of every email sent, like a hand-written signature at the bottom
+ of a written letter. A signature can be anything from a favorite
+ quotation to a link to a web page; courtesy dictates that it be
+ fewer than four lines long.
+
+ SMTP
+
+
+ This is the most common way of transporting mail messages from
+ the client's computer (you) to the server. SMTP stands for
+ Simple Mail Transfer Protocol.
+
+
+
Spam
- Spam: useless, unwanted e-mail. Spam normally comes in forms of
- chain-letters and advertisements for unscrupulous websites or
- services. Messages that are merely useless are called
- "opt-in newsletters."
+ Useless, unwanted e-mail. Spam normally comes in forms of
+ chain-letters and advertisements for unscrupulous web sites or
+ services. Messages that are merely useless are called "opt-in
+ newsletters."
+
+
+ <
+/glossentry>
+
+
+ Virus
+
+
+ A malicious program which inserts itself into others so that it will be
+ executed, allowing it to spread to still more programs and other computers.
+ A virus can cause substantial damage by clogging networks or disk drives,
+ deleting files, or opening security holes.
@@ -315,8 +373,9 @@
vFolder
- vFolders allow an e-mail to be shared among multiple folders, so
- it appears that theres a copy of the e-mail in each folder.
+ An email organization tool. vFolders allows you to create a folder
+ that contains the results of a complex search. Folder contents are
+ are updated dynamically.
diff --git a/help/C/config-prefs.sgml b/help/C/config-prefs.sgml
index 7119f13580..7fee2fd340 100644
--- a/help/C/config-prefs.sgml
+++ b/help/C/config-prefs.sgml
@@ -22,12 +22,11 @@
preferences are separated into several categories:
- Identies
+ Identities
This allows you to create and alter one or more
- identities for your email: your name, address, and so
- forth.
+ identities for your email.
@@ -58,7 +57,7 @@
If you would like to use
Evolution to read newsgroups,
- you can secify your news server preferences here.
+ you can specify your news server preferences here.
@@ -99,7 +98,8 @@
one address, you will only need to configure one identity. If
you want, however, you can have multiple identities. This
can be useful if you want to keep personal and professional
- email seperate.
+ email separate, or if you wear several hats at work.
+
To add a new identity, simply click
@@ -175,8 +175,10 @@
Mail source type:
- Select from IMAP, POP or Unix-style
- mbox files.
+ Select from IMAP or POP servers, or Unix-style
+ mbox
+ or mh
+ files.
@@ -184,9 +186,9 @@
Server:
- Enter the name of your mail server in this field.
- For example:
- mail.mycompany.com
+ Enter the name of the mail source server in this
+ field. If you use an may or may not be the same as your
+ SMTP server.
@@ -194,10 +196,13 @@
Username:
- Enter your user name here. This is often related to
- your real name, but not always. Examples include
- eltester and
- rupert.
+ Enter the user name for the account you have on the
+ server-- this should the part of your email address
+ before the @. If you use
+ mbox
+ or mh
+ files as your mail source, you do not need to enter
+ a username.
@@ -229,11 +234,13 @@
If you have several mail sources, clicking Get
- Mail will refresh any IMAP or
- mbox listings and check and download
- all POP servers. In other words, Get
- Mail gets your mail, no matter how many
- sources you have, or what types they are.
+ Mail will refresh any IMAP,
+ mh, or
+ mbox
+ listings and check and download mail from all POP servers.
+ In other words, Get Mail gets your
+ mail, no matter how many sources you have, or what types
+ they are.
@@ -252,8 +259,8 @@
To use SMTP, you'll need to enter the
- name of your SMTP server, which should look like:
- smtp.isp.net.
+ name of your SMTP server. It may have the same name as
+ your mail source server.
Evolution can attempt to
@@ -345,9 +352,11 @@
To set your calendar preferences, select
Settings
- Calendar Configuration. This
- will open up the Preferences window.
- It contains four tabs: Time display,
+ Calendar
+ Configuration from the Calendar
+ view. This will open up the
+ Preferences window. It contains four
+ tabs: Time display,
Colors, To Do List
and Alarms. The calendar
preferences window is illustrated in Evolution will only
alert you to events by opening a dialog box. These beeps
- are distict from full-fledged audio alarms.
+ are distinct from full-fledged audio alarms.
@@ -573,11 +582,9 @@
+
-
-
-
-
+
Managing the Contact Manager
To set the behavior of your Contact Manager, click on the
diff --git a/help/C/config-setupassist.sgml b/help/C/config-setupassist.sgml
index 966c62cfc2..392a0bbfc1 100644
--- a/help/C/config-setupassist.sgml
+++ b/help/C/config-setupassist.sgml
@@ -21,7 +21,8 @@
The setup assistant (sometimes called a
- Druid) will guide you through the
+ Druid, by analogy with the "Wizards"
+ that some other programs use) will guide you through the
network configuration process. It will ask you for some
basic information; your system administrator or ISP should
have the answers you'll need. The mail setup assistant is
@@ -46,15 +47,14 @@
- Name:
- Your
- full name: eg. Eva Lucianne Tester
+ Name:
+ Your full name.
Email address:
- Your email address: eg. eltester@helixcode.com
+ Your complete email address.
@@ -62,10 +62,9 @@
Organization:
- Any organization you represent; often, the company where
- you work. Leave this blank if you wish. One person I
- know always puts "My own bad self" in this box, so
- people know his opinions are his alone.
+ Any organization you represent, or the company where you
+ work. Leave this blank if you wish, or type "My own bad
+ self" so people know your opinions are yours alone.
@@ -77,7 +76,7 @@
A text file appended to any email you send. A signature
file typically consists of your name and email address,
or a quotation you like. It's good form to keep your
- "sig" on the short side: four lines is plenty. Remeber,
+ "sig" on the short side: four lines is plenty. Remember,
this is attached to every email you send.
@@ -87,23 +86,32 @@
Mail source type:
- Evolution supports three mail
- sources: POP servers,
+ Evolution supports several
+ mail sources: POP and
IMAP servers, and UNIX-style
- mbox files. POP servers retrieve
- your mail and store it on your local system so you can
- refer to it even when not connected to a network;
- IMAP servers store the mail on
- the server so you can access it from multiple locations;
- UNIX-style mbox files are used by
- your computer for internal mail, and may be useful if
- you want to switch from another email client such as
- spruce or
- mutt. Ask your system
- administrator which you should use, or keep guessing
- until one works. You may use multiple servers if you
- wish; see for
- more information.
+ mbox and
+ mh files.
+ POP servers retrieve your mail and store it on your
+ local system so you can refer to it even when not
+ connected to a network; IMAP
+ servers store the mail on the server so you can access
+ it from multiple locations;
+ mbox>
+ files are used by your computer for internal mail, and
+ may be useful if you want to switch from another email
+ client such as Spruce or
+ Netscape Communicator. Ask
+ your system administrator which you should use, or keep
+ guessing until one works. You may use multiple sources
+ if you wish; see for more
+ information.
+
+
+ If you decide not to have
+ Evolution use any servers,
+ the remaining items are not relevant; you only need to
+ point to the location of the files you wish to access.
@@ -112,9 +120,10 @@
Server:
- This should be the name of your mail server: it should
- look something like:
- mailserver.organization.org.
+ This should be the name of the server where you check
+ your mail, if you use one. It may be the same as the
+ server where you send your outgoing mail, if you use
+ one.
@@ -123,8 +132,9 @@
Username:
- Normally, this is the part of your email address before
- the @ character, and
+ Enter the username for your mail server account, if you
+ have one. Normally, this is the part of your email
+ address before the @ character, and
Evolution has selected that
value as the default. If you have a different username,
you can enter it here.
diff --git a/help/C/evolution-guide.sgml b/help/C/evolution-guide.sgml
index 9cab3a8bf8..8ec98271cc 100644
--- a/help/C/evolution-guide.sgml
+++ b/help/C/evolution-guide.sgml
@@ -5,7 +5,6 @@
-
@@ -20,7 +19,11 @@
]>
-
+
@@ -92,7 +95,7 @@
&USAGE-MAIL;
&USAGE-CONTACT;
&USAGE-CALENDAR;
- &USAGE-NOTES;
+
&USAGE-SYNC;
diff --git a/help/C/menuref.sgml b/help/C/menuref.sgml
index b4ae8d4f83..a3ba7e7b34 100644
--- a/help/C/menuref.sgml
+++ b/help/C/menuref.sgml
@@ -5,10 +5,11 @@
-
- Configure Folder
-
- Another FIXME item, this allows you to set the file format
- in which Evolution stores mail.
-
-
-
-
-
-
@@ -392,7 +405,7 @@
the sort of feature you'll want to use if your company has a
list of vendors and clients that needs constant updating. If
you also share your calendars, people can avoid duplicating
- work and keep up to date on developments within their workgroup
+ work and keep up to date on developments within their work-group
or across the entire company.
@@ -424,19 +437,29 @@
the folder bar, and will work exactly like a local folder of
cards, with the following exceptions:
+
They are only available when you are connected to the network. If
you use a laptop or have a modem connection, you may wish to copy or cache
the network directory and then synchronize your copy with the networked version
periodically.
-
+
+ To prevent excess network traffic,
+ Evolution will not normally
+ load the contents of LDAP folders immediately upon
+ opening. You must click Display
+ All before LDAP folder cards will be loaded
+ from the network. You can change this behavior in the
+ Contact Preferences window.
+
- Your ability to view, change, add or delete contacts
- depends on the settings of the LDAP server. For example, you may
- read all the entries in the public Netcenter directory (available by default in the
- External Directories folder), but you may not change or delete
- any of them.
+ Your ability to view, change, add or delete
+ contacts depends on the settings of the LDAP server.
+ For example, you may read all the entries in the public
+ Netcenter directory (available by default in the
+ External Directories folder), but
+ you may not change or delete any of them.
diff --git a/help/C/usage-mainwindow.sgml b/help/C/usage-mainwindow.sgml
index 3dcc38db86..394c634c27 100644
--- a/help/C/usage-mainwindow.sgml
+++ b/help/C/usage-mainwindow.sgml
@@ -166,12 +166,12 @@
- If you don't like the shortcut bar, you can use keyboard
- shortcuts, or hot keys. They're shown
- next to their equivalent menu items in the menu bar. You can
- also set your own hot keys for functions that don't have any;
- this is covered in . If you're using the
- keyboard shortcuts you may also want to hide the
+ If you don't like the shortcut bar, you can use the menu bar, or
+ keyboard shortcuts, also called hot keys.
+ They're shown next to their equivalent menu items in the menu
+ bar. You can also set your own hot keys for functions that don't
+ have any; this is covered in . If you're
+ using the keyboard shortcuts you may also want to hide the
shortcut bar by selecting
View Show Shortcut
Bar .
@@ -350,30 +350,25 @@
-
- Tools Menu
- All of your assistants and configuration
- tools go here. For the Inbox, that
- means things like Mail
- Configuration and the vFolder
- Editor. For the
- Calendar and the Contact
- Manager, it's color, network, and layout
- configuration.
+
+ View Menu
+
+ This menu lets you decide how Evolution
+ should look. Some of the features control the appearance of
+ Evolution as a whole, and others
+ the way a particular kind of information appears.
+
- Actions Menu
-
- This menu contains a list of actions you can perform on
- the information you've stored with
- Evolution. The contents vary
- depending on the view, but for the
- Inbox, it contains items like
- Mark All Messages Read and
- Expunge, to erase all the
- messages you've marked for deletion.
-
+ Settings Menu
+ Tools for configuring, changing, and
+ setting up go here. For mail, that means things like
+ Mail Configuration and the
+ vFolder Editor. For the
+ Calendar and the Contact
+ Manager, it's color, network, and layout
+ configuration.
@@ -386,6 +381,14 @@
+
+ Other menus, like Folder,
+ Message, and Actions,
+ appear only occasionally. Message and
+ Folder, for example, have commands that only
+ relate to email, so they're only available when you're looking at
+ email.
+
Once you've familiarized yourself with the main
window you can start doing things with it. We'll
diff --git a/help/C/usage-notes.sgml b/help/C/usage-notes.sgml
index 378b9c3866..1ff2283128 100644
--- a/help/C/usage-notes.sgml
+++ b/help/C/usage-notes.sgml
@@ -8,19 +8,19 @@
storage. These scraps of paper were called notes. Now, notes
are an almost necessary part of our lives, albeit in electronic
form. It only makes sense, then, that
- Evolution has a Notes feature.
- Evolution can help you take notes in
- the following ways:
+ Evolution will eventually have a
+ Notes feature. Evolution can help
+ you take notes in the following ways:
- You can take down phone numbers, take school notes, take phone
+ Take down phone numbers, take school notes, take phone
messages, or even write poetry.
- You can color code notes to organize them, or just to
+ Color code notes to organize them, or just to
make them look good.
@@ -31,14 +31,16 @@
- Something
+ Write Haiku
- You can start writing notes by clicking Notes in the
- shortcut bar.
+ You can start writing notes by clicking
+ Notes in the shortcut bar. Of course,
+ it's not there yet. But when it is, it'll take you to the
+ notepad.
diff --git a/help/C/usage-sync.sgml b/help/C/usage-sync.sgml
index 07325e1848..a6b53e9526 100644
--- a/help/C/usage-sync.sgml
+++ b/help/C/usage-sync.sgml
@@ -2,21 +2,19 @@
Synchronizing with a Hand-held Device
- Once you've set up a synchronization system, it pretty much
- takes care of itself. Not only that, it's entirely possible
- that your system administrator has set it up for you. All
- that this chapter covers is how to use that system once it's
- installed and configured. If you need to set it up, consult
- .
+ This chapter covers is how to synchronize data
+ installed and configured. If you need information on how to
+ set up a synchronization system, consult .
-
-
- If you've already got Gnome-pilot set up to use
- Evolution, put
- your hand-held device on the cradle and press the HotSync
- button.
-
-
+
+ Using HotSync
+
+ Put your hand-held device on its cradle and press the
+ HotSync button.
+
+
No, really. That's all there is to it.
-
+
+
\ No newline at end of file