--- a/thesis/input/requirements.tex	Sat Jan 10 21:17:25 2009 +0100
+++ b/thesis/input/requirements.tex	Sat Jan 10 22:26:10 2009 +0100
@@ -1,46 +1,46 @@
 \begin{tabular}[hbt]{| l || c | c | c |}
 	\hline
-	Requirement & Importance & Pending work & Priority \\
+	Requirement & Importance & Pending work & Focus \\
 	\hline \hline
-	RF1: In/out channels    & ++ & - & + \\
+	\RF1: In/out channels    & ++ & - & + \\
 	\hline
-	RF2: Mail queue         & ++ & - & + \\
+	\RF2: Mail queue         & ++ & - & + \\
 	\hline
-	RF3: Header sanitizing  & 0 & - & - \\
+	\RF3: Header sanitizing  & 0 & - & - \\
 	\hline
-	RF4: Aliasing           & 0 & - & - \\
+	\RF4: Aliasing           & 0 & - & - \\
 	\hline
-	RF5: Route selection    & + & - & 0 \\
+	\RF5: Route selection    & + & - & 0 \\
 	\hline
-	RF6: Authentication     & + & + & ++ \\
+	\RF6: Authentication     & ++ & + & +++ \\
 	\hline
-	RF7: Encryption         & ++ & + & +++ \\
+	\RF7: Encryption         & ++ & + & +++ \\
 	\hline
-	RF8: Spam prevention    & + & ++ & +++ \\
+	\RF8: Spam prevention    & + & ++ & +++ \\
 	\hline
-	RF9: Malware handling   & - & + & 0 \\
+	\RF9: Malware handling   & - & + & 0 \\
 	\hline
-	RF10: Archiving         & - & + & 0 \\
+	\RF10: Archiving         & - & + & 0 \\
 	\hline
 	\hline
-	RG1: Security           & ++ & + & +++ \\
+	\RG1: Security           & ++ & + & +++ \\
 	\hline
-	RG2: Reliability        & ++ & + & +++ \\
+	\RG2: Reliability        & ++ & + & +++ \\
 	\hline
-	RG3: Robustness         & + & + & ++ \\
+	\RG3: Robustness         & + & + & ++ \\
 	\hline
-	RG4: Extendability      & + & ++ & +++ \\
+	\RG4: Extendability      & + & ++ & +++ \\
 	\hline
-	RG5: Maintainability    & + & 0 & + \\
+	\RG5: Maintainability    & + & 0 & + \\
 	\hline
-	RG6: Testability        & 0 & 0 & 0 \\
+	\RG6: Testability        & 0 & 0 & 0 \\
 	\hline
-	RG7: Performance        & -{}- & - & -{}-{}- \\
+	\RG7: Performance        & -{}- & - & -{}-{}- \\
 	\hline
-	RG8: Availability       & - & - & -{}- \\
+	\RG8: Availability       & - & - & -{}- \\
 	\hline
-	RG9: Portability        & - & -{}- & -{}-{}- \\
+	\RG9: Portability        & - & -{}- & -{}-{}- \\
 	\hline
-	RG10: Usability         & + & -{}- & - \\
+	\RG10: Usability         & + & -{}- & - \\
 	\hline
 \end{tabular}

--- a/thesis/thesis.sty	Sat Jan 10 21:17:25 2009 +0100
+++ b/thesis/thesis.sty	Sat Jan 10 22:26:10 2009 +0100
@@ -56,6 +56,9 @@
 	\newcommand{\GPL}{\NAME{GPL}}
 	\newcommand{\SMTP}{\NAME{SMTP}}
 	\newcommand{\TLS}{\NAME{TLS}}
+	\newcommand{\TODO}{\NAME{TODO}\,}
+	\newcommand{\RF}{\NAME{RF}\,}
+	\newcommand{\RG}{\NAME{RG}\,}
 
 	\newcommand{\nth}{\textsuperscript{th}}
 	\newcommand{\st}{\textsuperscript{st}}