[Gnash-commit] gnash ./ChangeLog doc/C/gnash.xml doc/C/legal.x...

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Rob Savoye <address@hidden>     05/12/21 16:45:09

Modified files:
        .              : ChangeLog 
        doc/C          : gnash.xml legal.xml 
Added files:
        doc/C          : fdl-appendix.xml 

Log message:
        * doc/C/gnash.xml: Update legal notices.
        * doc/C/fdl-appendix.xml: Add FDL in DocBook format.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/doc/C/fdl-appendix.xml?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/doc/C/gnash.xml.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/doc/C/legal.xml.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.3 gnash/ChangeLog:1.4
--- gnash/ChangeLog:1.3 Wed Dec 21 02:16:44 2005
+++ gnash/ChangeLog     Wed Dec 21 16:45:09 2005
@@ -1,3 +1,8 @@
+2005-12-21  Rob Savoye  <address@hidden>
+
+       * doc/C/gnash.xml: Update legal notices.
+       * doc/C/fdl-appendix.xml: Add FDL in DocBook format.
+
 2005-12-20  Rob Savoye  <address@hidden>
 
        * libbase/Makefile.am, libgeometry/Makefile.am,
Index: gnash/doc/C/gnash.xml
diff -u gnash/doc/C/gnash.xml:1.3 gnash/doc/C/gnash.xml:1.4
--- gnash/doc/C/gnash.xml:1.3   Wed Dec 21 01:44:01 2005
+++ gnash/doc/C/gnash.xml       Wed Dec 21 16:45:09 2005
@@ -2,6 +2,7 @@
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
     "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"; [
   <!ENTITY legal SYSTEM "legal.xml">
+  <!ENTITY fdl-app SYSTEM "fdl-appendix.xml">
   <!ENTITY appversion "0.7">
   <!ENTITY manrevision "0.7">
   <!ENTITY date "December 2005">
@@ -47,6 +48,7 @@
 -->
 
    &legal;
+
    <!-- This file  contains link to license for the documentation (GNU FDL), 
and 
         other legal stuff such as "NO WARRANTY" statement. Please do not 
change 
        any of this. -->
@@ -79,7 +81,7 @@
     <revhistory>
       <revision> 
        <revnumber>&appname; Manual V&manrevision;</revnumber> 
-       <date>&date;</date> 
+       <date>&date;</date>
        <revdescription> 
          <para role="author">Rob Savoye
            <email>address@hidden</email>
@@ -277,7 +279,7 @@
          <listitem>
            <para>
              Be verbose about parsing the movie. Warning, this can
-             generate a lot of text, and can effect the performance of
+             generate a lot of text, and can affect the performance of
              the movie you are playing.
            </para>
          </listitem>
@@ -559,7 +561,7 @@
 
       </sect3>
       <sect3 id="processor">
-       <title>Gprocessor</title>
+       <title>Gprocesser</title>
        
        <para>
          Gprocesser is used to print out the actions (using the -va
@@ -624,34 +626,6 @@
 
   <!-- ============= Application License ============================= -->
 
-  <sect1 id="license">
-   <title>License</title>
-   <para>
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the <citetitle>GNU General Public
-    License</citetitle> as published by the Free Software Foundation;
-    either version 2 of the License, or (at your option) any later
-    version.
-   </para>
-   <para>
-    This program is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    <citetitle>GNU General Public License</citetitle> for more details.
-   </para>
-   <para>
-    A copy of the <citetitle>GNU General Public License</citetitle> is
-    included as an appendix to the <citetitle>GNOME Users
-    Guide</citetitle>.  You may also obtain a copy of the
-    <citetitle>GNU General Public License</citetitle> from the Free
-    Software Foundation by visiting <ulink type="http"
-    url="http://www.fsf.org";>their Web site</ulink> or by writing to
-    <address>
-     Free Software Foundation, Inc.
-     <street>51 Franklin St, Fifth Floor</street>
-     <city>Boston</city>, <state>MA</state> <postcode>02111-1301</postcode>
-     <country>USA</country>
-    </address>
-   </para>
-  </sect1>
+  &fdl-app;
+
 </article>
Index: gnash/doc/C/legal.xml
diff -u gnash/doc/C/legal.xml:1.1 gnash/doc/C/legal.xml:1.2
--- gnash/doc/C/legal.xml:1.1   Tue Dec 20 20:52:15 2005
+++ gnash/doc/C/legal.xml       Wed Dec 21 16:45:09 2005
@@ -1,76 +1,19 @@
-  <legalnotice id="legalnotice">
-       <para>
-         Permission is granted to copy, distribute and/or modify this
-         document under the terms of the GNU Free Documentation
-         License (GFDL), Version 1.1 or any later version published
-         by the Free Software Foundation with no Invariant Sections,
-         no Front-Cover Texts, and no Back-Cover Texts.  You can find
-         a copy of the GFDL at this <ulink type="help"
-         url="ghelp:fdl">link</ulink> or in the file COPYING-DOCS
-         distributed with this manual.
-         </para>
-         <para> This manual is part of a collection of GNOME manuals
-          distributed under the GFDL.  If you want to distribute this
-          manual separately from the collection, you can do so by
-          adding a copy of the license to the manual, as described in
-          section 6 of the license.
-       </para>
-
-       <para>
-         Many of the names used by companies to distinguish their
-         products and services are claimed as trademarks. Where those
-         names appear in any GNOME documentation, and the members of
-         the GNOME Documentation Project are made aware of those
-         trademarks, then the names are in capital letters or initial
-         capital letters.
-       </para>
-
-       <para>
-         DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED
-         UNDER  THE TERMS OF THE GNU FREE DOCUMENTATION LICENSE
-         WITH THE FURTHER UNDERSTANDING THAT:
-
-         <orderedlist>
-               <listitem>
-                 <para>DOCUMENT IS PROVIDED ON AN "AS IS" BASIS,
-                    WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR
-                    IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-                    THAT THE DOCUMENT OR MODIFIED VERSION OF THE
-                    DOCUMENT IS FREE OF DEFECTS MERCHANTABLE, FIT FOR
-                    A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE
-                    RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE
-                    OF THE DOCUMENT OR MODIFIED VERSION OF THE
-                    DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR
-                    MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT,
-                    YOU (NOT THE INITIAL WRITER, AUTHOR OR ANY
-                    CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-                    SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
-                    OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
-                    LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED
-                    VERSION OF THE DOCUMENT IS AUTHORIZED HEREUNDER
-                    EXCEPT UNDER THIS DISCLAIMER; AND
-                 </para>
-               </listitem>
-               <listitem>
-                 <para>UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL
-                       THEORY, WHETHER IN TORT (INCLUDING NEGLIGENCE),
-                       CONTRACT, OR OTHERWISE, SHALL THE AUTHOR,
-                       INITIAL WRITER, ANY CONTRIBUTOR, OR ANY
-                       DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION
-                       OF THE DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH
-                       PARTIES, BE LIABLE TO ANY PERSON FOR ANY
-                       DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR
-                       CONSEQUENTIAL DAMAGES OF ANY CHARACTER
-                       INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS
-                       OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR
-                       MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR
-                       LOSSES ARISING OUT OF OR RELATING TO USE OF THE
-                       DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT,
-                       EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF
-                       THE POSSIBILITY OF SUCH DAMAGES.
-                 </para>
-               </listitem>
-         </orderedlist>
-       </para>
-  </legalnotice>
-
+<legalnotice id="legalnotice">
+  <para>
+    Permission is granted to copy, distribute and/or modify this document
+    under the terms of the <link linkend="fdl"><citetitle>GNU
+    Free Documentation License</citetitle></link>, Version 1.1 or any later
+    version published by the Free Software Foundation with no Invariant
+    Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find
+    a copy of the GFDL at this <ulink type="help"
+    url="ghelp:fdl">link</ulink> or in the file COPYING-DOCS
+    distributed with this manual.
+   </para>
+   <para>
+     Many of the names used by companies to distinguish their products and
+     services are claimed as trademarks. Where those names appear in any
+     GNOME documentation, and those trademarks are made aware to the members
+     of the GNOME Documentation Project, the names have been printed in caps
+     or initial caps.
+   </para>
+ </legalnotice>