List:Commits« Previous MessageNext Message »
From:paul.dubois Date:December 20 2010 4:03pm
Subject:svn commit - mysqldoc@docsrva: r24508 - in trunk: . common dynamic-docs/licenses
View as plain text  
Author: paul
Date: 2010-12-20 17:03:08 +0100 (Mon, 20 Dec 2010)
New Revision: 24508

Log:
 r43313@dhcp-213:  paul | 2010-12-20 10:02:39 -0500
 Fix docs bug:
 Bug #59008	3rd-party notice for GPL v2
 
 This license previously was included directly in the GNU realine license.
 Now it is in a separate section and we just xref to it.


Removed:
   trunk/common/gnu-gpl-v-2.xml
Renamed/Moved:
   trunk/common/license-gnu-gpl-2-0.xml (from rev 24114, trunk/common/gnu-gpl-v-2.xml)
Modified:
   trunk/common/license-gnu-readline.xml
   trunk/dynamic-docs/licenses/products.xml

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:45597
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:66486
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
ebeeeee4-b232-4669-a521-231442eced53:/mysqldoc-local/mysqldoc/trunk:43308
   + 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:45597
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:66486
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
ebeeeee4-b232-4669-a521-231442eced53:/mysqldoc-local/mysqldoc/trunk:43313


Modified: trunk/common/license-gnu-readline.xml
===================================================================
--- trunk/common/license-gnu-readline.xml	2010-12-20 16:03:01 UTC (rev 24507)
+++ trunk/common/license-gnu-readline.xml	2010-12-20 16:03:08 UTC (rev 24508)
Changed blocks: 2, Lines Added: 5, Lines Deleted: 3; 729 bytes

@@ -12,9 +12,9 @@
   <para>
     The following software may be included in this product:
   </para>
-  
+
   <para>
-    GNU Readline Library 
+    GNU Readline Library
   </para>
 
 <programlisting>

@@ -33,6 +33,8 @@
 which version of the GPL is applied is unspecified. 
 </programlisting>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnu-gpl-v-2.xml"/>
+  <para>
+    This component is licensed under <xref linkend="gnu-gpl-v-2.xml"/>
+  </para>
 
 </section>


Modified: trunk/dynamic-docs/licenses/products.xml
===================================================================
--- trunk/dynamic-docs/licenses/products.xml	2010-12-20 16:03:01 UTC (rev 24507)
+++ trunk/dynamic-docs/licenses/products.xml	2010-12-20 16:03:08 UTC (rev 24508)
Changed blocks: 6, Lines Added: 6, Lines Deleted: 0; 1961 bytes

@@ -4,6 +4,7 @@
 
     <product id="mysqld" version="5.0">
       <use id="license-dbug"/>
+      <use id="license-gnu-gpl-2-0"/>
       <use id="license-gnu-readline"/>
       <use id="license-lib-sql"/>
       <use id="license-libedit"/>

@@ -18,6 +19,7 @@
       <use id="license-dtoa"/>
       <use id="license-findgtest-cmake"/>
       <use id="license-getarg"/>
+      <use id="license-gnu-gpl-2-0"/>
       <use id="license-gnu-readline"/>
       <use id="license-google-io-rate-patch"/>
       <use id="license-google-smp-patch"/>

@@ -38,6 +40,7 @@
       <use id="license-dtoa"/>
       <use id="license-findgtest-cmake"/>
       <use id="license-getarg"/>
+      <use id="license-gnu-gpl-2-0"/>
       <use id="license-gnu-readline"/>
       <use id="license-google-io-rate-patch"/>
       <use id="license-google-smp-patch"/>

@@ -59,6 +62,7 @@
       <use id="license-dtoa"/>
       <use id="license-findgtest-cmake"/>
       <use id="license-getarg"/>
+      <use id="license-gnu-gpl-2-0"/>
       <use id="license-gnu-readline"/>
       <use id="license-google-io-rate-patch"/>
       <use id="license-google-smp-patch"/>

@@ -84,6 +88,7 @@
       <use id="license-dtoa"/>
       <use id="license-findgtest-cmake"/>
       <use id="license-getarg"/>
+      <use id="license-gnu-gpl-2-0"/>
       <use id="license-gnu-readline"/>
       <use id="license-google-io-rate-patch"/>
       <use id="license-google-smp-patch"/>

@@ -109,6 +114,7 @@
       <use id="license-dtoa"/>
       <use id="license-findgtest-cmake"/>
       <use id="license-getarg"/>
+      <use id="license-gnu-gpl-2-0"/>
       <use id="license-gnu-readline"/>
       <use id="license-google-io-rate-patch"/>
       <use id="license-google-smp-patch"/>


Thread
svn commit - mysqldoc@docsrva: r24508 - in trunk: . common dynamic-docs/licensespaul.dubois20 Dec