1.1 --- a/thesis/tex/1-Introduction.tex	Sat Jan 31 21:39:53 2009 +0100
     1.2 +++ b/thesis/tex/1-Introduction.tex	Mon Feb 02 12:04:32 2009 +0100
     1.3 @@ -52,7 +52,7 @@
     1.4  
     1.5  A selection of important concepts of \SMTP\index{smtp!concepts of} is explained here.
     1.6  
     1.7 -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 gets stored for some time on each \MTA, until it is forwarded to the next \MTA.
     1.8 +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.9  
    1.10  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.11  
    1.12 @@ -76,7 +76,7 @@
    1.13  
    1.14  Each \MTA\ on the way reads envelopes it receives and generates new ones. If a message has recipients on different hosts, then the message gets copied and sent within multiple envelopes, one for each host.
    1.15  
    1.16 -The sample message would would lead to two envelopes\index{mail message!more envelopes}, one from \name{markus@host01} to \name{alice@host02}, the other from \name{markus@host01} to \name{bob@host03}. Both envelopes would contain the same message.
    1.17 +The sample message would lead to two envelopes\index{mail message!more envelopes}, one from \name{markus@host01} to \name{alice@host02}, the other from \name{markus@host01} to \name{bob@host03}. Both envelopes would contain the same message.
    1.18  
    1.19  
    1.20  
    1.21 @@ -114,7 +114,7 @@
    1.22  In these cases, MasqMail is a slim replacement for full-blown \MTA{}s such as sendmail, exim, qmail or postfix.
    1.23  \hfill\citeweb{packages.debian:masqmail}
    1.24  \end{quote}
    1.25 -The program is a good replacement ``in these cases'', but not generally, since is lacks essential features for running on mail servers. It is primarily not secure enough for being accessible from untrusted locations.
    1.26 +The program is a good replacement ``in these cases'', but not generally, since it lacks essential features for running on mail servers. It is primarily not secure enough for being accessible from untrusted locations.
    1.27  
    1.28  \masqmail\ is best used in home networks, which are non-permanently connected to the Internet. It is easy configurable for situations which are rarely solvable with the common \MTA{}s. Such include different handling of mail to local or remote destination and respecting different routes of being online connection. These features are explained in more detail in the following \name{Features} section on page \ref{sec:masqmail-features}. %fixme: is it still called ``features''?
    1.29  
    1.30 @@ -126,7 +126,7 @@
    1.31  
    1.32  \subsubsection*{Typical usage scenarios}
    1.33  
    1.34 -This section describes three common setups that makes sensible use of \masqmail. The first two are shown in figure \ref{fig:masqmail-typical-usage}.
    1.35 +This section describes three common setups that make sensible use of \masqmail. The first two are shown in figure \ref{fig:masqmail-typical-usage}.
    1.36  
    1.37  \begin{figure}
    1.38  	\begin{center}
    1.39 @@ -154,7 +154,7 @@
    1.40  \end{description}
    1.41  
    1.42  
    1.43 -In general, all kinds of usage scenarios within a trusted network are possible. Important to notice is that mail can not be send from outside into the trusted network then. For using \masqmail\ on notebooks it is suggested to only accept mail from local users because notebooks are often in untrusted environments.
    1.44 +In general, all kinds of usage scenarios within a trusted network are possible. Important to notice is that mail can not be sent from outside into the trusted network then. For using \masqmail\ on notebooks it is suggested to only accept mail from local users because notebooks are often in untrusted environments.
    1.45  
    1.46  
    1.47  
    1.48 @@ -187,7 +187,7 @@
    1.49  
    1.50  \subsection{Features}
    1.51  
    1.52 -Here regarded is version 0.2.21 of \masqmail. This is the last version released by \person{Oliver Kurth}.
    1.53 +This thesis regards version 0.2.21 of \masqmail. This is the last version released by \person{Oliver Kurth}.
    1.54  
    1.55  
    1.56  \subsubsection*{The source code}
    1.57 @@ -234,7 +234,7 @@
    1.58  
    1.59  Mail queuing is essential for \masqmail\ and thus supported of course, alias expansion is also supported.
    1.60  
    1.61 -The \masqmail\ executable can be called by various names for sendmail-compatibility reasons. As many programs expect the \MTA\ to be located at \path{/usr/lib/sendmail} or \path{/usr/sbin/sendmail}, symbolic links are pointing from there to the \masqmail\ executable. Further more does \sendmail\ supports calling it with a different name instead of supplying command line arguments. The best known of these shortcuts is \path{mailq} which is equivalent to calling it with the argument \verb+-bq+. \masqmail\ recognizes the shortcuts \path{mailq}, \path{smtpd}, \path{mailrm}, \path{runq}, \path{rmail}, and \path{in.smtpd}. The first two are inspired by \sendmail. Not implemented yet is the shortcut \path{newaliases} because \masqmail\ does not generate binary representations of the alias file.\footnote{A shell script named \path{newaliases} that invokes \texttt{masqmail -bi} can provide the command to satisfy strict requirements.} \path{hoststat} and \path{purgestat} are missing for complete sendmail-compatibility.
    1.62 +The \masqmail\ executable can be called by various names for sendmail-compatibility reasons. As many programs expect the \MTA\ to be located at \path{/usr/lib/sendmail} or \path{/usr/sbin/sendmail}, symbolic links are pointing from there to the \masqmail\ executable. Furthermore does \sendmail\ supports calling it with a different name instead of supplying command line arguments. The best known of these shortcuts is \path{mailq} which is equivalent to calling it with the argument \verb+-bq+. \masqmail\ recognizes the shortcuts \path{mailq}, \path{smtpd}, \path{mailrm}, \path{runq}, \path{rmail}, and \path{in.smtpd}. The first two are inspired by \sendmail. Not implemented yet is the shortcut \path{newaliases} because \masqmail\ does not generate binary representations of the alias file.\footnote{A shell script named \path{newaliases} that invokes \texttt{masqmail -bi} can provide the command to satisfy strict requirements.} \path{hoststat} and \path{purgestat} are missing for complete sendmail-compatibility.
    1.63  %masqmail: mailq, mailrm, runq, rmail, smtpd/in.smtpd
    1.64  %sendmail: hoststat, mailq, newaliases, purgestat, smtpd
    1.65  
    1.66 @@ -259,7 +259,7 @@
    1.67  \item Querying an \name{mserver} system
    1.68  \end{enumerate}
    1.69  
    1.70 -Each method may return a string naming the routes that is online or returning nothing to indicate offline state.
    1.71 +Each method may return a string naming the route that is online or returning nothing to indicate offline state.
    1.72  
    1.73  
    1.74  Mail for hosts inside the local network or for users on the local machine is not touched by this concept; such mail is always sent immediately.