[Gnash-commit] gnash ChangeLog doc/C/Makefile.am doc/C/userman...

[Russ Nelson]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Russ Nelson <nelsonrn>  08/05/07 01:03:00

Modified files:
        .              : ChangeLog 
        doc/C          : Makefile.am 
        doc/C/usermanual: acknowledgments.xml 

Log message:
        * doc/C/Makefile.am: Remove dependence upon gpl-appendix.xml
        * add required acknowledgement of jemalloc.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6531&r2=1.6532
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/Makefile.am?cvsroot=gnash&r1=1.74&r2=1.75
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/usermanual/acknowledgments.xml?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6531
retrieving revision 1.6532
diff -u -b -r1.6531 -r1.6532
--- ChangeLog   6 May 2008 16:26:12 -0000       1.6531
+++ ChangeLog   7 May 2008 01:02:58 -0000       1.6532
@@ -1,3 +1,8 @@
+2008-05-06 Russ Nelson <address@hidden>
+
+       * doc/C/Makefile.am: Remove dependence upon gpl-appendix.xml
+       * add required acknowledgement of jemalloc.
+
 2008-05-06 Benjamin Wolsey <address@hidden>
 
        * server/vm/ASHandlers.cpp (unsupported_action_handler): fix

Index: doc/C/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/doc/C/Makefile.am,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -b -r1.74 -r1.75
--- doc/C/Makefile.am   15 Mar 2008 04:41:07 -0000      1.74
+++ doc/C/Makefile.am   7 May 2008 01:02:59 -0000       1.75
@@ -39,7 +39,6 @@
        introduction.xml \
        security.xml \
        legal.xml \
-       gpl-appendix.xml \
        app_authors.xml \
        doc_authors.xml \
        fdl-appendix.xml \

Index: doc/C/usermanual/acknowledgments.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/usermanual/acknowledgments.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- doc/C/usermanual/acknowledgments.xml        3 Mar 2008 15:00:00 -0000       
1.2
+++ doc/C/usermanual/acknowledgments.xml        7 May 2008 01:03:00 -0000       
1.3
@@ -28,8 +28,40 @@
     </para>
   
     <para>
+      &app; makes use of jemalloc, which is copyrighted by Jason Evans
+      &lt;address@hidden&gt;.  The terms of the license follow:
+    </para>
+
+<para>
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+  1. Redistributions of source code must retain the above copyright
+     notice(s), this list of conditions and the following disclaimer as
+     the first lines of this file unmodified other than the possible
+     addition of one or more copyright notices.
+  2. Redistributions in binary form must reproduce the above copyright
+     notice(s), this list of conditions and the following disclaimer in
+     the documentation and/or other materials provided with the
+     distribution.
+    </para>
+ 
+    <para>
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``AS IS'' AND ANY
+  EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) BE
+  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+  OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+    </para>
+  
+    <para>
       Finally, thanks to all of the &app; developers I haven't mentioned for
       all their hard work, and for answering my unending questions. 
     </para>
   </sect1>
-