--- a/masqmail.tex	Thu Mar 05 23:01:54 2009 +0100
+++ b/masqmail.tex	Fri Mar 06 11:55:17 2009 +0100
@@ -98,13 +98,15 @@
 
 \frame{ \ft{overview}
 
-1) prerequisites (xx\%)
+1) prerequisites (5\%) %3
 
-2) about masqmail (xx\%)
+2) about masqmail (25\%) %15
 
-3) the thesis (xx\%)
+3) the thesis (60\%) %6 + 9 + 7 + 4 + 6 = 32
 
-4) help wanted (xx\%)
+4) help wanted (10\%) %5
+
+%== 55
 
 }
 
@@ -456,6 +458,7 @@
 
 
 
+\oneline{\it we're half way through :-) }
 
 
 
@@ -710,61 +713,59 @@
 
 }
 
-\frame{\ft{incoming channels}
+\frame{\ft{incoming and outgoing}
 
-arbitrary protocol handlers
+in/out:
 
-one single module that puts the mail into the queue
+\qquad arbitrary protocol handlers (incoming/outgoing)
 
-}
-
-\frame{\ft{queueing}
+\qquad one queue-in module; one queue-out module
 
-reliable queue
+\qquad no own MDA, only a pipe module
 
-preferably the system's native format
-
-}
+route management:
 
-\frame{\ft{mail sanitizing}
+\qquad the thing special to masqmail
 
-qmail: ``don't parse'' $\rightarrow$ parse very carefully
-
-Jon Postel's robustness principle
+\qquad done just before the outgoing modules
 
 }
 
-\frame{\ft{authentication and encryption}
 
-in receiving and sending modules (?)
+\frame{\ft{within the queue}
 
-with library code
+mail sanitizing:
 
-}
+\qquad qmail: ``don't parse'' $\rightarrow$ parse very carefully
 
-\frame{\ft{spam and malware handling}
+\qquad Jon Postel's robustness principle
 
-receiving modules vs. a scanning module
+spool files:
 
-in both places?
+\qquad preferably in the system's native format
 
 }
 
-\frame{\ft{route management}
+
+\frame{\ft{auth, enc, spam}
+
+auth and enc:
+
+\qquad in receiving and sending modules (?)
 
-the thing special to masqmail
+\qquad with library code
+
+spam and malware:
 
-done just before the outgoing modules
+\qquad receiving modules vs. a scanning module
+
+\qquad in both places?
+
+\qquad malware scanning is not the MTA's job
 
 }
 
-\frame{\ft{outgoing channels}
 
-modules for each protocol
-
-no own MDA, only a pipe module
-
-}
 
 \frame{\ft{the proposed architecture}
 
@@ -857,7 +858,24 @@
 
 \frame{\ft{links}
 
---all urls--
+\footnotesize
+
+my diploma thesis\\
+\qquad \url{http://marmaro.de/docs\#diploma}
+
+
+masqmail's website\\
+\qquad \url{http://prog.marmaro.de/masqmail}
+
+
+masqmail mailing list\\
+\qquad \url{masqmail@marmaro.de}\\
+\qquad \url{minimalist@marmaro.de?subject=subscribe\%20masqmail}
+
+
+suckless software\\
+\qquad \url{http://www.suckless.org}
+
 
 }
 
@@ -874,6 +892,8 @@
 
 diagrams: PIC and groff
 
+call graph: Egypt and dot
+
 \vfill
 
 {\scriptsize The slides are available on \url{http://marmaro.de/docs} \hfill 2009-03-09 }