svn commit: r38992 - head/en_US.ISO8859-1/htdocs/multimedia

[Benjamin Kaduk]

Author: bjk
Date: Wed Jun  6 02:06:20 2012
New Revision: 38992
URL: http://svn.freebsd.org/changeset/doc/38992

Log:
  Add items for BSDCan photos from 2011 and 2010.
  Remove a dead link.
  Patch slightly tweaked from the PR.
  
  PR:		docs/168729
  Submitted by:	db
  Approved by:	hrs (mentor)

Modified:
  head/en_US.ISO8859-1/htdocs/multimedia/multimedia-input.xml

Modified: head/en_US.ISO8859-1/htdocs/multimedia/multimedia-input.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/multimedia/multimedia-input.xml	Tue Jun  5 20:54:13 2012	(r38991)
+++ head/en_US.ISO8859-1/htdocs/multimedia/multimedia-input.xml	Wed Jun  6 02:06:20 2012	(r38992)
@@ -52,6 +52,46 @@
 	    <tags>2012,bsdcan,bsdcan2012,photos,ollivier robert</tags>
 	</item>
 
+	<item source="bsdcan" added="20110514">
+	    <title>BSDCan-2011 Photos - Saturday</title>
+	    <desc>
+		Photos taken during the Conference on Saturday at
+		BSDCan 2011 in Ottawa by Diane Bruce.
+	    </desc>
+	    <overview>http://www.db.net/gallery/BSDCan/BSDCan_2011_day_2/</overview>
+	    <tags>2011,bsdcan,bsdcan2011,photos,diane bruce</tags>
+	</item>
+
+	<item source="bsdcan" added="20110513">
+	    <title>BSDCan-2011 Photos - Friday</title>
+	    <desc>
+		Photos taken during the Conference on Friday at
+		BSDCan 2011 in Ottawa by Diane Bruce.
+	    </desc>
+	    <overview>http://www.db.net/gallery/BSDCan/BSDCan_2011_day_1/</overview>
+	    <tags>2011,bsdcan,bsdcan2011,photos,diane bruce</tags>
+	</item>
+
+	<item source="bsdcan" added="20100515">
+	    <title>BSDCan-2010 Photos - Saturday</title>
+	    <desc>
+		Photos taken during the Conference on Saturday at
+		BSDCan 2010 in Ottawa by Diane Bruce.
+	    </desc>
+	    <overview>http://www.db.net/gallery/BSDCan/BSDCan_2010_day_2/</overview>
+	    <tags>2010,bsdcan,bsdcan2010,photos,diane bruce</tags>
+	</item>
+
+	<item source="bsdcan" added="20100514">
+	    <title>BSDCan-2010 Photos - Friday</title>
+	    <desc>
+		Photos taken during the Conference on Friday at
+		BSDCan 2010 in Ottawa by Diane Bruce.
+	    </desc>
+	    <overview>http://www.db.net/gallery/BSDCan/BSDCan_2010_day_1/</overview>
+	    <tags>2010,bsdcan,bsdcan2010,photos,diane bruce</tags>
+	</item>
+
 	<!-- Source: bsdtalk
 	-->
 
@@ -6162,13 +6202,6 @@
 	    </files>
 	</item>
 
-	<item source="asiabsdcon" added="20080422">
-	    <title>AsiaBSDCon 2008 Photos</title>
-	    <overview>http://www.paeps.cx/gallery/AsiaBSDCon_2008/index.html</overview>
-	    <desc>AsiaBSDCon 2008 Photos by Philip Paeps</desc>
-	    <tags>asiabsdcon,asiabsdcon2008,photos,philip paeps</tags>
-	</item>
-
 	<item source="asiabsdcon" added="20080408">
 	    <title>AsiaBSDCon 2008 Paper List</title>
 	    <desc>