From owner-svn-doc-projects@FreeBSD.ORG  Sun Aug  5 22:18:27 2012
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 1BB17106566C;
	Sun,  5 Aug 2012 22:18:27 +0000 (UTC)
	(envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 03E9C8FC0C;
	Sun,  5 Aug 2012 22:18:27 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q75MIQut032916;
	Sun, 5 Aug 2012 22:18:26 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q75MIQFE032913;
	Sun, 5 Aug 2012 22:18:26 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201208052218.q75MIQFE032913@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Sun, 5 Aug 2012 22:18:26 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r39324 - in projects/sgml2xml:
	en_US.ISO8859-1/htdocs/multimedia share/sgml
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for doc projects trees
	<svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
	<mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
	<mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Aug 2012 22:18:27 -0000

Author: gabor
Date: Sun Aug  5 22:18:26 2012
New Revision: 39324
URL: http://svn.freebsd.org/changeset/doc/39324

Log:
  - Add XML DTD and make the multimedia database well-formed and valid XML
  
  Approved by:	doceng (implicit)

Added:
  projects/sgml2xml/share/sgml/multimedia.dtd
Modified:
  projects/sgml2xml/en_US.ISO8859-1/htdocs/multimedia/multimedia-input.xml
  projects/sgml2xml/share/sgml/catalog.xml

Modified: projects/sgml2xml/en_US.ISO8859-1/htdocs/multimedia/multimedia-input.xml
==============================================================================
--- projects/sgml2xml/en_US.ISO8859-1/htdocs/multimedia/multimedia-input.xml	Sun Aug  5 19:23:14 2012	(r39323)
+++ projects/sgml2xml/en_US.ISO8859-1/htdocs/multimedia/multimedia-input.xml	Sun Aug  5 22:18:26 2012	(r39324)
@@ -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>

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***