Author: paul
Date: 2006-04-27 05:47:39 +0200 (Thu, 27 Apr 2006)
New Revision: 1951
Log:
r9797@frost: paul | 2006-04-26 22:45:18 -0500
Restructure copyright info.
Regenerate dependencies.
Added:
trunk/administrator/copyright.xml
trunk/administrator/legalnotice.en.xml
trunk/internals/legalnotice.en.xml
trunk/migration-toolkit/copyright.xml
trunk/migration-toolkit/legalnotice.en.xml
trunk/mysqltest/copyright.xml
trunk/mysqltest/legalnotice.en.xml
trunk/query-browser/copyright.xml
trunk/query-browser/legalnotice.en.xml
trunk/refman-4.1/legalnotice.en.xml
trunk/refman-5.0/legalnotice.en.xml
trunk/refman-5.1/legalnotice.en.xml
trunk/userguide/copyright.xml
trunk/userguide/legalnotice.en.xml
Removed:
trunk/internals/legalnotice.xml
trunk/refman-4.1/legalnotice.xml
trunk/refman-5.0/legalnotice.xml
trunk/refman-5.1/legalnotice.xml
Modified:
trunk/
trunk/administrator/Makefile
trunk/administrator/administrator.xml
trunk/internals/Makefile
trunk/internals/internals.xml
trunk/migration-toolkit/Makefile
trunk/migration-toolkit/migration-toolkit.xml
trunk/mysqltest/Makefile
trunk/mysqltest/mysqltest.xml
trunk/query-browser/Makefile
trunk/query-browser/query-browser.xml
trunk/refman-4.1/Makefile
trunk/refman-4.1/manual.xml
trunk/refman-5.0/Makefile
trunk/refman-5.0/manual.xml
trunk/refman-5.1/Makefile
trunk/refman-5.1/manual.xml
trunk/refman-common/fixedchars.ent
trunk/userguide/Makefile
trunk/userguide/userguide.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:9796
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:9797
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:4590
Modified: trunk/administrator/Makefile
===================================================================
--- trunk/administrator/Makefile 2006-04-27 03:46:58 UTC (rev 1950)
+++ trunk/administrator/Makefile 2006-04-27 03:47:39 UTC (rev 1951)
@@ -41,7 +41,7 @@
ADMINISTRATOR_SRCS_EXTRA = ../gui-common/gui-common.ent
-ADMINISTRATOR_SRCS = $(ADMINISTRATOR_SRCS_EXTRA) administrator.xml images/connection.png images/configure-service-mode-connection.png images/configure-service-mode-window.png images/mainwindow.png images/marked-area.png images/user-accounts.png images/user-information.png images/graph-settings.png images/server-logs-general-log.png images/restore-content.png images/replication.png ../gui-common/chapter-table-editor.xml ../gui-common/images/tableeditor.png ../gui-common/images/columneditor.png ../gui-common/images/indexeditor.png ../gui-common/images/confirmchanges.png ../gui-common/chapter-options-introduction.xml ../gui-common/images/options.png ../gui-common/chapter-options-general.xml ../gui-common/chapter-options-connections.xml ../gui-common/images/options-connection.png ../gui-common/chapter-options-editors.xml chapter-options-administrator.xml images/system-tray.png ../gui-common/appendix-source-install.xml ../gui-common/appendix-troubleshooting.xml ../gui-common/ima!
ges/connectionerror.png ../gui-common/appendix-connection-storage.xml ../gui-common/appendix-common-files.xml ../gui-common/appendix-translator-notes.xml ../gui-common/appendix-third-party.xml
+ADMINISTRATOR_SRCS = $(ADMINISTRATOR_SRCS_EXTRA) administrator.xml legalnotice.en.xml copyright.xml images/connection.png images/configure-service-mode-connection.png images/configure-service-mode-window.png images/mainwindow.png images/marked-area.png images/user-accounts.png images/user-information.png images/graph-settings.png images/server-logs-general-log.png images/restore-content.png images/replication.png ../gui-common/chapter-table-editor.xml ../gui-common/images/tableeditor.png ../gui-common/images/columneditor.png ../gui-common/images/indexeditor.png ../gui-common/images/confirmchanges.png ../gui-common/chapter-options-introduction.xml ../gui-common/images/options.png ../gui-common/chapter-options-general.xml ../gui-common/chapter-options-connections.xml ../gui-common/images/options-connection.png ../gui-common/chapter-options-editors.xml chapter-options-administrator.xml images/system-tray.png ../gui-common/appendix-source-install.xml ../gui-common/appendix-trou!
bleshooting.xml ../gui-common/images/connectionerror.png ../gui-common/appendix-connection-storage.xml ../gui-common/appendix-common-files.xml ../gui-common/appendix-translator-notes.xml ../gui-common/appendix-third-party.xml
administrator-prepped.xml: $(ADMINISTRATOR_SRCS)
Modified: trunk/administrator/administrator.xml
===================================================================
--- trunk/administrator/administrator.xml 2006-04-27 03:46:58 UTC (rev 1950)
+++ trunk/administrator/administrator.xml 2006-04-27 03:47:39 UTC (rev 1951)
@@ -36,52 +36,8 @@
</abstract>
- <copyright>
+ <xi:include href="legalnotice.en.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <year>2004-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>
<chapter id="mysql-administrator-introduction">
Added: trunk/administrator/copyright.xml
===================================================================
--- trunk/administrator/copyright.xml (rev 0)
+++ trunk/administrator/copyright.xml 2006-04-27 03:47:39 UTC (rev 1951)
@@ -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 2004-2006 MySQL AB
+</para>
Added: trunk/administrator/legalnotice.en.xml
===================================================================
--- trunk/administrator/legalnotice.en.xml (rev 0)
+++ trunk/administrator/legalnotice.en.xml 2006-04-27 03:47:39 UTC (rev 1951)
@@ -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/internals/Makefile
===================================================================
--- trunk/internals/Makefile 2006-04-27 03:46:58 UTC (rev 1950)
+++ trunk/internals/Makefile 2006-04-27 03:47:39 UTC (rev 1951)
@@ -43,7 +43,7 @@
INTERNALS_SRCS_EXTRA = fixedchars.ent
-INTERNALS_SRCS = $(INTERNALS_SRCS_EXTRA) internals.xml legalnotice.xml copyright.xml
+INTERNALS_SRCS = $(INTERNALS_SRCS_EXTRA) internals.xml legalnotice.en.xml copyright.xml
internals-prepped.xml: $(INTERNALS_SRCS)
Modified: trunk/internals/internals.xml
===================================================================
--- trunk/internals/internals.xml 2006-04-27 03:46:58 UTC (rev 1950)
+++ trunk/internals/internals.xml 2006-04-27 03:47:39 UTC (rev 1951)
@@ -43,7 +43,7 @@
</abstract>
- <xi:include href="legalnotice.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="legalnotice.en.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
</bookinfo>
Added: trunk/internals/legalnotice.en.xml
===================================================================
--- trunk/internals/legalnotice.en.xml (rev 0)
+++ trunk/internals/legalnotice.en.xml 2006-04-27 03:47:39 UTC (rev 1951)
@@ -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>
Deleted: trunk/internals/legalnotice.xml
Modified: trunk/migration-toolkit/Makefile
===================================================================
--- trunk/migration-toolkit/Makefile 2006-04-27 03:46:58 UTC (rev 1950)
+++ trunk/migration-toolkit/Makefile 2006-04-27 03:47:39 UTC (rev 1951)
@@ -39,7 +39,7 @@
# Dependency list for Migration Toolkit document
# This variable is updated by "make depend"
-MIGRATION_TOOLKIT_SRCS = $(MIGRATION_TOOLKIT_SRCS_EXTRA) migration-toolkit.xml images/migration-plan.png images/welcome-screen.png images/configuration-type.png images/source-database-access.png images/source-database-mssql.png images/source-database-oracle.png images/source-database-oracle-nodriver.png images/source-database-mysql.png images/target-database-mysql.png images/connect-servers.png images/schema-selection.png images/reverse-engineering.png images/object-selection.png images/object-selection-detail.png images/object-selection-expression.png images/object-mapping.png images/meta-migration.png images/manual-editing.png images/manual-editing-detail.png images/creation-options.png images/creating-objects.png images/mapping-options.png images/bulk-transfer.png images/summary.png images/access-options-show.png images/access-system-tables.png images/access-object-permissions.png
+MIGRATION_TOOLKIT_SRCS = $(MIGRATION_TOOLKIT_SRCS_EXTRA) migration-toolkit.xml legalnotice.en.xml copyright.xml images/migration-plan.png images/welcome-screen.png images/configuration-type.png images/source-database-access.png images/source-database-mssql.png images/source-database-oracle.png images/source-database-oracle-nodriver.png images/source-database-mysql.png images/target-database-mysql.png images/connect-servers.png images/schema-selection.png images/reverse-engineering.png images/object-selection.png images/object-selection-detail.png images/object-selection-expression.png images/object-mapping.png images/meta-migration.png images/manual-editing.png images/manual-editing-detail.png images/creation-options.png images/creating-objects.png images/mapping-options.png images/bulk-transfer.png images/summary.png images/access-options-show.png images/access-system-tables.png images/access-object-permissions.png
migration-toolkit-prepped.xml: $(MIGRATION_TOOLKIT_SRCS)
Added: trunk/migration-toolkit/copyright.xml
===================================================================
--- trunk/migration-toolkit/copyright.xml (rev 0)
+++ trunk/migration-toolkit/copyright.xml 2006-04-27 03:47:39 UTC (rev 1951)
@@ -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 2005-2006 MySQL AB
+</para>
Added: trunk/migration-toolkit/legalnotice.en.xml
===================================================================
--- trunk/migration-toolkit/legalnotice.en.xml (rev 0)
+++ trunk/migration-toolkit/legalnotice.en.xml 2006-04-27 03:47:39 UTC (rev 1951)
@@ -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/migration-toolkit/migration-toolkit.xml
===================================================================
--- trunk/migration-toolkit/migration-toolkit.xml 2006-04-27 03:46:58 UTC (rev 1950)
+++ trunk/migration-toolkit/migration-toolkit.xml 2006-04-27 03:47:39 UTC (rev 1951)
@@ -35,52 +35,8 @@
</abstract>
- <copyright>
+ <xi:include href="legalnotice.en.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <year>2005-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>
<chapter id="mysql-migration-toolkit-introduction">
Modified: trunk/mysqltest/Makefile
===================================================================
--- trunk/mysqltest/Makefile 2006-04-27 03:46:58 UTC (rev 1950)
+++ trunk/mysqltest/Makefile 2006-04-27 03:47:39 UTC (rev 1951)
@@ -43,7 +43,7 @@
MYSQLTEST_SRCS_EXTRA = fixedchars.ent
-MYSQLTEST_SRCS = $(MYSQLTEST_SRCS_EXTRA) mysqltest.xml introduction.xml command-reference.xml tutorial.xml
+MYSQLTEST_SRCS = $(MYSQLTEST_SRCS_EXTRA) mysqltest.xml legalnotice.en.xml copyright.xml introduction.xml tutorial.xml command-reference.xml
mysqltest-prepped.xml: $(MYSQLTEST_SRCS)
Added: trunk/mysqltest/copyright.xml
===================================================================
--- trunk/mysqltest/copyright.xml (rev 0)
+++ trunk/mysqltest/copyright.xml 2006-04-27 03:47:39 UTC (rev 1951)
@@ -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 2006 MySQL AB
+</para>
Added: trunk/mysqltest/legalnotice.en.xml
===================================================================
--- trunk/mysqltest/legalnotice.en.xml (rev 0)
+++ trunk/mysqltest/legalnotice.en.xml 2006-04-27 03:47:39 UTC (rev 1951)
@@ -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/mysqltest/mysqltest.xml
===================================================================
--- trunk/mysqltest/mysqltest.xml 2006-04-27 03:46:58 UTC (rev 1950)
+++ trunk/mysqltest/mysqltest.xml 2006-04-27 03:47:39 UTC (rev 1951)
@@ -43,52 +43,8 @@
</abstract>
- <copyright>
+ <xi:include href="legalnotice.en.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <year>2005-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>
<preface id="preface">
Modified: trunk/query-browser/Makefile
===================================================================
--- trunk/query-browser/Makefile 2006-04-27 03:46:58 UTC (rev 1950)
+++ trunk/query-browser/Makefile 2006-04-27 03:47:39 UTC (rev 1951)
@@ -41,7 +41,7 @@
QUERY_BROWSER_SRCS_EXTRA = ../gui-common/gui-common.ent
-QUERY_BROWSER_SRCS = $(QUERY_BROWSER_SRCS_EXTRA) query-browser.xml images/connection.png images/mainscreen.png images/querybar.png images/twosakilas.png images/buttonbar.png images/schematabrowser.png images/script-editor.png images/file-open-script.png images/tabletool.png images/blob-buttons.png images/dynamiclist.png images/stored-procedure-database-browser.png ../gui-common/chapter-table-editor.xml ../gui-common/images/tableeditor.png ../gui-common/images/columneditor.png ../gui-common/images/indexeditor.png ../gui-common/images/confirmchanges.png ../gui-common/chapter-options-introduction.xml ../gui-common/images/options.png ../gui-common/chapter-options-general.xml ../gui-common/chapter-options-connections.xml ../gui-common/images/options-connection.png ../gui-common/chapter-options-editors.xml chapter-options-query-browser.xml images/qb-options.png ../gui-common/appendix-source-install.xml ../gui-common/appendix-troubleshooting.xml ../gui-common/images/connectionerro!
r.png ../gui-common/appendix-connection-storage.xml ../gui-common/appendix-common-files.xml ../gui-common/appendix-translator-notes.xml ../gui-common/appendix-third-party.xml
+QUERY_BROWSER_SRCS = $(QUERY_BROWSER_SRCS_EXTRA) query-browser.xml legalnotice.en.xml copyright.xml images/connection.png images/mainscreen.png images/querybar.png images/twosakilas.png images/buttonbar.png images/schematabrowser.png images/script-editor.png images/file-open-script.png images/tabletool.png images/blob-buttons.png images/dynamiclist.png images/stored-procedure-database-browser.png ../gui-common/chapter-table-editor.xml ../gui-common/images/tableeditor.png ../gui-common/images/columneditor.png ../gui-common/images/indexeditor.png ../gui-common/images/confirmchanges.png ../gui-common/chapter-options-introduction.xml ../gui-common/images/options.png ../gui-common/chapter-options-general.xml ../gui-common/chapter-options-connections.xml ../gui-common/images/options-connection.png ../gui-common/chapter-options-editors.xml chapter-options-query-browser.xml images/qb-options.png ../gui-common/appendix-source-install.xml ../gui-common/appendix-troubleshooting.xml ..!
/gui-common/images/connectionerror.png ../gui-common/appendix-connection-storage.xml ../gui-common/appendix-common-files.xml ../gui-common/appendix-translator-notes.xml ../gui-common/appendix-third-party.xml
query-browser-prepped.xml: $(QUERY_BROWSER_SRCS)
Added: trunk/query-browser/copyright.xml
===================================================================
--- trunk/query-browser/copyright.xml (rev 0)
+++ trunk/query-browser/copyright.xml 2006-04-27 03:47:39 UTC (rev 1951)
@@ -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 2004-2006 MySQL AB
+</para>
Added: trunk/query-browser/legalnotice.en.xml
===================================================================
--- trunk/query-browser/legalnotice.en.xml (rev 0)
+++ trunk/query-browser/legalnotice.en.xml 2006-04-27 03:47:39 UTC (rev 1951)
@@ -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/query-browser/query-browser.xml
===================================================================
--- trunk/query-browser/query-browser.xml 2006-04-27 03:46:58 UTC (rev 1950)
+++ trunk/query-browser/query-browser.xml 2006-04-27 03:47:39 UTC (rev 1951)
@@ -36,52 +36,8 @@
</abstract>
- <copyright>
+ <xi:include href="legalnotice.en.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <year>2004-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>
<chapter id="mysql-query-browser-introduction">
Modified: trunk/refman-4.1/Makefile
===================================================================
--- trunk/refman-4.1/Makefile 2006-04-27 03:46:58 UTC (rev 1950)
+++ trunk/refman-4.1/Makefile 2006-04-27 03:47:39 UTC (rev 1951)
@@ -44,7 +44,7 @@
MANUAL_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/titles.en.ent
-MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml preface.xml introduction.xml ../refman-common/manual-conventions.en.xml ../refman-common/what-is-mysql-ab.en.xml ../refman-common/what-is.en.xml ../refman-common/maxdb.en.xml ../refman-common/information-sources.xml ../refman-common/bug-reports.xml installing.xml tutorial.xml using-mysql-programs.xml database-administration.xml replication.xml optimization.xml client-utility-programs.xml language-structure.xml reservedwords.xml ../refman-common/reserved-new-4.0.xml ../refman-common/reserved-new-4.1.xml charset.xml data-types.xml functions.xml sql-syntax.xml storage-engines.xml innodb.xml images/blackhole-1.png ndbcluster.xml images/cluster-components-1.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png images/multi-comp-1.png spatial-extensions.xml apis.xml connectors.xml connector-odbc.xml images/myarchitecture.png images/mydsn-icon.png images/mydsn.png images/mydsn-setup.png images/mydsn-example.png images/mydsn!
-test-success.png images/mydsn-test-fail.png images/mydsn-options.png images/mydsn-icon.png images/mydsn.png images/mydsn-trace.png images/myaccess.png images/myaccess-odbc.png images/mydsn-trace.png images/mydll-properties.png images/mydsn-options.png images/myflowchart.png connector-net.xml ../refman-common/news-connector-net.xml connector-j.xml ../refman-common/news-connector-j.xml connector-mxj.xml connector-php.xml extending-mysql.xml problems.xml error-handling.xml errmsgs-server.xml errmsgs-client.xml ../refman-common/credits.xml news.xml ../refman-common/news-4.1.xml ../refman-common/news-4.0.xml ../refman-common/news-3.23.xml ../refman-common/news-innodb.xml ../refman-common/news-cluster.xml ../refman-common/news-myodbc.xml porting.xml ../refman-common/environment-variables.xml ../refman-common/regexp.xml limits.xml restrictions.xml ../refman-common/gpl-license.xml ../refman-common/mysql-floss-license-exception.xml
+MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml legalnotice.en.xml copyright.xml preface.xml introduction.xml ../refman-common/manual-conventions.en.xml ../refman-common/what-is-mysql-ab.en.xml ../refman-common/what-is.en.xml ../refman-common/maxdb.en.xml ../refman-common/information-sources.xml ../refman-common/bug-reports.xml installing.xml tutorial.xml using-mysql-programs.xml database-administration.xml replication.xml optimization.xml client-utility-programs.xml language-structure.xml reservedwords.xml ../refman-common/reserved-new-4.0.xml ../refman-common/reserved-new-4.1.xml charset.xml data-types.xml functions.xml sql-syntax.xml storage-engines.xml innodb.xml images/blackhole-1.png ndbcluster.xml images/cluster-components-1.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png images/multi-comp-1.png spatial-extensions.xml apis.xml connectors.xml connector-odbc.xml images/myarchitecture.png images/mydsn-icon.png images/mydsn.png images/mydsn-setup.png imag!
es/mydsn-example.png images/mydsn-test-success.png images/mydsn-test-fail.png images/mydsn-options.png images/mydsn-icon.png images/mydsn.png images/mydsn-trace.png images/myaccess.png images/myaccess-odbc.png images/mydsn-trace.png images/mydll-properties.png images/mydsn-options.png images/myflowchart.png connector-net.xml ../refman-common/news-connector-net.xml connector-j.xml ../refman-common/news-connector-j.xml connector-mxj.xml connector-php.xml extending-mysql.xml problems.xml error-handling.xml errmsgs-server.xml errmsgs-client.xml ../refman-common/credits.xml news.xml ../refman-common/news-4.1.xml ../refman-common/news-4.0.xml ../refman-common/news-3.23.xml ../refman-common/news-innodb.xml ../refman-common/news-cluster.xml ../refman-common/news-myodbc.xml porting.xml ../refman-common/environment-variables.xml ../refman-common/regexp.xml limits.xml restrictions.xml ../refman-common/gpl-license.xml ../refman-common/mysql-floss-license-exception.xml
manual-prepped.xml: $(MANUAL_SRCS)
manual-manprepped.xml: $(MANUAL_SRCS)
Added: trunk/refman-4.1/legalnotice.en.xml
===================================================================
--- trunk/refman-4.1/legalnotice.en.xml (rev 0)
+++ trunk/refman-4.1/legalnotice.en.xml 2006-04-27 03:47:39 UTC (rev 1951)
@@ -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>
Deleted: trunk/refman-4.1/legalnotice.xml
Modified: trunk/refman-4.1/manual.xml
===================================================================
--- trunk/refman-4.1/manual.xml 2006-04-27 03:46:58 UTC (rev 1950)
+++ trunk/refman-4.1/manual.xml 2006-04-27 03:47:39 UTC (rev 1951)
@@ -32,7 +32,7 @@
</abstract>
- <xi:include href="legalnotice.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="legalnotice.en.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
</bookinfo>
Modified: trunk/refman-5.0/Makefile
===================================================================
--- trunk/refman-5.0/Makefile 2006-04-27 03:46:58 UTC (rev 1950)
+++ trunk/refman-5.0/Makefile 2006-04-27 03:47:39 UTC (rev 1951)
@@ -44,7 +44,7 @@
MANUAL_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/titles.en.ent
-MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml preface.xml introduction.xml ../refman-common/manual-conventions.en.xml ../refman-common/what-is-mysql-ab.en.xml ../refman-common/what-is.en.xml ../refman-common/maxdb.en.xml ../refman-common/information-sources.xml ../refman-common/bug-reports.xml installing.xml tutorial.xml using-mysql-programs.xml database-administration.xml replication.xml optimization.xml client-utility-programs.xml language-structure.xml reservedwords.xml ../refman-common/reserved-new-5.0.xml charset.xml data-types.xml functions.xml sql-syntax.xml storage-engines.xml innodb.xml images/blackhole-1.png ndbcluster.xml images/cluster-components-1.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png images/multi-comp-1.png spatial-extensions.xml stored-procedures.xml triggers.xml views.xml information-schema.xml precision-math.xml apis.xml connectors.xml connector-odbc.xml images/myarchitecture.png images/mydsn-icon.png images/mydsn.png images/myds!
n-setup.png images/mydsn-example.png images/mydsn-test-success.png images/mydsn-test-fail.png images/mydsn-options.png images/mydsn-icon.png images/mydsn.png images/mydsn-trace.png images/myaccess.png images/myaccess-odbc.png images/mydsn-trace.png images/mydll-properties.png images/mydsn-options.png images/myflowchart.png connector-net.xml ../refman-common/news-connector-net.xml connector-j.xml ../refman-common/news-connector-j.xml connector-mxj.xml connector-php.xml extending-mysql.xml problems.xml error-handling.xml errmsgs-server.xml errmsgs-client.xml ../refman-common/credits.xml news.xml ../refman-common/news-5.0.xml ../refman-common/news-cluster.xml ../refman-common/news-myodbc.xml porting.xml ../refman-common/environment-variables.xml ../refman-common/regexp.xml limits.xml restrictions.xml ../refman-common/gpl-license.xml ../refman-common/mysql-floss-license-exception.xml
+MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml legalnotice.en.xml copyright.xml preface.xml introduction.xml ../refman-common/manual-conventions.en.xml ../refman-common/what-is-mysql-ab.en.xml ../refman-common/what-is.en.xml ../refman-common/maxdb.en.xml ../refman-common/information-sources.xml ../refman-common/bug-reports.xml installing.xml tutorial.xml using-mysql-programs.xml database-administration.xml replication.xml optimization.xml client-utility-programs.xml language-structure.xml reservedwords.xml ../refman-common/reserved-new-5.0.xml charset.xml data-types.xml functions.xml sql-syntax.xml storage-engines.xml innodb.xml images/blackhole-1.png ndbcluster.xml images/cluster-components-1.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png images/multi-comp-1.png spatial-extensions.xml stored-procedures.xml triggers.xml views.xml information-schema.xml precision-math.xml apis.xml connectors.xml connector-odbc.xml images/myarchitecture.png images/mydsn-icon!
.png images/mydsn.png images/mydsn-setup.png images/mydsn-example.png images/mydsn-test-success.png images/mydsn-test-fail.png images/mydsn-options.png images/mydsn-icon.png images/mydsn.png images/mydsn-trace.png images/myaccess.png images/myaccess-odbc.png images/mydsn-trace.png images/mydll-properties.png images/mydsn-options.png images/myflowchart.png connector-net.xml ../refman-common/news-connector-net.xml connector-j.xml ../refman-common/news-connector-j.xml connector-mxj.xml connector-php.xml extending-mysql.xml problems.xml error-handling.xml errmsgs-server.xml errmsgs-client.xml ../refman-common/credits.xml news.xml ../refman-common/news-5.0.xml ../refman-common/news-cluster.xml ../refman-common/news-myodbc.xml porting.xml ../refman-common/environment-variables.xml ../refman-common/regexp.xml limits.xml restrictions.xml ../refman-common/gpl-license.xml ../refman-common/mysql-floss-license-exception.xml
manual-prepped.xml: $(MANUAL_SRCS)
manual-manprepped.xml: $(MANUAL_SRCS)
Added: trunk/refman-5.0/legalnotice.en.xml
===================================================================
--- trunk/refman-5.0/legalnotice.en.xml (rev 0)
+++ trunk/refman-5.0/legalnotice.en.xml 2006-04-27 03:47:39 UTC (rev 1951)
@@ -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>
Deleted: trunk/refman-5.0/legalnotice.xml
Modified: trunk/refman-5.0/manual.xml
===================================================================
--- trunk/refman-5.0/manual.xml 2006-04-27 03:46:58 UTC (rev 1950)
+++ trunk/refman-5.0/manual.xml 2006-04-27 03:47:39 UTC (rev 1951)
@@ -32,7 +32,7 @@
</abstract>
- <xi:include href="legalnotice.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="legalnotice.en.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
</bookinfo>
Modified: trunk/refman-5.1/Makefile
===================================================================
--- trunk/refman-5.1/Makefile 2006-04-27 03:46:58 UTC (rev 1950)
+++ trunk/refman-5.1/Makefile 2006-04-27 03:47:39 UTC (rev 1951)
@@ -44,7 +44,7 @@
MANUAL_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/titles.en.ent
-MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml preface.xml introduction.xml ../refman-common/manual-conventions.en.xml ../refman-common/what-is-mysql-ab.en.xml ../refman-common/what-is.en.xml ../refman-common/maxdb.en.xml ../refman-common/information-sources.xml ../refman-common/bug-reports.xml installing.xml tutorial.xml using-mysql-programs.xml database-administration.xml replication.xml optimization.xml client-utility-programs.xml language-structure.xml reservedwords.xml ../refman-common/reserved-new-5.1.xml charset.xml data-types.xml functions.xml sql-syntax.xml storage-engines.xml innodb.xml images/blackhole-1.png custom-engine.xml images/custom-engine-overview.png ndbcluster.xml images/cluster-components-1.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png images/multi-comp-1.png images/cluster-replication-overview.png images/cluster-replication-binlog-injector.png partitioning.xml spatial-extensions.xml stored-procedures.xml triggers.xml events.xml view!
s.xml information-schema.xml precision-math.xml apis.xml connectors.xml connector-odbc.xml images/myarchitecture.png images/mydsn-icon.png images/mydsn.png images/mydsn-setup.png images/mydsn-example.png images/mydsn-test-success.png images/mydsn-test-fail.png images/mydsn-options.png images/mydsn-icon.png images/mydsn.png images/mydsn-trace.png images/myaccess.png images/myaccess-odbc.png images/mydsn-trace.png images/mydll-properties.png images/mydsn-options.png images/myflowchart.png connector-net.xml ../refman-common/news-connector-net.xml connector-j.xml ../refman-common/news-connector-j.xml connector-mxj.xml connector-php.xml extending-mysql.xml problems.xml error-handling.xml errmsgs-server.xml errmsgs-client.xml ../refman-common/credits.xml news.xml ../refman-common/news-5.1.xml ../refman-common/news-myodbc.xml porting.xml ../refman-common/environment-variables.xml ../refman-common/regexp.xml limits.xml restrictions.xml ../refman-common/gpl-license.xml ../refman-com!
mon/mysql-floss-license-exception.xml
+MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml legalnotice.en.xml copyright.xml preface.xml introduction.xml ../refman-common/manual-conventions.en.xml ../refman-common/what-is-mysql-ab.en.xml ../refman-common/what-is.en.xml ../refman-common/maxdb.en.xml ../refman-common/information-sources.xml ../refman-common/bug-reports.xml installing.xml tutorial.xml using-mysql-programs.xml database-administration.xml replication.xml optimization.xml client-utility-programs.xml language-structure.xml reservedwords.xml ../refman-common/reserved-new-5.1.xml charset.xml data-types.xml functions.xml sql-syntax.xml pluggable-storage.xml images/pluggable-storage-overview.png storage-engines.xml innodb.xml images/blackhole-1.png custom-engine.xml images/custom-engine-overview.png ndbcluster.xml images/cluster-components-1.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png images/multi-comp-1.png images/cluster-replication-overview.png images/cluster-replication-binlog-injector.p!
ng partitioning.xml spatial-extensions.xml stored-procedures.xml triggers.xml events.xml views.xml information-schema.xml precision-math.xml apis.xml connectors.xml connector-odbc.xml images/myarchitecture.png images/mydsn-icon.png images/mydsn.png images/mydsn-setup.png images/mydsn-example.png images/mydsn-test-success.png images/mydsn-test-fail.png images/mydsn-options.png images/mydsn-icon.png images/mydsn.png images/mydsn-trace.png images/myaccess.png images/myaccess-odbc.png images/mydsn-trace.png images/mydll-properties.png images/mydsn-options.png images/myflowchart.png connector-net.xml ../refman-common/news-connector-net.xml connector-j.xml ../refman-common/news-connector-j.xml connector-mxj.xml connector-php.xml extending-mysql.xml problems.xml error-handling.xml errmsgs-server.xml errmsgs-client.xml ../refman-common/credits.xml news.xml ../refman-common/news-5.1.xml ../refman-common/news-myodbc.xml porting.xml ../refman-common/environment-variables.xml ../refman!
-common/regexp.xml limits.xml restrictions.xml ../refman-commo!
n/gpl-li
cense.xml ../refman-common/mysql-floss-license-exception.xml
manual-prepped.xml: $(MANUAL_SRCS)
manual-manprepped.xml: $(MANUAL_SRCS)
Added: trunk/refman-5.1/legalnotice.en.xml
===================================================================
--- trunk/refman-5.1/legalnotice.en.xml (rev 0)
+++ trunk/refman-5.1/legalnotice.en.xml 2006-04-27 03:47:39 UTC (rev 1951)
@@ -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>
Deleted: trunk/refman-5.1/legalnotice.xml
Modified: trunk/refman-5.1/manual.xml
===================================================================
--- trunk/refman-5.1/manual.xml 2006-04-27 03:46:58 UTC (rev 1950)
+++ trunk/refman-5.1/manual.xml 2006-04-27 03:47:39 UTC (rev 1951)
@@ -32,7 +32,7 @@
</abstract>
- <xi:include href="legalnotice.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="legalnotice.en.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
</bookinfo>
Modified: trunk/refman-common/fixedchars.ent
===================================================================
--- trunk/refman-common/fixedchars.ent 2006-04-27 03:46:58 UTC (rev 1950)
+++ trunk/refman-common/fixedchars.ent 2006-04-27 03:47:39 UTC (rev 1951)
@@ -244,3 +244,6 @@
<!ENTITY le "≤">
<!ENTITY ge "≥">
<!ENTITY ddash "--">
+<!ENTITY dArr "⇓"> <!-- DOWNWARDS DOUBLE ARROW -->
+<!ENTITY uArr "⇑"> <!-- UPWARDS DOUBLE ARROW -->
+<!ENTITY vArr "⇕"> <!-- UP DOWN DOUBLE ARROW -->
Modified: trunk/userguide/Makefile
===================================================================
--- trunk/userguide/Makefile 2006-04-27 03:46:58 UTC (rev 1950)
+++ trunk/userguide/Makefile 2006-04-27 03:47:39 UTC (rev 1951)
@@ -39,7 +39,7 @@
# Dependency list for MySQL User Guide document
# This variable is updated by "make depend"
-USERGUIDE_SRCS = $(USERGUIDE_SRCS_EXTRA) userguide.xml introduction.xml creating.xml populating.xml querying.xml modifying.xml indexing.xml images/indexing-displaying-administrator.png storage-engines.xml views.xml stored-procedures.xml installing.xml configuring.xml security.xml logfiles.xml images/logfiles-slow-query-log-administrator-settings.png images/logfiles-slow-query-log-administrator-view.png disaster.xml php-mysqli.xml dotnet.xml java.xml glossary.xml
+USERGUIDE_SRCS = $(USERGUIDE_SRCS_EXTRA) userguide.xml legalnotice.en.xml copyright.xml introduction.xml creating.xml populating.xml querying.xml modifying.xml indexing.xml images/indexing-displaying-administrator.png storage-engines.xml views.xml stored-procedures.xml installing.xml configuring.xml security.xml logfiles.xml images/logfiles-slow-query-log-administrator-settings.png images/logfiles-slow-query-log-administrator-view.png disaster.xml php-mysqli.xml dotnet.xml java.xml glossary.xml
userguide-prepped.xml: $(USERGUIDE_SRCS)
Added: trunk/userguide/copyright.xml
===================================================================
--- trunk/userguide/copyright.xml (rev 0)
+++ trunk/userguide/copyright.xml 2006-04-27 03:47:39 UTC (rev 1951)
@@ -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 2005-2006 MySQL AB
+</para>
Added: trunk/userguide/legalnotice.en.xml
===================================================================
--- trunk/userguide/legalnotice.en.xml (rev 0)
+++ trunk/userguide/legalnotice.en.xml 2006-04-27 03:47:39 UTC (rev 1951)
@@ -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/userguide/userguide.xml
===================================================================
--- trunk/userguide/userguide.xml 2006-04-27 03:46:58 UTC (rev 1950)
+++ trunk/userguide/userguide.xml 2006-04-27 03:47:39 UTC (rev 1951)
@@ -23,6 +23,8 @@
</abstract>
+ <xi:include href="legalnotice.en.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
</bookinfo>
<xi:include href="introduction.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r1951 - in trunk: . administrator internals migration-toolkit mysqltest query-browser refman-4.1 refman-5.0 refman-5.1 ... | paul | 27 Apr |
