quick-guide structure

3 files changed, 57 insertions, 103 deletions

diff --git a/manual/en/syl_002.sgml b/manual/en/syl_002.sgml
index ceaa0f9..8238820 100644
--- a/manual/en/syl_002.sgml
+++ b/manual/en/syl_002.sgml
@@ -1,83 +1,56 @@
+<sect>Quick-guide to mail setup
+<sect1>Setup for reading your Unix mailbox in a hurry<p>
+<itemize>
+<item>In the configuration menu, select "Create new account".
+<item>In the <ref id="Basic"> tab, name the account. You can select this account to be the default account ("Usually used").
+<item>Enter your name and e-mail address.
+<item>To select your local unix mailbox, in the Protocol box you select "None (local)".
+<item>When you select this option, the "Server for receiving" is greyed out, since this is not relevant. You can enter the server to send (SMTP) in this tab also.
+</itemize>
+Settings in the remaining tabs can usually be left at default values.
 
-<sect>Quick-guide to mail setup.
+<figure loc="here"><ph vspace="1cm"><img src="snapshots/account_basic.png"></figure>
 
-<sect1>Setup for reading your Unix mailbox in a hurry
-<p>
-In the configuration menu, select "Create new account"
-<p>
-In the "Basic" tab, enter the relevant data. You name the account, enter your name and e-mail address, etc. You can select this account to be the default account ("Usually used"). To select your local unix mailbox, in the Protocol box you select "None (local)".
+The <ref id="Receive"> tab is not used in this setup, since you are not polling a server, your mail is delivered to you.
 
-<figure loc="here">
-<ph vspace="1cm">
-<img src="snapshots/account_basic.png">
-</figure>
+In the <ref id="Send"> tab you can select headers and SMTP authentication.
 
-<p>
-When you select this option, the "Server for receiving" is greyed out, since this is not relevant. You can enter the server to send (SMTP) in this tab also.
-<p>
-The "Receive" tab is not used in this setup, since you are not polling a server, your mail is delivered to you.
+<figure loc="here"><ph vspace="1cm"><img src="snapshots/account_send.png"></figure>
 
-<p>
-In the "Send" tab you can set up some more settings.
+In the <ref id="Compose"> tab you can define your signature file.
 
-<figure loc="here">
-<ph vspace="1cm">
-<img src="snapshots/account_send.png">
-</figure>
+<figure loc="here"><ph vspace="1cm"><img src="snapshots/account_compose.png"></figure>
 
-<p>
-In the "Compose" tab you can define your signature file.
+In the <ref id="Advanced"> tab you can edit the portnumbers for the servers you will be using. This normally will need no change.
 
-<figure loc="here">
-<ph vspace="1cm">
-<img src="snapshots/account_compose.png">
-</figure>
-
-<p>
-In the "Advanced" tab you can edit the portnumbers for the servers you will be using. This normally will need no change.
-<p>
-This is basically everything you need to start using Sylpheed for local mailboxes. You can press Alt-I or select "Message -> receive new mail" and see if there is new mail!
+This is basically everything you need to start using Sylpheed for local mailboxes. You can select "Message -> receive new mail" or press the <ref id="shortcut"> and see if there is new mail!
 </sect1>
-<sect1>Setup for reading POP3 mail in a hurry
-<p>
-In the configuration menu, select "Create new account"
-<p>
-In the "Basic" tab, enter the relevant data. You name the account, enter your name and e-mail address, etc. You can select this account to be the default account ("Usually used"). To check your POP3 mail, in the Protocol box you select "POP3 (normal)".
-
-<figure loc="here">
-<ph vspace="1cm">
-<img src="snapshots/account_pop_basic.png">
-</figure>
-
-<p>
-Enter the server information for "Server for receiving". You can then enter the server to send (SMTP) in this tab.
-<p>
-In the "Receive" tab you can define some selections or preferences that you want to use.
-
-<figure loc="here">
-<ph vspace="1cm">
-<img src="snapshots/account_pop_receive.png">
-</figure>
-
-<p>
-In the "Send" tab you can set up some more settings.
-
-<figure loc="here">
-<ph vspace="1cm">
-<img src="snapshots/account_send.png">
-</figure>
-
-<p>
-In the "Compose" tab you can define your signature file.
-
-<figure loc="here">
-<ph vspace="1cm">
-<img src="snapshots/account_compose.png">
-</figure>
-
-<p>
-In the "Advanced" tab you can edit the portnumbers for the servers you will be using. This normally will need no change.
-<p>
-This is basically everything you need to start using Sylpheed for POP3 mailsystems. You can press Alt-I or select "Message -> receive new mail" and see if there is new mail!
+<sect1>Setup for reading POP3 mail in a hurry<p>
+<itemize>
+<item>In the configuration menu, select "Create new account".
+<item>In the <ref id="Basic"> tab, name the account. You can select this account to be the default account ("Usually used").
+<item>Enter your name and e-mail address.
+<item>To check your POP3 mail, in the Protocol box you select "POP3 (normal)".
+<item>Enter the server information for "Server for receiving". You can then enter the server to send (SMTP) in this tab.
+</itemize>
+Settings in the remaining tabs can usually be left at default values.
+
+<figure loc="here"><ph vspace="1cm"><img src="snapshots/account_pop_basic.png"></figure>
+
+The <ref id="Receive"> tab offers advanced POP3 options.
+
+<figure loc="here"><ph vspace="1cm"><img src="snapshots/account_pop_receive.png"></figure>
+
+In the <ref id="Send"> tab you can select headers and SMTP authentication.
+
+<figure loc="here"><ph vspace="1cm"><img src="snapshots/account_send.png"></figure>
+
+In the <ref id="Compose"> tab you can define your signature file.
+
+<figure loc="here"><ph vspace="1cm"><img src="snapshots/account_compose.png"></figure>
+
+In the <ref id="Advanced"> tab you can edit the portnumbers for the servers you will be using. This normally will need no change.
+
+This is basically everything you need to start using Sylpheed for POP3 mailsystems. You select "Message -> receive new mail" or press the <ref id="shortcut"> and see if there is new mail!
 </sect1>
 </sect>
diff --git a/manual/en/syl_006.sgml b/manual/en/syl_006.sgml
index 270c3a5..b62073a 100644
--- a/manual/en/syl_006.sgml
+++ b/manual/en/syl_006.sgml
@@ -117,10 +117,7 @@ In the message summary you can do a host of things from the context menu, like v
 
 <sect>Dialogs and views<p>
 
-<figure loc="here">
-<ph vspace="1cm">
-<img src="snapshots/all_with_image.png">
-</figure>
+<figure loc="h"><ph vspace="515px"><img src="snapshots/all_with_image.png"></figure>
 
 <sect1>Folder view <p>
 The folder view shows you all the mail folders that you have created, in a tree-like structure. If you want to see the headers of the messages in a specific folder, just click the name of the folder once, and in the summary view you can see the messages in the selected mail folder.<p>
@@ -157,10 +154,7 @@ The Common Preferences, found in the Configuration menu, shows you the following
 <sect2>Receive tab<p>
 In here you can set up how to receive messages.
 
-<figure loc="here">
-<ph vspace="1cm">
-<img src="snapshots/pref_receive.png">
-</figure>
+<figure loc="h"><ph vspace="479px"><img src="snapshots/pref_receive.png"></figure>
 
 <itemize>
 <item>You can define a special program to pick up messages from the default unix mailbox. Usually this is not used, but you can use it. Actually, this information may be wrong. If someone knows better, please let me know.
@@ -175,12 +169,9 @@ In here you can set up how to receive messages.
 <sect1>Setting up an account/changing an account<p>
 In order to set up an account in Sylpheed, in the configuration menu you select "Create new account". If you want to change the settings of an existing account, you select the "Edit accounts..." option from the configuration menu, and there you select the account you want to change. After that you press "edit". Then a dialog appears in which you can enter or update the following areas:
 <p>
-<sect2>Basic tab<p>
+<sect2>Basic tab<label id="Basic"><p>
 
-<figure loc="here">
-<ph vspace="1cm">
-<img src="snapshots/account_basic.png">
-</figure>
+<figure loc="h"><ph vspace="479px"><img src="snapshots/account_basic.png"></figure>
 
 In the "Basic" tab you name the account. This is to make identifying the account easier.<p>
 Choose a name that tells something about the account, like the name of the ISP, mailbox or news-server you are setting up.  You can select this account to be the default account ("Usually used").<p>
@@ -191,35 +182,25 @@ For POP3 and IMAP services you can then specify the server where your mail is st
 For a local unix mailbox, the "Server for receiving" is disabled, since the mail will be received for you.<p>
 The fields for User ID and Password will also be disabled for accounts that do no deal with POP3 or IMAP services. Otherwise you can enter the login name and password for the e-mail server with your ISP here. Usually these are the same as your login name and password to access the dial-in service, but this is not standard. If in doubt, contact the helpdesk of your ISP.  <p>
 </sect2>
-<sect2>Receive tab<p>
+<sect2>Receive tab<label id="Receive"><p>
 
-<figure loc="here">
-<ph vspace="1cm">
-<img src="snapshots/account_pop_receive.png">
-</figure>
+<figure loc="h"><ph vspace="479px"><img src="snapshots/account_pop_receive.png"></figure>
 
-<p>
 The "Receive" tab is only used for POP3 accounts. Here you specify if the mails that were successfully retrieved should be removed from the server. You can also tell Sylpheed to get all the messages there, not only the ones you already received (in case you leave your messages on the server). The third option enables this account to be included when mail is checked for "all accounts" (see the message menu for this), and if the incoming messages should immediately be filtered when received.
 </sect2>
-<sect2>Send tab <p>
+<sect2>Send tab<label id="Send"><p>
 
-<figure loc="here">
-<ph vspace="1cm">
-<img src="snapshots/account_send.png">
-</figure>
+<figure loc="h"><ph vspace="479px"><img src="snapshots/account_send.png"></figure>
 
 In the "Send" tab you can set up some more settings.
 </sect2>
-<sect2>Compose tab <p>
+<sect2>Compose tab<label id="Compose"><p>
 
-<figure loc="here">
-<ph vspace="1cm">
-<img src="snapshots/account_compose.png">
-</figure>
+<figure loc="h"><ph vspace="479px"><img src="snapshots/account_compose.png"></figure>
 
 In the "Compose" tab you can define your signature file.
 </sect2>
-<sect2>Advanced tab<p>
+<sect2>Advanced tab<label id="Advanced"><p>
 In the "Advanced" tab you can edit the portnumbers for the servers you will be using. This normally will need no change.
 </sect2>
 </sect1>
diff --git a/manual/en/syl_015.sgml b/manual/en/syl_015.sgml
index 9510a0f..3ecdd69 100644
--- a/manual/en/syl_015.sgml
+++ b/manual/en/syl_015.sgml
@@ -1,7 +1,7 @@
 <sect>Reference<p>
 <!-- Added 2001/07/21 -->
 In this section you will find a few pieces of information that might be handy in making Sylpheed more clear for you in respect to the used shortcut keys, and a layout of the format of the address book.
-<sect1>Short-Cut Key List<p>
+<sect1>Short-Cut Key List<label id="shortcut"><p>
 <sect2>One-key shortcuts:<p>
 <itemize>
 <item>a: create a new message