--- a/thesis/bib/websites.bib	Tue Feb 03 22:15:58 2009 +0100
+++ b/thesis/bib/websites.bib	Wed Feb 04 12:37:07 2009 +0100
@@ -1,140 +1,140 @@
 @misc{wikipedia:mta,
 	author = "Wikipedia",
-	title = "\emph{Mail transfer agent}",
+	title = "\textit{Mail transfer agent}",
 	howpublished = "{\small\url{http://en.wikipedia.org/w/index.php?title=Mail_transfer_agent&oldid=238542929} (2008-10-15)}",
 }
 
 @misc{sendmail:homepage,
 	author = "The Sendmail Consortium",
-	title = "\emph{Homepage of sendmail}",
+	title = "\textit{Homepage of sendmail}",
 	howpublished = "{\small\url{http://www.sendmail.org} (2008-10-18)}",
 }
 
 @misc{qmail:homepage1,
 	author = "Daniel J. Bernstein",
-	title = "\emph{Homepage of qmail}",
+	title = "\textit{Homepage of qmail}",
 	howpublished = "{\small\url{http://cr.yp.to/qmail.html} (2008-10-18)}",
 }
 
 @misc{qmail:homepage2,
 	author = "Russell Nelson",
-	title = "\emph{Homepage of qmail}",
+	title = "\textit{Homepage of qmail}",
 	howpublished = "{\small\url{http://www.qmail.org} (2008-10-18)}",
 }
 
 @misc{postfix:homepage,
 	author = "Wietse Venema",
-	title = "\emph{Homepage of postfix}",
+	title = "\textit{Homepage of postfix}",
 	howpublished = "{\small\url{http://www.postfix.org} (2008-10-19)}",
 }
 
 @misc{masqmail:homepage,
 	author = "Markus Schnalke",
-	title = "\emph{Homepage of masqmail}",
+	title = "\textit{Homepage of masqmail}",
 	howpublished = "{\small\url{http://prog.marmaro.de/masqmail} (2008-10-19)}",
 }
 
 @misc{masqmail:homepage2,
 	author = "Oliver Kurth",
-	title = "\emph{Homepage of masqmail}",
+	title = "\textit{Homepage of masqmail}",
 	howpublished = "The original website {\small\url{http://masqmail.cx}} is not available anymore but a mirror exists: {\small\url{http://sonic.net/~okurth/masqmail} (2008-10-19)}",
 }
 
 @misc{exim:homepage,
 	author = "Nigel Metheringham",
-	title = "\emph{Homepage of exim}",
+	title = "\textit{Homepage of exim}",
 	howpublished = "{\small\url{http://www.exim.org} (2008-10-19)}",
 }
 
 @misc{wikipedia:sendmail,
 	author = "Wikipedia",
-	title = "\emph{Sendmail}",
+	title = "\textit{Sendmail}",
 	howpublished = "{\small\url{http://en.wikipedia.org/w/index.php?title=Sendmail&oldid=264962189} (2009-01-22)}",
 }
 
 @misc{wikipedia:qmail,
 	author = "Wikipedia",
-	title = "\emph{qmail}",
+	title = "\textit{qmail}",
 	howpublished = "{\small\url{http://en.wikipedia.org/w/index.php?title=Qmail&oldid=241013610} (2008-10-18)}",
 }
 
 @misc{wikipedia:postfix,
 	author = "Wikipedia",
-	title = "\emph{Postfix}",
+	title = "\textit{Postfix}",
 	howpublished = "{\small\url{http://en.wikipedia.org/w/index.php?title=Postfix_(software)&oldid=245529663} (2008-10-19)}",
 }
 
 @misc{wikipedia:exim,
 	author = "Wikipedia",
-	title = "\emph{Exim}",
+	title = "\textit{Exim}",
 	howpublished = "{\small\url{http://en.wikipedia.org/w/index.php?title=Exim&oldid=244563707} (2008-10-19)}",
 }
 
 @misc{website:techtarget,
 	author = "Whatis.com",
-	title = "\emph{Definition for ``mail server''}",
+	title = "\textit{Definition for ``mail server''}",
 	howpublished = "{\small\url{http://searchsoa.techtarget.com/sDefinition/0,,sid26_gci876011,00.html} (2008-10-15)}",
 }
 
 @misc{website:thefreedictionary,
 	author = "The Free Dictionary",
-	title = "\emph{Definition for ``Message Transfer Agent''}",
+	title = "\textit{Definition for ``Message Transfer Agent''}",
 	howpublished = "{\small\url{http://encyclopedia2.thefreedictionary.com/Message+Transfer+Agent} (2008-10-15)}",
 }
 
 @misc{website:faqs,
 	author = "FAQs.org",
-	title = "\emph{Definition for ``mail transfer agent''}",
+	title = "\textit{Definition for ``mail transfer agent''}",
 	howpublished = "{\small\url{http://www.faqs.org/docs/linux_admin/g2999.html} (2008-10-15)}",
 }
 
 @misc{website:freeserve.co.uk,
 	author = "www.kayian.freeserve.co.uk",
-	title = "\emph{Definition for ``mail transfer agent''}",
+	title = "\textit{Definition for ``mail transfer agent''}",
 	howpublished = "{\small\url{http://www.kayian.freeserve.co.uk/page7.htm} (2008-10-15)}",
 }
 
 
 @misc{faqs:mmdf,
 	author = "FAQs.org",
-	title = "\emph{The MMDF Frequently Asked Questions List (FAQ)}",
+	title = "\textit{The MMDF Frequently Asked Questions List (FAQ)}",
 	howpublished = "{\small\url{http://www.faqs.org/faqs/mail/mmdf-faq/part1/} (2008-10-23)}",
 }
 
 
 @misc{wikipedia:uucp,
 	author = "Wikipedia",
-	title = "\emph{UUCP}",
+	title = "\textit{UUCP}",
 	howpublished = "{\small\url{http://en.wikipedia.org/w/index.php?title=UUCP&oldid=238072862} (2008-10-23)}",
 }
 
 @misc{wikipedia:arpanet,
 	author = "Wikipedia",
-	title = "\emph{ARPANET}",
+	title = "\textit{ARPANET}",
 	howpublished = "{\small\url{http://en.wikipedia.org/w/index.php?title=ARPANET&oldid=247162321} (2008-10-23)}",
 }
 
 @misc{wikipedia:email,
 	author = "Wikipedia",
-	title = "\emph{E-mail}",
+	title = "\textit{E-mail}",
 	howpublished = "{\small\url{http://en.wikipedia.org/w/index.php?title=E-mail&oldid=247092569} (2008-10-23)}",
 }
 
 @misc{wikipedia:historyoftheinternet,
 	author = "Wikipedia",
-	title = "\emph{History of the Internet}",
+	title = "\textit{History of the Internet}",
 	howpublished = "{\small\url{http://en.wikipedia.org/w/index.php?title=History_of_the_Internet&oldid=245178555} (2008-10-23)}",
 }
 
 @misc{unix-mail-intro,
 	author = "Network Computing",
-	title = "\emph{Introducing Unix Mail}",
+	title = "\textit{Introducing Unix Mail}",
 	howpublished = "{\small\url{http://www.networkcomputing.com/unixworld/tutorial/810.txt.html} (2008-10-23)}",
 }
 
 @misc{packages.debian:masqmail,
 	author = "The Debian Project",
-	title = "\emph{Details of package masqmail in lenny}",
+	title = "\textit{Details of package masqmail in lenny}",
 	howpublished = "{\small\url{http://packages.debian.org/lenny/masqmail} (2008-10-24)}",
 }
 
@@ -145,45 +145,45 @@
 
 @misc{pcmag:uc,
 	author = "Encyclopedia of PC Magazine",
-	title = "\emph{Unified Communications}",
+	title = "\textit{Unified Communications}",
 	howpublished = "{\small\url{http:/pcmag.com/encyclopedia_term/0,2542,t=unified+communications&i=53422,00.asp} (2009-02-03)}",
 }
 
 @misc{wikipedia:uc,
 	author = "Wikipedia",
-	title = "\emph{Unified communications}",
+	title = "\textit{Unified communications}",
 	howpublished = "{\small\url{http://en.wikipedia.org/w/index.php?title=Unified_communications&oldid=253436289} (2008-11-26)}",
 }
 
 @misc{wikipedia:um,
 	author = "Wikipedia",
-	title = "\emph{Unified messaging}",
+	title = "\textit{Unified messaging}",
 	howpublished = "{\small\url{http://en.wikipedia.org/w/index.php?title=Unified_messaging&oldid=251586924} (2008-11-26)}",
 }
 
 
 @misc{wordnet,
 	author = "{WordNet, Princeton University}",
-	title = "\emph{Electronic communication}",
+	title = "\textit{Electronic communication}",
 	howpublished = "{\small\url{http://wordnet.princeton.edu/} (2008-11-26)}",
 }
 
 @misc{science-glossary-pa,
 	author = "Pennsylvania Department of Education",
-	title = "\emph{Science Glossary}",
+	title = "\textit{Science Glossary}",
 	howpublished = "{\small\url{http://www.pde.state.pa.us/a_and_t/lib/a_and_t/Science_Glossary.pdf} (2008-11-26)}",
 }
 
 
 @misc{mailsoftware42,
 	author = "unknown",
-	title = "\emph{open source mail server comparison}",
+	title = "\textit{open source mail server comparison}",
 	howpublished = "{\small\url{http://www.geocities.com/mailsoftware42} (2008-12-09)}",
 }
 
 @misc{wikipedia:comparison-of-mail-servers,
 	author = "Wikipedia",
-	title = "\emph{Comparison of mail servers}",
+	title = "\textit{Comparison of mail servers}",
 	howpublished = "{\small\url{http://en.wikipedia.org/w/index.php?title=Comparison_of_mail_servers&oldid=255827293} (2008-12-09)}",
 }
 
@@ -192,7 +192,7 @@
 
 @misc{mailradar:mta-stats,
 	author = "MailRadar",
-	title = "\emph{Mail server statistics}",
+	title = "\textit{Mail server statistics}",
 	howpublished = "{\small\url{http://www.mailradar.com/mailstat/} (2008-12-11)}",
 }
 
@@ -200,7 +200,7 @@
 
 @misc{wikipedia:tls,
 	author = "Wikipedia",
-	title = "\emph{Transport Layer Security}",
+	title = "\textit{Transport Layer Security}",
 	howpublished = "{\small\url{http://en.wikipedia.org/w/index.php?title=Transport_Layer_Security&oldid=258890258} (2008-12-22)}",
 }
 
@@ -211,32 +211,32 @@
 
 @misc{hashcash:homepage,
 	author = "Adam Back",
-	title = "\emph{Hashcash.org}",
+	title = "\textit{Hashcash.org}",
 	howpublished = "{\small\url{http://hashcash.org} (2009-01-04)}",
 }
 
 
 @misc{netqmail:homepage,
 	author = "Russell Nelson",
-	title = "\emph{Homepage of netqmail}",
+	title = "\textit{Homepage of netqmail}",
 	howpublished = "{\small\url{http://www.qmail.org/netqmail} (2009-01-05)}",
 }
 
 @misc{iana:port-numbers,
 	author = "Internet Assigned Numbers Authority",
-	title = "\emph{Port Numbers}",
+	title = "\textit{Port Numbers}",
 	howpublished = "{\small\url{http://iana.org/assignments/port-numbers} (2009-01-10)}",
 }
 
 @misc{wikipedia:smtp,
 	author = "Wikipedia",
-	title = "\emph{Simple Mail Transfer Protocol}",
+	title = "\textit{Simple Mail Transfer Protocol}",
 	howpublished = "{\small\url{http://en.wikipedia.org/w/index.php?title=Simple_Mail_Transfer_Protocol&oldid=262937416} (2009-01-12)}",
 }
 
 @misc{ubuntuforums:simple-mailer,
 	author = "Reinhard Tartler and Derek Broughton and others",
-	title = "\emph{Wanted: simple mailer for laptop use}",
+	title = "\textit{Wanted: simple mailer for laptop use}",
 	year = "2005",
 	month = "October",
 	howpublished = "{\small\url{http://ubuntuforums.org/showthread.php?t=82744} (2009-01-15)}",
@@ -244,33 +244,33 @@
 
 @misc{stosberg:low-mem-laptop,
 	author = "Mark Stosberg",
-	title = "\emph{Adventures with Slackware Linux on a Low Memory Laptop}",
+	title = "\textit{Adventures with Slackware Linux on a Low Memory Laptop}",
 	howpublished = "{\small\url{http://www.stosberg.com/Tech/slackware_on_lowlap.html} (2009-01-15)}",
 }
 
 
 @misc{packages.debian,
 	author = "The Debian Project",
-	title = "\emph{Debian -- Packages}",
+	title = "\textit{Debian -- Packages}",
 	howpublished = "{\small\url{http://packages.debian.org} (2009-01-15)}",
 }
 
 
 @misc{popcon.debian,
 	author = "The Debian Project",
-	title = "\emph{Popularity contest statistics for masqmail}",
+	title = "\textit{Popularity contest statistics for masqmail}",
 	howpublished = "{\small\url{http://popcon.debian.org} (2009-01-15)}",
 }
 
 @misc{popcon.debian:masqmail,
 	author = "The Debian Project",
-	title = "\emph{Debian Popularity Contest}",
+	title = "\textit{Debian Popularity Contest}",
 	howpublished = "{\small\url{http://qa.debian.org/popcon.php?package=masqmail} (2009-01-15)}",
 }
 
 @misc{popcon.ubuntu,
 	author = "The Ubuntu Project",
-	title = "\emph{Ubuntu Popularity Contest}",
+	title = "\textit{Ubuntu Popularity Contest}",
 	howpublished = "{\small\url{http://popcon.ubuntu.com} (2009-01-15)}",
 }
 
@@ -278,7 +278,7 @@
 
 @misc{debian:bug245882,
 	author = "Kyler Laird",
-	title = "Bugreport: \emph{spool files not completely removed upon delivery}",
+	title = "Bugreport: \textit{spool files not completely removed upon delivery}",
 	year = "2004",
 	month = "April",
 	howpublished = "{\small\url{http://bugs.debian.org/245882} (2009-01-15)}",
@@ -286,7 +286,7 @@
 
 @misc{debian:bug216226,
 	author = "Ralf Neubauer",
-	title = "Bugreport: \emph{big mails over slow links get sent multiple times}",
+	title = "Bugreport: \textit{big mails over slow links get sent multiple times}",
 	year = "2003",
 	month = "October",
 	howpublished = "{\small\url{http://bugs.debian.org/216226} (2009-01-15)}",
@@ -294,50 +294,50 @@
 
 @misc{counter.li.org,
 	author = "The Linux Counter Project",
-	title = "\emph{The Linux Counter}",
+	title = "\textit{The Linux Counter}",
 	howpublished = "{\small\url{http://counter.li.org} (2009-01-15)}",
 }
 
 @misc{suckless.org,
 	author = "Anselm~R. Garbe and the suckless.org community",
-	title = "\emph{suckless.org}",
+	title = "\textit{suckless.org}",
 	howpublished = "{\small\url{http://www.suckless.org} (2009-01-17)}",
 }
 
 
 @misc{sloccount,
 	author = "David~A. Wheeler",
-	title = "\emph{SLOCCount}",
+	title = "\textit{SLOCCount}",
 	howpublished = "{\small\url{http://www.dwheeler.com/sloccount} (2009-01-20)}",
 }
 
 @misc{qmail:tls-patch,
 	author = "Frederick Vermeulen",
-	title = "\emph{Qmail-TLS patch archive}",
+	title = "\textit{Qmail-TLS patch archive}",
 	howpublished = "{\small\url{http://inoa.net/qmail-tls/} (2009-01-24)}",
 }
 
 @misc{imc:mail-rfcs,
 	author = "Internet Mail Consortium",
-	title = "\emph{Internet Mail Standards}",
+	title = "\textit{Internet Mail Standards}",
 	howpublished = "{\small\url{http://imc.org/mail-standards.html} (2009-01-27)}",
 }
 
 @misc{flash:homepage,
 	author = "Adobe Systems",
-	title = "\emph{Homepage of Adobe Flash}",
+	title = "\textit{Homepage of Adobe Flash}",
 	howpublished = "{\small\url{http://adobe.com/products/flash} (2000-02-02)}",
 }
 
 @misc{wikipedia:bluray,
 	author = "Wikipedia",
-	title = "\emph{Blu-ray Disc}",
+	title = "\textit{Blu-ray Disc}",
 	howpublished = "{\small\url{http://en.wikipedia.org/w/index.php?title=Blu-ray_Disc&oldid=268015627} (2009-02-02)}",
 }
 
 @misc{wikipedia:hddvd,
 	author = "Wikipedia",
-	title = "\emph{HD DVD}",
+	title = "\textit{HD DVD}",
 	howpublished = "{\small\url{http://en.wikipedia.org/w/index.php?title=HD_DVD&oldid=267253912} (2009-02-02)}",
 }