1.1 --- a/thesis/tbl/strategies.tbl	Sat Feb 07 11:42:45 2009 +0100
     1.2 +++ b/thesis/tbl/strategies.tbl	Sat Feb 07 12:00:11 2009 +0100
     1.3 @@ -2,32 +2,32 @@
     1.4  	\hline
     1.5  	Requirement           & Focus & S\,1 & S\,2 & S\,3 \\
     1.6  	\hline \hline
     1.7 -	\RF7: Encryption (\TODO1)       & +++ & x  &    &   \\
     1.8 -	\RF6: Authentication (\TODO2)   & +++ & x  &    &   \\
     1.9 -	\RG1: Security (\TODO3)         & +++ &    & x  & x \\
    1.10 -	\RG2: Reliability (\TODO4)      & +++ &    &    & x \\
    1.11 -	\RF8: Spam handling (\TODO5)    & +++ & x  & x  & x \\
    1.12 -	\RG4: Extendability (\TODO6)    & +++ &    &    & x \\
    1.13 +	\RF\,7: Encryption (\TODO\,1)       & +++ & x  &    &   \\
    1.14 +	\RF\,6: Authentication (\TODO\,2)   & +++ & x  &    &   \\
    1.15 +	\RG\,1: Security (\TODO\,3)         & +++ &    & x  & x \\
    1.16 +	\RG\,2: Reliability (\TODO\,4)      & +++ &    &    & x \\
    1.17 +	\RF\,8: Spam handling (\TODO\,5)    & +++ & x  & x  & x \\
    1.18 +	\RG\,4: Extendability (\TODO\,6)    & +++ &    &    & x \\
    1.19  	\hline
    1.20 -	\RG3: Robustness        & ++  &    &    & x \\
    1.21 +	\RG\,3: Robustness        & ++  &    &    & x \\
    1.22  	\hline
    1.23 -	\RF1: In/out channels   & +   & x  & x  & x \\
    1.24 -	\RF2: Mail queueing     & +   &    &    & x \\
    1.25 -	\RG5: Maintainability   & +   &    &    & x \\
    1.26 +	\RF\,1: In/out channels   & +   & x  & x  & x \\
    1.27 +	\RF\,2: Mail queueing     & +   &    &    & x \\
    1.28 +	\RG\,5: Maintainability   & +   &    &    & x \\
    1.29  	\hline
    1.30 -	\RF5: Route management  & 0   & x  &    &   \\
    1.31 -	\RF9: Malware handling  & 0   & x  & x  & x \\
    1.32 -	\RF10: Archiving        & 0   & x  &    & x \\
    1.33 -	\RG6: Testability       & 0   &    &    & x \\
    1.34 +	\RF\,5: Route management  & 0   & x  &    &   \\
    1.35 +	\RF\,9: Malware handling  & 0   & x  & x  & x \\
    1.36 +	\RF\,10: Archiving        & 0   & x  &    & x \\
    1.37 +	\RG\,6: Testability       & 0   &    &    & x \\
    1.38  	\hline
    1.39 -	\RF3: Header sanitizing & -   & x  &    &   \\
    1.40 -	\RF4: Aliasing          & -   & x  &    &   \\
    1.41 -	\RG10: Usability        & -   & x  &    &   \\
    1.42 +	\RF\,3: Header sanitizing & -   & x  &    &   \\
    1.43 +	\RF\,4: Aliasing          & -   & x  &    &   \\
    1.44 +	\RG\,10: Usability        & -   & x  &    &   \\
    1.45  	\hline
    1.46 -	\RG8: Availability      & -{}- & x &    &   \\
    1.47 +	\RG\,8: Availability      & -{}- & x &    &   \\
    1.48  	\hline
    1.49 -	\RG7: Performance       & -{}-{}- & x &  &  \\
    1.50 -	\RG9: Portability       & -{}-{}- & x &  &  \\
    1.51 +	\RG\,7: Performance       & -{}-{}- & x &  &  \\
    1.52 +	\RG\,9: Portability       & -{}-{}- & x &  &  \\
    1.53  	\hline \hline
    1.54  	Score (Sum of `+')      & 23  & 9  & 7  & 17 \\
    1.55  	\hline