Trying to clean this cvs mess...

2 files changed, 32 insertions, 40 deletions

diff --git a/manual/en/syl_009.sgml b/manual/en/syl_009.sgml
index bd43098..f2eabce 100644
--- a/manual/en/syl_009.sgml
+++ b/manual/en/syl_009.sgml
@@ -1,27 +1,28 @@
-<sect>Composing Messages
 
-<sect1>Composing a New Message<p>
-When you start writing a new message, you are presented a nice dialog in which you can enter all kinds of information. In the From: line you find a dropdown list. In there you can select the e-mail account you want to use as the sending account.<p>
-In the To: / Cc: / Bcc: part, you write the e-mail address of the receiver. You can enter several e-mail addresses, as long as they are separated by commas. An important utility here is the button "Address". When you click that, you see the address book. You can point at an address, click the "To:", "Cc:" or "Bcc:" button, and Sylpheed will place the address in the selected line. The Bcc: may be greyed out. In order to make that accessible, you need to add the Bcc: line to the message. You do that through the Message menu, and checking the Bcc option.<p>
-In the Subject line you enter a short descriptive text what your message will be about.<p>
-You can move between these lines by pressing TAB (to skip to the next line) and SHIFT-TAB (to go back up). When you press TAB in the last line, you will be moved to the message body.<p>
-Did you select a signature file in the settings for the active account, it will be in the message text already. You can now write your message. When you are done, you can click Send, Send later or Draft in the toolbar. Send attempts to send the message immediately. Send later will place it in the Send folder, and Draft will place it in the Draft folder.
+<sect>Viewing messages
+<sect1>Reading a message<p>
+Reading a message is quite simple. If you have the message pane within view, all you need to do is once click the message you want to read and it already appears in the message view. When you double-click the message, a separate window will open, showing you the message. You can close the opened window by pressing ESCape or clicking the 'close' button.
 </sect1>
-<sect1>Replying to a Message<p>
-<!-- added 2001/07/19 -->
-To reply to a message, you use the "reply" function. In Sylpheed you activate this through either the "Reply" button, or by pressing Alt-R.<p>
-A new message window will be created, with the e-mail address of the recipient and the subject already set for you. Most of the things described in Composing a new message are also applicable to this window.
-<!-- end add 2001/07/19 -->
+<sect1>Viewing Multipart MIME (Attached Files)<p>
+When a message contains an attachment, you can have several options to view the information in that file. Sylpheed can be able, when compiled against the proper libraries, to display images "inline". This means you can click the name of the image and you can see it in the lower part of the message screen.<p>
+How do you see an attachment is in an e- mail?<p>
+This shows through an extra section that appears between the summary pane and the message view. In it you can see the separate parts of the e-mail. Sometimes you can't view the contents of an attachment directly. Then you can rightclick the name of the file and select "OPEN" from the appearing menu. If this does not work, it means that the extension of the file is not recognized through the directives in the mailcap file. In that case you can always use the "Save as..." option in the popup menu, save the file to disk and open the file with the proper program.
 </sect1>
-<sect1>Replying to a Message with Quotation<p>
-<!-- added 2001/07/19 -->
-If you want to have Sylpheed quote the text you are replying to, you need to go into the Configuration menu. There you select Common preferences, go to the Compose tab, and check the "Quote message when replying" box. There you can also edit the quotation mark (the mark put in front of each quoted line in the reply mail) and the reply attribution (which is placed in front of the reply text).
-<!-- end add 2001/07/19 -->
+<sect1>Extending and Closing Threads
+<p>
+Sylpheed offers the option to view messages in threads. Threads are no more than series of e-mails in a logical sequence. Suppose 15 people sent you a mail called "Re: bananas". You can't easily tell which one is the first and which one is the last in that sequence.<p>
+By activating threads (summary menu), Sylpheed will attempt to show the sequence of mails as they were written/sent from first to last.<p>
+To undo the threads view, you simply select the same menu option again and the e-mails are displayed in standard order again.
 </sect1>
-<sect1>Forwarding Messages<p>
-<!-- added 2001/07/19 -->
-Forwarding a message means: you send the entire message, including headers (Sender address, date sent etc.) on to someone else. For this you press the "Forward" button, or you press Ctrl-F. A new message window is created, containing the text of the selected message. You can then supply the name(s) of the recipient(s) of the message as in composing a new message, perhaps add a few lines of text to the message and send it on its way.
-<!-- end add 2001/07/19 -->
+<sect1>Message Operations (Moving, Deleting, etc.)
+<p>
+Sylpheed gives you many ways to manage your messages. You can move them to new mailboxes, or delete them. Through the message menu (see that section for more details) plenty of options are available to do with your e-mails what you want done. The advantage of moving messages to different mailboxes (also see Filtering for that, as described in the Configuration menu section) is that you keep an overview of your inbox. Suppose you are collecting e-mails in there of 8 different subjects. And you are looking for a specific one on a specific subject. That will give you a lot of work, trying to find the right message. Creating a new mail folder for each subject, and moving the messages to that new one, lifts a lot of work afterwards from your hands.
+</sect1>
+<sect1>URL in a Message
+<p>
+At times you may find a URL in a message. A URL is a link to a website. Usually it is shown in the form "http://www.somewhere.something".<p>
+If you want to visit that website, you only need to double-click the URL, and the default webbrowser you set up (usually Netscape) will activate and load the website.<p>
+In the configuration options, Sylpheed has a color setting specific for URL's so you can spot a URL easily. 
 </sect1>
 </sect>
 
diff --git a/manual/en/syl_010.sgml b/manual/en/syl_010.sgml
index bd43098..dc88118 100644
--- a/manual/en/syl_010.sgml
+++ b/manual/en/syl_010.sgml
@@ -1,27 +1,18 @@
-<sect>Composing Messages
+<sect>Recieving Messages
 
-<sect1>Composing a New Message<p>
-When you start writing a new message, you are presented a nice dialog in which you can enter all kinds of information. In the From: line you find a dropdown list. In there you can select the e-mail account you want to use as the sending account.<p>
-In the To: / Cc: / Bcc: part, you write the e-mail address of the receiver. You can enter several e-mail addresses, as long as they are separated by commas. An important utility here is the button "Address". When you click that, you see the address book. You can point at an address, click the "To:", "Cc:" or "Bcc:" button, and Sylpheed will place the address in the selected line. The Bcc: may be greyed out. In order to make that accessible, you need to add the Bcc: line to the message. You do that through the Message menu, and checking the Bcc option.<p>
-In the Subject line you enter a short descriptive text what your message will be about.<p>
-You can move between these lines by pressing TAB (to skip to the next line) and SHIFT-TAB (to go back up). When you press TAB in the last line, you will be moved to the message body.<p>
-Did you select a signature file in the settings for the active account, it will be in the message text already. You can now write your message. When you are done, you can click Send, Send later or Draft in the toolbar. Send attempts to send the message immediately. Send later will place it in the Send folder, and Draft will place it in the Draft folder.
-</sect1>
-<sect1>Replying to a Message<p>
-<!-- added 2001/07/19 -->
-To reply to a message, you use the "reply" function. In Sylpheed you activate this through either the "Reply" button, or by pressing Alt-R.<p>
-A new message window will be created, with the e-mail address of the recipient and the subject already set for you. Most of the things described in Composing a new message are also applicable to this window.
-<!-- end add 2001/07/19 -->
-</sect1>
-<sect1>Replying to a Message with Quotation<p>
+<sect1>Using POP Reception Function in Sylpheed<p>
 <!-- added 2001/07/19 -->
-If you want to have Sylpheed quote the text you are replying to, you need to go into the Configuration menu. There you select Common preferences, go to the Compose tab, and check the "Quote message when replying" box. There you can also edit the quotation mark (the mark put in front of each quoted line in the reply mail) and the reply attribution (which is placed in front of the reply text).
-<!-- end add 2001/07/19 -->
+Receiving messages from a POP server is very easy, once you set up Sylpheed the proper way. You can refer to the section "Setting up an account" on how to do this.<p>
+Once you are connected to the internet, or by another network that gives you access to the POP server, simply press the "Get new mail" button (or press Alt-I) and Sylpheed will connect to the server to fetch your new mail. Once this is retrieved, any filters you may have set up will be executed and then the folder pane will show you, marked in bold, which folder/mailbox contains new messages.
+<!-- end addition 2001/07/19 -->
 </sect1>
-<sect1>Forwarding Messages<p>
+<sect1>Using Other Programs such as fetchmail<p>
 <!-- added 2001/07/19 -->
-Forwarding a message means: you send the entire message, including headers (Sender address, date sent etc.) on to someone else. For this you press the "Forward" button, or you press Ctrl-F. A new message window is created, containing the text of the selected message. You can then supply the name(s) of the recipient(s) of the message as in composing a new message, perhaps add a few lines of text to the message and send it on its way.
-<!-- end add 2001/07/19 -->
+Although it is not within the scope of this manual, a bit of information on fetchmail or getmail.<p>
+You need to have either of these programs installed, and configured correctly. See the man pages/README files of the appropriate program on doing this.<p>
+After setting the program up, you can invoke it, either by hand or through CRON, to get your mail. The mail will usually be downloaded into /var/spool/mail/your_user_id. You can then tell Sylpheed, through an account that looks in your local unix mailbox, to get mail from there. For this you press the "Get mail" button, or press "Alt-I".
+<!-- end addition 2001/07/19 -->
 </sect1>
+
 </sect>