diff --git a/doc/C/evolution.sgml b/doc/C/evolution.sgml
index 647aa488f7..b78cfc233a 100644
--- a/doc/C/evolution.sgml
+++ b/doc/C/evolution.sgml
@@ -16,6 +16,7 @@
+
@@ -136,6 +137,7 @@ implemented. -->
&APX-GLOSS;
&APX-BUGS;
&APX-AUTHORS;
+
diff --git a/doc/C/preface.sgml b/doc/C/preface.sgml
index 3e507dc8f5..67779dc0af 100644
--- a/doc/C/preface.sgml
+++ b/doc/C/preface.sgml
@@ -302,7 +302,6 @@
import your files right back in.
-
Quick Reference for Common Tasks
@@ -530,8 +529,8 @@
-
-
+
+ Contact Manager
Here are the most frequent tasks that are done in the Contact Manager,
@@ -598,19 +597,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
diff --git a/doc/C/usage-contact.sgml b/doc/C/usage-contact.sgml
index a2e4558d5d..3b233baba0 100644
--- a/doc/C/usage-contact.sgml
+++ b/doc/C/usage-contact.sgml
@@ -108,75 +108,9 @@
more than a few people listed, you'll want some way of finding
them more quickly, which is why there's a search feature.
-
-
- Searching for Contacts
-
- Between Delete and View
- All is a quick search field. To use it, select
- from the drop-down list which sort of search you'd like to
- perform (the whole card, just the name, or just the email
- address), then enter one or more words in the text entry
- box, and press Enter.
- Evolution will search through
- the contents of every displayed card to find one that
- matches. You can refine searches by doing several in
- succession, or start over by pressing the View
- All button.
-
-
- If there are no matches, the card display will be
- blank. When you'd like to see all the cards again, press
- Show All.
-
-
- Refining a Quick Search
-
- Tom comes back from lunch and finds a note on his
- keyboard: "Curtis in sales called for you, but he didn't
- leave a number, and I forgot to write down the name of the
- company he works for. He said it was important, though."
- Tom is not at all annoyed.
-
-
- He opens his contacts folder, and runs a quick search for
- "Curtis." There are eighteen different people with that name
- in the file. He then enters "Sales," and
- Evolution narrows it down to the
- right Curtis. He only becomes annoyed when he discovers that
- the call was not actually important.
-
-
-
-
- If you prefer to perform a more complex search, press
- Find or choose
- ToolsSearch for
- Contact. This will open the
- in-depth search window, which lets you use multiple search
- criteria in the same way that email filters and virtual folders do.
-
-
- Click Add Criterion to increase the
- number of criteria you'd like to use in the search, and
- Remove Criterion to remove one from the
- bottom of the list. Your criteria may be a search within the
- Name or Email
- fields; alternately you can choose to search through all the
- fields with a regular expression. Then, you can select from
- all the familiar requirements like Begins
- With and Does Not Contain,
- decide whether to match All or
- Any of your criteria, and press
- Search to set it all off.
-
-
-
-
- Destroy, Create, and Change: The Contact Editor
+ The Contact Editor
To delete a card, click on it once to select it, then press the
Delete button. If you have multiple
@@ -370,6 +304,70 @@
+
+ Searching for Contacts
+
+ Between Delete and View
+ All is a quick search field. To use it, select
+ from the drop-down list which sort of search you'd like to
+ perform (the whole card, just the name, or just the email
+ address), then enter one or more words in the text entry
+ box, and press Enter.
+ Evolution will search through
+ the contents of every displayed card to find one that
+ matches. You can refine searches by doing several in
+ succession, or start over by pressing the View
+ All button.
+
+
+ If there are no matches, the card display will be
+ blank. When you'd like to see all the cards again, press
+ Show All.
+
+
+ Refining a Quick Search
+
+ Tom comes back from lunch and finds a note on his
+ keyboard: "Curtis in sales called for you, but he didn't
+ leave a number, and I forgot to write down the name of the
+ company he works for. He said it was important, though."
+ Tom is not at all annoyed.
+
+
+ He opens his contacts folder, and runs a quick search for
+ "Curtis." There are eighteen different people with that name
+ in the file. He then enters "Sales," and
+ Evolution narrows it down to the
+ right Curtis. He only becomes annoyed when he discovers that
+ the call was not actually important.
+
+
+
+
+ If you prefer to perform a more complex search, press
+ Find or choose
+ ToolsSearch for
+ Contact. This will open the
+ in-depth search window, which lets you use multiple search
+ criteria in the same way that email filters and virtual folders do.
+
+
+ Click Add Criterion to increase the
+ number of criteria you'd like to use in the search, and
+ Remove Criterion to remove one from the
+ bottom of the list. Your criteria may be a search within the
+ Name or Email
+ fields; alternately you can choose to search through all the
+ fields with a regular expression. Then, you can select from
+ all the familiar requirements like Begins
+ With and Does Not Contain,
+ decide whether to match All or
+ Any of your criteria, and press
+ Search to set it all off.
+
+
+
Organizing your Address Book
@@ -595,33 +593,18 @@
-->
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/doc/C/usage-mail-org.sgml b/doc/C/usage-mail-org.sgml
index 9a2a775740..6668623cf0 100644
--- a/doc/C/usage-mail-org.sgml
+++ b/doc/C/usage-mail-org.sgml
@@ -201,7 +201,7 @@
- Staying organized: Mail Filters in Evolution
+ Create Rules to Automatically Organize Mail
Filters work very much like the mail room in a large company.
Their purpose is to bundle, sort, and distribute mail to the
@@ -537,30 +537,30 @@
-
-
- Filtering by Mailing List
+
+
+ Filtering by Mailing List
You can tell Evolution to filter by
- mailing list. This means that Evolution
- will look at the mailing list address, and find out automatically
- what list this is. If you are subscribed to mailing lists, you
- should use the Filter by List instead of by
- sender.
-
+ mailing list. This means that Evolution
+ will look at the mailing list address, and find out automatically
+ what list this is. If you are subscribed to mailing lists, you
+ should use the Filter by List instead of by
+ sender.
+ Filter by List
-
- Kevin subscribes to bananas@ximian.com. However, there is also
- a bananas@ximian.org address. If he used a regular
- Filter by Sender, he would need to specify
- one for each address. However, Filter by
+
+ Kevin subscribes to bananas@ximian.com. However, there is also
+ a bananas@ximian.org address. If he used a regular
+ Filter by Sender, he would need to specify
+ one for each address. However, Filter by
List will recognize that both of them are the same
- list.
-
-
-
-
-
+ list.
+
+
+
+
+
Getting Really Organized with Virtual Folders
@@ -674,7 +674,7 @@
-
+ and your key will be uploaded for your
- friends to download.
-
-
-
- Setting up Evolution's Encryption
-
- You'll need to open
-
- Tools
- Mail Settings
-
- Once there, select the account you'd like to associate the key to and click
- the Edit button. In the
- Security tab is a section labeled Pretty
- Goog Privacy. Enter your key ID and click
- OK. Your key is now integrated into your identity
- in Evolution.
-
-
-
- Sending Encrypted Messages
-
- You can either sign or encrypt a message. When you sign a message, verify
- that you were the one who sent it, and that no one is forging your
- identity. Encrypting a message makes it impossible for someone with
- prying eyes to view it while it's in tranmission.
-
-
-
-
- Signing a Message
-
- To sign a message, you simply click
-
- Security
- PGP Sign
-
- . You will be prompted for your PGP password. Once you enter it,
- click OK and your message will be signed.
-
-
-
-
- Encrypting a Message
-
- Encrypting a message is very similar to signing a message. You simply
- click the menu item
-
- Security
- PGP Encrypt
-
-
-
-
- Unencrypting a Recieved Message
-
- Sometimes, a friend will send you a message which is encrypted. In order
- for you to read it, you need to unencrypt it.
-
-
- When you view the encrypted message, Evolution
- will prompt you for your PGP password. You type in your PGP password and
- the message is then decrypted.
-
-
+
+-->
diff --git a/doc/C/usage-mail.sgml b/doc/C/usage-mail.sgml
index 87d97b4561..1217109a25 100644
--- a/doc/C/usage-mail.sgml
+++ b/doc/C/usage-mail.sgml
@@ -47,11 +47,7 @@
-
-
- Reading, Getting and Sending Mail
-
-
+ Reading Mail
You can start reading email by clicking
@@ -127,7 +123,7 @@
-
+ Sorting the message list
One of the ways Evolution lets
@@ -155,8 +151,8 @@
message with the original, so you can follow the thread of a
conversation from one message to the next.
-
-
+
+ Deleting Mail
Once you've read your mail, you may want to get rid of
@@ -177,10 +173,10 @@
Folder menu. That will delete it
permanently.
-
-
+
+
-
+ Checking Mail
Now that you've had a look around the
@@ -220,7 +216,7 @@
-
+ Using Evolution for News
Newsgroups are so similar to email that there's no reason not
@@ -232,9 +228,9 @@
Evolution will also check for news
messages.
-
+
-
+ Attachments and HTML Mail
If someone sends you an attachment, a
@@ -257,11 +253,11 @@
HTML-formatted mail, complete with graphics. HTML
formatting will display automatically, although you can
turn it off if you prefer.
-
-
+
+
-
+ Writing and Sending Mail
You can start writing a new email message by selecting
@@ -296,7 +292,7 @@
Send.
-
+ Saving Messages for Later
Evolution will send mail immediately unless you tell it to
@@ -330,8 +326,8 @@
FileSave In
Folder .
-
-
+
+ Advanced Mail Composition
You can probably guess the purpose of the buttons labelled
@@ -343,7 +339,7 @@
additional features, including large recipient lists,
attachments, and forwarding.
-
+ Attachments
If you want to attach a file to your email message, you
@@ -374,8 +370,8 @@
always shown, load images only if the sender is in your
addressbook, or never load images.
-
-
+
+ Types of RecipientsEvolution, like most email
@@ -428,9 +424,9 @@
-
+
-
+ Choosing Recipients Quickly
f you have created address cards in the contact manager,
@@ -461,10 +457,10 @@ f you have created address cards in the contact manager,
linkend="usage-contact-automate"> and .
-
-
+
+
-
+ Replying to Messages
To reply to a message, press the
@@ -542,9 +538,9 @@ with quoted materials and the relevant replies interspersed-->
-
+
-
+ Searching and Replacing with the Composer
You're probably familiar with search and replace features,
@@ -601,8 +597,8 @@ with quoted materials and the relevant replies interspersed-->
be Case Sensitive when it determines
a match.
-
-
+
+ Embellish your email with HTML
Normally, you can't set text styles or insert pictures in
@@ -779,7 +775,7 @@ with quoted materials and the relevant replies interspersed-->
composition tool or text editor would.
-
+
@@ -796,7 +792,7 @@ with quoted materials and the relevant replies interspersed-->
-->
-
+ Forwarding Mail
The post office forwards your mail for you when you change
@@ -831,8 +827,8 @@ with quoted materials and the relevant replies interspersed-->
composition frame, and press
Send.
-
-
+
+ Seven Tips for Email Courtesy
I started with ten, but four were "Don't send
@@ -860,7 +856,7 @@ with quoted materials and the relevant replies interspersed-->
ALL CAPS MEANS YOU'RE SHOUTING! Don't write a whole
- message in capital letters. It hurts people's ears.
+ messagge in capital letters. It hurts people's ears.
@@ -876,18 +872,189 @@ with quoted materials and the relevant replies interspersed-->
don't write back.
-
-
-
- When you reply or forward, include just enough of
- the previous message to provide context: not too
- much, not too little.
-
-
-
-
- Happy mailing!
-
+
+
+
+ When you reply or forward, include just enough of
+ the previous message to provide context: not too
+ much, not too little.
+
+
+
+
+ Happy mailing!
+
+
+
+ Subscription Management
+
+ Evolution lets you handle your
+ IMAP and newsgroup subscriptions with the same tool: the
+ subscriptions manager. To start using it, choose
+ SettingsManage
+ Subscriptions.
+
+
+ If you have configured any IMAP (mail) or NNTP (news)
+ servers, you will see them listed in the left half of the
+ subscription management window. Click on a server to select
+ it, and you will see the folders or newsgroups available to
+ you. You can then select individual folders and subscribe to
+ them, or remove yourself from the subscription list.
+
+
+ Once you have subscribed to a folder or newsgroup, your system
+ will check for new messages whenever you press the
+ Get Mail button.
+
+
+
+
+
+ Encryption
+
+ What is Encryption?
+
+ Encryption is an ancient method of changing readable text to unreadable
+ text that dates back to Egyptian times. Encryption takes the statement
+ "Evolution" and turns it into something which cannot be read without help
+ through decryption.
+
+ Encryption Example
+
+ Kevin orders an Evolution t-shirt from
+ Ximian, Inc. over the internet. He puts in his credit card number
+ which is 1234-567-8901. For security, his computer encrypts the
+ credit card number so it can be safely transmitted over the internet.
+ The number now is @#$23ui7yr87#@!48970fsd, which holds no intentional
+ resemblance to the inital number. When the information gets to
+ Ximian, Inc. it'll be decrypted into the inital number.
+
+
+ Encryption can be used in email in two ways: to verify that the sender is
+ the real sender, and to hide the message while in transmission.
+ Evolution has the capability to do both.
+
+
+
+ Generating your PGP key
+
+ First, you need to create a PGP key. To do this, you'll need GPG
+ installed.
+
+
+ GPG Versions
+
+ This manual covers version 1.0.6 of GPG. If your version is different,
+ this may not be entirely accurate. You may find out your version number
+ by typing in: gpg --version.
+
+
+
+ You can start by typing in: gpg --gen-key. At the
+ first question, select 1. The next question asks you about key length.
+ The longer the key, more stronger it is. However, the longer the key, the
+ longer it takes to generate. This is your choice. However, 1024 bits
+ (default) should be adequate. The next question asks you if you want your
+ key to expire. Expiring keys make your key invalid after a certain amount
+ of time, so old keys don't float around active. This is the same concept
+ as a coupon at a supermarket. Next, you'll type in your Real name, your
+ email address, and a comment. You should not forge this information, as
+ it is used later to verify who you are. Assuming that all your
+ information is correct, press "O" to continue. GPG now asks you for a
+ passphrase. This is a password which you will need to decrypt and encrypt
+ messages. This can be any length, with any characters in it. It is case
+ sensitive, which means that it does know the difference between capital
+ letters and lower-case. Now your key is generated. It is recommend you
+ surf the internet, read your email, or write a letter in a word
+ processor. This help creates randomness in the key.
+
+
+ Once this is completed, you'll be dropped back to the command line.
+ Now you can view your key information by typing gpg
+ --list-keys. You should see something similar to this:
+
+ GPG Listing Keys
+
+ /home/bob/.gnupg/pubring.gpg
+ ----------------------------
+ pub 1024D/32j38dk2 2001-06-20 bob <bob@bob.com>
+ sub 1024g/289sklj3 2001-06-20 [expires: 2002-11-14]
+
+
+ You'll now need to upload your public key to a keyserver, so that your
+ friends can use your key. You'll need to know the ID of your key, which
+ is after the 1024D on the line beginning with pub. For this example, it
+ is 32j38dk2. You now type in gpg --send-keys --keyserver
+ wwwkeys.pgp.net 32j38dk2. Substitute your key ID for 32j38dk2.
+ You will be prompted to type in your password and your key will be uploaded for your
+ friends to download.
+
+
+
+ Setting up Evolution's Encryption
+
+ You'll need to open
+
+ Tools
+ Mail Settings
+
+ Once there, select the account you'd like to associate the key to and click
+ the Edit button. In the
+ Security tab is a section labeled Pretty
+ Goog Privacy. Enter your key ID and click
+ OK. Your key is now integrated into your identity
+ in Evolution.
+
+
+
+ Sending Encrypted Messages
+
+ You can either sign or encrypt a message. When you sign a message, verify
+ that you were the one who sent it, and that no one is forging your
+ identity. Encrypting a message makes it impossible for someone with
+ prying eyes to view it while it's in tranmission.
+
+
+
+
+ Signing a Message
+
+ To sign a message, you simply click
+
+ Security
+ PGP Sign
+
+ . You will be prompted for your PGP password. Once you enter it,
+ click OK and your message will be signed.
+
+
+
+
+ Encrypting a Message
+
+ Encrypting a message is very similar to signing a message. You simply
+ click the menu item
+
+ Security
+ PGP Encrypt
+
+
+
+
+ Unencrypting a Recieved Message
+
+ Sometimes, a friend will send you a message which is encrypted. In order
+ for you to read it, you need to unencrypt it.
+
+
+ When you view the encrypted message, Evolution
+ will prompt you for your PGP password. You type in your PGP password and
+ the message is then decrypted.
+
+
+
diff --git a/doc/C/usage-mainwindow.sgml b/doc/C/usage-mainwindow.sgml
index 22f58d5c40..2b29191ed6 100644
--- a/doc/C/usage-mainwindow.sgml
+++ b/doc/C/usage-mainwindow.sgml
@@ -36,10 +36,7 @@
the message list view, where a summary of your email is displayed.
If you're running the program for the first time,
you'll have one message: a welcome from Ximian.
-
-
-
-
+
Evolution Main Window and Inbox
@@ -49,17 +46,7 @@
-
-
-
- The Way Evolution Looks
-
- Both GNOME and
- Evolution's appearances can be customized,
- so your graphics may not look the same as the screenshots.
-
-
The Shortcut Bar
@@ -77,33 +64,19 @@
Take a look at the Shortcut Bar
The shortcut buttons in that category are:
-
-
-
-
- My Evolution
-
+
+
+ My Evolution
+
- Start your day here. My Evolution
- gives you a quick summary of new or important messages,
- daily appointments and urgent tasks. You can customize
- its appearance and content, and use it to access
- Evolution services.
-
-
-
-
+ Start your day here. My Evolution
+ gives you a quick summary of new or important messages,
+ daily appointments and urgent tasks. You can customize
+ its appearance and content, and use it to access
+ Evolution services.
+
+
+
Inbox
@@ -166,38 +139,9 @@
-->
-
-
-
- If you don't like the shortcut bar, you can use the folder bar
- or the menu bar to navigate the main window. Press
-
- Ctrl
- O
-
- to choose from a list of folders you'd like to visit, or use the
- drop-down folder bar. You can hide and show the folder bar and
- the shortcut bar by selecting those items in the
- View menu.
-
-
-
- Shortcut Bar Tricks
-
- To remove a shortcut from the shortcut bar, right-click on it
- and select Remove. To add one,
- select File
- NewEvolution Bar
- Shortcut.
-
-
- To change the way the shortcut bar looks, right-click in an
- empty space on the shortcut bar. From the menu that appears,
- you can select icon sizes.
-
-
-
-
+
+
+
Folders and The Folder Bar
@@ -372,7 +316,7 @@
-
+ The Menu Bar
The menu bar's contents will always
diff --git a/doc/ChangeLog b/doc/ChangeLog
index f99f016625..70235f3930 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,13 @@
+2001-07-02 Kevin Breit
+
+ * C/apx-common-tasks.sgml: Created its own file.
+
+ * C/usage-mainwindow.sgml: You name it.
+
+ * C/preface.sgml: Pulled shortcuts from here into its own apx
+
+ * C/evolution.sgml: Reordered entities
+
2001-06-30 Kevin Breit
* C/usage-mail.sgml: Pulled organizing stuff, made its own file.
diff --git a/help/C/evolution.sgml b/help/C/evolution.sgml
index 647aa488f7..b78cfc233a 100644
--- a/help/C/evolution.sgml
+++ b/help/C/evolution.sgml
@@ -16,6 +16,7 @@
+
@@ -136,6 +137,7 @@ implemented. -->
&APX-GLOSS;
&APX-BUGS;
&APX-AUTHORS;
+
diff --git a/help/C/preface.sgml b/help/C/preface.sgml
index 3e507dc8f5..67779dc0af 100644
--- a/help/C/preface.sgml
+++ b/help/C/preface.sgml
@@ -302,7 +302,6 @@
import your files right back in.
-
Quick Reference for Common Tasks
@@ -530,8 +529,8 @@
-
-
+
+ Contact Manager
Here are the most frequent tasks that are done in the Contact Manager,
@@ -598,19 +597,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
diff --git a/help/C/usage-contact.sgml b/help/C/usage-contact.sgml
index a2e4558d5d..3b233baba0 100644
--- a/help/C/usage-contact.sgml
+++ b/help/C/usage-contact.sgml
@@ -108,75 +108,9 @@
more than a few people listed, you'll want some way of finding
them more quickly, which is why there's a search feature.
-
-
- Searching for Contacts
-
- Between Delete and View
- All is a quick search field. To use it, select
- from the drop-down list which sort of search you'd like to
- perform (the whole card, just the name, or just the email
- address), then enter one or more words in the text entry
- box, and press Enter.
- Evolution will search through
- the contents of every displayed card to find one that
- matches. You can refine searches by doing several in
- succession, or start over by pressing the View
- All button.
-
-
- If there are no matches, the card display will be
- blank. When you'd like to see all the cards again, press
- Show All.
-
-
- Refining a Quick Search
-
- Tom comes back from lunch and finds a note on his
- keyboard: "Curtis in sales called for you, but he didn't
- leave a number, and I forgot to write down the name of the
- company he works for. He said it was important, though."
- Tom is not at all annoyed.
-
-
- He opens his contacts folder, and runs a quick search for
- "Curtis." There are eighteen different people with that name
- in the file. He then enters "Sales," and
- Evolution narrows it down to the
- right Curtis. He only becomes annoyed when he discovers that
- the call was not actually important.
-
-
-
-
- If you prefer to perform a more complex search, press
- Find or choose
- ToolsSearch for
- Contact. This will open the
- in-depth search window, which lets you use multiple search
- criteria in the same way that email filters and virtual folders do.
-
-
- Click Add Criterion to increase the
- number of criteria you'd like to use in the search, and
- Remove Criterion to remove one from the
- bottom of the list. Your criteria may be a search within the
- Name or Email
- fields; alternately you can choose to search through all the
- fields with a regular expression. Then, you can select from
- all the familiar requirements like Begins
- With and Does Not Contain,
- decide whether to match All or
- Any of your criteria, and press
- Search to set it all off.
-
-
-
-
- Destroy, Create, and Change: The Contact Editor
+ The Contact Editor
To delete a card, click on it once to select it, then press the
Delete button. If you have multiple
@@ -370,6 +304,70 @@
+
+ Searching for Contacts
+
+ Between Delete and View
+ All is a quick search field. To use it, select
+ from the drop-down list which sort of search you'd like to
+ perform (the whole card, just the name, or just the email
+ address), then enter one or more words in the text entry
+ box, and press Enter.
+ Evolution will search through
+ the contents of every displayed card to find one that
+ matches. You can refine searches by doing several in
+ succession, or start over by pressing the View
+ All button.
+
+
+ If there are no matches, the card display will be
+ blank. When you'd like to see all the cards again, press
+ Show All.
+
+
+ Refining a Quick Search
+
+ Tom comes back from lunch and finds a note on his
+ keyboard: "Curtis in sales called for you, but he didn't
+ leave a number, and I forgot to write down the name of the
+ company he works for. He said it was important, though."
+ Tom is not at all annoyed.
+
+
+ He opens his contacts folder, and runs a quick search for
+ "Curtis." There are eighteen different people with that name
+ in the file. He then enters "Sales," and
+ Evolution narrows it down to the
+ right Curtis. He only becomes annoyed when he discovers that
+ the call was not actually important.
+
+
+
+
+ If you prefer to perform a more complex search, press
+ Find or choose
+ ToolsSearch for
+ Contact. This will open the
+ in-depth search window, which lets you use multiple search
+ criteria in the same way that email filters and virtual folders do.
+
+
+ Click Add Criterion to increase the
+ number of criteria you'd like to use in the search, and
+ Remove Criterion to remove one from the
+ bottom of the list. Your criteria may be a search within the
+ Name or Email
+ fields; alternately you can choose to search through all the
+ fields with a regular expression. Then, you can select from
+ all the familiar requirements like Begins
+ With and Does Not Contain,
+ decide whether to match All or
+ Any of your criteria, and press
+ Search to set it all off.
+
+
+
Organizing your Address Book
@@ -595,33 +593,18 @@
-->
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/help/C/usage-mail-org.sgml b/help/C/usage-mail-org.sgml
index 9a2a775740..6668623cf0 100644
--- a/help/C/usage-mail-org.sgml
+++ b/help/C/usage-mail-org.sgml
@@ -201,7 +201,7 @@
- Staying organized: Mail Filters in Evolution
+ Create Rules to Automatically Organize Mail
Filters work very much like the mail room in a large company.
Their purpose is to bundle, sort, and distribute mail to the
@@ -537,30 +537,30 @@
-
-
- Filtering by Mailing List
+
+
+ Filtering by Mailing List
You can tell Evolution to filter by
- mailing list. This means that Evolution
- will look at the mailing list address, and find out automatically
- what list this is. If you are subscribed to mailing lists, you
- should use the Filter by List instead of by
- sender.
-
+ mailing list. This means that Evolution
+ will look at the mailing list address, and find out automatically
+ what list this is. If you are subscribed to mailing lists, you
+ should use the Filter by List instead of by
+ sender.
+ Filter by List
-
- Kevin subscribes to bananas@ximian.com. However, there is also
- a bananas@ximian.org address. If he used a regular
- Filter by Sender, he would need to specify
- one for each address. However, Filter by
+
+ Kevin subscribes to bananas@ximian.com. However, there is also
+ a bananas@ximian.org address. If he used a regular
+ Filter by Sender, he would need to specify
+ one for each address. However, Filter by
List will recognize that both of them are the same
- list.
-
-
-
-
-
+ list.
+
+
+
+
+
Getting Really Organized with Virtual Folders
@@ -674,7 +674,7 @@
-
+ and your key will be uploaded for your
- friends to download.
-
-
-
- Setting up Evolution's Encryption
-
- You'll need to open
-
- Tools
- Mail Settings
-
- Once there, select the account you'd like to associate the key to and click
- the Edit button. In the
- Security tab is a section labeled Pretty
- Goog Privacy. Enter your key ID and click
- OK. Your key is now integrated into your identity
- in Evolution.
-
-
-
- Sending Encrypted Messages
-
- You can either sign or encrypt a message. When you sign a message, verify
- that you were the one who sent it, and that no one is forging your
- identity. Encrypting a message makes it impossible for someone with
- prying eyes to view it while it's in tranmission.
-
-
-
-
- Signing a Message
-
- To sign a message, you simply click
-
- Security
- PGP Sign
-
- . You will be prompted for your PGP password. Once you enter it,
- click OK and your message will be signed.
-
-
-
-
- Encrypting a Message
-
- Encrypting a message is very similar to signing a message. You simply
- click the menu item
-
- Security
- PGP Encrypt
-
-
-
-
- Unencrypting a Recieved Message
-
- Sometimes, a friend will send you a message which is encrypted. In order
- for you to read it, you need to unencrypt it.
-
-
- When you view the encrypted message, Evolution
- will prompt you for your PGP password. You type in your PGP password and
- the message is then decrypted.
-
-
+
+-->
diff --git a/help/C/usage-mail.sgml b/help/C/usage-mail.sgml
index 87d97b4561..1217109a25 100644
--- a/help/C/usage-mail.sgml
+++ b/help/C/usage-mail.sgml
@@ -47,11 +47,7 @@
-
-
- Reading, Getting and Sending Mail
-
-
+ Reading Mail
You can start reading email by clicking
@@ -127,7 +123,7 @@
-
+ Sorting the message list
One of the ways Evolution lets
@@ -155,8 +151,8 @@
message with the original, so you can follow the thread of a
conversation from one message to the next.
-
-
+
+ Deleting Mail
Once you've read your mail, you may want to get rid of
@@ -177,10 +173,10 @@
Folder menu. That will delete it
permanently.
-
-
+
+
-
+ Checking Mail
Now that you've had a look around the
@@ -220,7 +216,7 @@
-
+ Using Evolution for News
Newsgroups are so similar to email that there's no reason not
@@ -232,9 +228,9 @@
Evolution will also check for news
messages.
-
+
-
+ Attachments and HTML Mail
If someone sends you an attachment, a
@@ -257,11 +253,11 @@
HTML-formatted mail, complete with graphics. HTML
formatting will display automatically, although you can
turn it off if you prefer.
-
-
+
+
-
+ Writing and Sending Mail
You can start writing a new email message by selecting
@@ -296,7 +292,7 @@
Send.
-
+ Saving Messages for Later
Evolution will send mail immediately unless you tell it to
@@ -330,8 +326,8 @@
FileSave In
Folder .
-
-
+
+ Advanced Mail Composition
You can probably guess the purpose of the buttons labelled
@@ -343,7 +339,7 @@
additional features, including large recipient lists,
attachments, and forwarding.
-
+ Attachments
If you want to attach a file to your email message, you
@@ -374,8 +370,8 @@
always shown, load images only if the sender is in your
addressbook, or never load images.
-
-
+
+ Types of RecipientsEvolution, like most email
@@ -428,9 +424,9 @@
-
+
-
+ Choosing Recipients Quickly
f you have created address cards in the contact manager,
@@ -461,10 +457,10 @@ f you have created address cards in the contact manager,
linkend="usage-contact-automate"> and .
-
-
+
+
-
+ Replying to Messages
To reply to a message, press the
@@ -542,9 +538,9 @@ with quoted materials and the relevant replies interspersed-->
-
+
-
+ Searching and Replacing with the Composer
You're probably familiar with search and replace features,
@@ -601,8 +597,8 @@ with quoted materials and the relevant replies interspersed-->
be Case Sensitive when it determines
a match.
-
-
+
+ Embellish your email with HTML
Normally, you can't set text styles or insert pictures in
@@ -779,7 +775,7 @@ with quoted materials and the relevant replies interspersed-->
composition tool or text editor would.
-
+
@@ -796,7 +792,7 @@ with quoted materials and the relevant replies interspersed-->
-->
-
+ Forwarding Mail
The post office forwards your mail for you when you change
@@ -831,8 +827,8 @@ with quoted materials and the relevant replies interspersed-->
composition frame, and press
Send.
-
-
+
+ Seven Tips for Email Courtesy
I started with ten, but four were "Don't send
@@ -860,7 +856,7 @@ with quoted materials and the relevant replies interspersed-->
ALL CAPS MEANS YOU'RE SHOUTING! Don't write a whole
- message in capital letters. It hurts people's ears.
+ messagge in capital letters. It hurts people's ears.
@@ -876,18 +872,189 @@ with quoted materials and the relevant replies interspersed-->
don't write back.
-
-
-
- When you reply or forward, include just enough of
- the previous message to provide context: not too
- much, not too little.
-
-
-
-
- Happy mailing!
-
+
+
+
+ When you reply or forward, include just enough of
+ the previous message to provide context: not too
+ much, not too little.
+
+
+
+
+ Happy mailing!
+
+
+
+ Subscription Management
+
+ Evolution lets you handle your
+ IMAP and newsgroup subscriptions with the same tool: the
+ subscriptions manager. To start using it, choose
+ SettingsManage
+ Subscriptions.
+
+
+ If you have configured any IMAP (mail) or NNTP (news)
+ servers, you will see them listed in the left half of the
+ subscription management window. Click on a server to select
+ it, and you will see the folders or newsgroups available to
+ you. You can then select individual folders and subscribe to
+ them, or remove yourself from the subscription list.
+
+
+ Once you have subscribed to a folder or newsgroup, your system
+ will check for new messages whenever you press the
+ Get Mail button.
+
+
+
+
+
+ Encryption
+
+ What is Encryption?
+
+ Encryption is an ancient method of changing readable text to unreadable
+ text that dates back to Egyptian times. Encryption takes the statement
+ "Evolution" and turns it into something which cannot be read without help
+ through decryption.
+
+ Encryption Example
+
+ Kevin orders an Evolution t-shirt from
+ Ximian, Inc. over the internet. He puts in his credit card number
+ which is 1234-567-8901. For security, his computer encrypts the
+ credit card number so it can be safely transmitted over the internet.
+ The number now is @#$23ui7yr87#@!48970fsd, which holds no intentional
+ resemblance to the inital number. When the information gets to
+ Ximian, Inc. it'll be decrypted into the inital number.
+
+
+ Encryption can be used in email in two ways: to verify that the sender is
+ the real sender, and to hide the message while in transmission.
+ Evolution has the capability to do both.
+
+
+
+ Generating your PGP key
+
+ First, you need to create a PGP key. To do this, you'll need GPG
+ installed.
+
+
+ GPG Versions
+
+ This manual covers version 1.0.6 of GPG. If your version is different,
+ this may not be entirely accurate. You may find out your version number
+ by typing in: gpg --version.
+
+
+
+ You can start by typing in: gpg --gen-key. At the
+ first question, select 1. The next question asks you about key length.
+ The longer the key, more stronger it is. However, the longer the key, the
+ longer it takes to generate. This is your choice. However, 1024 bits
+ (default) should be adequate. The next question asks you if you want your
+ key to expire. Expiring keys make your key invalid after a certain amount
+ of time, so old keys don't float around active. This is the same concept
+ as a coupon at a supermarket. Next, you'll type in your Real name, your
+ email address, and a comment. You should not forge this information, as
+ it is used later to verify who you are. Assuming that all your
+ information is correct, press "O" to continue. GPG now asks you for a
+ passphrase. This is a password which you will need to decrypt and encrypt
+ messages. This can be any length, with any characters in it. It is case
+ sensitive, which means that it does know the difference between capital
+ letters and lower-case. Now your key is generated. It is recommend you
+ surf the internet, read your email, or write a letter in a word
+ processor. This help creates randomness in the key.
+
+
+ Once this is completed, you'll be dropped back to the command line.
+ Now you can view your key information by typing gpg
+ --list-keys. You should see something similar to this:
+
+ GPG Listing Keys
+
+ /home/bob/.gnupg/pubring.gpg
+ ----------------------------
+ pub 1024D/32j38dk2 2001-06-20 bob <bob@bob.com>
+ sub 1024g/289sklj3 2001-06-20 [expires: 2002-11-14]
+
+
+ You'll now need to upload your public key to a keyserver, so that your
+ friends can use your key. You'll need to know the ID of your key, which
+ is after the 1024D on the line beginning with pub. For this example, it
+ is 32j38dk2. You now type in gpg --send-keys --keyserver
+ wwwkeys.pgp.net 32j38dk2. Substitute your key ID for 32j38dk2.
+ You will be prompted to type in your password and your key will be uploaded for your
+ friends to download.
+
+
+
+ Setting up Evolution's Encryption
+
+ You'll need to open
+
+ Tools
+ Mail Settings
+
+ Once there, select the account you'd like to associate the key to and click
+ the Edit button. In the
+ Security tab is a section labeled Pretty
+ Goog Privacy. Enter your key ID and click
+ OK. Your key is now integrated into your identity
+ in Evolution.
+
+
+
+ Sending Encrypted Messages
+
+ You can either sign or encrypt a message. When you sign a message, verify
+ that you were the one who sent it, and that no one is forging your
+ identity. Encrypting a message makes it impossible for someone with
+ prying eyes to view it while it's in tranmission.
+
+
+
+
+ Signing a Message
+
+ To sign a message, you simply click
+
+ Security
+ PGP Sign
+
+ . You will be prompted for your PGP password. Once you enter it,
+ click OK and your message will be signed.
+
+
+
+
+ Encrypting a Message
+
+ Encrypting a message is very similar to signing a message. You simply
+ click the menu item
+
+ Security
+ PGP Encrypt
+
+
+
+
+ Unencrypting a Recieved Message
+
+ Sometimes, a friend will send you a message which is encrypted. In order
+ for you to read it, you need to unencrypt it.
+
+
+ When you view the encrypted message, Evolution
+ will prompt you for your PGP password. You type in your PGP password and
+ the message is then decrypted.
+
+
+
diff --git a/help/C/usage-mainwindow.sgml b/help/C/usage-mainwindow.sgml
index 22f58d5c40..2b29191ed6 100644
--- a/help/C/usage-mainwindow.sgml
+++ b/help/C/usage-mainwindow.sgml
@@ -36,10 +36,7 @@
the message list view, where a summary of your email is displayed.
If you're running the program for the first time,
you'll have one message: a welcome from Ximian.
-
-
-
-
+
Evolution Main Window and Inbox
@@ -49,17 +46,7 @@
-
-
-
- The Way Evolution Looks
-
- Both GNOME and
- Evolution's appearances can be customized,
- so your graphics may not look the same as the screenshots.
-
-
The Shortcut Bar
@@ -77,33 +64,19 @@
Take a look at the Shortcut Bar
The shortcut buttons in that category are:
-
-
-
-
- My Evolution
-
+
+
+ My Evolution
+
- Start your day here. My Evolution
- gives you a quick summary of new or important messages,
- daily appointments and urgent tasks. You can customize
- its appearance and content, and use it to access
- Evolution services.
-
-
-
-
+ Start your day here. My Evolution
+ gives you a quick summary of new or important messages,
+ daily appointments and urgent tasks. You can customize
+ its appearance and content, and use it to access
+ Evolution services.
+
+
+
Inbox
@@ -166,38 +139,9 @@
-->
-
-
-
- If you don't like the shortcut bar, you can use the folder bar
- or the menu bar to navigate the main window. Press
-
- Ctrl
- O
-
- to choose from a list of folders you'd like to visit, or use the
- drop-down folder bar. You can hide and show the folder bar and
- the shortcut bar by selecting those items in the
- View menu.
-
-
-
- Shortcut Bar Tricks
-
- To remove a shortcut from the shortcut bar, right-click on it
- and select Remove. To add one,
- select File
- NewEvolution Bar
- Shortcut.
-
-
- To change the way the shortcut bar looks, right-click in an
- empty space on the shortcut bar. From the menu that appears,
- you can select icon sizes.
-
-
-
-
+
+
+
Folders and The Folder Bar
@@ -372,7 +316,7 @@
-
+ The Menu Bar
The menu bar's contents will always
diff --git a/help/ChangeLog b/help/ChangeLog
index f99f016625..70235f3930 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,3 +1,13 @@
+2001-07-02 Kevin Breit
+
+ * C/apx-common-tasks.sgml: Created its own file.
+
+ * C/usage-mainwindow.sgml: You name it.
+
+ * C/preface.sgml: Pulled shortcuts from here into its own apx
+
+ * C/evolution.sgml: Reordered entities
+
2001-06-30 Kevin Breit
* C/usage-mail.sgml: Pulled organizing stuff, made its own file.