Moved 'MIME types' in chapter 14, mail format conversion in chapter 15, and netNews in 16

3 files changed, 88 insertions, 157 deletions

diff --git a/manual/en/syl_014.sgml b/manual/en/syl_014.sgml
index f2d273b..bdbe411 100644
--- a/manual/en/syl_014.sgml
+++ b/manual/en/syl_014.sgml
@@ -1,33 +1,23 @@
-<sect>Conversion of Other Mail Format into Sylpheed (MH Format)
-
-<sect1>Importing Messages of mbox Format<p>
-<!-- added 2001/07/20 -->
-Sylpheed lets you import messages of the Mbox format from the File menu. First you create 
-the mail folder where you want the messages to end up in, then you select File->import 
-Mbox file. Use the browse function to select the Mbox file and the Sylpheed mail folder, 
-and press Ok. And voila, there is your mail, imported.
-<p>
-That was easy, wasn't it?
-</sect1>
+<sect>Handling MIME types
+
+<sect1>How Sylpheed checks for Mime types<p>
+
+(Thanks to Adriaan Penning for writing this!)<p>
+
+Two files, mime.types and mailcap, are involved in determining the mime type of an attachment, and the application associated with that mime type. The mime.types file is used to determine the mimetype of attachments you add when composing a message. The mime.types file consists of lines like:<p>
+
+application/pdf                    pdf<p>
+
+Sylpheed looks for this file in SYSCONFDIR (determined at compile time), /etc/ and $HOME/.sylpheed/ 
+
+If this file doesn't exist or has the wrong format, every attachment will have 	`application/octet-stream' as it's mime type, so the recipients mail client may not know what application to use to view the attachment.
+
+To change the default application that sylpheed uses to view an attachment that	somebody mailed you, look for a mailcap file like /etc/mailcap or $HOME/.mailcap
+
+For example, you can add a line like this in $HOME/.mailcap if you want to view pdf	files with xpdf:<p>
+
+application/pdf ; xpdf %s
 
-<sect1>Importing from Windows Mailers (Becky!, AL-Mail, Outlook Express4, etc.)
-<p>
-For import possibilities of the mail folders of these and more mail programs you 
-can download the program mbx2mbox at sourceforge.net. The project is located at 
-<url url="http://mbx2mbox.sourceforge.net" name ="http://mbx2mbox.sourceforge.net.">
-</sect1>
-<sect1>Importing dbx Format of Outlook Express 5<p>
-For import possibilities of the mail folders of these and more mail programs you 
-can download the program mbx2mbox at sourceforge.net. The project is located at 
-<url url="http://mbx2mbox.sourceforge.net" name="http://mbx2mbox.sourceforge.net.">
 </sect1>
-<!-- End added 2001/07/21 -->
-<!-- start add 2001/09/04 -->
-<sect1>Exporting from Sylpheed MH format to mbox<p>
-Sylpheed offers a way to export a mailbox to the standard mbox format through the 
-File menu. Just select the "Export to mbox file..." option and you can select the 
-folder to export (assisted by a browse dialog) and also select or enter the name 
-of the mbox file you wish to generate.
-<!-- end add 2001/09/04 -->
 </sect>
 
diff --git a/manual/en/syl_015.sgml b/manual/en/syl_015.sgml
index 328db0e..f2d273b 100644
--- a/manual/en/syl_015.sgml
+++ b/manual/en/syl_015.sgml
@@ -1,46 +1,33 @@
-<sect>NetNews<p>
-What is netnews?<p>
-Netnews, also called Usenet, is a collection of "news servers" that contain a great deal of information. News, as it is called in short, can be about anything. About making your own wine, about old cars or radios. You name it, and there probably is a newsgroup about it.<p>
-This is what we will set up here. Accessing newsgroups. Note that this is different from e-mails. You can almost compare it to a mailing list, but yet the concept is a bit different.
+<sect>Conversion of Other Mail Format into Sylpheed (MH Format)
+
+<sect1>Importing Messages of mbox Format<p>
 <!-- added 2001/07/20 -->
-<sect1>Adding and Deleting Servers<p>
-<sect2>
-Adding a news server<p>
-To add a news server, go to the configuration menu and select the "create new account" option.
-There you can name the news-account to anything of your liking. This is important, so you can identify the account later.<p>
-In the BASIC tab, in the block 'personal information' you also can enter your own name, your e-mail address (so you can reply to news message by e-mail), optionally your organization (if you are organized at all).<p>
-In the block 'Server information' you select the "News (NNTP)" protocol. Forget about "Inbox", that does not matter in this setup. Next you enter the name of the newsserver you want to connect to. You can get that name from your ISP, if you don't already have that.<p>
-If you need to log into the news server, check the box next to "This server requires authentication", and then fill the fields for User ID and Password.<p>
-Next step is to go to the Send tab. Since Receive is only there for e-mail, there is no need to do anything there. You can't even do anything in the Receive tab, for that matter. So, in Send you can select a few options:
-<itemize>
-<item>If you want a date header field added to posts
-<item>If Sylpheed should generate a Message-ID
-<item>If you want to add user-defined headers
-</itemize>
-The next items only apply to when you reply to a news message through e-mail. You can set an automatic CC, BCC or Reply-To address here. In case your ISP requires SMTP authentication, you can select the checkbox here below.<p>
-The next tab, Compose, allows you to select a default signature file. This will be added to each post to the newsgroups you do.<p>
-Finally, in the "Advanced" tab, you can specify the port on which Sylpheed has to connect to the news server. The default is 119, and only in rare cases you should have to do something about that.<p>
-Now you click "OK" and the account is created! You can verify this by checking the folder pane in Sylpheed. There you will see a new folder created with the name of the account you entered, and (news) behind it.<p>
-</sect2>
-<sect2>
-Deleting a news-server.<p>
-If you want to delete a news-account, right-click the news-folder and select "Remove news account". After confirming that you want this to be done, the account and all files related will be removed.
-</sect2>
+Sylpheed lets you import messages of the Mbox format from the File menu. First you create 
+the mail folder where you want the messages to end up in, then you select File->import 
+Mbox file. Use the browse function to select the Mbox file and the Sylpheed mail folder, 
+and press Ok. And voila, there is your mail, imported.
+<p>
+That was easy, wasn't it?
 </sect1>
-<sect1>Subscribing and Unsubscribing to NewsGroups<p>
-Okay. Here the real stuff begins. First you have to let Sylpheed load the list of news groups that is on the news system. Right-click the new NEWS folder and select "Subscribe to newsgroups". Sylpheed will tell you that the groups need to be downloaded, so sit back and wait a while. Of course, during time, new groups are added, and dead groups are removed. For this you can click the "refresh" button in the newsgroup dialog, so a new list is downloaded and you are up to date<p>
-After a while the groups are loaded and displayed in a window. Now you can look up a group that is interesting, for example comp.os.linux.networking. Click the name once and then select OK. The group will be added to the news folder as a subfolder. When you now click the name of the new subfolder, Sylpheed will connect to the news server and download the headers (subject lines, in e-mail talk), to your computer. Some groups have -large- amounts of articles, so this may take a while!!<p>
+
+<sect1>Importing from Windows Mailers (Becky!, AL-Mail, Outlook Express4, etc.)
+<p>
+For import possibilities of the mail folders of these and more mail programs you 
+can download the program mbx2mbox at sourceforge.net. The project is located at 
+<url url="http://mbx2mbox.sourceforge.net" name ="http://mbx2mbox.sourceforge.net.">
 </sect1>
-<sect1>Reading News<p>
-When the articles are displayed, in the summary view, you can click one of them to be downloaded so you can read it. This will usually go very quickly on discussion groups.<p>
-If you want to respond to a message, press Alt-R (or press "Reply") and a message window will pop up, with the name of the newsgroup already in the "To" field. Depending on whether or not you selected quoting of the message, the original message will be in the body of the message already. Write away, then send, and soon the entire world will be able to read what you wrote on the subject.<p>
-Starting a new message in a newsgroup is equally simple: press Alt-N (or click "New"), the name of the newsgroup is in the "To" field, and you can write your question or reply.
-<sect2>A note about binary files<p>
-In newsgroups you can download binary files. These are programs, images etc. Often these are posted as so called UUencoded files. Sylpheed will as upto version 0.5.1 not decode UUencoded files. You need to save these articles to disk as separate files, and use a separate decoder program, like juju, to decode the garble of text. A UUencoded file usually looks something like this:<p>
-begin 666 sundown.jpg<p>
-after which you will find nicely formatted blocks of characters that don't seem to mean anything.
-</sect2>
+<sect1>Importing dbx Format of Outlook Express 5<p>
+For import possibilities of the mail folders of these and more mail programs you 
+can download the program mbx2mbox at sourceforge.net. The project is located at 
+<url url="http://mbx2mbox.sourceforge.net" name="http://mbx2mbox.sourceforge.net.">
 </sect1>
-<!-- end add 2001/07/20 -->
+<!-- End added 2001/07/21 -->
+<!-- start add 2001/09/04 -->
+<sect1>Exporting from Sylpheed MH format to mbox<p>
+Sylpheed offers a way to export a mailbox to the standard mbox format through the 
+File menu. Just select the "Export to mbox file..." option and you can select the 
+folder to export (assisted by a browse dialog) and also select or enter the name 
+of the mbox file you wish to generate.
+<!-- end add 2001/09/04 -->
 </sect>
 
diff --git a/manual/en/syl_016.sgml b/manual/en/syl_016.sgml
index 781495a..328db0e 100644
--- a/manual/en/syl_016.sgml
+++ b/manual/en/syl_016.sgml
@@ -1,92 +1,46 @@
-<sect>Customization (General Setup)<p>
-Sylpheed offers you several ways to customize it's interface for your personal use.<p>
-<sect1>General Setup Window<p>
-For making changes to Sylpheed's interface, you need to open the "common preferences" in the Configuration menu.<p>
-In here you will find a tabbed window that offers the following possibility to customize Sylpheed.
-</sect1>
-<sect1>Description of Each Entry<p>
-In the third tab, "Compose", the following settings can be changed:
-
-<figure loc="here">
-<ph vspace="1cm">
-<img src="snapshots/pref_compose.png">
-</figure>
-
-<itemize>
-<item>Quoting the original text of a message
-<item>Define the quoting character that is put in front of each line of text.
-<item>Define the text that is placed in front of the quoted text
-<item>An optional signature separator. This is a combination of characters that are placed in front of a signature text.
-<item>Whether or not to insert the signature automatically
-<item>Define if the account that recieved the message should automatically be used as the account from which the reply is sent. This also influences the signature to be selected.
-<item>Set the position of the line where wrapping should occur.
-<item>Select if the quoted text should be wrapped also.
-<item>Indicate if e-mail text should be wrapped or not. If you choose not to select wrapping, then the lines you wrote will not be chopped up by carriage return/line feed characters.
-</itemize>
-In the fourth tab, "Display", you can set or unset the following options:
-
-<figure loc="here">
-<ph vspace="1cm">
-<img src="snapshots/pref_display.png">
-</figure>
-
-<itemize>
-<item><tt>Font.</tt> You can set the font that is used to display the messages.
-<item><tt>Translate header name.</tt> This options changes the behaviour of the different headers.
-<item><tt>Unread number.</tt> This toggles the display of the number of unread messages next to each mailbox.
-<item><tt>Display recipient.</tt> With this option you can tell Sylpheed to show the recipient in the summary view when you are the one who sent the message.
-<item><tt>Enable horizontal scrollbar.</tt> This option enables or disables showing the horizontal toolbar beneath the summary view. With the bar disabled, you cannot scroll to the right to see extremely long message subjects.
-<item><tt>Expand threads.</tt> If you disable this options and you have enabled the Threaded view through the Summary menu, threads are shown as collapsed lines with a '+' sign in front of them. Enable this option to show all the messages in a thread.
-<item><tt>Display unread with bold font.</tt> If you enable this checkbox, messages in the summary view that have not been read yet are shown in a bold font. Unchecking this option will of course show all messages in the default font.
-<item><tt>Date format.</tt> This option puts you in charge of the way the date of an e-mail message is shown. You can click the "..." button to open a new window. In there you see the codings that you can use to format the date. As you change the codings, an example is shown beneath the coding sequence of how your date will look.
-<item><tt>Set display item.</tt> This button allows you to select the specific columns that will be shown in the summary view.
-</itemize>
-Next to these options, there is the message tab, in which you can set the following choices:
-
-<figure loc="here">
-<ph vspace="1cm">
-<img src="snapshots/pref_message.png">
-</figure>
-
+<sect>NetNews<p>
+What is netnews?<p>
+Netnews, also called Usenet, is a collection of "news servers" that contain a great deal of information. News, as it is called in short, can be about anything. About making your own wine, about old cars or radios. You name it, and there probably is a newsgroup about it.<p>
+This is what we will set up here. Accessing newsgroups. Note that this is different from e-mails. You can almost compare it to a mailing list, but yet the concept is a bit different.
+<!-- added 2001/07/20 -->
+<sect1>Adding and Deleting Servers<p>
+<sect2>
+Adding a news server<p>
+To add a news server, go to the configuration menu and select the "create new account" option.
+There you can name the news-account to anything of your liking. This is important, so you can identify the account later.<p>
+In the BASIC tab, in the block 'personal information' you also can enter your own name, your e-mail address (so you can reply to news message by e-mail), optionally your organization (if you are organized at all).<p>
+In the block 'Server information' you select the "News (NNTP)" protocol. Forget about "Inbox", that does not matter in this setup. Next you enter the name of the newsserver you want to connect to. You can get that name from your ISP, if you don't already have that.<p>
+If you need to log into the news server, check the box next to "This server requires authentication", and then fill the fields for User ID and Password.<p>
+Next step is to go to the Send tab. Since Receive is only there for e-mail, there is no need to do anything there. You can't even do anything in the Receive tab, for that matter. So, in Send you can select a few options:
 <itemize>
-<item><tt>Enable colorization.</tt> When you enable this option, you can define with what colors the message text and the quotings will be displayed.
-<item><tt>Display 2-byte alphabet and numeric with 1 character.</tt> This option is necessary for double-byte languages as Japanese and Chinese.
-<item><tt>Display header pane above message view.</tt> Enabled, this option shows the From, To and Subject headers from the selected e-mail in a separate area over the message view.
-<item><tt>Display short headers on message view.</tt> This option lets you select all the headers that will be shown in the message view window. There are options to enable all, no or selected headers.
-<item><tt>Line space.</tt> This option lets you select how many pixels of space Sylpheed has to show between the lines of text in the message view window.
-<item><tt>Leave space on head.</tt> Checking this box will make the start of new lines (unwrapped, where the writer has pressed the Enter/Return key) indent a few pixels. This can be useful to read larger e-mails.
-<item><tt>Scroll half page.</tt> When enabled, the text in the message view will only scroll half a page instead of a whole page when pressing the space bar.
-<item><tt>Smooth scroll.</tt> Enabling this box will make the text in the message view scroll in a smooth, sliding way. For the eye this can be pleasing, it is a personal preference.
-</itemize>
-The tab "Interface" allows even more customization of Sylpheed. This tab features:
-
-<figure loc="here">
-<ph vspace="1cm">
-<img src="snapshots/pref_interface.png">
-</figure>
-
-<itemize>
-<item>Opening the first unread message when you enter a folder.
-<item>Automatically move focus to the inbox after new mail was received.
-<item>Immediate execution of commands like delete, move or copy.
-<item>Influence the way the "receive" dialog box behaves when new mail is retrieved (Always, When a window is active, Never).
-<item>Double clicking an e-mail address can be used to put that address in a new e-mail.
-<item>Confirming if you want to exit Sylpheed.
-<item>Cleaning the trashbox when exiting Sylpheed.
-<item>Have Sylpheed ask you to clean the trash before it is done.
-<item>Warn you when exiting Sylpheed when there are still messages queued to be sent.
-</itemize>
-Finally there is the "Other" tab. In here you can define the programs you want as helper applications for Sylpheed.
-
-<figure loc="here">
-<ph vspace="1cm">
-<img src="snapshots/pref_other.png">
-</figure>
-
-<itemize>
-<item><tt>The web browser.</tt> Here you can enter the name of your favorite web browser (Netscape, Opera, Mozilla, Lynx etc.). Add the %s parameter to the command so Sylpheed knows it has to provide the text you clicked on as the URL that the browser has to visit.
-<item><tt>Printing.</tt> Here you can define the program that should be used to print. Default is lpr, and the %s is the name of the temporary file that Sylpheed creates for lpr to print.
-<item><tt>External editor.</tt> You can select an external editor to write your e-mails with, for example vi, emacs or gedit. Note that for text-based editors like vi, you need to define a terminal window, e.g. <tt>xterm -e vi %s</tt>. Otherwise there is no place that the editor will be able to show up. Here too, the %s parameter is the name of a temporary file that is created by Sylpheed.
+<item>If you want a date header field added to posts
+<item>If Sylpheed should generate a Message-ID
+<item>If you want to add user-defined headers
 </itemize>
+The next items only apply to when you reply to a news message through e-mail. You can set an automatic CC, BCC or Reply-To address here. In case your ISP requires SMTP authentication, you can select the checkbox here below.<p>
+The next tab, Compose, allows you to select a default signature file. This will be added to each post to the newsgroups you do.<p>
+Finally, in the "Advanced" tab, you can specify the port on which Sylpheed has to connect to the news server. The default is 119, and only in rare cases you should have to do something about that.<p>
+Now you click "OK" and the account is created! You can verify this by checking the folder pane in Sylpheed. There you will see a new folder created with the name of the account you entered, and (news) behind it.<p>
+</sect2>
+<sect2>
+Deleting a news-server.<p>
+If you want to delete a news-account, right-click the news-folder and select "Remove news account". After confirming that you want this to be done, the account and all files related will be removed.
+</sect2>
+</sect1>
+<sect1>Subscribing and Unsubscribing to NewsGroups<p>
+Okay. Here the real stuff begins. First you have to let Sylpheed load the list of news groups that is on the news system. Right-click the new NEWS folder and select "Subscribe to newsgroups". Sylpheed will tell you that the groups need to be downloaded, so sit back and wait a while. Of course, during time, new groups are added, and dead groups are removed. For this you can click the "refresh" button in the newsgroup dialog, so a new list is downloaded and you are up to date<p>
+After a while the groups are loaded and displayed in a window. Now you can look up a group that is interesting, for example comp.os.linux.networking. Click the name once and then select OK. The group will be added to the news folder as a subfolder. When you now click the name of the new subfolder, Sylpheed will connect to the news server and download the headers (subject lines, in e-mail talk), to your computer. Some groups have -large- amounts of articles, so this may take a while!!<p>
 </sect1>
+<sect1>Reading News<p>
+When the articles are displayed, in the summary view, you can click one of them to be downloaded so you can read it. This will usually go very quickly on discussion groups.<p>
+If you want to respond to a message, press Alt-R (or press "Reply") and a message window will pop up, with the name of the newsgroup already in the "To" field. Depending on whether or not you selected quoting of the message, the original message will be in the body of the message already. Write away, then send, and soon the entire world will be able to read what you wrote on the subject.<p>
+Starting a new message in a newsgroup is equally simple: press Alt-N (or click "New"), the name of the newsgroup is in the "To" field, and you can write your question or reply.
+<sect2>A note about binary files<p>
+In newsgroups you can download binary files. These are programs, images etc. Often these are posted as so called UUencoded files. Sylpheed will as upto version 0.5.1 not decode UUencoded files. You need to save these articles to disk as separate files, and use a separate decoder program, like juju, to decode the garble of text. A UUencoded file usually looks something like this:<p>
+begin 666 sundown.jpg<p>
+after which you will find nicely formatted blocks of characters that don't seem to mean anything.
+</sect2>
+</sect1>
+<!-- end add 2001/07/20 -->
 </sect>
+