List:Commits« Previous MessageNext Message »
From:john.russell Date:July 12 2010 10:31pm
Subject:svn commit - mysqldoc@docsrva: r21679 - trunk/mysql-enterprise-backup-3.5
View as plain text  
Author: jrussell
Date: 2010-07-13 00:31:08 +0200 (Tue, 13 Jul 2010)
New Revision: 21679

Log:
Beefed up the attribution for the zlib library with a /* */ block from Trudy Pelzer.


Modified:
   trunk/mysql-enterprise-backup-3.5/manual.xml


Modified: trunk/mysql-enterprise-backup-3.5/manual.xml
===================================================================
--- trunk/mysql-enterprise-backup-3.5/manual.xml	2010-07-12 20:37:58 UTC (rev 21678)
+++ trunk/mysql-enterprise-backup-3.5/manual.xml	2010-07-12 22:31:08 UTC (rev 21679)
Changed blocks: 1, Lines Added: 26, Lines Deleted: 1; 1694 bytes

@@ -4433,10 +4433,35 @@
         library that is used for the compressed backup feature:
       </para>
 
-<programlisting>
+<para>
 Oracle gratefully acknowledges the contributions of Jean-loup
 Gailly and Mark Adler in creating the zlib general purpose
 compression library which is used in this product.
+</para>
+
+<programlisting>
+/* zlib.h -- interface of the 'zlib' general purpose compression
+library version 1.2.3,
+July 18th, 2005 
+Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler 
+
+This software is provided 'as-is', without any express or implied warranty. 
+In no event will the authors be held liable for any damages arising from the
+use of this software. Permission is granted to anyone to use this software 
+for any purpose,including commercial applications, and to alter it and
+redistribute it freely, subject to the following restrictions: 
+1. The origin of this software must not be misrepresented; you must not claim
+that you wrote the original software. If you use this software in a product, 
+an acknowledgment in the product documentation would be appreciated but is not
+required. 
+2. Altered source versions must be plainly marked as such, and must not be
+misrepresented as being the original software. 
+3. This notice may not be removed or altered from any source
+distribution.
+
+Jean-loup Gailly jloup@stripped 
+Mark Adler madler@stripped 
+*/
 </programlisting>
 
     </section>


Thread
svn commit - mysqldoc@docsrva: r21679 - trunk/mysql-enterprise-backup-3.5john.russell13 Jul