From e7c0a3e041533990cede4e59124dd3ae69de9262 Mon Sep 17 00:00:00 2001
From: Michael Spang <mspang@uwaterloo.ca>
Date: Fri, 20 Jul 2007 03:27:01 -0400
Subject: [PATCH] Add Q&A summary to RMS talk.

---
 media/index.xml | 13 ++++++++++++-
 xsl/media.xsl   | 23 ++++++++++++++---------
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/media/index.xml b/media/index.xml
index f845643..fcfb917 100644
--- a/media/index.xml
+++ b/media/index.xml
@@ -39,8 +39,19 @@
     are available under the <a href="http://creativecommons.org/licenses/nd/1.0/">
     Creative Commons NoDerivs 1.0</a> license.
   </p></abstract>
+  <other>
+  <h2>Q&amp;A</h2>
+  <p>
+  Download the question and answers section for answers to questions such as:
+  <ul>
+    <li> What do you do when no free alternatives for a proprietary program exist?  </li>
+    <li> If we are to treat works used for practical purposes differently from those used for entertainment, how do you treat works such as video games that fall in both categories?  </li>
+    <li> If most of the computing industry and the US Copyright Board don't disagree with your views on copyright, how come no one has gone to change things?  </li>
+  </ul>
+  </p>
+  </other>
   <mediafile file="rms-talk.ogg" type="Talk (OGG/Theora)" size="687M" />
-  <mediafile file="rms-qa.ogg" type="Q/A (OGG/Theora)" size="225M" />
+  <mediafile file="rms-qa.ogg" type="Q&amp;A (OGG/Theora)" size="225M" />
 </mediaitem>
 
 <mediaitem title="Dr Michael Terry - Usability in the Wild">
diff --git a/xsl/media.xsl b/xsl/media.xsl
index 7cc3498..cebbd4a 100644
--- a/xsl/media.xsl
+++ b/xsl/media.xsl
@@ -62,15 +62,6 @@
             </xsl:apply-templates>
           </strong></div>
         </xsl:if>
-        <br/>
-        <!-- AddThis Bookmark Button -->
-        <script type="text/javascript">
-          addthis_url    = location.href;
-          addthis_title  = document.title;
-          addthis_pub    = 'calumt';
-        </script>
-        <script type="text/javascript" 
-            src="http://s7.addthis.com/js/addthis_widget.php?v=12" />
         <xsl:if test="@buttons">
           <br/><br/>
           <!-- digg button -->
@@ -80,6 +71,20 @@
           <script type="text/javascript" 
                   src="http://reddit.com/button.js?t=3" />
         </xsl:if>
+        <xsl:if test="other">
+        <div>
+          <xsl:copy-of select="other/node()"/>
+          </div>
+        </xsl:if>
+        <br/>
+        <!-- AddThis Bookmark Button -->
+        <script type="text/javascript">
+          addthis_url    = location.href;
+          addthis_title  = document.title;
+          addthis_pub    = 'calumt';
+        </script>
+        <script type="text/javascript"
+            src="http://s7.addthis.com/js/addthis_widget.php?v=12" />
         <!-- google ads -->
         <!--
         <script type="text/javascript">