diff --git a/en_US.ISO8859-1/htdocs/multimedia/multimedia-input.xml b/en_US.ISO8859-1/htdocs/multimedia/multimedia-input.xml
index b677fd9d04..62e7f25595 100644
--- a/en_US.ISO8859-1/htdocs/multimedia/multimedia-input.xml
+++ b/en_US.ISO8859-1/htdocs/multimedia/multimedia-input.xml
@@ -1,4 +1,7 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE multimedia PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Multimedia//EN"
+        "http://www.FreeBSD.org/XML/www/share/sgml/multimedia.dtd">
+
 <!-- $FreeBSD$ -->
 <!--
   The tags should be like:
@@ -363,14 +366,14 @@
 
 	<item source="bsdtalk" added="20090221">
 	    <title>Marshall Kirk McKusick at DCBSDCon</title>
-	    <desc><![CDATA[
+	    <desc>
 		A recording of Marshall Kirk McKusick's talk "A
 		Narrative History of BSD" at DCBSDCon this past
 		weekend.
-		<br>
+		<br/>
 		You can get a much more complete history here:
 		http://www.mckusick.com/history/index.html
-	    ]]></desc>
+	    </desc>
 	    <overview>http://bsdtalk.blogspot.com/2009/02/bsdtalk170-marshall-kirk-mckusick-at.html</overview>
 	    <tags>bsdtalk,presentation,bsd,history,kirk mckusick</tags>
 	    <files>
@@ -586,13 +589,13 @@
 
 	<item source="bsdtalk" added="20081116">
 	    <title>BSD on a eeePC 900A</title>
-	    <desc><![CDATA[
+	    <desc>
 		I look forward to attending MeetBSD this weekend.
-		<br>
+		<br/>
 		A brief description of my first attempts to get BSD
 		on a eeePC 900A. I try OpenBSD 4.4, DragonFlyBSD
 		2.0.1, PC-BSD 7.0.1, and FreeBSD 7.
-		]]>
+		
 	    </desc>
 	    <overview>http://bsdtalk.blogspot.com/2008/11/bsdtalk162-bsd-on-eeepc-900a.html</overview>
 	    <tags>bsdtalk,eeepc</tags>
@@ -724,13 +727,13 @@
 
 	<item source="bsdtalk" added="20080916">
 	    <title>Questions for you</title>
-	    <desc><![CDATA[
+	    <desc>
 	    <ul>
-	    <li>Things have been very busy at the beginning of the school year, so I'm sorry that I haven't been producing as many shows as usual.
-	    <li>Registration is open for NYCBSDCon and the list of speakers is available. Are you going?
-	    <li>I plan on streaming live during the conference. Do you have any suggestions for live streaming software that is known to work well on the BSDs? Are there any live CDs like Dyne:bolic?
-	    <li>I've come into possession of a Soekris 5501. What are your suggestions for soekris-friendly projects to test?
-	    </ul>]]>
+	    <li>Things have been very busy at the beginning of the school year, so I'm sorry that I haven't been producing as many shows as usual.</li>
+	    <li>Registration is open for NYCBSDCon and the list of speakers is available. Are you going?</li>
+	    <li>I plan on streaming live during the conference. Do you have any suggestions for live streaming software that is known to work well on the BSDs? Are there any live CDs like Dyne:bolic?</li>
+	    <li>I've come into possession of a Soekris 5501. What are your suggestions for soekris-friendly projects to test?</li>
+	    </ul>
 	    </desc>
 	    <overview>http://bsdtalk.blogspot.com/2008/09/bsdtalk157-questions-for-you.html</overview>
 	    <tags>bsdtalk</tags>
@@ -1049,7 +1052,7 @@
 
 	<item source="bsdtalk" added="20080402">
 	    <title>Adam Wright from No Starch Press</title>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
 		Intro: Some musings on the consistency and simplicity of BSD.
 		</p><p>
@@ -1058,7 +1061,7 @@
 		BSDTalk. They talk about recent and future BSD
 		books.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <overview>http://bsdtalk.blogspot.com/2008/04/bsdtalk145-adam-wright-from-no-starch.html</overview>
 	    <tags>bsdtalk,interview,books,no starch press,adam wright</tags>
 	    <files>
@@ -1214,7 +1217,7 @@
 
 	<item source="bsdtalk" added="20080131">
 	    <title>Dru Lavigne</title>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
 		Interview with Dru Lavigne. We talk about her new
 		book "The Best of FreeBSD Basics" and also get an
@@ -1228,7 +1231,7 @@
 		<li>http://reedmedia.net/books/freebsd-basics</li>
 		<li>http://www.osbr.ca</li>
 		</ul>
-	    ]]></desc>
+	    </desc>
 	    <overview>http://bsdtalk.blogspot.com/2008/01/bsdtalk139-dru-lavigne.html</overview>
 	    <tags>bsdtalk,interview,dru lavigne,the best of freebsd basics</tags>
 	    <files>
@@ -1251,7 +1254,7 @@
 
 	<item source="bsdtalk" added="20080125">
 	    <title>Central Syslog</title>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
 		Setting up a central syslog server.
 		</p>
@@ -1266,7 +1269,7 @@
 		<li>Most network devices such as printers and commercial firewalls support sending to a central syslog server. Take a look at "Snare" for Windows hosts.</li>
 		<li>To send messages from a Unix host, specify the host name prepended with @ instead of a file for logging in /etc/syslog.conf. For example, change /var/log/xferlog to @loghost.mydomain.biz. You can also copy and edit the line to have it log to both a local file and a remote host.</li>
 		</ul>
-	    ]]></desc>
+	    </desc>
 	    <overview>http://bsdtalk.blogspot.com/2008/01/bsdtalk138-central-syslog.html</overview>
 	    <tags>bsdtalk,syslog</tags>
 	    <files>
@@ -1552,7 +1555,7 @@
 
 	<item source="bsdtalk" added="20070901">
 	    <title>Why I like the CLI</title>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
 		Why I like the CLI:
 		</p>
@@ -1568,7 +1571,7 @@
 		<li>Requires reading skills instead of clicking skills.</li>
 		<li>Much faster when you know what you are doing.</li>
 		</ul>
-	    ]]></desc>
+	    </desc>
 	    <overview>http://bsdtalk.blogspot.com/2007/08/bsdtalk127-why-i-like-cli.html</overview>
 	    <tags>bsdtalk,cli,will backman</tags>
 	    <files>
@@ -1773,10 +1776,10 @@
 
 	<item source="bsdtalk" added="20070706">
 	    <title>Playing with IPv6</title>
-	    <desc><![CDATA[
+	    <desc>
 		I ramble on about how I have been experimenting
 		with IPv6. For more details, see <a href="http://cisx1.uma.maine.edu/~wbackman/cis341/resources/ipv6-test-lab.html">http://cisx1.uma.maine.edu/~wbackman/cis341/resources/ipv6-test-lab.html</a>.
-	    ]]></desc>
+	    </desc>
 	    <overview>http://bsdtalk.blogspot.com/2007/07/bsdtalk119-playing-with-ipv6.html</overview>
 	    <tags>bsdtalk,ipv6</tags>
 	    <files>
@@ -1824,7 +1827,7 @@
 
 	<item source="bsdtalk" added="20070614">
 	    <title>One Time Passwords</title>
-	    <desc><![CDATA[
+	    <desc>
 		<ul>
 		<li> Important when you don't trust the computer you are using, such as a library computer or internet kiosk.</li>
 		<li> Available by default in Free/Net/Open BSD.</li>
@@ -1843,7 +1846,7 @@
 		<li> Instead of carrying a list of passwords around, you can use s/key generators on a portable device that you trust, such as a palm pilot.</li>
 		<li> For more info, check the man pages.</li>
 		</ul>
-	    ]]></desc>
+	    </desc>
 	    <overview>http://bsdtalk.blogspot.com/2007/06/bsdtalk117-one-time-passwords.html</overview>
 	    <tags>bsdtalk,security,one time passwords</tags>
 	    <files>
@@ -2004,12 +2007,12 @@
 
 	<item source="bsdtalk" added="20070510">
 	    <title>FreeBSD Developer Diane Bruce</title>
-	    <desc><![CDATA[
+	    <desc>
 		Interview with FreeBSD developer Diane Bruce. We
 		talk about Ham Radio on BSD.
 		Slides from one of her talks:
 		<a href="http://www.oarc.net/presentations/hamradio_on_freebsd.pdf">http://www.oarc.net/presentations/hamradio_on_freebsd.pdf</a>
-	    ]]></desc>
+	    </desc>
 	    <overview>http://bsdtalk.blogspot.com/2007/05/bsdtalk111-freebsd-developer-diane.html</overview>
 	    <tags>bsdtalk,interview,freebsd,diana bruce</tags>
 	    <files>
@@ -2186,7 +2189,7 @@
 
 	<item source="bsdtalk" added="20070321">
 	    <title>Getting to know X</title>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
 		Getting to know the X Window System.<br />
 		Make sure you are in a text only mode. You might
@@ -2201,7 +2204,7 @@
 		<li>"xterm -geometry +300+300"</li>
 		<li>"twm" or "metacity"</li>
 		</ul>
-	    ]]></desc>
+	    </desc>
 	    <overview>http://bsdtalk.blogspot.com/2007/03/bsdtalk104-getting-to-know-x.html</overview>
 	    <tags>bsdtalk,X</tags>
 	    <files>
@@ -3111,9 +3114,9 @@
 
 	<item source="bsdtalk" added="20060922">
 	    <title>Interview with Dan Langille about backups</title>
-	    <desc><![CDATA[
+	    <desc>
 		 Interview with Dan Langille about backups. Check out <a href="http://www.bacula.org/">http://www.bacula.org/</a>
-	    ]]></desc>
+	    </desc>
 	    <overview>http://bsdtalk.blogspot.com/2006/09/bsdtalk067-interview-with-dan-langille.html</overview>
 	    <tags>bsdtalk,interview,bacula,dan langille</tags>
 	    <files>
@@ -3136,9 +3139,9 @@
 
 	<item source="bsdtalk" added="20060921">
 	    <title>Interview with Michael Dexter about sysjail</title>
-	    <desc><![CDATA[
+	    <desc>
 		 Interview with Michael Dexter about sysjail. <a href="http://sysjail.bsd.lv/">http://sysjail.bsd.lv/</a>
-	    ]]></desc>
+	    </desc>
 	    <overview>http://bsdtalk.blogspot.com/2006/09/bsdtalk066-interview-with-michael.html</overview>
 	    <tags>bsdtalk,interview,sysjail,michael dexter</tags>
 	    <files>
@@ -3160,11 +3163,11 @@
 	</item>
 
 	<item source="bsdtalk" added="20060915">
-	    <title><![CDATA[ Interview with Eirik &Oslash;verby.]]></title>
-	    <desc><![CDATA[
+	    <title> Interview with Eirik &Oslash;verby.</title>
+	    <desc>
 		Interview with Eirik &Oslash;verby. We talk about
 		his use of BSD and Jails.
-	    ]]></desc>
+	    </desc>
 	    <overview>http://bsdtalk.blogspot.com/2006/09/bsdtalk065-interview-with-eirik-verby.html</overview>
 	    <tags>bsdtalk,interview,jails,eirik Overby</tags>
 	    <files>
@@ -3365,13 +3368,13 @@
 
 	<item source="youtube" added="20090524">
 	    <title>Using BSD in SchmooCon Labs</title>
-	    <desc><![CDATA[
+	    <desc>
 		Using BSD in SchmooCon Labs
-		<br>
+		<br/>
 		DCBSDCon 2009, Ken Caruso
-		<br>
+		<br/>
 		clive URL: http://www.youtube.com/watch?v=9ZhfuP4jghY
-	    ]]></desc>
+	    </desc>
 	    <overview>http://www.youtube.com/watch?v=9ZhfuP4jghY</overview>
 	    <tags>youtube,presentation,dcbsdcon,dcbsdcon2009,bsd,schmoocon,ken caruso</tags>
 	    <files>
@@ -3386,13 +3389,13 @@
 
 	<item source="youtube" added="20090524">
 	    <title>Sleeping Beauty - NetBSD on Modern laptops</title>
-	    <desc><![CDATA[
+	    <desc>
 		P9A: Sleeping Beauty - NetBSD on Modern Laptops
-		<br>
+		<br/>
 		AsiaBSDCon 2008, Jorg Sonnenberger
-		<br>
+		<br/>
 		clive URL: http://www.youtube.com/watch?v=v9ygBFjGR50
-	    ]]></desc>
+	    </desc>
 	    <overview>http://www.youtube.com/watch?v=v9ygBFjGR50</overview>
 	    <tags>youtube,presentation,asiabsdcon2008,asiabsdcon,netbsd,laptops,jorg sonnenberger</tags>
 	    <files>
@@ -3407,13 +3410,13 @@
 
 	<item source="youtube" added="20090524">
 	    <title>OpenBSD Network Stack Internals</title>
-	    <desc><![CDATA[
+	    <desc>
 		P8A: OpenBSD Network Stack Internals
-		<br>
+		<br/>
 		AsiaBSDCon 2008, Claudio Jeker
-		<br>
+		<br/>
 		clive URL: http://www.youtube.com/watch?v=V85It0dGUF4
-	    ]]></desc>
+	    </desc>
 	    <overview>http://www.youtube.com/watch?v=V85It0dGUF4</overview>
 	    <tags>youtube,presentation,asiabsdcon2008,asiabsdcon,openbsd,claudio jeker</tags>
 	    <files>
@@ -3428,13 +3431,13 @@
 
 	<item source="youtube" added="20090524">
 	    <title>25 years with BSD</title>
-	    <desc><![CDATA[
+	    <desc>
 		Thinking RealSpace: Life with BSD - ~25 years with BSD
-		<br>
+		<br/>
 		AsiaBSDCon 2008, Hideki Sunahara
-		<br>
+		<br/>
 		clive URL: http://www.youtube.com/watch?v=brYdkQ120Do
-	    ]]></desc>
+	    </desc>
 	    <overview>http://www.youtube.com/watch?v=brYdkQ120Do</overview>
 	    <tags>youtube,keynote,asiabsdcon2008,asiabsdcon,bsd,hideki sunahara</tags>
 	    <files>
@@ -3449,13 +3452,13 @@
 
 	<item source="youtube" added="20090524">
 	    <title>P6A: A Portable iSCSI Initiator</title>
-	    <desc><![CDATA[
+	    <desc>
 		P3B: A Portable iSCSI Initiator
-		<br>
+		<br/>
 		AsiaBSDCon 2008, Alistair Crooks
-		<br>
+		<br/>
 		clive URL: http://www.youtube.com/watch?v=MiZY7PMu7Ic
-	    ]]></desc>
+	    </desc>
 	    <overview>http://www.youtube.com/watch?v=MiZY7PMu7Ic</overview>
 	    <tags>youtube,presentation,asiabsdcon2008,asiabsdcon,iscsi,alistair crooks</tags>
 	    <files>
@@ -3470,13 +3473,13 @@
 
 	<item source="youtube" added="20090327">
 	    <title>P3B: BSD Implementations of XCAST6</title>
-	    <desc><![CDATA[
+	    <desc>
 		P3B: BSD Implementations of XCAST6
-		<br>
+		<br/>
 		AsiaBSDCon 2008, Yuji Imai
-		<br>
+		<br/>
 		clive URL: http://www.youtube.com/watch?v=g1Ga48smqyI
-	    ]]></desc>
+	    </desc>
 	    <overview>http://www.youtube.com/watch?v=g1Ga48smqyI</overview>
 	    <tags>youtube,presentation,asiabsdcon2008,asiabsdcon,xcast6,yuji imai</tags>
 	    <files>
@@ -3491,13 +3494,13 @@
 
 	<item source="youtube" added="20090327">
 	    <title>P5A: Logical Resource Isolation in the NetBSD Kernel</title>
-	    <desc><![CDATA[
+	    <desc>
 		P5A: Logical Resource Isolation in the NetBSD Kernel
-		<br>
+		<br/>
 		AsiaBSDCon 2008, Kristaps Dzonsons
-		<br>
+		<br/>
 		clive URL: http://www.youtube.com/watch?v=c63VneyQI-k
-	    ]]></desc>
+	    </desc>
 	    <overview>http://www.youtube.com/watch?v=c63VneyQI-k</overview>
 	    <tags>youtube,presentation,asiabsdcon2008,asiabsdcon,netbsd,kristaps dzonsons</tags>
 	    <files>
@@ -3512,13 +3515,13 @@
 
 	<item source="youtube" added="20090327">
 	    <title>P4B: Send and Receive of File System Protocols: Userspace Approach With puffs</title>
-	    <desc><![CDATA[
+	    <desc>
 		P4B: Send and Receive of File System Protocols: Userspace Approach With puffs
-		<br>
+		<br/>
 		AsiaBSDCon 2008, Antti Kantee
-		<br>
+		<br/>
 		clive URL: http://www.youtube.com/watch?v=ziGeB8iRA0c
-	    ]]></desc>
+	    </desc>
 	    <overview>http://www.youtube.com/watch?v=ziGeB8iRA0c</overview>
 	    <tags>youtube,presentation,asiabsdcon2008,asiabsdcon,puffs,antti kantee</tags>
 	    <files>
@@ -3533,13 +3536,13 @@
 
 	<item source="youtube" added="20090327">
 	    <title>P1B: Tracking FreeBSD in a Commercial Setting</title>
-	    <desc><![CDATA[
+	    <desc>
 		P1B: Tracking FreeBSD in a Commercial Setting
-		<br>
+		<br/>
 		AsiaBSDCon 2008, M. Warner Losh
-		<br>
+		<br/>
 		clive URL: http://www.youtube.com/watch?v=VaZ9Ef04bJg
-	    ]]></desc>
+	    </desc>
 	    <overview>http://www.youtube.com/watch?v=VaZ9Ef04bJg</overview>
 	    <tags>youtube,presentation,asiabsdcon2008,asiabsdcon,freebsd,warner losh</tags>
 	    <files>
@@ -3554,13 +3557,13 @@
 
 	<item source="youtube" added="20090313">
 	    <title>A Brief History of the BSD Fast Filesystem, Kirk McKusick</title>
-	    <desc><![CDATA[
+	    <desc>
 		A Brief History of the BSD Fast Filesystem, Kirk McKusick
-		<br>
+		<br/>
 		AsiaBSDCon 2008, Dr. Kirk McKusick
-		<br>
+		<br/>
 		clive URL: http://www.youtube.com/watch?v=tzieR5MM06M
-	    ]]></desc>
+	    </desc>
 	    <overview>http://www.youtube.com/watch?v=tzieR5MM06M</overview>
 	    <tags>youtube,presentation,asiabsdcon2008,asiabsdcon,bsd fast filesystem,kirk mckusick</tags>
 	    <files>
@@ -3575,11 +3578,11 @@
 
 	<item source="youtube" added="20090221">
 	    <title>PC-BSD, Matt Olander, AsiaBSDCon 2008</title>
-	    <desc><![CDATA[
+	    <desc>
 		PC-BSD, Matt Olander, AsiaBSDCon 2008
-		<br>
+		<br/>
 		clive URL: http://www.youtube.com/watch?v=N0q37X-MJzY
-	    ]]></desc>
+	    </desc>
 	    <overview>http://www.youtube.com/watch?v=N0q37X-MJzY</overview>
 	    <tags>youtube,presentation,asiabsdcon2008,asiabsdcon,pc-bsd,matt olander</tags>
 	    <files>
@@ -3594,12 +3597,12 @@
 
 	<item source="youtube" added="20090221">
 	    <title>Using FreeBSD to Promote Open Source Development Methods, Brooks Davis, AsiaBSDCon 2008</title>
-	    <desc><![CDATA[
+	    <desc>
 		Using FreeBSD to Promote Open Source Development
 		Methods, Brooks Davis, AsiaBSDCon 2008
-		<br>
+		<br/>
 		clive URL: http://www.youtube.com/watch?v=4lcrinKBMas
-	    ]]></desc>
+	    </desc>
 	    <overview>http://www.youtube.com/watch?v=4lcrinKBMas</overview>
 	    <tags>youtube,presentation,asiabsdcon2008,asiabsdcon,freebsd,promotion,open source development models,brooks davis</tags>
 	    <files>
@@ -3614,12 +3617,12 @@
 
 	<item source="youtube" added="20090221">
 	    <title>Keynote, Peter Losher, Internet Systems Consortium, AsiaBSDCon 2008</title>
-	    <desc><![CDATA[
+	    <desc>
 		Keynote, Peter Losher, Internet Systems Consortium,
 		AsiaBSDCon 2008
-		<br>
+		<br/>
 		clive URL: http://www.youtube.com/watch?v=vQbdG7TwhKo
-	    ]]></desc>
+	    </desc>
 	    <overview>http://www.youtube.com/watch?v=vQbdG7TwhKo</overview>
 	    <tags>youtube,keynote,asiabsdcon2008,asiabsdcon,peter losher</tags>
 	    <files>
@@ -3634,12 +3637,12 @@
 
 	<item source="youtube" added="20090221">
 	    <title>GEOM - in Infrastructure We Trust, Pawel Jakub Dawidek, AsiaBSDCon 2008</title>
-	    <desc><![CDATA[
+	    <desc>
 		GEOM - in Infrastructure We Trust, Pawel Jakub
 		Dawidek, AsiaBSDCon 2008
-		<br>
+		<br/>
 		clive URL: http://www.youtube.com/watch?v=xMpmOezBJZo
-	    ]]></desc>
+	    </desc>
 	    <overview>http://www.youtube.com/watch?v=xMpmOezBJZo</overview>
 	    <tags>youtube,presentation,asiabsdcon2008,asiabsdcon,geom,pawel jakub dawidek</tags>
 	    <files>
@@ -3654,12 +3657,12 @@
 
 	<item source="youtube" added="20090221">
 	    <title>Reducing Lock Contention in a Multi-Core System, Randall Stewart, AsiaBSDCon 2008</title>
-	    <desc><![CDATA[
+	    <desc>
 		Reducing Lock Contention in a Multi-Core System,
 		Randall Stewart, AsiaBSDCon 2008
-		<br>
+		<br/>
 		clive URL: http://www.youtube.com/watch?v=OQOMva1SmbY
-	    ]]></desc>
+	    </desc>
 	    <overview>http://www.youtube.com/watch?v=OQOMva1SmbY</overview>
 	    <tags>youtube,presentation,asiabsdcon2008,asiabsdcon,multicore,lock contention,randall stewart</tags>
 	    <files>
@@ -3674,15 +3677,15 @@
 
 	<item source="youtube" added="20090119">
 	    <title>FreeBSD Kernel Internals, Dr. Marshall Kirk McKusick</title>
-	    <desc><![CDATA[
+	    <desc>
 		The first hour of Marshall Kirk McKusick's course
 		on FreeBSD kernel internals based on his book, The
 		Design and Implementation of the FreeBSD Operating
 		System. This course has been given at BSD Conferences
 		and technology companies around the world.
-		<br>
+		<br/>
 		clive URL: http://www.youtube.com/watch?v=nwbqBdghh6E
-		]]>
+		
 	    </desc>
 	    <overview>http://www.youtube.com/watch?v=nwbqBdghh6E</overview>
 	    <tags>youtube,course,freebsd,design and implementation of the freebsd operating system,kirk mckusick</tags>
@@ -3698,13 +3701,13 @@
 
 	<item source="youtube" added="20081231">
 	    <title>May 2008 developer Vimage report</title>
-	    <desc><![CDATA[
+	    <desc>
 		A sneak peak into the FreeBSD development process.
-		<br>
+		<br/>
 		Warning 2 hours! filmed over 2 days.
 		(The schedule worked out was optimistic to say the
 		least but it's still looking ok...)
-		<br>
+		<br/>
 		Marko Zec and Julian Elischer report back to the
 		developers at BSDCan on the progress on virtualizing
 		the network stack in FreeBSD. This has been a long
@@ -3717,21 +3720,21 @@
 		to call the feature. In this video you can see the
 		decision being made by a "quorum" of developers to
 		take this project mainstream.
-		<br>
+		<br/>
 		The sound is less that perfect, but it's what we have.
-		<br>
+		<br/>
 		This is a montage of 3 video sources, one of which
 		is a lower resolution, but at times it was the only
 		camera capturing the action. (the other ran out of
 		tape for a while)
-		<br>
+		<br/>
 		Thanks to Ed Maste for the added footage.
-		<br>
+		<br/>
 		I will be doing more editing later and will be
 		substituting in better footage in some places.
-		<br>
+		<br/>
 		clive URL: http://au.youtube.com/watch?v=Px-pSXm32dE
-		]]>
+		
 	    </desc>
 	    <overview>http://www.youtube.com/watch?v=Px-pSXm32dE</overview>
 	    <tags>youtube,freebsd,vimage,marko zec,julian elischer</tags>
@@ -3747,12 +3750,12 @@
 
 	<item source="youtube" added="20081231">
 	    <title>ZFS in FreeBSD, by Pawel Jakub Dawidek</title>
-	    <desc><![CDATA[
+	    <desc>
 		Pawel goes over ZFS, and tells us the state of the
 		FreeBSD port. Source: Julian
-		<br>
+		<br/>
 		clive URL: http://au.youtube.com/watch?v=5-CR3o-Q2CU
-		]]>
+		
 	    </desc>
 	    <overview>http://www.youtube.com/watch?v=5-CR3o-Q2CU</overview>
 	    <tags>youtube,freebsd,zfs,pawel jakub</tags>
@@ -3768,13 +3771,13 @@
 
 	<item source="youtube" added="20081231">
 	    <title>Isilon and FreeBSD</title>
-	    <desc><![CDATA[
+	    <desc>
 		Zach Loafman explains how Isilon uses FreeBSD and
 		how the company adds to it and interacts with the
 		FreeBSD community.
-		<br>
+		<br/>
 		clive URL: http://au.youtube.com/watch?v=OlMocIwM5QU
-		]]>
+		
 	    </desc>
 	    <overview>http://www.youtube.com/watch?v=OlMocIwM5QU</overview>
 	    <tags>youtube,freebsd,isilon,zach loafman</tags>
@@ -3790,13 +3793,13 @@
 
 	<item source="youtube" added="20081216">
 	    <title>FreeBSD networking work summary</title>
-	    <desc><![CDATA[
+	    <desc>
 		Robert Watson reports on work currently under way
 		to optimize the networking stack for new hardware.
 		Source: Julian
-		<br>
+		<br/>
 		clive URL: http://www.youtube.com/watch?v=ohLVNmI3lCg
-		]]>
+		
 	    </desc>
 	    <overview>http://www.youtube.com/watch?v=ohLVNmI3lCg</overview>
 	    <tags>youtube,freebsd,networking,robert watson</tags>
@@ -3812,11 +3815,11 @@
 
 	<item source="youtube" added="20081216">
 	    <title>Kris Moore and PCBSD</title>
-	    <desc><![CDATA[
+	    <desc>
 		PCBSD from a developer's perspective. Source: Julian
-		<br>
+		<br/>
 		clive URL: http://au.youtube.com/watch?v=aHRRa-OvwxM
-		]]>
+		
 	    </desc>
 	    <overview>http://au.youtube.com/watch?v=aHRRa-OvwxM</overview>
 	    <tags>youtube,pcbsd,kris moore</tags>
@@ -3832,12 +3835,12 @@
 
 	<item source="youtube" added="20081207">
 	    <title>FreeBSD, klaster pocztowy</title>
-	    <desc><![CDATA[
+	    <desc>
 		"Projektowanie korporacyjnego klastra pocztowego",
 		Jan Srzednicki at MeetBSD 2007 in Warsaw, Poland.
-		<br>
+		<br/>
 		clive URL: http://www.youtube.com/watch?v=9B8MDy-37TI
-		]]>
+		
 	    </desc>
 	    <overview>http://www.youtube.com/watch?v=9B8MDy-37TI</overview>
 	    <tags>youtube,meetbsd,meetbsd2007,polish,jan srzednicki</tags>
@@ -3853,12 +3856,12 @@
 
 	<item source="youtube" added="20081207">
 	    <title>Meet BSD projects from GSoC 2007</title>
-	    <desc><![CDATA[
+	    <desc>
 		"Meet BSD projects from Google Summer of Code 2007",
 		Pawel Solyga at MeetBSD 2007 in Warsaw, Poland.
-		<br>
+		<br/>
 		clive URL: http://www.youtube.com/watch?v=snVtilaj-KI
-		]]>
+		
 	    </desc>
 	    <overview>http://www.youtube.com/watch?v=snVtilaj-KI</overview>
 	    <tags>youtube,meetbsd,meetbsd2007,google soc,pawel solyga</tags>
@@ -3874,12 +3877,12 @@
 
 	<item source="youtube" added="20081207">
 	    <title>Google Summer of Code 2008. BSD summary</title>
-	    <desc><![CDATA[
+	    <desc>
 		A panel discusses the GSOC project an how it and BSD get on.
 		Source: Julian
-		<br>
+		<br/>
 		clive URL: http://www.youtube.com/watch?v=3l3tuhSmp_E
-		]]>
+		
 	    </desc>
 	    <overview>http://www.youtube.com/watch?v=3l3tuhSmp_E</overview>
 	    <tags>youtube,meetbsd,meetbsd2008,google soc</tags>
@@ -3895,12 +3898,12 @@
 
 	<item source="youtube" added="20081207">
 	    <title>Embedded FreeBSD</title>
-	    <desc><![CDATA[
+	    <desc>
 		"FreeBSD do zabudowy czyli nie tylko pecety", Rafal
 		Jaworowski at MeetBSD 2007 in Warsaw, Poland.
-		<br>
+		<br/>
 		clive URL: http://www.youtube.com/watch?v=2HcIJvJX4y8
-		]]>
+		
 	    </desc>
 	    <overview>http://www.youtube.com/watch?v=2HcIJvJX4y8</overview>
 	    <tags>youtube,meetbsd,meetbsd2007,embedded,freebsd,polish,rafal jaworowski</tags>
@@ -3916,12 +3919,12 @@
 
 	<item source="youtube" added="20081207">
 	    <title>DTrace</title>
-	    <desc><![CDATA[
+	    <desc>
 		"DTrace - Monitoring i strojenie systemu w XXI
 		wieku", Slawomir Zak at MeetBSD 2007 in Warsaw, Poland.
-		<br>
+		<br/>
 		clive URL: http://www.youtube.com/watch?v=5VK6tV4y3r0
-		]]>
+		
 	    </desc>
 	    <overview>http://www.youtube.com/watch?v=5VK6tV4y3r0</overview>
 	    <tags>youtube,meetbsd,meetbsd2007,dtrace,polish,slawomir zak</tags>
@@ -3937,12 +3940,12 @@
 
 	<item source="youtube" added="20081207">
 	    <title>New features in FreeBSD 7</title>
-	    <desc><![CDATA[
+	    <desc>
 		"New features and improvements in FreeBSD 7", Kris
 		Kennaway at MeetBSD 2007 in Warsaw, Poland
-		<br>
+		<br/>
 		clive URL: http://www.youtube.com/watch?v=XUjJWhlnujQ
-		]]>
+		
 	    </desc>
 	    <overview>http://www.youtube.com/watch?v=XUjJWhlnujQ</overview>
 	    <tags>youtube,meetbsd,meetbsd2007,freebsd,kris kennaway</tags>
@@ -3958,13 +3961,13 @@
 
 	<item source="youtube" added="20081206">
 	    <title>Detangling and debugging</title>
-	    <desc><![CDATA[
+	    <desc>
 		"Detangling and debugging: friends in unexpected
 		places", Philip Paeps at MeetBSD 2007 in Warsaw,
 		Poland.
-		<br>
+		<br/>
 		clive URL: http://www.youtube.com/watch?v=G8Fm8mgPyDc
-		]]>
+		
 	    </desc>
 	    <overview>http://www.youtube.com/watch?v=G8Fm8mgPyDc</overview>
 	    <tags>youtube,meetbsd,meetbsd2007,debugging,philip paeps</tags>
@@ -3980,12 +3983,12 @@
 
 	<item source="youtube" added="20081206">
 	    <title>FreeBSD Profiling, Kris Kennaway, MeetBSD 2008</title>
-	    <desc><![CDATA[
+	    <desc>
 		FreeBSD Profiling tools, tips and tricks, Kris
 		Kennaway, MeetBSD 2008
-		<br>
+		<br/>
 		clive URL: http://www.youtube.com/watch?v=Mfb5_uG7BCA
-		]]>
+		
 	    </desc>
 	    <overview>http://www.youtube.com/watch?v=Mfb5_uG7BCA</overview>
 	    <tags>youtube,meetbsd,meetbsd2008,freebsd,profiling,kris kennaway</tags>
@@ -4001,7 +4004,7 @@
 
 	<item source="youtube" added="20081206">
 	    <title>BSD v. GPL, Jason Dixon, NYCBSDCon 2008</title>
-	    <desc><![CDATA[
+	    <desc>
 		BSD vs GPL is a sweeping epic, focused on the
 		dichotomy between good and evil. It peers inside
 		the hearts and minds of the creators of these
@@ -4011,9 +4014,9 @@
 		presentation was given by Jason Dixon at the NYC
 		BSD Conference at Columbia University on October
 		11, 2008
-		<br>
+		<br/>
 		clive URL: http://www.youtube.com/watch?v=mMmbjJI5su0
-		]]>
+		
 	    </desc>
 	    <overview>http://www.youtube.com/watch?v=mMmbjJI5su0</overview>
 	    <tags>youtube,nycbsdcon,nycbsdcon2008,bsd versus gpl,jason dixon</tags>
@@ -4029,7 +4032,7 @@
 
 	<item source="youtube" added="20081206">
 	    <title>BSD is Dying, Jason Dixon, NYCBSDCon 2007</title>
-	    <desc><![CDATA[
+	    <desc>
 		A tongue-in-cheek look at the history and future
 		of the BSD movement. Modeled after the presentation
 		styles of Lessig and Hardt, the talk provides a
@@ -4039,9 +4042,9 @@
 		presentation was given by Jason Dixon at the NYC
 		BSD Conference at Columbia University on October
 		28, 2006
-		<br>
+		<br/>
 		clive URL: http://www.youtube.com/watch?v=g7tvI6JCXD0
-		]]>
+		
 	    </desc>
 	    <overview>http://www.youtube.com/watch?v=g7tvI6JCXD0</overview>
 	    <tags>youtube,nycbsdcon,nycbsdcon2007,bsd is dying,jason dixon</tags>
@@ -4057,12 +4060,12 @@
 
 	<item source="youtube" added="20081206">
 	    <title>PC-BSD: FreeBSD on the Desktop</title>
-	    <desc><![CDATA[
+	    <desc>
 		"PC-BSD: FreeBSD on the Desktop", Matt Olander at
 		MeetBSD 2007 in Warsaw, Poland.
-		<br>
+		<br/>
 		clive URL: http://www.youtube.com/watch?v=oC4gsipGfQU
-		]]>
+		
 	    </desc>
 	    <overview>http://www.youtube.com/watch?v=oC4gsipGfQU</overview>
 	    <tags>youtube,meetbsd,meetbsd2007,pc-bsd,matt olander</tags>
@@ -4078,12 +4081,12 @@
 
 	<item source="youtube" added="20081206">
 	    <title>FreeBSD, Protecting Privacy with Tor</title>
-	    <desc><![CDATA[
+	    <desc>
 		"Protecting your Privacy with FreeBSD and Tor",
 		Christian Br&uuml;ffer at MeetBSD 2007 in Warsaw, Poland.
-		<br>
+		<br/>
 		clive URL: http://www.youtube.com/watch?v=OwBh8ro7xHQ
-		]]>
+		
 	    </desc>
 	    <overview>http://www.youtube.com/watch?v=OwBh8ro7xHQ</overview>
 	    <tags>youtube,meetbsd,meetbsd2007,freebsd,tor,privacy,christian bruffer</tags>
@@ -4099,13 +4102,13 @@
 
 	<item source="youtube" added="20081206">
 	    <title>FreeBSD, Building a Computing Cluster</title>
-	    <desc><![CDATA[
+	    <desc>
 		"Reflections on Building a High-Performance Computing
 		Cluster using FreeBSD", Brooks Davis at MeetBSD
 		2007 in Warsaw, Poland.
-		<br>
+		<br/>
 		clive URL: http://www.youtube.com/watch?v=BpsRb9fJ4Ds
-		]]>
+		
 	    </desc>
 	    <overview>http://www.youtube.com/watch?v=BpsRb9fJ4Ds</overview>
 	    <tags>youtube,meetbsd,meetbsd2007,freebsd,cluster,performance,brooks davis</tags>
@@ -4121,13 +4124,13 @@
 
 	<item source="youtube" added="20081206">
 	    <title>Isolating Cluster Jobs for Performance and Predictability, Brooks Davis, MeetBSD 2008</title>
-	    <desc><![CDATA[
+	    <desc>
 		Isolating Cluster Jobs for Performance and
 		Predictability by Brooks Davis, The Aerospace
 		Corporation, MeetBSD November 15, 2008
-		<br>
+		<br/>
 		clive URL: http://www.youtube.com/watch?v=0uBFLJm7IHc
-		]]>
+		
 	    </desc>
 	    <overview>http://www.youtube.com/watch?v=0uBFLJm7IHc</overview>
 	    <tags>youtube,meetbsd,meetbsd2008,cluster,performance,brooks davis</tags>
@@ -4143,12 +4146,12 @@
 
 	<item source="youtube" added="20081206">
 	    <title>BSD Certification, MeetBSD 2008</title>
-	    <desc><![CDATA[
+	    <desc>
 		BSD Certification by Dru Lavigne, Chair, BSD
 		Certification Group, MeetBSD November 15, 2008
-		<br>
+		<br/>
 		clive URL: http://www.youtube.com/watch?v=rGQmLYplO9U
-		]]>
+		
 	    </desc>
 	    <overview>http://www.youtube.com/watch?v=rGQmLYplO9U</overview>
 	    <tags>youtube,meetbsd,meetbsd2008,bsd certification,dru lavigne</tags>
@@ -4164,12 +4167,12 @@
 
 	<item source="youtube" added="20081206">
 	    <title>Embedding FreeBSD, MeetBSD 2008</title>
-	    <desc><![CDATA[
+	    <desc>
 		Embedding FreeBSD by Warner Losh and Philip Paeps,
 		MeetBSD November 15, 2008
-		<br>
+		<br/>
 		clive URL: http://www.youtube.com/watch?v=Fc3xYrxvIU0
-		]]>
+		
 	    </desc>
 	    <overview>http://www.youtube.com/watch?v=Fc3xYrxvIU0</overview>
 	    <tags>youtube,meetbsd,meetbsd2008,embedded,freebsd,philip paeps,warner losh</tags>
@@ -4185,13 +4188,13 @@
 
 	<item source="youtube" added="20081206">
 	    <title>FreeBSD Foundation Update &amp; Recognition, MeetBSD 2008</title>
-	    <desc><![CDATA[
+	    <desc>
 		Robert Watson provides a status update on the
 		non-profit FreeBSD Foundation at MeetBSD November
 		16, 2008
-		<br>
+		<br/>
 		clive URL: http://www.youtube.com/watch?v=sNQ2d41Vn2A
-		]]>
+		
 	    </desc>
 	    <overview>http://www.youtube.com/watch?v=sNQ2d41Vn2A</overview>
 	    <tags>youtube,meetbsd,meetbsd2008,freebsd foundation,robert watson</tags>
@@ -4519,22 +4522,22 @@
 
 	<item source="dcbsdcon" added="20090524">
 	    <title>Marco Peereboom - Epitome</title>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
 		Tired of tape and their weaknesses? So am I!
 		</p><p>
 		Epitome is the next generation backup mechanism.
 		It is based on the idea of providing instant available
-		backup data while removing duplicate files & blocks
+		backup data while removing duplicate files &amp; blocks
 		from backups (yes really!). It is a disk based WORM
 		backup system.
 		</p><p>
 		This talk will go into the Epitome protocol and its
 		application. The code is generic enough that it can
 		address all 3 major (buzzword compliant) technologies
-		known as: CAS, DEDUP & SIS.
+		known as: CAS, DEDUP &amp; SIS.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <overview>http://www.dcbsdcon.org/speakers/peereboom.html</overview>
 	    <tags>dcbsdcon,dcbsdcon2009,slides,epitome,backup,marco peereboom</tags>
 	    <files>
@@ -4721,7 +4724,7 @@
 
 	<item source="eurobsdcon" added="20081022">
 	    <title>EuroBSDCon 2008 - Pedro Giffuni - Working with Engineering Applications in FreeBSD</title>
-	    <desc><![CDATA[
+	    <desc>
 		In recent years, traditional branches of engineering
 		like Civil, Chemical, Mechanical, Electrical and
 		Industrial Engineering are requiring extensive
@@ -4811,7 +4814,7 @@
 		becoming an option that can't be ignored, and best
 		of all, it is an effort that will benefit not only
 		FreeBSD but the wider audience.
-		<br>
+		<br/>
 		Pedro F. Giffuni M. Sc. Industrial Engineering -
 		University of Pittsburgh Mechanical Engineer -
 		Universidad Nacional de Colombia I was born in
@@ -4837,10 +4840,10 @@
 		the idea of one day seeing a "UnifiedBSD" I am glad
 		to see different approaches sharing ideas in a
 		healthful environment.
-		<br>
+		<br/>
 		Keywords: BSD, engineering, CAE, CAD, math, mechanical,
 		FreeBSD ports
-	    ]]></desc>
+	    </desc>
 	    <overview>http://2008.eurobsdcon.org/talks.html</overview>
 	    <tags>eurobsdcon,eurobsdcon2008,freebsd,engineering applications,pedro giffuni</tags>
 	    <files>
@@ -4870,7 +4873,7 @@
 
 	<item source="eurobsdcon" added="20081022">
 	    <title>EuroBSDCon 2008 - Constantine Murenin - OpenBSD Hardware Sensors Framework</title>
-	    <desc><![CDATA[
+	    <desc>
 		In this talk, we will discuss the past and present
 		history and the design principles of the OpenBSD
 		hardware sensors framework. Sensors framework
@@ -4889,7 +4892,7 @@
 		framework has sustained many improvements in OpenBSD,
 		and was ported and committed to FreeBSD and DragonFly
 		BSD.
-		<br>
+		<br/>
 		Constantine A. Murenin is an MMath graduate student
 		at the David R. Cheriton School of Computer Science
 		at the University of Waterloo (CA). Prior to his
@@ -4902,9 +4905,9 @@
 		Contributor, Constantine's interests range from
 		standards compliance and usability at all levels,
 		to quiet computing and hardware monitoring.
-		<br>
+		<br/>
 		<a href="http://Constantine.SU/">http://Constantine.SU/</a>
-	    ]]></desc>
+	    </desc>
 	    <overview>http://2008.eurobsdcon.org/talks.html</overview>
 	    <tags>eurobsdcon,eurobsdcon2008,presentation,openbsd,hardware sensors,constantine murenin</tags>
 	    <files>
@@ -4920,20 +4923,20 @@
 
 	<item source="eurobsdcon" added="20081022">
 	    <title>EuroBSDCon 2008 - Ion-Mihai Tetcu - Improving FreeBSD ports/packages quality</title>
-	    <desc><![CDATA[
+	    <desc>
 		This talk is focused on ways to improve the quality
 		of FreeBSD's ports and packages and it's partially
 		based on the 5 months experience of writing and
 		running the consecutive versions of "QA Tindy".
-		<br>
+		<br/>
 		Ion-Mihai "IOnut" Tetcu is a 28 years old FreeBSD
 		ports committer and maintains about 40 ports scattered
 		in the Ports Tree. He lives in Bucharest, Romania
-		where he runs and co-owns an IT& company and he's
+		where he runs and co-owns an IT company and he's
 		a member of Romanian FreeBSD and FreeUnix User Group
 		(RoFUG). His non-IT interests include history,
 		philosophy and mountain climbing.
-	    ]]></desc>
+	    </desc>
 	    <overview>http://2008.eurobsdcon.org/talks.html</overview>
 	    <tags>eurobsdcon,eurobsdcon2008,freebsd,ports,packages,ion-mihai tetcu</tags>
 	    <files>
@@ -4963,7 +4966,7 @@
 
 	<item source="eurobsdcon" added="20081022">
 	    <title>EuroBSDCon 2008 - Yvan Vanhullebus - IPSec tools: past, present and future</title>
-	    <desc><![CDATA[
+	    <desc>
 		The first part will explain what have been major
 		changes since Manu's presentation at Bale's EuroBSDCon,
 		including more detailed informations on changes
@@ -4973,7 +4976,7 @@
 		it the good way now, why this is far better), on
 		both the UserLand (ipsec-tools project) and maybe
 		in [Free|Net]BSD kernels/ IPSec stacks.
-		<br>
+		<br/>
 		The second part will talk about the future of the
 		project. News of the next major version (which may
 		be out or about to be out when we'll be ate
@@ -4981,7 +4984,7 @@
 		are done but not yet public, but also news about
 		the team: it's new members, new tools, what we would
 		like to do in tue future, a
-		<br>
+		<br/>
 		Yvan VANHULLEBUS works as an R&amp;D security engineer
 		for NETASQ since 2000, where he works on FreeBSD
 		OS. He started to work on KAME's IPSec stack in
@@ -4990,7 +4993,7 @@
 		ipsec-tools project, a fork of KAME's userland
 		daemon. He became a NetBSD developper when ipsec-tools
 		was migrated to NetBSD's CVS.
-	    ]]></desc>
+	    </desc>
 	    <overview>http://2008.eurobsdcon.org/talks.html</overview>
 	    <tags>eurobsdcon,eurobsdcon2008,ipsec,yvan vanhullebus</tags>
 	    <files>
@@ -5050,7 +5053,7 @@
 
 	<item source="eurobsdcon" added="20081022">
 	    <title>EuroBSDCon 2008 - Robert Watson - FreeBSD Network Stack Performance Optimizations for Modern Hardware</title>
-	    <desc><![CDATA[
+	    <desc>
 		The arrival of high CPU core density, with commodity
 		quad-core notebooks and 32-core servers, combined
 		with 10gbps networking have transformed network
@@ -5063,19 +5066,19 @@
 		their rationales, and their impact on applications
 		and users:
 		<ul>
-		<li>Introduction to the SMPng Project and the follow-on Netperf Project
-		<li>Workloads and performance measurement
-		<li>Efficient primitives to support modern network stacks
-		<li>Multi-core and cache-aware network memory allocator
-		<li>Fine-grained network stack locking
-		<li>Load-balancing and contention-avoidance across multiple CPUs
-		<li>CPU affinity for network stack data structures
-		<li>TCP performance enhancements including TSO, LRO, and TOE
-		<li>Zero-copy Berkely Packet Filter (BPF) buffers
-		<li>Direct network stack dispatch from interrupt handlers
-		<li>Multiple input and output queues
+		<li>Introduction to the SMPng Project and the follow-on Netperf Project</li>
+		<li>Workloads and performance measurement</li>
+		<li>Efficient primitives to support modern network stacks</li>
+		<li>Multi-core and cache-aware network memory allocator</li>
+		<li>Fine-grained network stack locking</li>
+		<li>Load-balancing and contention-avoidance across multiple CPUs</li>
+		<li>CPU affinity for network stack data structures</li>
+		<li>TCP performance enhancements including TSO, LRO, and TOE</li>
+		<li>Zero-copy Berkely Packet Filter (BPF) buffers</li>
+		<li>Direct network stack dispatch from interrupt handlers</li>
+		<li>Multiple input and output queues</li>
 		</ul>
-		<br>
+		<br/>
 		Robert Watson is a researcher at the University of
 		Cambridge Computer Laboratory investinging operating
 		system and network security. Prior to joining the
@@ -5089,7 +5092,7 @@
 		stack structure and performance, and windowing
 		system structure. He is also a member of the FreeBSD
 		Core Team and president of the FreeBSD Foundation.
-	    ]]></desc>
+	    </desc>
 	    <overview>http://2008.eurobsdcon.org/talks.html</overview>
 	    <tags>eurobsdcon,eurobsdcon2008,freebsd,network stack,hardware,robert watson</tags>
 	    <files>
@@ -5119,7 +5122,7 @@
 
 	<item source="eurobsdcon" added="20081022">
 	    <title>EuroBSDCon 2008 - Martin Schuette - Improved NetBSD Syslogd</title>
-	    <desc><![CDATA[
+	    <desc>
 	    Martin Schuette has three main goals, defined by three
 	    internet drafts to implement:
 	    <ul>
@@ -5127,30 +5130,30 @@
 	    provides a reliable network transport with data encryption
 	    and peer authentication. To make full use of this a
 	    buffering mechanism to bridge temporary network errors
-	    is implemented as well.
+	    is implemented as well.</li>
 	    <li>Syslog-protocol extends the message format to use
 	    a complete timestamp, include a fully qualified domain
 	    name, and allow UTF-8 messages. It also offers a
 	    structured data field to unambiguously encode application
-	    dependent information.
+	    dependent information.</li>
 	    <li>Syslog-sign will allow any syslog sender to digitally
 	    sign its messages, so their integrity can be verified
 	    later. This enable the detection of loss, deletion or
 	    other manipulation syslog data after network transfer
-	    or archiving on storage media.
+	    or archiving on storage media.</li>
 	    </ul>
-	    <br>
+	    <br/>
 	    Martin Schuette is a student of computer science in
 	    Potsdam, Germany, and has been working as a part-time
 	    system administrator for BSD servers since 2004.
-	    <br>
+	    <br/>
 	    In 2007 Martin Schuette already gave a talk on Syslog
 	    at the Chemnitze Linux-Tage
 	    (http://chemnitzer.linux-tage.de/2007/vortraege/detail.html?idx=547
 	    in german; for a newer english version see these slides
 	    for a seminar talk:
 	    http://fara.cs.uni-potsdam.de/~mschuett/uni/syslog-protocols-080522.pdf).
-	    ]]></desc>
+	    </desc>
 	    <overview>http://2008.eurobsdcon.org/talks.html</overview>
 	    <tags>eurobsdcon,eurobsdcon2008,netbsd,syslogd,martin schuette</tags>
 	    <files>
@@ -5242,7 +5245,7 @@
 
 	<item source="eurobsdcon" added="20081022">
 	    <title>EuroBSDCon 2008 - Edd Barret - Modern Typesetting on BSD</title>
-	    <desc><![CDATA[
+	    <desc>
 		Edd Barrett will speak about using the BSD Platform
 		as a means of typesetting from a practical standpoint
 		at EuroBSDcon 2008. Edd Barrett does not wish to
@@ -5250,7 +5253,7 @@
 		rather state which are good for certain types of
 		document, and which tools (ports and packages),
 		integrate well with the available typesetters.
-		<br>
+		<br/>
 		Edd Barrett os a student from the UK, currently on
 		"placement year" as a systems administrator for
 		Bournemouth University. Open Source *NIX has been
@@ -5259,7 +5262,7 @@
 		because it is small, clean, correct and secure.
 		Just recently he has started developing things I
 		want or need for OpenBSD.
-	    ]]></desc>
+	    </desc>
 	    <overview>http://2008.eurobsdcon.org/talks.html</overview>
 	    <tags>eurobsdcon,eurobsdcon2008,typesetting,bsd,edd barrett</tags>
 	    <files>
@@ -5289,7 +5292,7 @@
 
 	<item source="eurobsdcon" added="20081022">
 	    <title>EuroBSDCon 2008 - Michael Dexter - Zen and the Art of Multiplicity Maintenance: An applied survey of BSD-licensed multiplicity strategies from chroot to mult</title>
-	    <desc><![CDATA[
+	    <desc>
 		Many BSD-licensed strategies of various levels of
 		maturity exist to implement multiplicity, herein
 		defined as the introduction of plurality to
@@ -5316,12 +5319,12 @@
 		to traditional systems. Keywords: multiplicity,
 		virtualization, chroot, jail, hypervisor, xen,
 		compat.
-		<br>
+		<br/>
 		Michael Dexter has used Unix systems since 1991 and
 		BSD-licensed multiplicity strategies for over five
 		years. He is the Program Manager at the BSD Fund
 		and Project Manager of the BSD.lv Project.
-	    ]]></desc>
+	    </desc>
 	    <overview>http://2008.eurobsdcon.org/talks.html</overview>
 	    <tags>eurobsdcon,eurobsdcon2008,bsd,michael dexter</tags>
 	    <files>
@@ -5351,7 +5354,7 @@
 
 	<item source="eurobsdcon" added="20081022">
 	    <title>EuroBSDCon 2008 - Nick Barkas - Dynamic memory allocation for dirhash in UFS2</title>
-	    <desc><![CDATA[
+	    <desc>
 		Hello My name is Nick Barkas. I'm a master's student
 		studying scientific computing at Kungliga Tekniska
 		hgskolan (KTH) in Stockholm, Sweden. I have just
@@ -5399,9 +5402,9 @@
 		results of some benchmarks on this filesystem with
 		indices, and compare to performance with dirhash,
 		and with no indices or dirhashes.
-		<br>
+		<br/>
 		Keywords: dirhash, ufs2, filesystems, performance tuning
-	    ]]></desc>
+	    </desc>
 	    <overview>http://2008.eurobsdcon.org/talks.html</overview>
 	    <tags>eurobsdcon,eurobsdcon2008,ufs2,nick barkas</tags>
 	    <files>
@@ -5471,7 +5474,7 @@
 
 	<item source="eurobsdcon" added="20081022">
 	    <title>EuroBSDCon 2008 - Hauke Fath - Managing BSD desktop clients - Fencing in the herd</title>
-	    <desc><![CDATA[
+	    <desc>
 		The members of the BSD family have traditionally
 		prospered off the desktop, as operating systems on
 		servers and embedded systems. The advent of MacOS
@@ -5504,7 +5507,7 @@
 		life-cycle of Installation, configuration changes,
 		security updates, component updates, and system
 		upgrades.
-		<br>
+		<br/>
 		Hauke Fath works as a systems administrator for the
 		Institut fr Nachrichtentechnik (telecommunication)
 		at Technische Universitt Darmstadt. He has been
@@ -5515,10 +5518,10 @@
 		and network administration. Hauke Fath holds a MS
 		in Physics and became a NetBSD developer in late
 		2006.
-		<br>
+		<br/>
 		Keywords: Managing Unix desktop clients, software
 		distribution, tripwire
-	    ]]></desc>
+	    </desc>
 	    <overview>http://2008.eurobsdcon.org/talks.html</overview>
 	    <tags>eurobsdcon,eurobsdcon2008,bsd,desktop,hauke fath</tags>
 	    <files>
@@ -5765,7 +5768,7 @@
 
 	<item source="eurobsdcon" added="20081022">
 	    <title>EuroBSDCon 2008 - Anttii Kantee - Converting kernel file systems to services</title>
-	    <desc><![CDATA[
+	    <desc>
 		ABSD/UNIX operating system is traditionally split
 		into two pieces: the kernel and userspace. Historically
 		the reasons for this were clear: the UNIX kernel
@@ -5794,17 +5797,17 @@
 		the environments where possible, the arbitrary
 		division is weakened and porting between these
 		environments becomes simpler.
-		<br>
+		<br/>
 		Antti Kantee has been a NetBSD developer for many
 		many moons. He has managed to work on quite a few
 		bits and pieces of a BSD system: userland utilities,
 		the pkgsrc packaging system, networking, virtual
 		memory, device drivers, hardware support and file
 		systems.
-		<br>
+		<br/>
 		See also <a
 		href="http://www.netbsd.org/docs/puffs/rump.htm">http://www.netbsd.org/docs/puffs/rump.htm</a>
-	    ]]></desc>
+	    </desc>
 	    <overview>http://2008.eurobsdcon.org/talks.html</overview>
 	    <tags>eurobsdcon,eurobsdcon2008,anttii kantee</tags>
 	    <files>
@@ -5834,7 +5837,7 @@
 
 	<item source="eurobsdcon" added="20081022">
 	    <title>EuroBSDCon 2008 - Matthieu Herrb - Input handling in wscons and X.Org</title>
-	    <desc><![CDATA[
+	    <desc>
 		This talk will present the different layers that
 		handle input, from the key that gets pressed or the
 		mouse motion to the applications, all the way through
@@ -5846,7 +5849,7 @@
 		It will show some problems of current implementations
 		and try to show how current evolutions can solve
 		them.
-		<br>
+		<br/>
 		Matthieu Herrb is maintaing X on OpenBSD. I've been
 		using X on various systems (SunOS, NetBSD, OpenBSD,
 		Mac OS X,...) since 1989. He has been a member of
@@ -5855,7 +5858,7 @@
 		Matthieu Herrb works at LAAS a research laborarory
 		of the French National Research Agency (CNRS) both
 		on robotics and network security.
-	    ]]></desc>
+	    </desc>
 	    <overview>http://2008.eurobsdcon.org/talks.html</overview>
 	    <tags>eurobsdcon,eurobsdcon2008,wscons,x.org,matthieu herrb</tags>
 	    <files>
@@ -6586,7 +6589,7 @@
 
 	<item source="robertwatson" added="20070114">
 	    <title>Robert Watson's Slides from UKUUG LISA 2006</title>
-	    <desc><![CDATA[
+	    <desc>
 		UKUUG LISA 2006 took place in Durham, UK in March,
 		2006. On this page, you can find my slides from
 		this conference.
@@ -6600,7 +6603,7 @@
 		provides detailed logging of security-relevant
 		events, and meets the requirements of the CAPP
 		Common Criteria protection profile.
-	    ]]></desc>
+	    </desc>
 	    <overview>http://www.watson.org/~robert/freebsd/2006ukuuglisa/</overview>
 	    <tags>ukuug,slides,openbsm,trustedbsd,freebsd,robert watson</tags>
 	    <files>
@@ -6616,7 +6619,7 @@
 
 	<item source="robertwatson" added="20070114">
 	    <title>Robert Watson's Slides from EuroBSDCon 2006 and FreeBSD Developer Summit</title>
-	    <desc><![CDATA[
+	    <desc>
 		EuroBSDCon 2006 took place in Milan, Italy, and not
 		only offered excellent food on a flexible schedule,
 		but also an interesting array of talks on work
@@ -6651,7 +6654,7 @@
 		a kernel architecture? This presentation will attempt
 		to provide, in 45 minutes, a brief if entertaining
 		snapshot into what makes FreeBSD run.
-	    ]]></desc>
+	    </desc>
 	    <overview>http://www.watson.org/~robert/freebsd/2006eurobsdcon/</overview>
 	    <tags>eurobsdcon,eurobsdcon2006,robert watson</tags>
 	    <files>
@@ -6673,14 +6676,14 @@
 
 	<item source="robertwatson" added="20070114">
 	    <title>Robert Watson's Slides from BSDCan 2006 and FreeBSD Developer Summit</title>
-	    <desc><![CDATA[
+	    <desc>
 		As usual, Dan Langille ran an excellent <a
 		href="http://www.bsdcan.org/">BSDCan conference</a>.
 		On this page, you can find my slides from the
 		developer summit and full conference, excluding the
 		contents of the WIPs, for which I don't have
 		permission to redistribute the slides.
-	    ]]></desc>
+	    </desc>
 	    <overview>http://www.watson.org/~robert/freebsd/2006bsdcan/</overview>
 	    <tags>bsdcan,bsdcan2006,notes,devsummit,robert watson</tags>
 	    <files>
@@ -6714,7 +6717,7 @@
 
 	<item source="robertwatson" added="20070114">
 	    <title>Robert Watson's Slides from EuroBSDCon 2005</title>
-	    <desc><![CDATA[
+	    <desc>
 		EuroBSDCon 2005 took place in Basel, Switzerland
 		in November, 2005. Due to an injury, I was unable
 		to attend the conference itself, and my talks were
@@ -6732,7 +6735,7 @@
 		the FreeBSD network stack, including strategies for
 		integrating SMP support into the network stack,
 		locking approaches, optimizations, and challenges.
-	    ]]></desc>
+	    </desc>
 	    <overview>http://www.watson.org/~robert/freebsd/2005eurobsdcon/</overview>
 	    <tags>eurobsdcon,eurobsdcon2005,slides,freebsd,smp,robert watson,poul-henning kamp,ed maste</tags>
 	    <files>
@@ -6748,7 +6751,7 @@
 
 	<item source="robertwatson" added="20070114">
 	    <title>Robert Watson's Slides from BSDCan 2004</title>
-	    <desc><![CDATA[
+	    <desc>
 		BSDCan 2004 took place at the University of Ottawa
 		in Ottawa, Canada. On this page, you can find my
 		slides from the conference.
@@ -6760,7 +6763,7 @@
 		such as GEOM/GBDE, UFS2, OpenPAM. He will also
 		discuss how certification and evaluation play into
 		feature selection, design, and documentation.
-	    ]]></desc>
+	    </desc>
 	    <overview>http://www.watson.org/~robert/freebsd/2004bsdcan/</overview>
 	    <tags>bsdcan,bsdcan2004,slides,trustedbsd,freebsd,robert watson</tags>
 	    <files>
@@ -6915,7 +6918,7 @@
 
 	<item source="nycbug" added="20090313">
 	    <title>What's your biggest Time Management problem?</title>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
 		What's your biggest Time Management problem?
 		</p><p>
@@ -6928,7 +6931,7 @@
 		this presentation will help you with something more
 		precious a quad-processor AMD box.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <overview>http://www.nycbug.org/index.php?NAV=Home;SUBM=10172</overview>
 	    <tags>nycbug,presentation,time management,tom limoncelli</tags>
 	    <files>
@@ -6943,7 +6946,7 @@
 
 	<item source="nycbug" added="20090221">
 	    <title>Postfix Performance Tuning</title>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
 		Money can buy you bandwidth, but latency is forever!
 		</p><p>
@@ -6953,26 +6956,26 @@
 		Postfix performance tuning, including:
 		</p>
 		<ul>
-		<li>Latency, concurrency and throughput
-		<li>Postfix input processing
-		<li>Queue file format rationale
-		<li>Input processing bottlenecks
-		<li>Pre-queue filters, milters, content filters
-		<li>Tuning for fast (enough) input
-		<li>Postfix on-disk queues, requirements and architecture
-		<li>What is a "transport"?
-		<li>Postfix "nqmgr" scheduler algorithm
-		<li>Per-destination in memory queues
-		<li>Per-destination scheduler controls
-		<li>SMTP delivery
-		<li>Understanding delay logging
-		<li>Transport process limits, concurrency limits
-		<li>Scaling to thousands of output processes
-		<li>Connection caching, TLS session caching, feedback controls
+		<li>Latency, concurrency and throughput</li>
+		<li>Postfix input processing</li>
+		<li>Queue file format rationale</li>
+		<li>Input processing bottlenecks</li>
+		<li>Pre-queue filters, milters, content filters</li>
+		<li>Tuning for fast (enough) input</li>
+		<li>Postfix on-disk queues, requirements and architecture</li>
+		<li>What is a "transport"?</li>
+		<li>Postfix "nqmgr" scheduler algorithm</li>
+		<li>Per-destination in memory queues</li>
+		<li>Per-destination scheduler controls</li>
+		<li>SMTP delivery</li>
+		<li>Understanding delay logging</li>
+		<li>Transport process limits, concurrency limits</li>
+		<li>Scaling to thousands of output processes</li>
+		<li>Connection caching, TLS session caching, feedback controls</li>
 		</ul>
 		<p>
 		<b>Speaker Bio</b>
-		<br>
+		<br/>
 		Victor Duchovni trained in mathematics, switched
 		tracks to CS in 1980s leaving Princeton with a
 		master's degree in mathematics and newly acquired
@@ -6999,7 +7002,7 @@
 		ciphers and multi-instance management tooling,
 		ideally also TLS SNI if time permits.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <overview>http://www.nycbug.org/index.php?NAV=Home;SUBM=10168</overview>
 	    <tags>nycbug,presentation,postfix,john mashey</tags>
 	    <files>
@@ -7014,13 +7017,13 @@
 
 	<item source="nycbug" added="20090119">
 	    <title>Introduction to Puppet</title>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
 		What it is and how can it make system administration
 		less painful
 		</p><p>
 		About the speaker:
-		<br>
+		<br/>
 		Larry Ludwig - Principal Consultant/Founder of
 		Empowering Media. Empowering Media is a consulting
 		firm and managed hosting provider. Larry Ludwig
@@ -7032,7 +7035,7 @@
 		Brian Gupta are founding members of the NYC Puppet
 		usergroup.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <overview>http://www.nycbug.org/index.php?NAV=Home;SUBM=10171</overview>
 	    <tags>nycbug,presentation,puppet,larry ludwig</tags>
 	    <files>
@@ -7047,7 +7050,7 @@
 
 	<item source="nycbug" added="20081116">
 	    <title>Hardware Performance Monitoring Counters</title>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
 		Many modern CPUs provide on chip counters for
 		performance events such as retiring instructions
@@ -7064,7 +7067,7 @@
 		FreeBSD Operating System. He works on networking
 		an operating systems for fun and profit.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <overview>http://www.nycbug.org/index.php?NAV=Home;SUBM=10166</overview>
 	    <tags>nycbug,presentation,george neville-neil,counters</tags>
 	    <files>
@@ -7079,7 +7082,7 @@
 
 	<item source="nycbug" added="20081014">
 	    <title>New York City BSD Con 2008: BSD v. GPL - a.k.a. not the sequel to "BSD is Dying"</title>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
 		BSD vs GPL is a sweeping epic, focused on the
 		dichotomy between good and evil. It peers inside
@@ -7088,7 +7091,7 @@
 		domination. No common documentary will dare to
 		follow the path that BSD vs GPL blazes.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <overview>http://talks.dixongroup.net/nycbsdcon2008/</overview>
 	    <tags>nycbsdcon,nycbsdcon2008,presentation,humor,bsd versus gpl,jason dixon</tags>
 	    <files>
@@ -7251,7 +7254,7 @@
 
 	<item source="nycbug" added="20080819">
 	    <title>Public Key sudo</title>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
 		Two tools which have become the norm in Linux- and
 		Unix-based environments are SSH for secure
@@ -7269,7 +7272,7 @@
 		authentication module and the sudo modifications
 		required to use this module.
 		</p><p>
-		Bio:<br>
+		Bio:<br/>
 		Matthew Burnside is a Ph.D. student in the Computer
 		Science department at Columbia University, in New
 		York. He works for Professor Angelos Keromytis in
@@ -7278,7 +7281,7 @@
 		research interests are in network anonymity, trust
 		management, and enterprise-scale policy enforcement.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <overview>http://www.nycbug.org/index.php?NAV=Home;SUBM=10160</overview>
 	    <tags>nycbug,presentation,sudo,public key,matthew burnside</tags>
 	    <files>
@@ -7293,7 +7296,7 @@
 
 	<item source="nycbug" added="20080703">
 	    <title>Configuration Management with Cfengine</title>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
 		Configuration Management with Cfengine
 		</p><p>
@@ -7310,7 +7313,7 @@
 		language that would offer self-documenting
 		configuration.
 		</p><p>
-		about the speaker:<br>
+		about the speaker:<br/>
 		Steven Kreuzer has been working with Open Source
 		technologies since as long as he can remember,
 		starting out with a 486 salvaged from a dumpster
@@ -7318,7 +7321,7 @@
 		time he enjoys doing things with technology that
 		have absolutely no redeeming social value.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <overview>http://www.nycbug.org/index.php?NAV=Home;SUBM=10157</overview>
 	    <tags>nycbug,presentation,configuration management,cfengine</tags>
 	    <files>
@@ -7334,7 +7337,7 @@
 
 	<item source="nycbug" added="20080512">
 	    <title>Managing OpenBSD Environments</title>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
 		This talk is the result of an after-meeting discussion
 		with a few folks, when it became apparent that there
@@ -7353,7 +7356,7 @@
 		believes, namely simplicity and correctness, and
 		reap the benefits of such.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <overview>http://www.nycbug.org/index.php?NAV=Home;SUBM=10154</overview>
 	    <tags>nycbug,presentation,openbsd,system management</tags>
 	    <files>
@@ -7369,7 +7372,7 @@
 
 	<item source="nycbug" added="20080322">
 	    <title>Building a High-Performance Computing Cluster Using FreeBSD</title>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
 		<b>Special NYC*BUG meeting with FreeBSD developer Brooks Davis</b>
 		<br />
@@ -7408,7 +7411,7 @@
 		cooking, brewing and pounding on red-hot iron in
 		his garage blacksmith shop.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <overview>http://www.nycbug.org</overview>
 	    <tags>nycbug,presentation,high performance computing,freebsd,brooks davis</tags>
 	    <files>
@@ -7424,7 +7427,7 @@
 
 	<item source="nycbug" added="20080310">
 	    <title>User Interfaces and How People Think</title>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
 		"User Interfaces and How People Think" will introduce
 		concepts of designing software for different users
@@ -7445,7 +7448,7 @@
 		Business Strategy. Jeff holds a Masters in Design
 		from the IIT Institute of Design in Chicago, Illinois.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <overview>http://www.nycbug.org</overview>
 	    <tags>nycbug,presentation,user interfaces</tags>
 	    <files>
@@ -7461,7 +7464,7 @@
 
 	<item source="nycbug" added="20080219">
 	    <title>Open Meeting on OpenSSH</title>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
 		Open Meeting on OpenSSH
 		</p><p>
@@ -7472,7 +7475,7 @@
 		opportunity to discuss OpenSSH, and for others to
 		contribute their hacks and interesting applications.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <overview>http://www.nycbug.org/index.php?NAV=Home;SUBM=10150</overview>
 	    <tags>nycbug,presentation,openssh</tags>
 	    <files>
@@ -7488,7 +7491,7 @@
 
 	<item source="nycbug" added="20080111">
 	    <title>SSARES</title>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
 		SSARES: Secure Searchable Automated Remote Email
 		Storage - A usable, secure email system on a remote
@@ -7547,7 +7550,7 @@
 		research interests revolve around systems and network
 		security, and cryptography.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <overview>http://www.nycbug.org/index.php?NAV=Home;SUBM=10133</overview>
 	    <tags>nycbug,presentation,ipv6,gene cronk</tags>
 	    <files>
@@ -7570,7 +7573,7 @@
 
 	<item source="nycbug" added="20071006">
 	    <title>Gene Cronk on Implementing IPv6</title>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
 		This talk will be on some of the basics of IPv6
 		including addressing, subnetting, and tools to test
@@ -7599,7 +7602,7 @@
 		href="http://www.hackerpimps.com/">Hacker Pimps
 		Security Think Tank</a>, or fixing up his house.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <overview>http://www.nycbug.org/index.php?NAV=Home;SUBM=10133</overview>
 	    <tags>nycbug,presentation,ipv6,gene cronk</tags>
 	    <files>
@@ -7616,7 +7619,7 @@
 
 	<item source="nycbug" added="20070912">
 	    <title>Using Cryptography to Improve Web Application Performance and Security</title>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
 		Cryptography has a reputation of slowing down
 		applications. However if done correctly, it can
@@ -7638,7 +7641,7 @@
 		University, and published a book on cryptography.
 		He currently lives in the Lower East Side.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <overview>http://www.nycbug.org/index.php?NAV=Home;SUBM=10129</overview>
 	    <tags>nycbug,presentation,cryptography,nick galbreath</tags>
 	    <files>
@@ -7654,7 +7657,7 @@
 
 	<item source="nycbug" added="20070801">
 	    <title>Marc Spitzer on Nagios</title>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
 		Nagios is a platform for monitoring services and
 		the hosts they reside on. It provides a reasonable
@@ -7696,7 +7699,7 @@
 		great deal of pride in not needing a budget to solve
 		most problems.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <overview>http://www.nycbug.org/index.php?NAV=Home;SUBM=10122</overview>
 	    <tags>nycbug,presentation,nagios,marc spitzer</tags>
 	    <files>
@@ -7713,7 +7716,7 @@
 
 	<item source="nycbug" added="20070708">
 	    <title>Isaac 'Ike' Levy on the Real Unix Tradition</title>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
 		"The Real Unix Tradition"
 		</p><p>
@@ -7758,7 +7761,7 @@
 		of LESMUUG, (the Lower East Side Mac Unix Users
 		Group).
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <overview>http://www.nycbug.org/index.php?NAV=Home;SUBM=10107</overview>
 	    <tags>nycbug,presentation,unix tradition,isaac levy</tags>
 	    <files>
@@ -7774,7 +7777,7 @@
 
 	<item source="nycbug" added="20070608">
 	    <title>Steven Kreuzer on Denial of Service Mitigation Techniques</title>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
 		Protecting your servers, workstations and networks
 		can only go so far. Attacks which consume your
@@ -7795,7 +7798,7 @@
 		time he enjoys doing things with technology that
 		have absolutely no redeeming social value.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <overview>http://www.nycbug.org/index.php?NAV=Home;SUBM=10108</overview>
 	    <tags>nycbug,presentation,denialofservice,steven kreuzer</tags>
 	    <files>
@@ -7811,7 +7814,7 @@
 
 	<item source="nycbug" added="20070504">
 	    <title>Amitai Schlair on pkgsrcCon.</title>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
 		The fourth annual <a
 		href="http://www.pkgsrccon.org/2007/">pkgsrcCon</a> is
@@ -7832,7 +7835,7 @@
 		to his impending insanity. He consults in software
 		and IT.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <overview>http://www.nycbug.org/index.php?NAV=Home;SUBM=10102</overview>
 	    <tags>nycbug,presentation,pkgsrccon,netbsd,amitai schlair</tags>
 	    <files>
@@ -7848,7 +7851,7 @@
 
 	<item source="nycbug" added="20070406">
 	    <title>Ray Lai: on OpenCVS</title>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
 		This presentation was inspired by the recent
 		Subversion presentation. It will talk about the
@@ -7862,7 +7865,7 @@
 		that the beauty of UNIX's security is in its
 		simplicity.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <overview>http://www.nycbug.org/index.php?NAV=Home;SUBM=10104</overview>
 	    <tags>nycbug,presentation,cvs,openbsd,ray lai</tags>
 	    <files>
@@ -7877,7 +7880,7 @@
 
 	<item source="nycbug" added="20070309">
 	    <title>Matthew Burnside: Integrated Enterprise Security Mgmt</title>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
 		<b>Integrated Enterprise Security Management</b>
 		</p><p>
@@ -7911,7 +7914,7 @@
 		main research interests are in computer security,
 		trust management, and network anonymity.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <overview>http://www.nycbug.org/index.php?NAV=Home;SUBM=10089</overview>
 	    <tags>mp3,presentation,enterprise security,matthew burnside</tags>
 	    <files>
@@ -7926,7 +7929,7 @@
 
 	<item source="nycbug" added="20070209">
 	    <title>Ivan Ivanov on The Version Control System Subversion</title>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
 		The presentation will discuss Subversion from both
 		client and server points of view. It will show how
@@ -7952,7 +7955,7 @@
 		https to enable a reliable and secure way to access
 		them from any point.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <overview>http://www.fetissov.org/public/nycbug/</overview>
 	    <tags>nycbug,presentation,subversion,ivan ivanov</tags>
 	    <files>
@@ -7986,7 +7989,7 @@
 
 	<item source="nycbug" added="20061102">
 	    <title>New York City BSD Con 2006: BSD is Dying - A Cautionary Tale of Sex and Greed</title>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
 		<b>BSD is Dying</b><br />
 		<b>A Cautionary Tale of Sex and Greed</b><br />
@@ -8007,7 +8010,7 @@
 		unable to view QuickTime movies, please contact me
 		and I'll try to assist.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <overview>http://talks.dixongroup.net/nycbsdcon2006/</overview>
 	    <tags>nycbug,presentation,humor,bsd is dying,jason dixon</tags>
 	    <files>
@@ -8122,7 +8125,7 @@
 
 	<item source="nycbug" added="20060909">
 	    <title>Isaac 'Ike' Levy on m0n0wall and PFSense</title>
-	    <desc><![CDATA[
+	    <desc>
 		UNIX professionals are busy these days. Setting up
 		routers and firewalls are fundamental to any network,
 		but in environments where the focus is on various
@@ -8165,7 +8168,7 @@
 		spoken frequently on a number of topics at various
 		venues, particularly on the issue of FreeBSD's jail
 		(8).
-	    ]]></desc>
+	    </desc>
 	    <tags>nycbug,presentation,monowall,pfsense,isaac levy</tags>
 	    <files>
 		<file>
@@ -8178,7 +8181,7 @@
 
 	<item source="nycbug" added="20060807">
 	    <title>Alfred Perlstein on Sendmail Hacks</title>
-	    <desc><![CDATA[
+	    <desc>
 		 Alfred will discuss the hacks used to turn Sendmail
 		 into a high performance solution for delivering
 		 millions of messages to OKCupid's subscribers.
@@ -8191,7 +8194,7 @@
 		 VFS, pthreads, networking and general system
 		 maintenance during his tenure on both FreeBSD and
 		 OS X kernels.
-	    ]]></desc>
+	    </desc>
 	    <tags>nycbug,presentation,sendmail,alfred perlstein</tags>
 	    <files>
 		<file>
@@ -8256,7 +8259,7 @@
 
 	<item source="f4all" added="20060605">
 	    <title>Episode 06 of "FreeBSD for all" uploaded</title>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
 		This week we talk about
 		</p>
@@ -8266,7 +8269,7 @@
 		<li>John Baldwin Introduction</li>
 		<li>Podcast announcement - call for co-hosts!</li>
 		</ul>
-	    ]]></desc>
+	    </desc>
 	    <overview>http://freebsdforall.blogspot.com/2006/06/episode-06.html</overview>
 	    <tags>freebsd for all,talk,john baldwin,freebsd vs linux</tags>
 	    <files>
@@ -8294,7 +8297,7 @@
 
 	<item source="bafug" added="20060909">
 	    <title>Nate Lawson on ACPI</title>
-	    <desc><![CDATA[
+	    <desc>
 		<b>Our Topic:</b>
 		FreeBSD's ACPI implementation: The details.
 		<br />
@@ -8305,7 +8308,7 @@
 		FreeBSD's ACPI implementation is based on code for ACPI released
 		by Intel. Nate and others wrote the glue code to make this code
 		work on FreeBSD. He explains how this was done, and why.
-	    ]]></desc>
+	    </desc>
 	    <tags>bafug,presentation,freebsd,acpi,nate lawson</tags>
 	    <files>
 		<file>
@@ -8318,7 +8321,7 @@
 
 	<item source="bafug" added="20060810">
 	    <title>Network Protocol Development Tools and Techniques for FreeBSD</title>
-	    <desc><![CDATA[
+	    <desc>
 		<b>Our Topic:</b>
 		Network Protocol Development Tools and Techniques for FreeBSD
 		<br />
@@ -8343,7 +8346,7 @@
 		<li>Packet Construction Set (PCS) a new library for
 		    writing protocol tests</li>
 		</ol>
-		]]></desc>
+		</desc>
 	    <tags>bafug,presentation,freebsd,packet construction set,george neville-neil</tags>
 	    <files>
 		<file>
@@ -8426,7 +8429,7 @@
 
 	<item source="ccc22" added="20060823">
 	    <title>COMPLETE Hard Disk Encryption with FreeBSD</title>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
 		COMPLETE Hard Disk Encryption with FreeBSD, by Marc Schiesser
 		</p><p>
@@ -8450,7 +8453,7 @@
 		the operating system from being compromised while
 		the machine is turned off.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <overview>http://events.ccc.de/congress/2005/fahrplan/events/1139.en.html</overview>
 	    <tags>ccc,ccc2005,ccc22,presentation,freebsd,harddisk encryption,marc schiesser</tags>
 	    <files>
@@ -8461,7 +8464,7 @@
 		    <tags>slides</tags>
 		</file>
 		<file>
-		    <url><![CDATA[http://vp.video.google.com/videodownload?version=0&amp;secureurl=uAAAANDveMbSROZ54T6ovHpX7U46rpfxARh9qN1NEemo6WM7qeDBk-8GxxtGIXTqDRuaHnUUJVcUs0bf539CXM4fqBp6xeb9INr7CRp9JPcKZeT9UsSqDsvdYZhiN7xnPzju7rN379RkfS47rjI8TnCJ1iQdrEqhd8Okw_KJcO7O3Iq00GUYYZaedmq5jrmy1ezFXGAG6KURgb8RV19cCaui1U0zVEKd2ApjzlxRHSi89QBih_VSyFE64p3haNyy76qCVQ&amp;sigh=GK-OoKkmqQWNalgoUzB4HmzA3EI&amp;begin=0&amp;len=3967520&amp;amp;docid=-2979502732836620391]]></url>
+		    <url>http://vp.video.google.com/videodownload?version=0&amp;secureurl=uAAAANDveMbSROZ54T6ovHpX7U46rpfxARh9qN1NEemo6WM7qeDBk-8GxxtGIXTqDRuaHnUUJVcUs0bf539CXM4fqBp6xeb9INr7CRp9JPcKZeT9UsSqDsvdYZhiN7xnPzju7rN379RkfS47rjI8TnCJ1iQdrEqhd8Okw_KJcO7O3Iq00GUYYZaedmq5jrmy1ezFXGAG6KURgb8RV19cCaui1U0zVEKd2ApjzlxRHSi89QBih_VSyFE64p3haNyy76qCVQ&amp;sigh=GK-OoKkmqQWNalgoUzB4HmzA3EI&amp;begin=0&amp;len=3967520&amp;amp;docid=-2979502732836620391</url>
 		    <length>1:06:07</length>
 		    <desc>Google Video</desc>
 		    <tags>mp4</tags>
@@ -8523,7 +8526,7 @@
 
 	<item source="googletechtalks" added="20070704">
 	    <title>Google Tech Talks June 20, 2007: How the FreeBSD Project Works</title>
-	    <desc><![CDATA[
+	    <desc>
 		 <p>
 		 The FreeBSD Project is one of the oldest and most
 		 successful open source operating system ... all
@@ -8564,16 +8567,16 @@
 		 He is also a member of the FreeBSD Core Team and
 		 president of the FreeBSD Foundation.
 		 </p>
-	    ]]></desc>
-	    <overview><![CDATA[
+	    </desc>
+	    <overview>
 		http://video.google.com/videoplay?docid=-4400856579609253323&amp;total=1&amp;start=0&amp;num=10&amp;so=1&amp;type=search&amp;plindex=0
-		]]></overview>
+		</overview>
 	    <tags>google,presentation,freebsd,freebsd project,robert watson</tags>
 	    <files>
 		<file>
-		    <url><![CDATA[
+		    <url>
 			http://vp.video.google.com/videodownload?version=0&amp;secureurl=uAAAAMnsi51RXPgEl7zGKAWEdrKWWWjUJ5q602Nvd2V5YwaDTyCIRM5k8Rq4nUZipL4tHODLiuiSxq34qoHi8TiEyXrdjKI8_WN0fXSKQYyrrlrWKMWd5Vw7AuXiu_B0uHEadc-fR6np2MP0ItJbT-Zx-J0-GCx0Mya2fQLoLG2pb55veUzTepcJz2RsKjNaGM-XUHpxqTZoIh0rggQIkNp-vZzghRb_8JQanc00ChX2CYB3LogDCHj1hpnFFmFd-2sEEg&amp;sigh=ZrfuqGS7FqWRpFYVklZH1V4LRj4&amp;begin=0&amp;len=3053322&amp;docid=-4400856579609253323
-		    ]]></url>
+		    </url>
 		    <size>321 Mb</size>
 		    <length>51 minutes</length>
 		    <desc>AVI</desc>
@@ -8588,7 +8591,7 @@
 
 	<item source="nuug" added="20061003">
 	    <title>Releaseparty, the Varnish HTTP accelerator</title>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
 		VG sponsored the creation of a web-accellerator
 		called "Varnish" because Squid was too slow for
@@ -8606,7 +8609,7 @@
 		</p><p>
 		(The English text starts at about 5 minutes in the stream)
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <overview>http://www.nuug.no/aktiviteter/20060919-varnish/</overview>
 	    <tags>nuug,presentation,varnish,poul-henning kamp</tags>
 	    <files>
@@ -8631,14 +8634,14 @@
 
 	<item source="openbsd" added="20080525">
 	    <title>OpenBSD 4.5 Release Songs - Games</title>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
 		[Commentary still being written]
 		</p><p>
 		For RSS readers: Please note that the download URL
 		is an FTP site.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <overview>http://www.openbsd.org/lyrics.html#45</overview>
 	    <tags>openbsd,artwork</tags>
 	    <files>
@@ -8662,7 +8665,7 @@
 
 	<item source="openbsd" added="20061010">
 	    <title>OpenBSD 4.0 Release Songs - OpenVOX</title>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
 		This is an extra track by the artist Ty Semaka (who
 		really has "had Puffy on his mind") which we included
@@ -8677,7 +8680,7 @@
 		For RSS readers: Please note that the download URL
 		is an FTP site.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <overview>http://www.openbsd.org/lyrics.html#audio_extra</overview>
 	    <tags>openbsd,artwork</tags>
 	    <files>
@@ -8701,7 +8704,7 @@
 
 	<item source="openbsd" added="20081118">
 	    <title>OpenBSD 4.4 Release Song - "Source Wars - Episode IV - Trial of the BSD Knights"</title>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
 		Nearly 10 years ago Kirk McKusick wrote a history
 		of the Berkeley Unix distributions for the O'Reilly
@@ -8769,7 +8772,7 @@
 		Mike Karels, Kirk McKusick, and all of those who
 		contributed to making Net/2 and 4.4BSD-Lite free.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <overview>http://www.openbsd.org/lyrics.html#44</overview>
 	    <tags>openbsd,artwork</tags>
 	    <files>
@@ -8793,7 +8796,7 @@
 
 	<item source="openbsd" added="20080503">
 	    <title>OpenBSD 4.3 Release Song - "Home to Hypocrisy"</title>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
 		We are just plain tired of being lectured to by a
 		man who is a lot like Naomi Campbell.
@@ -8860,7 +8863,7 @@
 		listen to people who do not follow their own stupid
 		rules.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <overview>http://www.openbsd.org/lyrics.html#43</overview>
 	    <tags>openbsd,artwork</tags>
 	    <files>
@@ -8885,7 +8888,7 @@
 
 	<item source="openbsd" added="20071102">
 	    <title>OpenBSD 4.2 Release Song - "100001 1010101"</title>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
 		Those of us who work on OpenBSD are often asked why
 		we do what we do. This song's lyrics express the
@@ -8955,7 +8958,7 @@
 		every distraction, or worry how this will affect
 		our image. We are here to have fun doing right.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <overview>http://www.openbsd.org/lyrics.html#42</overview>
 	    <tags>openbsd,artwork</tags>
 	    <files>
@@ -8979,7 +8982,7 @@
 
 	<item source="openbsd" added="20070502">
 	    <title>OpenBSD 4.1 Release Song - Puffy Baba and the 40 Vendors</title>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
 		As developers of a free operating system, one of
 		our prime responsibilities is device support. No
@@ -9042,7 +9045,7 @@
 		href="http://www.openbsd.org/papers/brhard2007/mgp00027.html">users
 		help</a> us in changing the political landscape.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <overview>http://www.openbsd.org/lyrics.html#41</overview>
 	    <tags>openbsd,artwork</tags>
 	    <files>
@@ -9067,7 +9070,7 @@
 
 	<item source="openbsd" added="20061010">
 	    <title>OpenBSD 4.0 Release Song - Humppa negala</title>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
 		The last 10 years, every 6 month period has (without
 		fail) resulted in an official OpenBSD release making
@@ -9113,7 +9116,7 @@
 		For RSS readers: Please note that the download URL
 		is an FTP site.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <overview>http://www.openbsd.org/lyrics.html#40</overview>
 	    <tags>openbsd,artwork</tags>
 	    <files>
@@ -9294,7 +9297,7 @@
 	-->
 	<item source="oarc" added="20070219">
 	    <title>Ham Radio on FreeBSD</title>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
 		Last month I attended a meeting of the Ottawa Amateur
 		Radio Club (<a href="http://www.oarc.net/">OARC</a>)
@@ -9319,7 +9322,7 @@
 		including both descriptions and screenshots of the
 		utilities in action.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <tags>oarc,presentation,radio,diane bruce</tags>
 	    <files>
 		<file>
@@ -9418,9 +9421,9 @@
 	<item source="bsdcan" added="20090525">
 	    <title>Chris Buechler and Scott Ullrich - pfSense: 2.0 and beyond</title>
 	    <overview>http://www.bsdcan.org/2009/schedule/events/130.en.html</overview>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
-		pfSense: 2.0 and beyond<br>
+		pfSense: 2.0 and beyond<br/>
 		From firewall distribution to appliance building platform
 		</p><p>
 		pfSense is a BSD licensed customized distribution
@@ -9458,7 +9461,7 @@
 		will be provided along with references for additional
 		information.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <tags>bsdcan,bsdcan2009,presentation,pfsense,chris buechler,scott ullrich</tags>
 	    <files>
 		<file>
@@ -9474,7 +9477,7 @@
 	<item source="bsdcan" added="20090525">
 	    <title>Luigi Rizzo - GEOM based disk schedulers for FreeBSD</title>
 	    <overview>http://www.bsdcan.org/2009/schedule/events/122.en.html</overview>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
 		GEOM based disk schedulers for FreeBSD
 		</p><p>
@@ -9533,7 +9536,7 @@
 		will be covered in the presentation is available
 		at http://info.iet.unipi.it/~luigi/FreeBSD/
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <tags>bsdcan,bsdcan2009,presentation,freebsd,geom,disk schedulers,luigi rzzo</tags>
 	    <files>
 		<file>
@@ -9549,9 +9552,9 @@
 	<item source="bsdcan" added="20090525">
 	    <title>Constantine A. Murenin - Quiet Computing with BSD</title>
 	    <overview>http://www.bsdcan.org/2009/schedule/events/119.en.html</overview>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
-		Quiet Computing with BSD<br>
+		Quiet Computing with BSD<br/>
 		Programming system hardware monitors for quiet computing
 		</p><p>
 		In this talk, we will present a detailed overview
@@ -9581,7 +9584,7 @@
 		BSD and FreeBSD.
 		</p><p>
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <tags>bsdcan,bsdcan2009,presentation,openbsd,hardware sensors,constantine murenin</tags>
 	    <files>
 		<file>
@@ -9597,7 +9600,7 @@
 	<item source="bsdcan" added="20090525">
 	    <title>Fernando Gont - Results of a Security Assessment of the TCP and IP protocols and Common implementation Strategies</title>
 	    <overview>http://www.bsdcan.org/2009/schedule/events/129.en.html</overview>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
 		Results of a Security Assessment of the TCP and IP
 		protocols and Common implementation Strategies
@@ -9659,7 +9662,7 @@
 		different TCP/IP implementations found in BSD
 		operating systems.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <tags>bsdcan,bsdcan2009,presentation,bsd,security assessment,fernado gont</tags>
 	    <files>
 		<file>
@@ -9696,9 +9699,9 @@
 	<item source="bsdcan" added="20090525">
 	    <title>Randi Harper - Automating FreeBSD Installations</title>
 	    <overview>http://www.bsdcan.org/2009/schedule/events/126.en.html</overview>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
-		Automating FreeBSD Installations<br>
+		Automating FreeBSD Installations<br/>
 		PXE Booting and install.cfg Demystified
 		</p><p>
 		This paper will provide an explanation of the tools
@@ -9709,7 +9712,7 @@
 		mechanism for automated installs but doesn't get
 		used very often because of a lack of documentation.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <tags>bsdcan,bsdcan2009,presentation,freebsd,pxe,sysinstall,randi harper</tags>
 	    <files>
 		<file>
@@ -9725,7 +9728,7 @@
 	<item source="bsdcan" added="20090525">
 	    <title>Brooks Davis - Isolating Cluster Jobs for Performance and Predictability</title>
 	    <overview>http://www.bsdcan.org/2009/schedule/events/125.en.html</overview>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
 		Isolating Cluster Jobs for Performance and Predictability
 		</p><p>
@@ -9744,7 +9747,7 @@
 		of partial file systems virtualization and CPU
 		isolation using CPU sets.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <tags>bsdcan,bsdcan2009,presentation,freebsd,cluster,brooks davis</tags>
 	    <files>
 		<file>
@@ -9760,7 +9763,7 @@
 	<item source="bsdcan" added="20090525">
 	    <title>John Baldwin - Multiple Passes of the FreeBSD Device Tree</title>
 	    <overview>http://www.bsdcan.org/2009/schedule/events/118.en.html</overview>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
 		Multiple Passes of the FreeBSD Device Tree
 		</p><p>
@@ -9780,7 +9783,7 @@
 		are probed and attached. This in turn can be used
 		to develop solutions to the earlier list of problems.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <tags>bsdcan,bsdcan2009,presentation,freebsd,device tree,john baldwin</tags>
 	    <files>
 		<file>
@@ -9803,9 +9806,9 @@
 	<item source="bsdcan" added="20090525">
 	    <title>Colin Percival - scrypt: A new key derivation function</title>
 	    <overview>http://www.bsdcan.org/2009/schedule/events/147.en.html</overview>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
-		scrypt: A new key derivation function<br>
+		scrypt: A new key derivation function<br/>
 		Doing our best to thwart TLAs armed with ASICs
 		</p><p>
 		Password-based key derivation functions are used
@@ -9839,7 +9842,7 @@
 		of performing brute force attacks on a variety of
 		password strengths and key derivation functions.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <tags>bsdcan,bsdcan2009,presentation,scrypt,colin percival</tags>
 	    <files>
 		<file>
@@ -9862,9 +9865,9 @@
 	<item source="bsdcan" added="20090525">
 	    <title>George Neville-Neil - Thinking about thinking in code</title>
 	    <overview>http://www.bsdcan.org/2009/schedule/events/145.en.html</overview>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
-		Thinking about thinking in code<br>
+		Thinking about thinking in code<br/>
 		Proposed keynote talk
 		</p><p>
 		This is not a talk that's specific to any BSD but
@@ -9876,7 +9879,7 @@
 		learn from how we work and from how others work as
 		well.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <tags>bsdcan,bsdcan2009,keynote,bsd,george neville-neil</tags>
 	    <files>
 		<file>
@@ -9892,9 +9895,9 @@
 	<item source="bsdcan" added="20090525">
 	    <title>Stephen Borrill - Building products with NetBSD - thin-clients</title>
 	    <overview>http://www.bsdcan.org/2009/schedule/events/140.en.html</overview>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
-		Building products with NetBSD - thin-clients<br>
+		Building products with NetBSD - thin-clients<br/>
 		NetBSD: delivering the goods
 		</p><p>
 		This talk will discuss what thin-clients are, why
@@ -9911,7 +9914,7 @@
 		well as recent developments in NetBSD that have
 		helped improve the product.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <tags>bsdcan,bsdcan2009,presentation,netbsd,thin client,stephen borrill</tags>
 	    <files>
 		<file>
@@ -9927,9 +9930,9 @@
 	<item source="bsdcan" added="20090525">
 	    <title>Cat Allman and Leslie Hawthorn - Getting Started in Free and Open Source</title>
 	    <overview>http://www.bsdcan.org/2009/schedule/events/149.en.html</overview>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
-		Getting Started in Free and Open Source<br>
+		Getting Started in Free and Open Source<br/>
 		Interested in getting involved? But don't really
 		know where or how to start?
 		</p><p>
@@ -9944,7 +9947,7 @@
 		-how to get started -etiquette of lists and other
 		communication -dos and don't of joining a community
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <tags>bsdcan,bsdcan2009,presentation,getting started,cat allman,leslie hawthorn</tags>
 	    <files>
 		<file>
@@ -9960,9 +9963,9 @@
 	<item source="bsdcan" added="20090525">
 	    <title>Warner Losh - Tracking FreeBSD in a commercial Environment</title>
 	    <overview>http://www.bsdcan.org/2009/schedule/events/143.en.html</overview>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
-		Tracking FreeBSD in a commercial Environment<br>
+		Tracking FreeBSD in a commercial Environment<br/>
 		How to stay current while staying sane
 		</p><p>
 		The FreeBSD project publishes two lines of source
@@ -10046,7 +10049,7 @@
 		companies integrating FreeBSD into their products
 		are not discussed.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <tags>bsdcan,bsdcan2009,presentation,freebsd,commercial environment,waner losh</tags>
 	    <files>
 		<file>
@@ -10069,9 +10072,9 @@
 	<item source="bsdcan" added="20090525">
 	    <title>Kris Moore - PC-BSD - Making FreeBSD on the desktop a reality</title>
 	    <overview>http://www.bsdcan.org/2009/schedule/events/133.en.html</overview>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
-		PC-BSD - Making FreeBSD on the desktop a reality<br>
+		PC-BSD - Making FreeBSD on the desktop a reality<br/>
 		FreeBSD on the Desktop
 		</p><p>
 		While FreeBSD is a all-around great operating system,
@@ -10103,7 +10106,7 @@
 		some of the pitfalls it brings, which may hinder
 		widespread desktop adoption.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <tags>bsdcan,bsdcan2009,presentation,pc-bsd,freebsd,kris moore</tags>
 	    <files>
 		<file>
@@ -10126,9 +10129,9 @@
 	<item source="bsdcan" added="20090525">
 	    <title>Sean Bruno - Implementation of TARGET_MODE applications</title>
 	    <overview>http://www.bsdcan.org/2009/schedule/events/127.en.html</overview>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
-		Implementation of TARGET_MODE applications<br>
+		Implementation of TARGET_MODE applications<br/>
 		How we used TARGET_MODE in the kernel to create and
 		interesting product
 		</p><p>
@@ -10178,7 +10181,7 @@
 		and finish up with a hands-on demonstration with a
 		FreeBSD PC flipped into TARGET_MODE and a Mac.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <tags>bsdcan,bsdcan2009,presentation,freebsd,firewire,sean bruno</tags>
 	    <files>
 		<file>
@@ -10194,7 +10197,7 @@
 	<item source="bsdcan" added="20090525">
 	    <title>George Neville-Neil - Understanding and Tuning SCHED_ULE</title>
 	    <overview>http://www.bsdcan.org/2009/schedule/events/117.en.html</overview>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
 		Understanding and Tuning SCHED_ULE
 		</p><p>
@@ -10241,7 +10244,7 @@
 		recent experiments we have used the top(1) program
 		to measure our results.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <tags>bsdcan,bsdcan2009,presentation,freebsd,sched_ule,george neville-neil</tags>
 	    <files>
 		<file>
@@ -10257,9 +10260,9 @@
 	<item source="bsdcan" added="20090525">
 	    <title>Lawrence Stewart - Improving the FreeBSD TCP Implementation</title>
 	    <overview>http://www.bsdcan.org/2009/schedule/events/121.en.html</overview>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
-		Improving the FreeBSD TCP Implementation.<br>
+		Improving the FreeBSD TCP Implementation.<br/>
 		An update on all things TCP in FreeBSD and how they
 		affect you.
 		</p><p>
@@ -10289,7 +10292,7 @@
 		analysis/debugging tools to the base system, all
 		of which I will also discuss.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <tags>bsdcan,bsdcan2009,presentation,freebsd,tcp,lawrence stewart</tags>
 	    <files>
 		<file>
@@ -10305,7 +10308,7 @@
 	<item source="bsdcan" added="20090525">
 	    <title>Joerg Sonnenberger - Journaling FFS with WAPBL</title>
 	    <overview>http://www.bsdcan.org/2009/schedule/events/138.en.html</overview>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
 		Journaling FFS with WAPBL
 		</p><p>
@@ -10345,7 +10348,7 @@
 		and plans for the current implementation are
 		discussed.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <tags>bsdcan,bsdcan2009,presentation,netbsd,wapbl,ffs,joerg sonnenberger</tags>
 	    <files>
 		<file>
@@ -10361,9 +10364,9 @@
 	<item source="bsdcan" added="20090525">
 	    <title>Ivan Voras - Remote and mass management of systems with finstall</title>
 	    <overview>http://www.bsdcan.org/2009/schedule/events/115.en.html</overview>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
-		Remote and mass management of systems with finstall<br>
+		Remote and mass management of systems with finstall<br/>
 		Automated management on a largish scale
 		</p><p>
 		An important part of the "finstall" project, created
@@ -10384,7 +10387,7 @@
 		to make use of this property of finstall to remotely
 		manage large groups of systems.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <tags>bsdcan,bsdcan2009,presentation,finstall,management,freebsd,ivan voras</tags>
 	    <files>
 		<file>
@@ -10400,7 +10403,7 @@
 	<item source="bsdcan" added="20090525">
 	    <title>Mike Silbersack - Detecting TCP regressions with tcpdiff</title>
 	    <overview>http://www.bsdcan.org/2009/schedule/events/120.en.html</overview>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
 		Detecting TCP regressions with tcpdiff
 		</p><p>
@@ -10435,7 +10438,7 @@
 		bugs can be detected. Additionally, I plan to run
 		it on OSes other than FreeBSD.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <tags>bsdcan,bsdcan2009,presentation,tcpdiff,freebsd,mike silbersack</tags>
 	    <files>
 		<file>
@@ -10451,7 +10454,7 @@
 	<item source="bsdcan" added="20090525">
 	    <title>Philip Paeps - Crypto Acceleration on FreeBSD</title>
 	    <overview>http://www.bsdcan.org/2009/schedule/events/135.en.html</overview>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
 		Crypto Acceleration on FreeBSD
 		</p><p>
@@ -10479,7 +10482,7 @@
 		own it" principle, he has been fiddling the crypto
 		framework more than is good for him.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <tags>bsdcan,bsdcan2009,presentation,crypto acceleration,freebsd,philip paeps</tags>
 	    <files>
 		<file>
@@ -10495,9 +10498,9 @@
 	<item source="bsdcan" added="20090525">
 	    <title>Sean Bruno - Firewire BoF Plugfest</title>
 	    <overview>http://www.bsdcan.org/2009/schedule/events/144.en.html</overview>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
-		Firewire BoF Plugfest<br>
+		Firewire BoF Plugfest<br/>
 		Debugging and testing of Firewire products with FreeBSD
 		</p><p>
 		Come one come all to a Firewire plugfest. Let's
@@ -10521,7 +10524,7 @@
 		it by so it can be documented as supported by the
 		Firewire team!
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <tags>bsdcan,bsdcan2009,presentation,firewire,plugfest,sean bruno</tags>
 	    <files>
 		<file>
@@ -10537,7 +10540,7 @@
 	<item source="bsdcan" added="20090525">
 	    <title>Peter Hansteen - Building the Network You Need with PF, the OpenBSD packet filter</title>
 	    <overview>http://www.bsdcan.org/2009/schedule/track/Tutorial/114.en.html</overview>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
 		Building the Network You Need with PF, the OpenBSD
 		packet filter.
@@ -10564,7 +10567,7 @@
 		and adaptations based on developments since the
 		book's publication date.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <tags>bsdcan,bsdcan2009,tutorial,pf,openbsd,peter hansteen</tags>
 	    <files>
 		<file>
@@ -10580,7 +10583,7 @@
 	<item source="bsdcan" added="20090525">
 	    <title>George Neville-Neil - Networking from the Bottom Up: Device Drivers</title>
 	    <overview>http://www.bsdcan.org/2009/schedule/track/Tutorial/146.en.html</overview>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
 		Networking from the Bottom Up: Device Drivers.
 		</p><p>
@@ -10600,7 +10603,7 @@
 		network that I am developing over the next year or
 		so.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <tags>bsdcan,bsdcan2009,tutorial,device drivers,george neville-neil</tags>
 	    <files>
 		<file>
@@ -10616,7 +10619,7 @@
 	<item source="bsdcan" added="20080528">
 	    <title>Daniel Braniss</title>
 	    <overview>http://www.bsdcan.org/2008/schedule/events/102.en.html</overview>
-	    <desc><![CDATA[
+	    <desc>
 		<h1>iSCSI</h1>
 		<i>not an Apple appliance.</i>
 		<p>
@@ -10628,7 +10631,7 @@
 		to the actual working driver, the challenges, the
 		frustrations.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <tags>bsdcan,bsdcan2008,presentation,iscsi,daniel braniss</tags>
 	    <files>
 		<file>
@@ -10644,7 +10647,7 @@
 	<item source="bsdcan" added="20080528">
 	    <title>Scott Ullrich, Chris Buechler - pfSense Tutorial</title>
 	    <overview>http://www.bsdcan.org/2008/schedule/events/80.en.html</overview>
-	    <desc><![CDATA[
+	    <desc>
 		<h1>pfSense Tutorial</h1>
 		<i>From Zero to Hero with pfSense</i>
 		<p>
@@ -10681,7 +10684,7 @@
 		knowledge in these areas or prior knowledge of
 		pfSense or FreeBSD is necessary.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <tags>bsdcan,bsdcan2008,tutorial,freebsd,pfsense,scott ullrich,chris buechler</tags>
 	    <files>
 		<file>
@@ -10712,7 +10715,7 @@
 	    <tags>bsdcan,bsdcan2008,devsummit,devsummit2008,freebsd,embedded,rafal jaworowski</tags>
 	    <files>
 		<file>
-		    <url><![CDATA[http://wiki.freebsd.org/200805DevSummit?action=AttachFile&amp;do=get&amp;target=devsummit-200805-embedded_summary.pdf]]></url>
+		    <url>http://wiki.freebsd.org/200805DevSummit?action=AttachFile&amp;do=get&amp;target=devsummit-200805-embedded_summary.pdf</url>
 		    <length>6 pages</length>
 		    <size>58 Kb</size>
 		    <desc>PDF file</desc>
@@ -10730,7 +10733,7 @@
 	    <tags>bsdcan,bsdcan2008,devsummit,devsummit2008,freebsd,smp,robert watson</tags>
 	    <files>
 		<file>
-		    <url><![CDATA[http://wiki.freebsd.org/200805DevSummit?action=AttachFile&amp;do=get&amp;target=20080515-stack-parallelism.pdf]]></url>
+		    <url>http://wiki.freebsd.org/200805DevSummit?action=AttachFile&amp;do=get&amp;target=20080515-stack-parallelism.pdf</url>
 		    <length>8 pages</length>
 		    <size>70 Kb</size>
 		    <desc>PDF file</desc>
@@ -10748,7 +10751,7 @@
 	    <tags>bsdcan,bsdcan2008,devsummit,devsummit2008,freebsd,portmgr,erwin lansing</tags>
 	    <files>
 		<file>
-		    <url><![CDATA[http://wiki.freebsd.org/200805DevSummit?action=AttachFile&amp;do=get&amp;target=portmgr-BSDCan2008.pdf]]></url>
+		    <url>http://wiki.freebsd.org/200805DevSummit?action=AttachFile&amp;do=get&amp;target=portmgr-BSDCan2008.pdf</url>
 		    <length>14 pages</length>
 		    <size>146 Kb</size>
 		    <desc>PDF file</desc>
@@ -10760,7 +10763,7 @@
 	<item source="bsdcan" added="20080526">
 	    <title>Kern Sibbald - Bacula</title>
 	    <overview>http://www.bsdcan.org/2008/schedule/events/96.en.html</overview>
-	    <desc><![CDATA[
+	    <desc>
 		<h1>Bacula</h1>
 		<i>The Open Source Enterprise Backup Solution</i>
 		<p>
@@ -10776,7 +10779,7 @@
 		Kern is one of the original project founders and
 		still one of the most productive Bacula developers.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <tags>bsdcan,bsdcan2008,slides,bacula,kern sibbald</tags>
 	    <files>
 		<file>
@@ -10792,7 +10795,7 @@
 	<item source="bsdcan" added="20080526">
 	    <title>Warner Losh - FreeBSD/mips</title>
 	    <overview>http://www.bsdcan.org/2008/schedule/events/86.en.html</overview>
-	    <desc><![CDATA[
+	    <desc>
 		<h1>FreeBSD/mips</h1>
 		<i>Embedding FreeBSD</i>
 		<p>
@@ -10850,7 +10853,7 @@
 		and new build tools that help to support the embedded
 		developer.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <tags>bsdcan,bsdcan2008,slides,freebsd,mips,embedded,warner losh</tags>
 	    <files>
 		<file>
@@ -10866,7 +10869,7 @@
 	<item source="bsdcan" added="20080526">
 	    <title>Kris Moore - Building self-contained PBIs from Ports (Automagically)</title>
 	    <overview>http://www.bsdcan.org/2008/schedule/events/81.en.html</overview>
-	    <desc><![CDATA[
+	    <desc>
 		<h1>Building self-contained PBIs from Ports (Automagically)</h1>
 		<i>Creating a self-contained application from the ports tree</i>
 		<p>
@@ -10911,7 +10914,7 @@
 		<li>Module creation &amp; configuration</li>
 		<li>Converting messy ports into PBIs</li>
 		</ul>
-	    ]]></desc>
+	    </desc>
 	    <tags>bsdcan,bsdcan2008,slides,pc-bsd,ports,pbi,kris moore</tags>
 	    <files>
 		<file>
@@ -10927,7 +10930,7 @@
 	<item source="bsdcan" added="20080526">
 	    <title>John Pertalion - An Open Source Enterprise VPN Solution with OpenVPN and OpenBSD</title>
 	    <overview>http://www.bsdcan.org/2008/schedule/events/71.en.html</overview>
-	    <desc><![CDATA[
+	    <desc>
 		<h1>An Open Source Enterprise VPN Solution with OpenVPN and OpenBSD</h1>
 		<i>Solving the problem</i>
 		<p>
@@ -10978,7 +10981,7 @@
 		VPN solutions. We hope our presentation leaves
 		participants with that feeling.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <tags>bsdcan,bsdcan2008,slides,openbsd,openvpn,john pertalion</tags>
 	    <files>
 		<file>
@@ -10994,7 +10997,7 @@
 	<item source="bsdcan" added="20080526">
 	    <title>Ivan Voras - "finstall" - the new FreeBSD installer</title>
 	    <overview>http://www.bsdcan.org/2008/schedule/events/69.en.html</overview>
-	    <desc><![CDATA[
+	    <desc>
 		<h1>"finstall" - the new FreeBSD installer</h1>
 		<i>A graphical installer for FreeBSD</i>
 		<p>
@@ -11023,7 +11026,7 @@
 		More information on finstall can be found here:
 		http://wiki.freebsd.org/finstall.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <tags>bsdcan,bsdcan2008,slides,freebsd,installer,ivan voras</tags>
 	    <files>
 		<file>
@@ -11039,7 +11042,7 @@
 	<item source="bsdcan" added="20080526">
 	    <title>Poul-Henning Kamp - Measured (almost) does Air Traffic Control</title>
 	    <overview>http://www.bsdcan.org/2008/schedule/events/68.en.html</overview>
-	    <desc><![CDATA[
+	    <desc>
 		<h1>Measured (almost) does Air Traffic Control</h1>
 		<i>Monitoring weird hardware reliably</i>
 		<p>
@@ -11067,7 +11070,7 @@
 		I believe I gave a WIP presentation of this about
 		two years ago.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <tags>bsdcan,bsdcan2008,slides,air traffic control,scada,poul-henning kamp</tags>
 	    <files>
 		<file>
@@ -11083,7 +11086,7 @@
 	<item source="bsdcan" added="20080521">
 	    <title>Chris Lattner - BSD licensed C++ compiler</title>
 	    <overview>http://www.bsdcan.org/2008/schedule/events/99.en.html</overview>
-	    <desc><![CDATA[
+	    <desc>
 		<h1>BSD licensed C++ compiler</h1>
 		<p>
 		LLVM is a suite of carefully designed open source
@@ -11114,7 +11117,7 @@
 		error messages, and supports many other applications
 		(e.g. static analysis and refactoring).
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <tags>bsdcan,bsdcan2008,slides,bsdl,llvm,chris lattner</tags>
 	    <files>
 		<file>
@@ -11130,7 +11133,7 @@
 	<item source="bsdcan" added="20080521">
 	    <title>Robert Watson - BSDCan 2008 - Closing</title>
 	    <overview>http://www.bsdcan.org/2008/schedule/events/97.en.html</overview>
-	    <desc><![CDATA[
+	    <desc>
 		<h1>Closing</h1>
 		<i>Beer, prizes, secrets, Works In Progress</i>
 		<p>
@@ -11139,7 +11142,7 @@
 		with some new and interesting twists. Sleep in if
 		you must, but don't miss this session.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <tags>bsdcan,bsdcan2008,slides,robert watson</tags>
 	    <files>
 		<file>
@@ -11155,7 +11158,7 @@
 	<item source="bsdcan" added="20080521">
 	    <title>Leslie Hawthorn - Google SoC</title>
 	    <overview>http://www.bsdcan.org/2008/schedule/events/95.en.html</overview>
-	    <desc><![CDATA[
+	    <desc>
 		<h1>Google SoC</h1>
 		<i>Summer of Code</i>
 		<p>
@@ -11176,7 +11179,7 @@
 		of Code participants in the audience are welcome
 		and encouraged to chime in with their own insights.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <tags>bsdcan,bsdcan2008,slides,google,summer of code,leslie hawthorn</tags>
 	    <files>
 		<file>
@@ -11192,7 +11195,7 @@
 	<item source="bsdcan" added="20080521">
 	    <title>Pawel Jakub Dawidek - A closer look at the ZFS file system</title>
 	    <overview>http://www.bsdcan.org/2008/schedule/events/93.en.html</overview>
-	    <desc><![CDATA[
+	    <desc>
 		<h1>A closer look at the ZFS file system</h1>
 		<i>simple administration, transactional semantics, end-to-end data integrity</i>
 		<p>
@@ -11224,7 +11227,7 @@
 		or RAID) configurations. If one copy is damaged,
 		ZFS detects it and uses another copy to repair it.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <tags>bsdcan,bsdcan2008,slides,zfs,freebsd,pawel jakub dawidek</tags>
 	    <files>
 		<file>
@@ -11240,7 +11243,7 @@
 	<item source="bsdcan" added="20080521">
 	    <title>Rafal Jaworowski - Interfacing embedded FreeBSD with U-Boot</title>
 	    <overview>http://www.bsdcan.org/2008/schedule/events/74.en.html</overview>
-	    <desc><![CDATA[
+	    <desc>
 		<h1>Interfacing embedded FreeBSD with U-Boot</h1>
 		<i>Working with the de facto standard for an initial level boot loader</i>
 		<p>
@@ -11265,7 +11268,7 @@
 		architecture and platform independent, and how
 		loader(8) has been bound to it.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <tags>bsdcan,bsdcan2008,slides,embedded,freebsd,u-boot,rafal jaworowski</tags>
 	    <files>
 		<file>
@@ -11281,7 +11284,7 @@
 	<item source="bsdcan" added="20080521">
 	    <title>John Baldwin - Introduction to Debugging the FreeBSD Kernel</title>
 	    <overview>http://www.bsdcan.org/2008/schedule/events/70.en.html</overview>
-	    <desc><![CDATA[
+	    <desc>
 		<h1>Introduction to Debugging the FreeBSD Kernel</h1>
 		<p>
 		Just like every other piece of software, the FreeBSD
@@ -11327,7 +11330,7 @@
 		    <li>system hangs</li>
 		    </ul></li>
 		</ul>
-	    ]]></desc>
+	    </desc>
 	    <tags>bsdcan,bsdcan2008,slides,paper,debugging,freebsd,john baldwin</tags>
 	    <files>
 		<file>
@@ -11350,7 +11353,7 @@
 	<item source="bsdcan" added="20080521">
 	    <title>John Birrell - DTrace for FreeBSD</title>
 	    <overview>http://www.bsdcan.org/2008/schedule/events/66.en.html</overview>
-	    <desc><![CDATA[
+	    <desc>
 		<h1>DTrace for FreeBSD</h1>
 		<i>What on earth is that system doing?!</i>
 		<p>
@@ -11383,7 +11386,7 @@
 		<li>The DTrace test suite.</li>
 		<li>A brief list of things to do to port the DTrace facility to other BSD-derived operating systems.</li>
 		</ul>
-	    ]]></desc>
+	    </desc>
 	    <tags>bsdcan,bsdcan2008,slides,dtrace,freebsd,john birrell</tags>
 	    <files>
 		<file>
@@ -11399,7 +11402,7 @@
 	<item source="bsdcan" added="20080521">
 	    <title>Matthieu Herrb - X.org</title>
 	    <overview>http://www.bsdcan.org/2008/schedule/events/94.en.html</overview>
-	    <desc><![CDATA[
+	    <desc>
 		<h1>X.org</h1>
 		<i>upcoming plans</i>
 		<p>
@@ -11418,7 +11421,7 @@
 		be affected by the developments done with Linux as
 		the primary target.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <tags>bsdcan,bsdcan2008,slides,x.org,matthieu herrb</tags>
 	    <files>
 		<file>
@@ -11434,7 +11437,7 @@
 	<item source="bsdcan" added="20080521">
 	    <title>Adrian Chad - What Not To Do When Writing Network Applications</title>
 	    <overview>http://www.bsdcan.org/2008/schedule/events/72.en.html</overview>
-	    <desc><![CDATA[
+	    <desc>
 		<h1>What Not To Do When Writing Network Applications</h1>
 		<i>The lessons learnt working with not-so-high-performance network applications</i>
 		<p>
@@ -11471,7 +11474,7 @@
 		away with more of an understanding about how the
 		network, application and operating systems interact.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <tags>bsdcan,bsdcan2008,slides,network applications,adrian chad</tags>
 	    <files>
 		<file>
@@ -11487,7 +11490,7 @@
 	<item source="bsdcan" added="20080521">
 	    <title>Brooks Davis - Using FreeBSD to Promote Open Source Development Methods</title>
 	    <overview>http://www.bsdcan.org/2008/schedule/events/64.en.html</overview>
-	    <desc><![CDATA[
+	    <desc>
 		<h1>Using FreeBSD to Promote Open Source Development Methods</h1>
 		<p>
 		In this talk we present Aerosource, an initiative
@@ -11511,7 +11514,7 @@
 		successes and how we use projects like FreeBSD as
 		exemplars of OSS development.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <tags>bsdcan,bsdcan2008,abstract,software development,brooks davis</tags>
 	    <files>
 		<file>
@@ -11534,7 +11537,7 @@
 	<item source="bsdcan" added="20080521">
 	    <title>Randall Stewart - SCTP what it is and how to use it</title>
 	    <overview>http://www.bsdcan.org/2008/schedule/events/91.en.html</overview>
-	    <desc><![CDATA[
+	    <desc>
 		<h1>SCTP - SCTP what it is and how to use it</h1>
 		<p>
 		This talk will introduce the attendee into the
@@ -11551,7 +11554,7 @@
 		<li>Extended system calls that support the SCTP feature set.</li>
 		<li>What model may fit you best</li>
 		</ul>
-	    ]]></desc>
+	    </desc>
 	    <tags>bsdcan,bsdcan2008,abstract,freebsd,sctp,randall stewart</tags>
 	    <files>
 		<file>
@@ -11567,7 +11570,7 @@
 	<item source="bsdcan" added="20080521">
 	    <title>Rafal Jaworowski - Porting FreeBSD/ARM to Marvell Orion System-On-Chip</title>
 	    <overview>http://www.bsdcan.org/2008/schedule/events/73.en.html</overview>
-	    <desc><![CDATA[
+	    <desc>
 		<h1>Porting FreeBSD/ARM to Marvell Orion System-On-Chip</h1>
 		<p>
 		This talk covers the development work on porting
@@ -11594,7 +11597,7 @@
 		debugging techniques and difficulties encountered
 		during such undertaking.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <tags>bsdcan,bsdcan2008,slides,freebsd,arm,marvell orion,rafal jaworowski</tags>
 	    <files>
 		<file>
@@ -11610,12 +11613,12 @@
 	<item source="bsdcan" added="20080521">
 	    <title>Dan Langille - BSDCan 2008 - Opening session</title>
 	    <overview>http://www.bsdcan.org/2008/schedule/events/59.en.html</overview>
-	    <desc><![CDATA[
+	    <desc>
 		<h1>Opening session</h1>
 		Welcome to BSDCan 2008
 		<br />
 		Traditional greetings
-	    ]]></desc>
+	    </desc>
 	    <tags>bsdcan,bsdcan2008,slides,dan langille</tags>
 	    <files>
 		<file>
@@ -11631,10 +11634,10 @@
 	<item source="bsdcan" added="20070824">
 	    <title>BSDCan-2007 - Videos</title>
 	    <overview>http://people.freebsd.org/~julian/BSDCan-2007/</overview>
-	    <desc><![CDATA[
+	    <desc>
 		The 2007 BSDCan conference<br />
 		Kirk McKusick - Code Reading of Locally-Connected Sockets<br />
-	    ]]></desc>
+	    </desc>
 	    <tags>bsdcan,bsdcan2007,talks,kirk mckusick</tags>
 	    <files>
 		<file>
@@ -11650,10 +11653,10 @@
 	<item source="bsdcan" added="20070814">
 	    <title>BSDCan-2007 - Videos</title>
 	    <overview>http://people.freebsd.org/~julian/BSDCan-2007/</overview>
-	    <desc><![CDATA[
+	    <desc>
 		The 2007 BSDCan conference<br />
 		Erwin Lansing - The state of the FreeBSD Ports Tree<br />
-	    ]]></desc>
+	    </desc>
 	    <tags>bsdcan,bsdcan2007,talks,erwin lansing,ports</tags>
 	    <files>
 		<file>
@@ -11687,12 +11690,12 @@
 	<item source="bsdcan" added="20070813">
 	    <title>BSDCan-2007 - Videos</title>
 	    <overview>http://people.freebsd.org/~julian/BSDCan-2007/</overview>
-	    <desc><![CDATA[
+	    <desc>
 		The 2007 BSDCan conference<br />
 		Kris Kennaway - Scalability Update 2007<br />
 		Progress on FreeBSD SMP performance and scalablity
 		since BSDCan Dev Summit 2006
-	    ]]></desc>
+	    </desc>
 	    <tags>bsdcan,bsdcan2007,talks,kris kennaway,scalability</tags>
 	    <files>
 		<file>
@@ -11708,10 +11711,10 @@
 	<item source="bsdcan" added="20070813">
 	    <title>BSDCan-2007 - Videos</title>
 	    <overview>http://people.freebsd.org/~julian/BSDCan-2007/</overview>
-	    <desc><![CDATA[
+	    <desc>
 		The 2007 BSDCan conference<br />
 		Qing Li - Routing, ARP and ND6
-	    ]]></desc>
+	    </desc>
 	    <tags>bsdcan,bsdcan2007,talks,qing li,routing arp and nd6</tags>
 	    <files>
 		<file>
@@ -11727,10 +11730,10 @@
 	<item source="bsdcan" added="20070813">
 	    <title>BSDCan-2007 - Videos</title>
 	    <overview>http://people.freebsd.org/~julian/BSDCan-2007/</overview>
-	    <desc><![CDATA[
+	    <desc>
 		The 2007 BSDCan conference<br />
 		Marko Zec explains the vimage architecture
-	    ]]></desc>
+	    </desc>
 	    <tags>bsdcan,bsdcan2007,talks,marko zec,vimage</tags>
 	    <files>
 		<file>
@@ -11746,10 +11749,10 @@
 	<item source="bsdcan" added="20070813">
 	    <title>BSDCan-2007 - Videos</title>
 	    <overview>http://people.freebsd.org/~julian/BSDCan-2007/</overview>
-	    <desc><![CDATA[
+	    <desc>
 		The 2007 BSDCan conference<br />
 		Max Laier - PFIL, firewalls and locking
-	    ]]></desc>
+	    </desc>
 	    <tags>bsdcan,bsdcan2007,talks,max laier,ipf</tags>
 	    <files>
 		<file>
@@ -11855,12 +11858,12 @@
 	<item source="bsdcan" added="20070520">
 	    <title>FreeBSD Portsnap</title>
 	    <overview>http://www.daemonology.net/papers/</overview>
-	    <desc><![CDATA[
+	    <desc>
 		"FreeBSD Portsnap - 
 		What (it is), Why (it was written), and How (it works)"
 		by Colin Percival (cperciva@FreeBSD.org)<br />
 		(Note: use ^L to get back in non-fullscreen mode)
-	    ]]></desc>
+	    </desc>
 	    <tags>bsdcan,bsdcan2007,pdf,portsnap,freebsd,colin percival</tags>
 	    <files>
 		<file>
@@ -11908,7 +11911,7 @@
 	    <title>Server deployment in mass-hosting environment using FreeBSD Ports system by Stanislav Sedov (in russian)</title>
 	    <overview>http://blog.springdaemons.com/freebsd/</overview>
 	    <desc>
-		<![CDATA[
+		
 		<p>
 		Recently I have been attending Hostobzor 12th, the
 		Russian conference of hosting providers, beeing
@@ -11931,7 +11934,7 @@
 		much... At least, some people was interested a lot
 		and asked interesting questions.
 		</p>
-		]]>
+		
 	    </desc>
 	    <tags>hostobzor,hostobzor12,freebsd,ports,stanislav sedov,russian</tags>
 	    <files>
@@ -12025,7 +12028,7 @@
 	<item source="nllgg" added="20081231">
 	    <title>Van FreeBSD Documentatie projectleider tot FreeBSD Developer - Remko Lodder</title>
 	    <overview>http://www.nllgg.nl/communitydag_20081213#freebsd-doc-2-dev</overview>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
 		In 2004 ben ik begonnen met het FreeBSD Dutch
 		Documentation Project, een project dat inmiddels
@@ -12041,7 +12044,7 @@
 		team en is momenteel 1 van de meest actieve developers
 		binnen het team.
 		</p>
-		]]>
+		
 	    </desc>
 	    <tags>nllgg,freebsd,documentation,nederlands,remko lodder</tags>
 	    <files>
@@ -12058,7 +12061,7 @@
 	<item source="nllgg" added="20081231">
 	    <title>Een historisch overzicht van BSD - Hans van de Looy</title>
 	    <overview>http://www.nllgg.nl/communitydag_20081213#bsd-history</overview>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
 		Hans zal een historisch overzicht geven van het
 		ontstaan van *BSD vanaf de oorsprong van UNIX tot
@@ -12077,7 +12080,7 @@
 		dergelijke onderzoeken maakt hij ook regelmatig
 		gebruik van op BSD* gebaseerde systemen.
 		</p>
-		]]>
+		
 	    </desc>
 	    <tags>nllgg,bsd,history,hans van de looy</tags>
 	    <files>
@@ -12121,7 +12124,7 @@
 	<item source="josephkoshy" added="20090524">
 	    <title>PmcTools talk at the Bangalore chapter of the ACM</title>
 	    <overview>http://edoofus.blogspot.com/2009/04/pmctools-talk-at-bangalore-chapter-of.html</overview>
-	    <desc><![CDATA[
+	    <desc>
 		<p>
 		In April 2009 I was invited to speak on FreeBSD/PmcTools
 		by the Bangalore chapter of the ACM.
@@ -12131,7 +12134,7 @@
 		programming APIs, some aspects of the implementation
 		and on possible future work.
 		</p>
-	    ]]></desc>
+	    </desc>
 	    <tags>freebsd,presentation,freebsd,pmctools,joseph koshy</tags>
 	    <files>
 		<file>
@@ -12172,11 +12175,6 @@
 	    <url>http://freebsdforall.blogspot.com/</url>
 	</source>
 
-	<source id="bafug">
-	    <name>Bay Area FreeBSD Users Group</name>
-	    <url>http://www.bafug.org/</url>
-	</source>
-
 	<source id="daemonnews">
 	    <name>Daemon News</name>
 	    <url>http://www.daemonnews.org/</url>
@@ -12319,9 +12317,9 @@
 
 	<source id="googletechtalks">
 	    <name>Google Tech Talks</name>
-	    <url><![CDATA[
-		http://video.google.com/videosearch?q=type%3Agoogle+engEDU&so=1
-	    ]]></url>
+	    <url>
+		http://video.google.com/videosearch?q=type%3Agoogle+engEDU&amp;so=1
+	    </url>
 	</source>
 
 	<source id="devsummit-cambridge">
diff --git a/share/sgml/catalog.xml b/share/sgml/catalog.xml
index 13301653f6..f299f9d1fd 100644
--- a/share/sgml/catalog.xml
+++ b/share/sgml/catalog.xml
@@ -59,6 +59,9 @@
   <public
 	publicId="-//FreeBSD//DTD FreeBSD XML Database for Sitemap//EN"
 	uri="sitemap.dtd"/>
+  <public
+        publicId="-//FreeBSD//DTD FreeBSD XML Database for Multimedia//EN"
+        uri="multimedia.dtd"/>
   <public
         publicId="-//FreeBSD//DTD FreeBSD XML Database for Events//EN"
         uri="events.dtd" />
diff --git a/share/sgml/multimedia.dtd b/share/sgml/multimedia.dtd
new file mode 100644
index 0000000000..3705344d04
--- /dev/null
+++ b/share/sgml/multimedia.dtd
@@ -0,0 +1,54 @@
+<!ELEMENT multimedia (items, sources)>
+
+<!ELEMENT items (item*)>
+<!ELEMENT item (title, overview, desc, tags)>
+<!ELEMENT overview (#PCDATA)>
+<!ELEMENT tags (#PCDATA)>
+
+<!ATTLIST item
+	source IDREF #REQUIRED
+	added CDATA #REQUIRED>
+
+<!ELEMENT sources (source*)>
+<!ELEMENT source (name, url)>
+<!ELEMENT name (#PCDATA)>
+<!ELEMENT url (#PCDATA)>
+
+<!ATTLIST source
+	id ID #REQUIRED>
+
+<!ENTITY % html.orig PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+%html.orig;
+
+<!ELEMENT desc %Flow;>
+
+<!ENTITY % autogen.ent
+ PUBLIC "-//FreeBSD//ENTITIES FreeBSD Automatically Generated Entities//EN"
+        "http://www.FreeBSD.org/XML/cwd/autogen.ent">
+%autogen.ent;
+
+<!ENTITY % iso8879.ent
+ PUBLIC "-//FreeBSD//ENTITIES ISO 8879:1986 Entity Set//EN//XML"
+        "http://www.FreeBSD.org/XML/www/share/sgml/iso8879.ent">
+%iso8879.ent;
+
+<!ENTITY % l10n.ent
+ PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
+        "http://www.FreeBSD.org/XML/www/lang/share/sgml/l10n.ent">
+%l10n.ent;
+
+<!ENTITY % l10n-common.ent
+ PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Common Entities//EN"
+        "http://www.FreeBSD.org/XML/www/share/sgml/l10n.ent">
+%l10n-common.ent;
+
+<!ENTITY % release.ent
+ PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release Entities//EN"
+        "http://www.FreeBSD.org/XML/www/share/sgml/release.ent">
+%release.ent;
+
+<!ENTITY % common.ent
+ PUBLIC "-//FreeBSD//ENTITIES FreeBSD Common Entities//EN"
+        "common.ent">
+%common.ent;