1.1 --- a/thesis/tex/1-Introduction.tex	Sat Feb 07 14:47:27 2009 +0100
     1.2 +++ b/thesis/tex/1-Introduction.tex	Sat Feb 07 19:00:25 2009 +0100
     1.3 @@ -47,12 +47,13 @@
     1.4  
     1.5  
     1.6  \subsubsection{Mail transfer with SMTP}
     1.7 +\label{smtp-intro}
     1.8  
     1.9  Today most of the email is transferred using the \name{Simple Mail Transfer Protocol}\index{smtp} (short: \SMTP), which is defined in \RFC\,821 and the successors \RFC\,2821 and \RFC\,5321. A good entry point for further information is \citeweb{wikipedia:smtp}.
    1.10  
    1.11  A selection of important concepts of \SMTP\index{smtp!concepts of} is explained here.
    1.12  
    1.13 -First the \name{store and forward}\index{smtp!store and forward} transfer concept. This means mail messages are sent from \MTA\ to \MTA, until the final \MTA\ (the one which is responsible for the recipient) is reached. The message is stored for some time on each \MTA, until it is forwarded to the next \MTA.
    1.14 +First the \name{store-and-forward}\index{smtp!store-and-forward} transfer concept. This means mail messages are sent from \MTA\ to \MTA, until the final \MTA\ (the one which is responsible for the recipient) is reached. The message is stored for some time on each \MTA, until it is forwarded to the next \MTA.
    1.15  
    1.16  This leads to the concept of \name{responsibility}\index{smtp!responsibility}. A mail message is always in the responsibility of one system. First it is the \MUA\index{mua}. When it is transferred to an \MTA, this \MTA\ takes over the responsibility for the message, too. The \MUA{} can then delete its copy of the message. This is the same for each transfer---from \MTA\ to \MTA\ and finally from \MTA\ to the \MDA{}---the message gets transferred and if the transfer was successful, the responsibility for the message is transferred as well. The responsibility chain ends at a user's mailbox where he himself has control on the message.
    1.17  
    1.18 @@ -330,7 +331,7 @@
    1.19  
    1.20  %fixme: hikernet
    1.21  
    1.22 -Additionally does \masqmail\ make it easy to run an \MTA\ on workstations or notebooks. There is no need to do complex configuration or to be a mail server expert. Only a handful of options need to be set; the host name, the local networks, and one route for relaying are sufficient in most times. %fixme: is that true?
    1.23 +Additionally does \masqmail\ make it easy to run an \MTA\ on workstations or notebooks. There is no need to do complex configuration or to be a mail server expert. Only a handful of options need to be set; the host name, the local networks, and one route for relaying are sufficient in most times.
    1.24  \index{notebook}
    1.25  
    1.26  Probably users say it best; in this case \person{Derek Broughton}: