List:Commits« Previous MessageNext Message »
From:mc.brown Date:April 20 2010 9:04am
Subject:svn commit - mysqldoc@docsrva: r20109 - in trunk: mysql-monitor-2.0 mysql-monitor-2.1
View as plain text  
Author: mcbrown
Date: 2010-04-20 11:04:36 +0200 (Tue, 20 Apr 2010)
New Revision: 20109

Log:
Updating the MEM legalnotice



Modified:
   trunk/mysql-monitor-2.0/legalnotice.en.xml
   trunk/mysql-monitor-2.1/legalnotice.en.xml


Modified: trunk/mysql-monitor-2.0/legalnotice.en.xml
===================================================================
--- trunk/mysql-monitor-2.0/legalnotice.en.xml	2010-04-20 09:03:13 UTC (rev 20108)
+++ trunk/mysql-monitor-2.0/legalnotice.en.xml	2010-04-20 09:04:36 UTC (rev 20109)
Changed blocks: 1, Lines Added: 15, Lines Deleted: 62; 4992 bytes

@@ -15,72 +15,25 @@
 -->
 
   <para>
-    Copyright 2005-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc.
+    Copyright &copy; 2005, 2010, Oracle and/or its affiliates. All
+    rights reserved.
   </para>
 
-  <para>
-    This documentation is NOT distributed under a GPL license. Use of
-    this documentation is subject to the following terms: You may create
-    a printed copy of this documentation solely for your own personal
-    use. Conversion to other formats is allowed as long as the actual
-    content is not altered or edited in any way. You shall not publish
-    or distribute this documentation in any form or on any media, except
-    if you distribute the documentation in a manner similar to how Sun
-    disseminates it (that is, electronically for download on a Web site
-    with the software) or on a CD-ROM or similar medium, provided
-    however that the documentation is disseminated together with the
-    software on the same medium. Any other use, such as any
-    dissemination of printed copies or use of this documentation, in
-    whole or in part, in another publication, requires the prior written
-    consent from an authorized representative of Sun Microsystems, Inc.
-    Sun Microsystems, Inc. and MySQL AB reserve any and all rights to
-    this documentation not expressly granted above.
-  </para>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+              href="../common/oracle-notice-ga.en.xml"
+              xpointer="xpointer(//section/para)" />
 
-  <para>
-    Copyright © 2008-2010 Sun Microsystems, Inc., 4150 Network Circle,
-    Santa Clara, California 95054, U.S.A. All rights reserved.U.S.
-    Government Rights - Commercial software. Government users are
-    subject to the Sun Microsystems, Inc. standard license agreement and
-    applicable provisions of the FAR and its supplements. Use is subject
-    to license terms. This distribution may include materials developed
-    by third parties.Sun, Sun Microsystems, the Sun logo, MySQL
-    Enterprise Monitor 2.0, MySQL logo(TM) and MySQL(TM) are trademarks
-    or registered trademarks of Sun Microsystems, Inc. in the U.S. and
-    other countries.This product is covered and controlled by U.S.
-    Export Control laws and may be subject to the export or import laws
-    in other countries. Nuclear, missile, chemical biological weapons or
-    nuclear maritime end uses or end users, whether direct or indirect,
-    are strictly prohibited. Export or reexport to countries subject to
-    U.S. embargo or to entities identified on U.S. export exclusion
-    lists, including, but not limited to, the denied persons and
-    specially designated nationals lists is strictly prohibited.
+  <para role="legalnotice-gpl">
+    Copyright &copy; 2005, 2010, Oracle and/or its affiliates. All
+    rights reserved.
   </para>
 
-  <para>
-    Copyright © 2008-2010 Sun Microsystems, Inc., 4150 Network Circle,
-    Santa Clara, California 95054, Etats-Unis. Tous droits
-    réservés.L'utilisation est soumise aux termes de la Licence.Cette
-    distribution peut comprendre des composants développés par des
-    tierces parties.Sun, Sun Microsystems, le logo Sun, MySQL Enterprise
-    Monitor 2.0, MySQL logo(TM) et MySQL(TM) sont des marques de
-    fabrique ou des marques déposées de Sun Microsystems, Inc. aux
-    Etats-Unis et dans d'autres pays.Ce produit est soumis à la
-    législation américaine en matière de contrôle des exportations
-    et peut être soumis à la règlementation en vigueur dans d'autres
-    pays dans le domaine des exportations et importations. Les
-    utilisations, ou utilisateurs finaux, pour des armes nucléaires,des
-    missiles, des armes biologiques et chimiques ou du nucléaire
-    maritime, directement ou indirectement, sont strictement interdites.
-    Les exportations ou réexportations vers les pays sous embargo
-    américain, ou vers des entités figurant sur les listes d'exclusion
-    d'exportation américaines, y compris, mais de manière non
-    exhaustive, la liste de personnes qui font objet d'un ordre de ne
-    pas participer, d'une façon directe ou indirecte, aux exportations
-    des produits ou des services qui sont régis par la législation
-    américaine en matière de contrôle des exportations et la liste de
-    ressortissants spécifiquement désignés, sont rigoureusement
-    interdites.
-  </para>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+              href="../common/gpl-notice.en.xml"
+              xpointer="xpointer(//section/para)" />
 
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+              href="../common/legalnotice-misc-refman.en.xml"
+              xpointer="xpointer(//section/para)" />
+
 </legalnotice>


Modified: trunk/mysql-monitor-2.1/legalnotice.en.xml
===================================================================
--- trunk/mysql-monitor-2.1/legalnotice.en.xml	2010-04-20 09:03:13 UTC (rev 20108)
+++ trunk/mysql-monitor-2.1/legalnotice.en.xml	2010-04-20 09:04:36 UTC (rev 20109)
Changed blocks: 1, Lines Added: 15, Lines Deleted: 62; 4992 bytes

@@ -15,72 +15,25 @@
 -->
 
   <para>
-    Copyright 2005-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc.
+    Copyright &copy; 2006, 2010, Oracle and/or its affiliates. All
+    rights reserved.
   </para>
 
-  <para>
-    This documentation is NOT distributed under a GPL license. Use of
-    this documentation is subject to the following terms: You may create
-    a printed copy of this documentation solely for your own personal
-    use. Conversion to other formats is allowed as long as the actual
-    content is not altered or edited in any way. You shall not publish
-    or distribute this documentation in any form or on any media, except
-    if you distribute the documentation in a manner similar to how Sun
-    disseminates it (that is, electronically for download on a Web site
-    with the software) or on a CD-ROM or similar medium, provided
-    however that the documentation is disseminated together with the
-    software on the same medium. Any other use, such as any
-    dissemination of printed copies or use of this documentation, in
-    whole or in part, in another publication, requires the prior written
-    consent from an authorized representative of Sun Microsystems, Inc.
-    Sun Microsystems, Inc. and MySQL AB reserve any and all rights to
-    this documentation not expressly granted above.
-  </para>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+              href="../common/oracle-notice-ga.en.xml"
+              xpointer="xpointer(//section/para)" />
 
-  <para>
-    Copyright © 2008-2010 Sun Microsystems, Inc., 4150 Network Circle,
-    Santa Clara, California 95054, U.S.A. All rights reserved.U.S.
-    Government Rights - Commercial software. Government users are
-    subject to the Sun Microsystems, Inc. standard license agreement and
-    applicable provisions of the FAR and its supplements. Use is subject
-    to license terms. This distribution may include materials developed
-    by third parties.Sun, Sun Microsystems, the Sun logo, MySQL
-    Enterprise Monitor 2.0, MySQL logo(TM) and MySQL(TM) are trademarks
-    or registered trademarks of Sun Microsystems, Inc. in the U.S. and
-    other countries.This product is covered and controlled by U.S.
-    Export Control laws and may be subject to the export or import laws
-    in other countries. Nuclear, missile, chemical biological weapons or
-    nuclear maritime end uses or end users, whether direct or indirect,
-    are strictly prohibited. Export or reexport to countries subject to
-    U.S. embargo or to entities identified on U.S. export exclusion
-    lists, including, but not limited to, the denied persons and
-    specially designated nationals lists is strictly prohibited.
+  <para role="legalnotice-gpl">
+    Copyright &copy; 2006, 2010, Oracle and/or its affiliates. All
+    rights reserved.
   </para>
 
-  <para>
-    Copyright © 2008-2010 Sun Microsystems, Inc., 4150 Network Circle,
-    Santa Clara, California 95054, Etats-Unis. Tous droits
-    réservés.L'utilisation est soumise aux termes de la Licence.Cette
-    distribution peut comprendre des composants développés par des
-    tierces parties.Sun, Sun Microsystems, le logo Sun, MySQL Enterprise
-    Monitor 2.0, MySQL logo(TM) et MySQL(TM) sont des marques de
-    fabrique ou des marques déposées de Sun Microsystems, Inc. aux
-    Etats-Unis et dans d'autres pays.Ce produit est soumis à la
-    législation américaine en matière de contrôle des exportations
-    et peut être soumis à la règlementation en vigueur dans d'autres
-    pays dans le domaine des exportations et importations. Les
-    utilisations, ou utilisateurs finaux, pour des armes nucléaires,des
-    missiles, des armes biologiques et chimiques ou du nucléaire
-    maritime, directement ou indirectement, sont strictement interdites.
-    Les exportations ou réexportations vers les pays sous embargo
-    américain, ou vers des entités figurant sur les listes d'exclusion
-    d'exportation américaines, y compris, mais de manière non
-    exhaustive, la liste de personnes qui font objet d'un ordre de ne
-    pas participer, d'une façon directe ou indirecte, aux exportations
-    des produits ou des services qui sont régis par la législation
-    américaine en matière de contrôle des exportations et la liste de
-    ressortissants spécifiquement désignés, sont rigoureusement
-    interdites.
-  </para>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+              href="../common/gpl-notice.en.xml"
+              xpointer="xpointer(//section/para)" />
 
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+              href="../common/legalnotice-misc-refman.en.xml"
+              xpointer="xpointer(//section/para)" />
+
 </legalnotice>


Thread
svn commit - mysqldoc@docsrva: r20109 - in trunk: mysql-monitor-2.0 mysql-monitor-2.1mc.brown20 Apr