diff --git a/help/C/config-prefs.sgml b/help/C/config-prefs.sgml
index ef2df3bc6f..dd4f940037 100644
--- a/help/C/config-prefs.sgml
+++ b/help/C/config-prefs.sgml
@@ -156,73 +156,131 @@ smtp.omniport.com:143
Here, decide whether you'd like to check for mail
- automatically and how often. You can also set other
- options related to the behavior of your server. If you
- use POP mail, you can choose to leave mail on the server
- if you wish. For IMAP, there are more extensife options:
+ automatically and how often.
+
- Check for new messages in all folders
+ If you chose POP:
- If you turn this feature on, then at startup
- and when you click Send/Receive,
- Ximian Evolution
- will check all folders on your IMAP server to
- see if they have new messages in them. If you
- leave it turned off, it will only check the
- INBOX folder. Checking only one folder is
- faster than checking them all at once.
+
+
+ Checking for new mail: If you would
+ like Evolution
+ to check for new mail automatically,
+ check the box and select a frequency in
+ minutes.
+
+
+
+
+
+ Message Storage: If you'd like to store
+ copies of your mail on the server, check
+ this option.
+
+
+
+
+
+
+
+
+ If you chose Microsoft Exchange:
+
+
+
+
+ Checking for new mail: If you would like
+ Evolution to check for new mail
+ automatically, check the box and select a frequency in
+ minutes.
+
+
+
+
+ Exchange Server: If your active directory user name
+ is different from your Exchange mail user name, check this
+ box and enter your mail username here.
+
+
+
+
+ Create a Global Address List folder: If you would
+ like to have a seperate folder for the Active Directory's
+ Global Address List, leave this box checked.
+
+
+
+
+ Active Directory Server Name: In most organizations,
+ the Active Directory server will be different from
+ the Exchange mail server. If so, check the box and
+ enter the Active Directory server name here.
+
+
+
+
+ Limit number of Responses: Select a maximum number
+ of results for an address search. A maximum number of
+ results limits the load on your system and on your network.
+
+
+
- Show only subscribed folders
+ If you chose IMAP:
- Some IMAP servers provide you with a very large
- number of folders above and beyond your mail
- folders, and expect you to indicate which ones
- you want to work with. If you turn this off,
- Evolution will show all of your folders. To
- subscribe to folders, select
- Tools
- Subscribe to
- Folders. You can
- learn about subscriptions in .
-
-
-
-
-
- Override server-supplied namespace
-
-
- This is not needed for most IMAP servers. If
- you see system files or other non-email files
- appearing in the folder tree after configuring
- your IMAP server, check this box and specify
- the name of the directory that contains your
- mail folders.
-
-
-
-
-
- Apply filters to new messages in INBOX on
- this server
-
-
- If you want to use filters on the mail you
- store in your IMAP folders, check this box.
-
-
-
-
+
+
+
+ Checking for new mail: If you would like
+ Evolution to check for new mail
+ automatically, check the box and select a frequency in
+ minutes.
+
+
+ If you want Evolution
+ to check for new messages in all your
+ IMAP folders, make sure the Check for new
+ messages in all folders box is selected.
+
+
+
+ Show only subscribed folders: Check this box if you
+ have more folders in your IMAP view than you want to
+ read.
+
+
+
+
+ Override server-supplied namespace: If you like, enter a
+ specific directory where your server stores mail for
+ you. Typical values are "mail" and "Mail." For more
+ information about how to use IMAP mail, see .
+
+
+
+ Apply filters to new messages in INBOX on this
+ server: If you'd like your filters to work on this account
+ as well as on locally downloaded mail, check this box.
+
+
+
+
+
+
+
+
+
+
Sending Mail
diff --git a/help/C/usage-mainwindow.sgml b/help/C/usage-mainwindow.sgml
index bf47f13660..55b6aaa4b3 100644
--- a/help/C/usage-mainwindow.sgml
+++ b/help/C/usage-mainwindow.sgml
@@ -95,11 +95,11 @@
Defining Your Identity
- The Identity window is the first of four steps in the
- assistant. The identity step will ask you to enter your basic
- personal information. You can define multiple identities
- later on with the Tools
- Mail Settings tool.
+ The Identity window is the first step in the assistant. Here,
+ you will enter some basic personal information. You can
+ define multiple identities later on with the
+ Tools Mail
+ Settings tool.
@@ -144,6 +144,7 @@
you're not sure which of the following are available to
you:
+
POP: Downloads your email to your hard disk for
@@ -158,37 +159,50 @@
Exchange, this will allow you to connect to a
Microsoft Exchange 2000 server, which stores
email, calendar, and contact information on the
- server.
+ server.
- IMAP: Keeps the email on your server so you
- can access your email from multiple systems.
+ IMAP: Keeps the email on your server so you can
+ access your email from multiple systems.
+
- Unix mail spool file: If you run a mail
- server on your desktop computer, choose this
- option.
+ Standard Unix mbox spools: If you want to read and
+ store mail in the mail spool on your local system,
+ choose this option. You'll need
+ to provide the path to the mail spool you want to
+ use.
+
- Standard Unix .mbox file: If you want
- Ximian Evolution to
- read mail from a specific file, or if you download
- mail with another application, choose this option.
+ Maildir format mail directories: If you download
+ your mail using qmail or another maildir-style
+ program, you'll want to use this option. You'll need
+ to provide the path to the mail directory you want to
+ use.
+
- Qmail maildir format files: If you download your
- mail using qmail, you'll want to use this.
+ Local Delivery: Choose this option if you want to
+ move mail from the spool and store it in your home
+ directory. If you would rather leave mail in your
+ system's spool files, choose the
+ Standard Unix mbox
+ spools option instead. You'll need
+ to provide the path to the mail spool you want to
+ use.
+
None: Select this if you do not plan to
@@ -197,7 +211,188 @@
-
+
+
+
+
+
+ If you selected POP, Microsoft Exchange, or IMAP as your mail
+ server, you'll need to enter some more information:
+
+
+
+ The host name of your mail server. Ask
+ your system administrator if you're not
+ sure.
+
+
+
+ The username for the account on that
+ system.
+
+
+
+ Whether you want to use a secure (SSL)
+ connection. If your server supports it, it's
+ best to enable this security option.
+
+
+
+
+ The authentication options supported by
+ your server. If you're not sure, click the
+ Check for supported types
+ button or ask your system administrator.
+
+
+
+
+ Whether you'd like Evolution to remember
+ your password.
+
+
+
+
+
+
+ Can Ximian Evolution Talk to Microsoft Exchange?
+
+ If you have purchased the Ximian Connector for Microsoft
+ Exchange, you can access Microsoft Exchange 2000 servers
+ natively. If you do not have the Connector, or if you use
+ an older version of Microsoft Exchange, talk to your system
+ administrator about access to standard protocol services
+ like POP and IMAP.
+
+
+
+
+ More Mail Configuration Options
+
+ There are more extensive options for mail preferences,
+ especially if you've chosen POP, Microsoft Exchange, or IMAP
+ as incoming mail server type. If you want to set these
+ options after you've created the account, you can select
+ Tools Mail
+ Settings, click on the account you
+ want to change, and then click the Edit
+ button. See for details.
+
+
+
+ If you chose POP mail:
+
+
+
+ Checking for new mail: If you would like
+ Evolution to check for new mail
+ automatically, check the box and select a frequency in
+ minutes.
+
+
+
+
+
+ Message Storage: If you'd like to store copies of your
+ mail on the server, check this option.
+
+
+
+
+
+
+
+ If you chose Microsoft Exchange:
+
+
+ Checking for new mail: If you would like
+ Evolution to check for new mail
+ automatically, check the box and select a frequency in
+ minutes.
+
+
+
+
+ Exchange Server: If your active directory user name
+ is different from your Exchange mail user name, check this
+ box and enter your mail username here.
+
+
+
+
+ Create a Global Address List folder: If you would
+ like to have a seperate folder for the Active Directory's
+ Global Address List, leave this box checked.
+
+
+
+
+ Active Directory Server Name: In most organizations, the
+ Active Directory server will be different from the
+ Exchange mail server. Enter the Active Directory server
+ name here.
+
+
+
+
+ Limit number of Responses: Select a maximum number
+ of results for an address search. A maximum number of
+ results limits the load on your system and on your network.
+
+
+
+
+
+
+
+ If you chose IMAP:
+
+
+
+
+ Checking for new mail: If you would like
+ Evolution to check for new mail
+ automatically, check the box and select a frequency in
+ minutes.
+
+
+
+
+ If you want Evolution
+ to check for new messages in all your
+ IMAP folders, make sure the Check for new
+ messages in all folders box is selected.
+
+
+
+ Show only subscribed folders: Check this box if you
+ have more folders in your IMAP view than you want to
+ read.
+
+
+
+
+ Override server-supplied namespace: If you like, enter a
+ specific directory where your server stores mail for
+ you. Typical values are "mail" and "Mail." For more
+ information about how to use IMAP mail, see .
+
+
+
+ Apply filters to new messages in INBOX on this
+ server: If you'd like your filters to work on this account
+ as well as on locally downloaded mail, check this box.
+
+
+
+
+
+
+
+
+
+
What's an IMAP Namespace?
For IMAP mail servers, your sysadmin may provide
@@ -213,59 +408,9 @@
linkend="usage-mail-subscriptions">.
-
-
-
-
- Email Server: This is the address of the server you're
- downloading from.
-
-
-
-
- Username: The username that you login to your email. That
- is often the part before the @ in your email.
-
-
- Authentication Type: Chances are you are using
- Password. Ask your administrator
- for more details. You can have Ximian
- Evolution make sure you've chosen
- correctly by clicking Check for supported
- types.
-
-
- Remember Password: If you prefer to not enter your
- password every time you check email, press this button.
-
-
-
-
-
- Can Ximian Evolution Talk to Microsoft Exchange?
-
- If you have purchased the Ximian Connector for Microsoft
- Exchange, you can access Microsoft Exchange 2000 servers
- natively. If you do not have the Connector, or if you use
- an older version of Microsoft Exchange, talk to your system
- administrator about access to standard protocol services
- like POP and IMAP.
-
-
-
-More Options
-
-There are more extensive options for mail preferences, especially if
-you've chosen IMAP as your incoming mail server type. Once you've
-created an account, you can fine-tune it by selecting
-Tools Mail
-Settings, selecting the account you want to
-change, and clicking the Edit button. See for details.
-
-
+
Sending Email
diff --git a/help/ChangeLog b/help/ChangeLog
index cae97f991d..2d956c279c 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,3 +1,11 @@
+2002-01-15 Aaron Weber
+
+ * C/config-prefs.sgml: Redo the whole options/account-creation
+ thing.
+
+ * C/usage-mainwindow.sgml: Redo the whole options/account-creation
+ thing.
+
2002-01-07 Aaron Weber
* C/evolution.sgml: Touched this file but don't think I changed