List:Commits« Previous MessageNext Message »
From:paul.dubois Date:March 23 2011 2:56pm
Subject:svn commit - mysqldoc@oter02: r25485 - in trunk: . common
View as plain text  
Author: pd221994
Date: 2011-03-23 15:56:58 +0100 (Wed, 23 Mar 2011)
New Revision: 25485

Log:
 r46170@dhcp-adc-twvpn-1-vpnpool-10-154-5-216:  paul | 2011-03-23 09:54:23 -0500
 Update license files


Modified:
   svk:merge
   trunk/common/license-glib-mcm.xml
   trunk/common/license-glib-mem.xml
   trunk/common/license-glib-proxy.xml
   trunk/common/license-glib-wb.xml
   trunk/common/license-gnu-libtool-verbose.xml

Property changes on: trunk
___________________________________________________________________

Modified: svk:merge
===================================================================


Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 1277 bytes


Modified: trunk/common/license-glib-mcm.xml
===================================================================
--- trunk/common/license-glib-mcm.xml	2011-03-23 14:56:38 UTC (rev 25484)
+++ trunk/common/license-glib-mcm.xml	2011-03-23 14:56:58 UTC (rev 25485)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 465 bytes

@@ -6,7 +6,7 @@
 ]>
 <section id="license-glib-mcm">
 
-  <title>GLib License</title>
+  <title>GLib License (for MySQL Cluster Manager)</title>
 
   <para>
     The following software may be included in this product:


Modified: trunk/common/license-glib-mem.xml
===================================================================
--- trunk/common/license-glib-mem.xml	2011-03-23 14:56:38 UTC (rev 25484)
+++ trunk/common/license-glib-mem.xml	2011-03-23 14:56:58 UTC (rev 25485)
Changed blocks: 2, Lines Added: 5, Lines Deleted: 6; 1334 bytes

@@ -6,21 +6,21 @@
 ]>
 <section id="license-glib-mem">
 
-  <title>GLib License</title>
+  <title>GLib License (for MySQL Enterprise Monitor)</title>
 
   <para>
     The following software may be included in this product:
   </para>
 
 <programlisting>
-<![CDATA[
 GLib
 
 You are receiving a copy of the GLib library in both source and 
 object code in the following:
-./lib/charset.alias, ./lib/libglib*, ./lib/libgmodule*, ./lib/libgthread*
-and ./licenses/lgpl/glib-2.16.6.tar.gz (or, for Windows: /bin/libglib*,
-/bin/libgmodule*, /bin/libgthread*).
+./lib/charset.alias, ./lib/libglib*, ./lib/libgmodule*,
+./lib/libgthread* and ./licenses/lgpl/glib-2.16.6.tar.gz
+(or, for Windows: /bin/libglib*, /bin/libgmodule*,
+/bin/libgthread*).
 
 The terms of the Oracle license do NOT apply to the GLib library; 
 it is licensed under the following license, separately from the 

@@ -30,7 +30,6 @@
 but the Oracle program might not operate properly or at all without 
 the library. For more information, see
 <xref linkend="mem-unattended-installation-cmdline-options-agent"/>.
-]]>
 </programlisting>
 
   <para>


Modified: trunk/common/license-glib-proxy.xml
===================================================================
--- trunk/common/license-glib-proxy.xml	2011-03-23 14:56:38 UTC (rev 25484)
+++ trunk/common/license-glib-proxy.xml	2011-03-23 14:56:58 UTC (rev 25485)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 463 bytes

@@ -6,7 +6,7 @@
 ]>
 <section id="license-glib-proxy">
 
-  <title>GLib License</title>
+  <title>GLib License (for MySQL Proxy)</title>
 
   <para>
     The following software may be included in this product:


Modified: trunk/common/license-glib-wb.xml
===================================================================
--- trunk/common/license-glib-wb.xml	2011-03-23 14:56:38 UTC (rev 25484)
+++ trunk/common/license-glib-wb.xml	2011-03-23 14:56:58 UTC (rev 25485)
Changed blocks: 2, Lines Added: 16, Lines Deleted: 13; 2314 bytes

@@ -6,7 +6,7 @@
 ]>
 <section id="license-glib-wb">
 
-  <title>GLib License</title>
+  <title>GLib License (for MySQL Workbench)</title>
 
   <para>
     The following software may be included in this product:

@@ -15,18 +15,21 @@
 <programlisting>
 <![CDATA[
 GLib
-You are receiving a copy of the GLib library in both source and object code 
-in the following folder: C:\Program Files (x86)\MySQL\MySQLWorkbench 5.2\ on 
-Windows and MySQLWorkbench.app/Contents/Frameworks on Mac OS X. The terms of 
-the Oracle license do NOT apply to the GLib library; it is licensed under the 
-following license, separately from the Oracle programs you receive. If you do 
-not wish to install this library, you may go to the folder C:\Program Files 
-(x86)\MySQL\MySQL Workbench 5.2\ and remove or replace the libglib-2.0-0.dll, 
-libgmodule-2.0-0.dll, libgobject-2.0-0.dll and libgthread-2.0-0.dll files if 
-present on Windows or go to the folder MySQLWorkbench.app/Contents/Frameworks 
-and remove or replace the files libglib-2.*.dylib, libgmodule-2.*.dylib and 
-libgthread-2.*.dylib on Mac OS X, but the Oracle program might not operate 
-properly or at all without the library. 
+
+You are receiving a copy of the GLib library in both source and
+object code in the following folder: C:\Program Files
+(x86)\MySQL\MySQLWorkbench 5.2\ on Windows and
+MySQLWorkbench.app/Contents/Frameworks on Mac OS X. The terms of
+the Oracle license do NOT apply to the GLib library; it is licensed
+under the following license, separately from the Oracle programs
+you receive. If you do not wish to install this library, you may
+go to the folder C:\Program Files (x86)\MySQL\MySQL Workbench 5.2\
+and remove or replace the libglib-2.0-0.dll, libgmodule-2.0-0.dll,
+libgobject-2.0-0.dll and libgthread-2.0-0.dll files if present on
+Windows or go to the folder MySQLWorkbench.app/Contents/Frameworks
+and remove or replace the files libglib-2.*.dylib, libgmodule-2.*.dylib
+and libgthread-2.*.dylib on Mac OS X, but the Oracle program might
+not operate properly or at all without the library.
 ]]>
 </programlisting>
 


Modified: trunk/common/license-gnu-libtool-verbose.xml
===================================================================
--- trunk/common/license-gnu-libtool-verbose.xml	2011-03-23 14:56:38 UTC (rev 25484)
+++ trunk/common/license-gnu-libtool-verbose.xml	2011-03-23 14:56:58 UTC (rev 25485)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 526 bytes

@@ -7,7 +7,7 @@
 ]>
 <section id="license-gnu-libtool-verbose">
 
-  <title>GNU Libtool License</title>
+  <title>GNU Libtool License (for MySQL Enterprise Monitor)</title>
 
   <para>
     The following software may be included in this product:


Thread
svn commit - mysqldoc@oter02: r25485 - in trunk: . commonpaul.dubois23 Mar