List:Commits« Previous MessageNext Message »
From:paul Date:April 27 2006 3:46am
Subject:svn commit - mysqldoc@docsrva: r1950 - in trunk: . refman-4.1 refman-5.0 refman-5.1
View as plain text  
Author: paul
Date: 2006-04-27 05:46:58 +0200 (Thu, 27 Apr 2006)
New Revision: 1950

Log:
 r9796@frost:  paul | 2006-04-26 22:09:21 -0500
 Restructure copyright info.


Added:
   trunk/refman-4.1/copyright.xml
   trunk/refman-4.1/legalnotice.xml
   trunk/refman-5.0/copyright.xml
   trunk/refman-5.0/legalnotice.xml
   trunk/refman-5.1/copyright.xml
   trunk/refman-5.1/legalnotice.xml
Modified:
   trunk/
   trunk/refman-4.1/manual.xml
   trunk/refman-5.0/manual.xml
   trunk/refman-5.1/manual.xml


Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:6954
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:9795
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:4590
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:6954
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:9796
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:4590

Added: trunk/refman-4.1/copyright.xml
===================================================================
--- trunk/refman-4.1/copyright.xml	                        (rev 0)
+++ trunk/refman-4.1/copyright.xml	2006-04-27 03:46:58 UTC (rev 1950)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
+<para>
+  Copyright 1997-2006 MySQL AB
+</para>

Added: trunk/refman-4.1/legalnotice.xml
===================================================================
--- trunk/refman-4.1/legalnotice.xml	                        (rev 0)
+++ trunk/refman-4.1/legalnotice.xml	2006-04-27 03:46:58 UTC (rev 1950)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
+<legalnotice>
+
+  <xi:include href="copyright.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+  <para>
+    This document is NOT distributed under a GPL style license. Its use
+    is subject to the following terms:
+  </para>
+
+  <itemizedlist>
+
+    <listitem>
+      <para>
+        Conversion to other formats is allowed, but the actual content
+        may not be altered or edited in any way.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para>
+        You may create a printed copy for your own personal use.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para>
+        For all other uses, such as selling printed copies or using this
+        document in whole or in part within another publication, prior
+        written agreement from MySQL AB is required.
+      </para>
+    </listitem>
+
+  </itemizedlist>
+
+  <para>
+    Please email <email>docs@stripped</email> for more information or
+    if you are interested in doing a translation.
+  </para>
+
+</legalnotice>

Modified: trunk/refman-4.1/manual.xml
===================================================================
--- trunk/refman-4.1/manual.xml	2006-04-27 03:46:44 UTC (rev 1949)
+++ trunk/refman-4.1/manual.xml	2006-04-27 03:46:58 UTC (rev 1950)
@@ -32,52 +32,8 @@
 
     </abstract>
 
-    <copyright>
+    <xi:include href="legalnotice.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
-      <year>1997-2006</year>
-
-      <holder>MySQL AB</holder>
-
-    </copyright>
-
-    <legalnotice>
-
-      <para>
-        This manual is NOT distributed under a GPL style license. Use of
-        the manual is subject to the following terms:
-
-        <itemizedlist>
-
-          <listitem>
-            <para>
-              Conversion to other formats is allowed, but the actual
-              content may not be altered or edited in any way.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              You may create a printed copy for your own personal use.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              For all other uses, such as selling printed copies or
-              using the manual in whole or in part within another
-              publication, prior written agreement from MySQL AB is
-              required.
-            </para>
-          </listitem>
-
-        </itemizedlist>
-
-        Please email <email>docs@stripped</email> for more information
-        or if you are interested in doing a translation.
-      </para>
-
-    </legalnotice>
-
   </bookinfo>
 
   <xi:include href="preface.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>

Added: trunk/refman-5.0/copyright.xml
===================================================================
--- trunk/refman-5.0/copyright.xml	                        (rev 0)
+++ trunk/refman-5.0/copyright.xml	2006-04-27 03:46:58 UTC (rev 1950)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
+<para>
+  Copyright 1997-2006 MySQL AB
+</para>

Added: trunk/refman-5.0/legalnotice.xml
===================================================================
--- trunk/refman-5.0/legalnotice.xml	                        (rev 0)
+++ trunk/refman-5.0/legalnotice.xml	2006-04-27 03:46:58 UTC (rev 1950)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
+<legalnotice>
+
+  <xi:include href="copyright.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+  <para>
+    This document is NOT distributed under a GPL style license. Its use
+    is subject to the following terms:
+  </para>
+
+  <itemizedlist>
+
+    <listitem>
+      <para>
+        Conversion to other formats is allowed, but the actual content
+        may not be altered or edited in any way.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para>
+        You may create a printed copy for your own personal use.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para>
+        For all other uses, such as selling printed copies or using this
+        document in whole or in part within another publication, prior
+        written agreement from MySQL AB is required.
+      </para>
+    </listitem>
+
+  </itemizedlist>
+
+  <para>
+    Please email <email>docs@stripped</email> for more information or
+    if you are interested in doing a translation.
+  </para>
+
+</legalnotice>

Modified: trunk/refman-5.0/manual.xml
===================================================================
--- trunk/refman-5.0/manual.xml	2006-04-27 03:46:44 UTC (rev 1949)
+++ trunk/refman-5.0/manual.xml	2006-04-27 03:46:58 UTC (rev 1950)
@@ -32,52 +32,8 @@
 
     </abstract>
 
-    <copyright>
+    <xi:include href="legalnotice.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
-      <year>1997-2006</year>
-
-      <holder>MySQL AB</holder>
-
-    </copyright>
-
-    <legalnotice>
-
-      <para>
-        This manual is NOT distributed under a GPL style license. Use of
-        the manual is subject to the following terms:
-
-        <itemizedlist>
-
-          <listitem>
-            <para>
-              Conversion to other formats is allowed, but the actual
-              content may not be altered or edited in any way.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              You may create a printed copy for your own personal use.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              For all other uses, such as selling printed copies or
-              using the manual in whole or in part within another
-              publication, prior written agreement from MySQL AB is
-              required.
-            </para>
-          </listitem>
-
-        </itemizedlist>
-
-        Please email <email>docs@stripped</email> for more information
-        or if you are interested in doing a translation.
-      </para>
-
-    </legalnotice>
-
   </bookinfo>
 
   <xi:include href="preface.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>

Added: trunk/refman-5.1/copyright.xml
===================================================================
--- trunk/refman-5.1/copyright.xml	                        (rev 0)
+++ trunk/refman-5.1/copyright.xml	2006-04-27 03:46:58 UTC (rev 1950)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
+<para>
+  Copyright 1997-2006 MySQL AB
+</para>

Added: trunk/refman-5.1/legalnotice.xml
===================================================================
--- trunk/refman-5.1/legalnotice.xml	                        (rev 0)
+++ trunk/refman-5.1/legalnotice.xml	2006-04-27 03:46:58 UTC (rev 1950)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
+<legalnotice>
+
+  <xi:include href="copyright.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+  <para>
+    This document is NOT distributed under a GPL style license. Its use
+    is subject to the following terms:
+  </para>
+
+  <itemizedlist>
+
+    <listitem>
+      <para>
+        Conversion to other formats is allowed, but the actual content
+        may not be altered or edited in any way.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para>
+        You may create a printed copy for your own personal use.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para>
+        For all other uses, such as selling printed copies or using this
+        document in whole or in part within another publication, prior
+        written agreement from MySQL AB is required.
+      </para>
+    </listitem>
+
+  </itemizedlist>
+
+  <para>
+    Please email <email>docs@stripped</email> for more information or
+    if you are interested in doing a translation.
+  </para>
+
+</legalnotice>

Modified: trunk/refman-5.1/manual.xml
===================================================================
--- trunk/refman-5.1/manual.xml	2006-04-27 03:46:44 UTC (rev 1949)
+++ trunk/refman-5.1/manual.xml	2006-04-27 03:46:58 UTC (rev 1950)
@@ -32,52 +32,8 @@
 
     </abstract>
 
-    <copyright>
+    <xi:include href="legalnotice.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
-      <year>1997-2006</year>
-
-      <holder>MySQL AB</holder>
-
-    </copyright>
-
-    <legalnotice>
-
-      <para>
-        This manual is NOT distributed under a GPL style license. Use of
-        the manual is subject to the following terms:
-
-        <itemizedlist>
-
-          <listitem>
-            <para>
-              Conversion to other formats is allowed, but the actual
-              content may not be altered or edited in any way.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              You may create a printed copy for your own personal use.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              For all other uses, such as selling printed copies or
-              using the manual in whole or in part within another
-              publication, prior written agreement from MySQL AB is
-              required.
-            </para>
-          </listitem>
-
-        </itemizedlist>
-
-        Please email <email>docs@stripped</email> for more information
-        or if you are interested in doing a translation.
-      </para>
-
-    </legalnotice>
-
   </bookinfo>
 
   <xi:include href="preface.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>

Thread
svn commit - mysqldoc@docsrva: r1950 - in trunk: . refman-4.1 refman-5.0 refman-5.1paul27 Apr