1.1 --- a/thesis/bib/thesis.bib	Wed Nov 26 10:42:57 2008 +0100
     1.2 +++ b/thesis/bib/thesis.bib	Wed Nov 26 22:01:33 2008 +0100
     1.3 @@ -39,7 +39,7 @@
     1.4  	title = "The Cathedral \& the Bazaar",
     1.5  	year = "1999",
     1.6  	publisher = "O'Reilly Media",
     1.7 -	note = "ISBN: 1-56592-724-9. Also available at {\small\url{http://catb.org/esr/writings/cathedral-bazaar/cathedral-bazaar/} (2008-10-14)}",
     1.8 +	note = "ISBN: 1-56592-724-9. Also available online at {\small\url{http://catb.org/esr/writings/cathedral-bazaar/cathedral-bazaar/} (2008-10-14)}",
     1.9  }
    1.10  
    1.11  @book{costales97,
    1.12 @@ -61,28 +61,39 @@
    1.13  }
    1.14  
    1.15  
    1.16 -
    1.17 -=====================================
    1.18 -
    1.19 -@article{AbedonHymanThomas2003,
    1.20 -  author = "Abedon, S. T. and Hyman, P. and Thomas, C.",
    1.21 -  year = "2003",
    1.22 -  title = "Experimental examination of bacteriophage latent-period evolution as a response to bacterial availability",
    1.23 -  journal = "Applied and Environmental Microbiology",
    1.24 -  volume = "69",
    1.25 -  pages = "7499--7506"
    1.26 -}
    1.27 - 
    1.28 -@incollection{Abedon1994,
    1.29 -  author = "Abedon, S. T.",
    1.30 -  title = "Lysis and the interaction between free phages and infected cells",
    1.31 -  pages = "397--405",
    1.32 -  booktitle = "Molecular biology of bacteriophage T4",
    1.33 -  editor = "Karam, Jim D. Karam and Drake, John W. and Kreuzer, Kenneth N. and Mosig, Gisela
    1.34 -            and Hall, Dwight and Eiserling, Frederick A. and Black, Lindsay W. and Kutter, Elizabeth
    1.35 -            and Carlson, Karin and Miller, Eric S. and Spicer, Eleanor",
    1.36 -  publisher = "ASM Press, Washington DC",
    1.37 -  year = "1994"
    1.38 +@book{powerof2x2,
    1.39 +	author = "Alex Lowy and Phil Hood",
    1.40 +	title = "The Power of the 2 x 2 Matrix: Using 2 x 2 Thinking to Solve Business Problems and Make Better Decisions",
    1.41 +	publisher = "Jossey-Bass",
    1.42 +	year = "2004",
    1.43 +	note = "ISBN: 0-78797-292-4",
    1.44 +	pages = "129--131",
    1.45  }
    1.46  
    1.47 -note = "\url{http://www.example.com}"
    1.48 +@article{wired:hype,
    1.49 +	author = "Jesse Freund",
    1.50 +	title = "\emph{Hype List}",
    1.51 +	journal = "Wired Magazine",
    1.52 +	month = "June",
    1.53 +	year = "1998",
    1.54 +	note = "Also available online at: {\small\url{http://www.wired.com/wired/archive/6.06/hypelist.html} (2008-11-26)}",
    1.55 +}
    1.56 +
    1.57 +@techreport{panda:email-threats,
    1.58 +	institution = "Panda Security and Commtouch",
    1.59 +	author = "",
    1.60 +	title = "Q2 2008 Email Threats Trend Report",
    1.61 +	note = "Also available online at: {\small\url{http://www.pandasecurity.com/emailhtml/oxygen/Q2_08%20Email_Threats%20-%20Panda.pdf} (2008-11-26)}",
    1.62 +	year = "2008",
    1.63 +	month = "July",
    1.64 +}
    1.65 +
    1.66 +@techreport{ironport:zombie-computers,
    1.67 +	institution = "{IronPort Systems Inc.}",
    1.68 +	type = "Press Release",
    1.69 +	author = "",
    1.70 +	title = "Spammers Continue Innovation: IronPort Study Shows Image-based Spam, Hit \& Run, and Increased Volumes Latest Threat to Your Inbox",
    1.71 +	month = "June",
    1.72 +	year = "2006",
    1.73 +	note = "Also available online at: {\small\url{http://ironport.com/company/ironport_pr_2006-06-28.html} (2008-11-26)}",
    1.74 +}

     2.1 --- a/thesis/bib/websites.bib	Wed Nov 26 10:42:57 2008 +0100
     2.2 +++ b/thesis/bib/websites.bib	Wed Nov 26 22:01:33 2008 +0100
     2.3 @@ -183,3 +183,66 @@
     2.4  	howpublished = "On the Internet: {\small\url{http://packages.debian.org/lenny/masqmail} (2008-10-24)}",
     2.5  }
     2.6  
     2.7 +
     2.8 +
     2.9 +
    2.10 +
    2.11 +
    2.12 +@misc{pcmag:uc,
    2.13 +	author = "Encyclopedia of PC Magazine",
    2.14 +	title = "\emph{Unified Communications}",
    2.15 +	howpublished = "On the Internet: {\small\url{http://www.pcmag.com/encyclopedia/} (2008-11-26)}",
    2.16 +}
    2.17 +
    2.18 +@misc{howto-def-uc,
    2.19 +	author = "Michael Osterman",
    2.20 +	title = "\emph{How do you define `unified communications'?}",
    2.21 +	month = "February",
    2.22 +	year = "2008",
    2.23 +	howpublished = "On the Internet: {\small\url{http://www.networkworld.com/newsletters/gwm/2008/0225msg1.html} (2008-11-26)}",
    2.24 +}
    2.25 +
    2.26 +@misc{wikipedia:uc,
    2.27 +	author = "Wikipedia",
    2.28 +	title = "\emph{Unified communications}",
    2.29 +	howpublished = "On the Internet: {\small\url{http://en.wikipedia.org/w/index.php?title=Unified_communications&oldid=253436289} (2008-11-26)}",
    2.30 +}
    2.31 +
    2.32 +@misc{wikipedia:um,
    2.33 +	author = "Wikipedia",
    2.34 +	title = "\emph{Unified messaging}",
    2.35 +	howpublished = "On the Internet: {\small\url{http://en.wikipedia.org/w/index.php?title=Unified_messaging&oldid=251586924} (2008-11-26)}",
    2.36 +}
    2.37 +
    2.38 +
    2.39 +@misc{wordnet,
    2.40 +	author = "{WordNet, Princeton University}",
    2.41 +	title = "\emph{Electronic communication}",
    2.42 +	howpublished = "On the Internet: {\small\url{http://wordnet.princeton.edu/} (2008-11-26)}",
    2.43 +}
    2.44 +
    2.45 +@misc{science-glossary-pa,
    2.46 +	author = "Pennsylvania Department of Education",
    2.47 +	title = "\emph{Science Glossary}",
    2.48 +	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)}",
    2.49 +}
    2.50 +
    2.51 +misc{wikipedia:exim,
    2.52 +	author = "Wikipedia",
    2.53 +	title = "\emph{Exim}",
    2.54 +	howpublished = "On the Internet: {\small\url{} (2008-11-26)}",
    2.55 +}
    2.56 +
    2.57 +misc{wikipedia:exim,
    2.58 +	author = "Wikipedia",
    2.59 +	title = "\emph{Exim}",
    2.60 +	howpublished = "On the Internet: {\small\url{} (2008-11-26)}",
    2.61 +}
    2.62 +
    2.63 +
    2.64 +
    2.65 +misc{wikipedia:exim,
    2.66 +	author = "Wikipedia",
    2.67 +	title = "\emph{Exim}",
    2.68 +	howpublished = "On the Internet: {\small\url{} (2008-11-26)}",
    2.69 +}