--- a/thesis/bib/thesis.bib	Wed Nov 26 10:42:57 2008 +0100
+++ b/thesis/bib/thesis.bib	Wed Nov 26 22:01:33 2008 +0100
@@ -39,7 +39,7 @@
 	title = "The Cathedral \& the Bazaar",
 	year = "1999",
 	publisher = "O'Reilly Media",
-	note = "ISBN: 1-56592-724-9. Also available at {\small\url{http://catb.org/esr/writings/cathedral-bazaar/cathedral-bazaar/} (2008-10-14)}",
+	note = "ISBN: 1-56592-724-9. Also available online at {\small\url{http://catb.org/esr/writings/cathedral-bazaar/cathedral-bazaar/} (2008-10-14)}",
 }
 
 @book{costales97,
@@ -61,28 +61,39 @@
 }
 
 
-
-=====================================
-
-@article{AbedonHymanThomas2003,
-  author = "Abedon, S. T. and Hyman, P. and Thomas, C.",
-  year = "2003",
-  title = "Experimental examination of bacteriophage latent-period evolution as a response to bacterial availability",
-  journal = "Applied and Environmental Microbiology",
-  volume = "69",
-  pages = "7499--7506"
+@book{powerof2x2,
+	author = "Alex Lowy and Phil Hood",
+	title = "The Power of the 2 x 2 Matrix: Using 2 x 2 Thinking to Solve Business Problems and Make Better Decisions",
+	publisher = "Jossey-Bass",
+	year = "2004",
+	note = "ISBN: 0-78797-292-4",
+	pages = "129--131",
 }
- 
-@incollection{Abedon1994,
-  author = "Abedon, S. T.",
-  title = "Lysis and the interaction between free phages and infected cells",
-  pages = "397--405",
-  booktitle = "Molecular biology of bacteriophage T4",
-  editor = "Karam, Jim D. Karam and Drake, John W. and Kreuzer, Kenneth N. and Mosig, Gisela
-            and Hall, Dwight and Eiserling, Frederick A. and Black, Lindsay W. and Kutter, Elizabeth
-            and Carlson, Karin and Miller, Eric S. and Spicer, Eleanor",
-  publisher = "ASM Press, Washington DC",
-  year = "1994"
+
+@article{wired:hype,
+	author = "Jesse Freund",
+	title = "\emph{Hype List}",
+	journal = "Wired Magazine",
+	month = "June",
+	year = "1998",
+	note = "Also available online at: {\small\url{http://www.wired.com/wired/archive/6.06/hypelist.html} (2008-11-26)}",
 }
 
-note = "\url{http://www.example.com}"
+@techreport{panda:email-threats,
+	institution = "Panda Security and Commtouch",
+	author = "",
+	title = "Q2 2008 Email Threats Trend Report",
+	note = "Also available online at: {\small\url{http://www.pandasecurity.com/emailhtml/oxygen/Q2_08%20Email_Threats%20-%20Panda.pdf} (2008-11-26)}",
+	year = "2008",
+	month = "July",
+}
+
+@techreport{ironport:zombie-computers,
+	institution = "{IronPort Systems Inc.}",
+	type = "Press Release",
+	author = "",
+	title = "Spammers Continue Innovation: IronPort Study Shows Image-based Spam, Hit \& Run, and Increased Volumes Latest Threat to Your Inbox",
+	month = "June",
+	year = "2006",
+	note = "Also available online at: {\small\url{http://ironport.com/company/ironport_pr_2006-06-28.html} (2008-11-26)}",
+}

--- a/thesis/bib/websites.bib	Wed Nov 26 10:42:57 2008 +0100
+++ b/thesis/bib/websites.bib	Wed Nov 26 22:01:33 2008 +0100
@@ -183,3 +183,66 @@
 	howpublished = "On the Internet: {\small\url{http://packages.debian.org/lenny/masqmail} (2008-10-24)}",
 }
 
+
+
+
+
+
+@misc{pcmag:uc,
+	author = "Encyclopedia of PC Magazine",
+	title = "\emph{Unified Communications}",
+	howpublished = "On the Internet: {\small\url{http://www.pcmag.com/encyclopedia/} (2008-11-26)}",
+}
+
+@misc{howto-def-uc,
+	author = "Michael Osterman",
+	title = "\emph{How do you define `unified communications'?}",
+	month = "February",
+	year = "2008",
+	howpublished = "On the Internet: {\small\url{http://www.networkworld.com/newsletters/gwm/2008/0225msg1.html} (2008-11-26)}",
+}
+
+@misc{wikipedia:uc,
+	author = "Wikipedia",
+	title = "\emph{Unified communications}",
+	howpublished = "On the Internet: {\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}",
+	howpublished = "On the Internet: {\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}",
+	howpublished = "On the Internet: {\small\url{http://wordnet.princeton.edu/} (2008-11-26)}",
+}
+
+@misc{science-glossary-pa,
+	author = "Pennsylvania Department of Education",
+	title = "\emph{Science Glossary}",
+	howpublished = "On the Internet: {\small\url{http://www.pde.state.pa.us/a_and_t/lib/a_and_t/Science_Glossary.pdf} (2008-11-26)}",
+}
+
+misc{wikipedia:exim,
+	author = "Wikipedia",
+	title = "\emph{Exim}",
+	howpublished = "On the Internet: {\small\url{} (2008-11-26)}",
+}
+
+misc{wikipedia:exim,
+	author = "Wikipedia",
+	title = "\emph{Exim}",
+	howpublished = "On the Internet: {\small\url{} (2008-11-26)}",
+}
+
+
+
+misc{wikipedia:exim,
+	author = "Wikipedia",
+	title = "\emph{Exim}",
+	howpublished = "On the Internet: {\small\url{} (2008-11-26)}",
+}