docs/faq/legal.xml: Update FAQ, Totem actually has an exception these days.

Original commit message from CVS:
* docs/faq/legal.xml:
Update FAQ, Totem actually has an exception these days.

diff --git a/ChangeLog b/ChangeLog
index 947881da60455ed854c99726a126af07a1df465a..753c8eb6f2639874cf61c3d4686cf3e43c9f83c3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-17  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+       * docs/faq/legal.xml:
+         Update FAQ, Totem actually has an exception these days.
+
 2008-01-14  Jan Schmidt  <jan.schmidt@sun.com>
 
        * win32/common/libgstreamer.def:

diff --git a/docs/faq/legal.xml b/docs/faq/legal.xml
index 6705a5e621dd54b82ec51ce09bf7df0933dac272..5ec56fdf3e22c3a405ddb139c32bb9f2bd4c673f 100644 (file)
--- a/docs/faq/legal.xml
+++ b/docs/faq/legal.xml
@@ -20,7 +20,7 @@ by the FSF lawyer team and verified by FSF lawyer and law professor Eben Moglen.
 Can someone distribute the combination of
 <itemizedlist>
   <listitem><para>GStreamer, the LGPL library</para></listitem>
-  <listitem><para>Totem, a GPL playback application</para></listitem>
+  <listitem><para>MyPlayer, a GPL playback application</para></listitem>
   <listitem><para>The binary-only Sorenson decoder</para></listitem>
 </itemizedlist>
 together in one distribution/operating system ? If not, what
@@ -30,20 +30,24 @@ needs to be changed to make this possible ?
 
       <answer>
         <para>
-This would be a problem, because the GStreamer and Totem licenses would
-forbid it.  In order to link GStreamer to Totem, you need to use section
+This would be a problem, because the GStreamer and MyPlayer licenses would
+forbid it.  In order to link GStreamer to MyPlayer, you need to use section
 3 of the LGPL to convert GStreamer to GPL.  The GPL version of GStreamer
-forbids linking to the Sorenson decoder.  Anyway, the Totem GPL
+forbids linking to the Sorenson decoder.  Anyway, the MyPlayer GPL
 license forbids this.  
         </para>
 
         <para>
-If the authors of Totem want to permit this, we have an
+If the authors of MyPlayer want to permit this, we have an
 exception for them: the controlled interface exception from the FAQ.
 The idea of this is that you can't get around the GPL just by including
 a LGPL bit in the middle.
         </para>
 
+        <para>
+Note: MyPlayer is a completely fictituous application at the time of writing.
+        </para>
+
       </answer>
     </qandaentry>