Attachment 125709 Details for Bug 169361 – file.diff

[patch] file.diff

file.diff (text/plain), 8.95 KB, created by Diane Bruce on 2012-06-24 05:20:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Diane Bruce

Created: 2012-06-24 05:20:09 UTC

Size: 8.95 KB

patch

obsolete

>Index: en_US.ISO8859-1/htdocs/multimedia/multimedia-input.xml
>===================================================================
>--- en_US.ISO8859-1/htdocs/multimedia/multimedia-input.xml	(revision 39098)
>+++ en_US.ISO8859-1/htdocs/multimedia/multimedia-input.xml	(working copy)
>@@ -64,7 +64,7 @@
> 		it introduces plurality and demonstrate the usage
> 		of the utilities relating to each solution.
> 	    </desc>
>-	    <overview>http://www.bsdcan.org/2012/schedule/events/291en.html</overview>
>+	    <overview>http://www.bsdcan.org/2012/schedule/events/291.en.html</overview>
> 	    <tags>2012,bsdcan,bsdcan2012,papers,michael dexter</tags>
> 	    <files>
> 		<file>
>@@ -92,7 +92,7 @@
> 		that might occur because of improper acquisition ordering
> 		of locks.
> 	    </desc>
>-	    <overview>http://www.bsdcan.org/2012/schedule/events/306en.html</overview>
>+	    <overview>http://www.bsdcan.org/2012/schedule/events/306.en.html</overview>
> 	    <tags>2012,bsdcan,bsdcan2012,papers,kirk mckusick</tags>
> 	    <files>
> 		<file>
>@@ -115,7 +115,7 @@
> 		The auditdistd daemon's role is to distribute audit
> 		trail files to a remote system in a secure and reliable way.
> 	    </desc>
>-	    <overview>http://www.bsdcan.org/2012/schedule/events/335en.html</overview>
>+	    <overview>http://www.bsdcan.org/2012/schedule/events/335.en.html</overview>
> 	    <tags>2012,bsdcan,bsdcan2012,papers,pawel jakub dawidek</tags>
> 	    <files>
> 		<file>
>@@ -141,7 +141,7 @@
> 		scenarios with the focus on how it can help real-world
> 		applications (not limited to Web applications).
> 	    </desc>
>-	    <overview>http://www.bsdcan.org/2012/schedule/events/339en.html</overview>
>+	    <overview>http://www.bsdcan.org/2012/schedule/events/339.en.html</overview>
> 	    <tags>2012,bsdcan,bsdcan2012,papers,ivan voras</tags>
> 	    <files>
> 		<file>
>@@ -159,7 +159,7 @@
> 	    <desc>
> 		A summary of FreeBSD's participation in the 2011 contest.
> 	    </desc>
>-	    <overview>http://www.bsdcan.org/2012/schedule/events/354en.html</overview>
>+	    <overview>http://www.bsdcan.org/2012/schedule/events/354.en.html</overview>
> 	    <tags>2012,bsdcan,bsdcan2012,papers,benedict reuschling</tags>
> 	    <files>
> 		<file>
>@@ -199,7 +199,7 @@
> 		features in a number of different ways. This talk
> 		presents some of the more interesting ones.
> 	    </desc>
>-	    <overview>http://www.bsdcan.org/2011/schedule/events/233en.html</overview>
>+	    <overview>http://www.bsdcan.org/2011/schedule/events/233.en.html</overview>
> 	    <tags>2011,bsdcan,bsdcan2011,papers,brooks davis</tags>
> 	    <files>
> 		<file>
>@@ -266,11 +266,11 @@
> 		the heavy requirements from being implemented in QT/KDE,
> 		and lack of a digital verification mechanism.
> 	    </desc>
>-	    <overview>http://www.bsdcan.org/2011/schedule/events/215en.html</overview>
>+	    <overview>http://www.bsdcan.org/2011/schedule/events/215.en.html</overview>
> 	    <tags>2010,bsdcan,bsdcan2010,papers,kris moore</tags>
> 	    <files>
> 		<file>
>-		    <url>http://www.bsdcan.org/2011/schedule/events/215en.html</url>
>+		    <url>http://www.bsdcan.org/2011/schedule/events/215.en.html</url>
> 		    <desc>html</desc>
> 		    <tags>html</tags>
> 		</file>
>@@ -1373,7 +1373,7 @@
> 	    <desc>
> 		A quick update on AsiaBSDCon 2008 with Hiroki Sato
> 		and George Neville-Neil. More information at
>-		http://www.asiabsdcon.org/.
>+		http://2008.asiabsdcon.org/.
> 	    </desc>
> 	    <overview>http://bsdtalk.blogspot.com/2007/10/bsdtalk134-asiabsdcon-update-with.html</overview>
> 	    <tags>bsdtalk,interview,asiabsdcon,hiroki sato,george neville-neil</tags>
>@@ -2935,7 +2935,7 @@
> 	    <title>Interview with Hiroki Sato and George Neville-Neil from AsiaBSDCon</title>
> 	    <desc>
> 		Interview with Hiroki Sato and George Neville-Neil
>-		from AsiaBSDCon.  More info at http://www.asiabsdcon.org/.
>+		from AsiaBSDCon.  More info at http://2006.asiabsdcon.org/.
> 	    </desc>
> 	    <overview>http://bsdtalk.blogspot.com/2006/10/bsdtalk074-interview-with-hiroki-sato.html</overview>
> 	    <tags>bsdtalk,interview,asiabsdcon,asiabsdcon2006,hiroki sao,george neville-neil</tags>
>@@ -5915,12 +5915,6 @@
> 		    <tags>avi,network testing,freebsd,george neville-neil</tags>
> 		</file>
> 		<file>
>-		    <url>IsaacLevy.EuroBSDCon.2007.avi</url>
>-		    <desc>Isaac Levy - FreeBSD jail(8) Overview, the Secure Virtual Server</desc>
>-		    <size>350 Mb</size>
>-		    <tags>avi,freebsd,isaac levy</tags>
>-		</file>
>-		<file>
> 		    <url>JohnHartmann.EuroBSDCon.2007.avi</url>
> 		    <desc>John P Hartmann - Real Men's Pipes - When UNIX meets the mainframe mindset</desc>
> 		    <size>315 Mb</size>
>@@ -5945,12 +5939,6 @@
> 		    <tags>avi,load balancing,pierre yves ritschard</tags>
> 		</file>
> 		<file>
>-		    <url>RobertWatson.EuroBSDCon.2007.avi</url>
>-		    <desc>Robert Watson - FreeBSD Advanced Security Features</desc>
>-		    <size>200 Mb</size>
>-		    <tags>avi,security,freebsd,robert watson</tags>
>-		</file>
>-		<file>
> 		    <url>RyanBickhart.EuroBSDCon.2007.avi</url>
> 		    <desc>Ryan Bickhart - Transparent TCP-to-SCTP Translation Shim Layer</desc>
> 		    <size>376 Mb</size>
>@@ -6446,10 +6434,10 @@
> 	    <desc>
> 		Slides and papers of the AsiaBSDCon 2007
> 	    </desc>
>-	    <overview>http://asiabsdcon.org/papers/</overview>
>+	    <overview>http://2007.asiabsdcon.org/papers/</overview>
> 	    <tags>asiabsdcon,asiabsdcon2007</tags>
> 	    <files>
>-		<prefix>http://asiabsdcon.org/papers/</prefix>
>+		<prefix>http://2007.asiabsdcon.org/papers/</prefix>
> 		<file>
> 		    <url>abc2007-proc-cover.pdf</url>
> 		    <size>588 Kb</size>
>@@ -8461,12 +8449,6 @@
> 		    <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>
>-		    <length>1:06:07</length>
>-		    <desc>Google Video</desc>
>-		    <tags>mp4</tags>
>-		</file>
>-		<file>
> 		    <url>http://events.ccc.de/congress/2005/fahrplan/attachments/905-22C3-1139-en-complete_harddisk_encryption_with_freebsd.mp4.torrent</url>
> 		    <size>37Kb</size>
> 		    <desc>Bittorrent link</desc>
>@@ -8485,7 +8467,7 @@
> 		AAUUG, 22 August 2006 by Simon L. Nielsen (FreeBSD
> 		Deputy Security Officer)
> 	    </desc>
>-	    <overview>http://www.aauug.dk/foredrag.html</overview>
>+	    <overview>http://www.aauug.dk/</overview>
> 	    <tags>aauug,presentation,danish,freebsd,security officer,simon l nielsen</tags>
> 	    <files>
> 		<file>
>@@ -9156,7 +9138,7 @@
> 	<item source="openfest" added="20080327">
> 	    <title>Discussion - What's cooking for FreeBSD 7.0?</title>
> 	    <desc>Discussion - What's cooking for FreeBSD 7.0? (Bulgarian)</desc>
>-	    <overview>http://openfest.org/archive/openfest-2007/</overview>
>+	    <overview>http://openfest.org/openfest-2007/</overview>
> 	    <tags>openfest,openfest2007,discussion,freebsd,freebsd7</tags>
> 	    <files>
> 		<file>
>@@ -9198,7 +9180,7 @@
> 	<item source="openfest" added="20080327">
> 	    <title>Willow Vachkov - FreeBSD and the new network and transport protocols (IPv6 and SCTP)</title>
> 	    <desc>Willow Vachkov - FreeBSD and the new network and transport protocols (IPv6 and SCTP) (Bulgarian)</desc>
>-	    <overview>http://openfest.org/archive/openfest-2007/</overview>
>+	    <overview>http://openfest.org/openfest-2007/</overview>
> 	    <tags>openfest,openfest2007,presentation,freebsd,ipv6,sctp,willow vanchkov</tags>
> 	    <files>
> 		<file>
>@@ -9226,7 +9208,7 @@
> 	<item source="openfest" added="20080327">
> 	    <title>Nikolai Denev - FreeBSD goes Zettabyte</title>
> 	    <desc>Nikolai Denev - FreeBSD goes Zettabyte (Bulgarian)</desc>
>-	    <overview>http://openfest.org/archive/openfest-2007/</overview>
>+	    <overview>http://openfest.org/openfest-2007/</overview>
> 	    <tags>openfest,openfest2007,presentation,freebsd,zettabyte,nikolai denev</tags>
> 	    <files>
> 		<file>
>@@ -9240,7 +9222,7 @@
> 	<item source="openfest" added="20080327">
> 	    <title>Vasil Dimov - The FreeBSD ports collection - tips and tricks</title>
> 	    <desc>Vasil Dimov - The FreeBSD ports collection - tips and tricks (Bulgarian)</desc>
>-	    <overview>http://openfest.org/archive/openfest-2007/</overview>
>+	    <overview>http://openfest.org/openfest-2007/</overview>
> 	    <tags>openfest,openfest2007,presentation,freebsd,ports collection,vasil dimov</tags>
> 	    <files>
> 		<file>
>@@ -11799,15 +11781,6 @@
> 	</item>
> 
> 	<item source="bsdcan" added="20070524">
>-	    <title>BSDCan-2007 Photos - Julian C. Dunn</title>
>-	    <overview>http://www.aquezada.com/gallery/v/trips/bsdcan2007/</overview>
>-	    <desc>
>-		Photos taken at BSDCan 2007 by Julian C. Dunn
>-	    </desc>
>-	    <tags>bsdcan,bsdcan2007,photos,julian c dunn</tags>
>-	</item>
>-
>-	<item source="bsdcan" added="20070524">
> 	    <title>BSDCan-2007 Photos - Bjoern A. Zeeb</title>
> 	    <overview>http://www.zabbadoz.net/users/bz/BSDCan2007/BSDCan2007-public/</overview>
> 	    <desc>

Actions: View | Diff

Attachments on bug 169361: 125709