Author: paul
Date: 2007-08-20 22:02:17 +0200 (Mon, 20 Aug 2007)
New Revision: 7480
Log:
r23874@frost: paul | 2007-08-20 14:51:49 -0500
Update legalnotice files.
Update dependencies.
Removed:
trunk/administrator/copyright.xml
trunk/cy/query-browser/copyright.xml
trunk/guibook/copyright.xml
trunk/internals/copyright.xml
trunk/migration-toolkit/copyright.xml
trunk/mysqldoc-guide/copyright.xml
trunk/ndbapi/copyright.xml
trunk/proto-doc/copyright.xml
trunk/pt/refman-5.1/copyright.xml
trunk/query-browser/copyright.xml
trunk/ro/administrator/copyright.xml
trunk/sample-data/sakila/copyright.xml
trunk/userguide/copyright.xml
trunk/workbench/copyright.xml
Modified:
trunk/administrator/Makefile.depends
trunk/administrator/legalnotice.en.xml
trunk/cy/query-browser/Makefile.depends
trunk/cy/query-browser/legalnotice.en.xml
trunk/guibook/Makefile.depends
trunk/guibook/legalnotice.en.xml
trunk/internals/legalnotice.en.xml
trunk/migration-toolkit/Makefile.depends
trunk/migration-toolkit/legalnotice.en.xml
trunk/mysqldoc-guide/Makefile.depends
trunk/mysqldoc-guide/legalnotice.de.xml
trunk/mysqldoc-guide/legalnotice.en.xml
trunk/mysqltest/legalnotice.en.xml
trunk/ndbapi/Makefile.depends
trunk/ndbapi/legalnotice.en.xml
trunk/proto-doc/Makefile.depends
trunk/proto-doc/legalnotice.en.xml
trunk/pt/refman-5.1/legalnotice.en.xml
trunk/query-browser/Makefile.depends
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/refman-5.2/legalnotice.en.xml
trunk/ro/administrator/Makefile.depends
trunk/ro/administrator/legalnotice.en.xml
trunk/sample-data/sakila/Makefile.depends
trunk/sample-data/sakila/legalnotice.en.xml
trunk/userguide/Makefile.depends
trunk/userguide/legalnotice.en.xml
trunk/workbench/Makefile.depends
trunk/workbench/legalnotice.en.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:28858
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:23873
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:19696
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:28858
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:23874
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:19696
Modified: trunk/administrator/Makefile.depends
===================================================================
--- trunk/administrator/Makefile.depends 2007-08-20 20:02:00 UTC (rev 7479)
+++ trunk/administrator/Makefile.depends 2007-08-20 20:02:17 UTC (rev 7480)
Changed blocks: 3, Lines Added: 1, Lines Deleted: 16; 1699 bytes
@@ -34,7 +34,6 @@
catalogs.xml \
chapter-options-administrator.xml \
connection-dialog.xml \
- copyright.xml \
health.xml \
images/published/configure-service-mode-connection.png \
images/published/configure-service-mode-window.png \
@@ -196,19 +195,6 @@
connection-dialog-manprepped.xml: $(connection_dialog_SOURCES) $(connection_dialog_IDMAPS)
connection-dialog-remprepped.xml: $(connection_dialog_SOURCES) $(connection_dialog_IDMAPS)
-copyright_INCLUDES =
-copyright_IMAGES =
-copyright_SOURCES = copyright.xml $(copyright_INCLUDES)
-copyright_IDMAPS =
-copyright.validpure: $(copyright_SOURCES)
-copyright.titles: $(copyright_SOURCES)
-copyright.useless: $(copyright_SOURCES)
-copyright.valid: $(copyright_SOURCES) $(copyright_IDMAPS)
-copyright.validwarn: $(copyright_SOURCES) $(copyright_IDMAPS)
-copyright-prepped.xml: $(copyright_SOURCES) $(copyright_IDMAPS)
-copyright-manprepped.xml: $(copyright_SOURCES) $(copyright_IDMAPS)
-copyright-remprepped.xml: $(copyright_SOURCES) $(copyright_IDMAPS)
-
health_INCLUDES = \
../common/fixedchars.ent \
../gui-common/gui-common.ent \
@@ -249,8 +235,7 @@
introduction-manprepped.xml: $(introduction_SOURCES) $(introduction_IDMAPS)
introduction-remprepped.xml: $(introduction_SOURCES) $(introduction_IDMAPS)
-legalnotice_en_INCLUDES = \
- copyright.xml
+legalnotice_en_INCLUDES =
legalnotice_en_IMAGES =
legalnotice_en_SOURCES = legalnotice.en.xml $(legalnotice_en_INCLUDES)
legalnotice_en_IDMAPS =
Modified: trunk/administrator/legalnotice.en.xml
===================================================================
--- trunk/administrator/legalnotice.en.xml 2007-08-20 20:02:00 UTC (rev 7479)
+++ trunk/administrator/legalnotice.en.xml 2007-08-20 20:02:17 UTC (rev 7480)
Changed blocks: 2, Lines Added: 13, Lines Deleted: 2; 1366 bytes
@@ -3,9 +3,20 @@
"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"/>
+ <remark>
+ The role attribute for each top-level legalnotice element determines
+ the context in which the element is used: 1) no role attribute: part
+ of the default legalnotice, used for regular documentation that is
+ not released under GPL; 2) role = legalnotice-gpl: for manpage
+ legalnotices, which are released under GPL; 3) role =
+ legalnotice-all: included in legalnotice for all documentation.
+ </remark>
<para>
+ Copyright 2004-2007 MySQL AB
+ </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
@@ -24,7 +35,7 @@
granted above.
</para>
- <para>
+ <para role="legalnotice-all">
Please email <email>docs@stripped</email> for more information or
if you are interested in doing a translation.
</para>
Modified: trunk/cy/query-browser/Makefile.depends
===================================================================
--- trunk/cy/query-browser/Makefile.depends 2007-08-20 20:02:00 UTC (rev 7479)
+++ trunk/cy/query-browser/Makefile.depends 2007-08-20 20:02:17 UTC (rev 7480)
Changed blocks: 3, Lines Added: 1, Lines Deleted: 16; 1669 bytes
@@ -39,19 +39,6 @@
connection-dialog-manprepped.xml: $(connection_dialog_SOURCES) $(connection_dialog_IDMAPS)
connection-dialog-remprepped.xml: $(connection_dialog_SOURCES) $(connection_dialog_IDMAPS)
-copyright_INCLUDES =
-copyright_IMAGES =
-copyright_SOURCES = copyright.xml $(copyright_INCLUDES)
-copyright_IDMAPS =
-copyright.validpure: $(copyright_SOURCES)
-copyright.titles: $(copyright_SOURCES)
-copyright.useless: $(copyright_SOURCES)
-copyright.valid: $(copyright_SOURCES) $(copyright_IDMAPS)
-copyright.validwarn: $(copyright_SOURCES) $(copyright_IDMAPS)
-copyright-prepped.xml: $(copyright_SOURCES) $(copyright_IDMAPS)
-copyright-manprepped.xml: $(copyright_SOURCES) $(copyright_IDMAPS)
-copyright-remprepped.xml: $(copyright_SOURCES) $(copyright_IDMAPS)
-
introduction_INCLUDES = \
../../common/fixedchars.ent \
../gui-common/gui-common.ent \
@@ -68,8 +55,7 @@
introduction-manprepped.xml: $(introduction_SOURCES) $(introduction_IDMAPS)
introduction-remprepped.xml: $(introduction_SOURCES) $(introduction_IDMAPS)
-legalnotice_en_INCLUDES = \
- copyright.xml
+legalnotice_en_INCLUDES =
legalnotice_en_IMAGES =
legalnotice_en_SOURCES = legalnotice.en.xml $(legalnotice_en_INCLUDES)
legalnotice_en_IDMAPS =
@@ -153,7 +139,6 @@
all-entities.ent \
chapter-options-query-browser.xml \
connection-dialog.xml \
- copyright.xml \
images/blob-buttons.png \
images/buttonbar.png \
images/connection.png \
Modified: trunk/cy/query-browser/legalnotice.en.xml
===================================================================
--- trunk/cy/query-browser/legalnotice.en.xml 2007-08-20 20:02:00 UTC (rev 7479)
+++ trunk/cy/query-browser/legalnotice.en.xml 2007-08-20 20:02:17 UTC (rev 7480)
Changed blocks: 2, Lines Added: 13, Lines Deleted: 2; 1375 bytes
@@ -3,9 +3,20 @@
"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"/>
+ <remark>
+ The role attribute for each top-level legalnotice element determines
+ the context in which the element is used: 1) no role attribute: part
+ of the default legalnotice, used for regular documentation that is
+ not released under GPL; 2) role = legalnotice-gpl: for manpage
+ legalnotices, which are released under GPL; 3) role =
+ legalnotice-all: included in legalnotice for all documentation.
+ </remark>
<para>
+ Copyright 2004-2007 MySQL AB
+ </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
@@ -24,7 +35,7 @@
granted above.
</para>
- <para>
+ <para role="legalnotice-all">
Please email <email>docs@stripped</email> for more information or
if you are interested in doing a translation.
</para>
Modified: trunk/guibook/Makefile.depends
===================================================================
--- trunk/guibook/Makefile.depends 2007-08-20 20:02:00 UTC (rev 7479)
+++ trunk/guibook/Makefile.depends 2007-08-20 20:02:17 UTC (rev 7480)
Changed blocks: 3, Lines Added: 1, Lines Deleted: 16; 1497 bytes
@@ -1,16 +1,3 @@
-copyright_INCLUDES =
-copyright_IMAGES =
-copyright_SOURCES = copyright.xml $(copyright_INCLUDES)
-copyright_IDMAPS =
-copyright.validpure: $(copyright_SOURCES)
-copyright.titles: $(copyright_SOURCES)
-copyright.useless: $(copyright_SOURCES)
-copyright.valid: $(copyright_SOURCES) $(copyright_IDMAPS)
-copyright.validwarn: $(copyright_SOURCES) $(copyright_IDMAPS)
-copyright-prepped.xml: $(copyright_SOURCES) $(copyright_IDMAPS)
-copyright-manprepped.xml: $(copyright_SOURCES) $(copyright_IDMAPS)
-copyright-remprepped.xml: $(copyright_SOURCES) $(copyright_IDMAPS)
-
guibook_INCLUDES = \
../administrator/../common/fixedchars.ent \
../administrator/../gui-common/gui-common.ent \
@@ -146,7 +133,6 @@
../workbench/reverse-engineering.xml \
../workbench/using.xml \
all-entities.ent \
- copyright.xml \
legalnotice.en.xml
guibook_IMAGES = \
../administrator/images/published/configure-service-mode-connection.png \
@@ -234,8 +220,7 @@
guibook-manprepped.xml: $(guibook_SOURCES) $(guibook_IDMAPS)
guibook-remprepped.xml: $(guibook_SOURCES) $(guibook_IDMAPS)
-legalnotice_en_INCLUDES = \
- copyright.xml
+legalnotice_en_INCLUDES =
legalnotice_en_IMAGES =
legalnotice_en_SOURCES = legalnotice.en.xml $(legalnotice_en_INCLUDES)
legalnotice_en_IDMAPS =
Modified: trunk/guibook/legalnotice.en.xml
===================================================================
--- trunk/guibook/legalnotice.en.xml 2007-08-20 20:02:00 UTC (rev 7479)
+++ trunk/guibook/legalnotice.en.xml 2007-08-20 20:02:17 UTC (rev 7480)
Changed blocks: 2, Lines Added: 13, Lines Deleted: 2; 1348 bytes
@@ -3,9 +3,20 @@
"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"/>
+ <remark>
+ The role attribute for each top-level legalnotice element determines
+ the context in which the element is used: 1) no role attribute: part
+ of the default legalnotice, used for regular documentation that is
+ not released under GPL; 2) role = legalnotice-gpl: for manpage
+ legalnotices, which are released under GPL; 3) role =
+ legalnotice-all: included in legalnotice for all documentation.
+ </remark>
<para>
+ Copyright 2004-2007 MySQL AB
+ </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
@@ -24,7 +35,7 @@
granted above.
</para>
- <para>
+ <para role="legalnotice-all">
Please email <email>docs@stripped</email> for more information or
if you are interested in doing a translation.
</para>
Modified: trunk/internals/legalnotice.en.xml
===================================================================
--- trunk/internals/legalnotice.en.xml 2007-08-20 20:02:00 UTC (rev 7479)
+++ trunk/internals/legalnotice.en.xml 2007-08-20 20:02:17 UTC (rev 7480)
Changed blocks: 2, Lines Added: 13, Lines Deleted: 2; 1354 bytes
@@ -3,9 +3,20 @@
"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"/>
+ <remark>
+ The role attribute for each top-level legalnotice element determines
+ the context in which the element is used: 1) no role attribute: part
+ of the default legalnotice, used for regular documentation that is
+ not released under GPL; 2) role = legalnotice-gpl: for manpage
+ legalnotices, which are released under GPL; 3) role =
+ legalnotice-all: included in legalnotice for all documentation.
+ </remark>
<para>
+ Copyright 1998-2007 MySQL AB
+ </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
@@ -24,7 +35,7 @@
granted above.
</para>
- <para>
+ <para role="legalnotice-all">
Please email <email>docs@stripped</email> for more information or
if you are interested in doing a translation.
</para>
Modified: trunk/migration-toolkit/Makefile.depends
===================================================================
--- trunk/migration-toolkit/Makefile.depends 2007-08-20 20:02:00 UTC (rev 7479)
+++ trunk/migration-toolkit/Makefile.depends 2007-08-20 20:02:17 UTC (rev 7480)
Changed blocks: 3, Lines Added: 1, Lines Deleted: 16; 1623 bytes
@@ -20,19 +20,6 @@
accessprep-manprepped.xml: $(accessprep_SOURCES) $(accessprep_IDMAPS)
accessprep-remprepped.xml: $(accessprep_SOURCES) $(accessprep_IDMAPS)
-copyright_INCLUDES =
-copyright_IMAGES =
-copyright_SOURCES = copyright.xml $(copyright_INCLUDES)
-copyright_IDMAPS =
-copyright.validpure: $(copyright_SOURCES)
-copyright.titles: $(copyright_SOURCES)
-copyright.useless: $(copyright_SOURCES)
-copyright.valid: $(copyright_SOURCES) $(copyright_IDMAPS)
-copyright.validwarn: $(copyright_SOURCES) $(copyright_IDMAPS)
-copyright-prepped.xml: $(copyright_SOURCES) $(copyright_IDMAPS)
-copyright-manprepped.xml: $(copyright_SOURCES) $(copyright_IDMAPS)
-copyright-remprepped.xml: $(copyright_SOURCES) $(copyright_IDMAPS)
-
extending_INCLUDES = \
../common/fixedchars.ent \
../gui-common/gui-common.ent \
@@ -147,8 +134,7 @@
introduction-manprepped.xml: $(introduction_SOURCES) $(introduction_IDMAPS)
introduction-remprepped.xml: $(introduction_SOURCES) $(introduction_IDMAPS)
-legalnotice_en_INCLUDES = \
- copyright.xml
+legalnotice_en_INCLUDES =
legalnotice_en_IMAGES =
legalnotice_en_SOURCES = legalnotice.en.xml $(legalnotice_en_INCLUDES)
legalnotice_en_IDMAPS =
@@ -177,7 +163,6 @@
../gui-common/starting-all.xml \
accessprep.xml \
all-entities.ent \
- copyright.xml \
extending.xml \
features.xml \
images/published/access-object-permissions.png \
Modified: trunk/migration-toolkit/legalnotice.en.xml
===================================================================
--- trunk/migration-toolkit/legalnotice.en.xml 2007-08-20 20:02:00 UTC (rev 7479)
+++ trunk/migration-toolkit/legalnotice.en.xml 2007-08-20 20:02:17 UTC (rev 7480)
Changed blocks: 2, Lines Added: 13, Lines Deleted: 2; 1378 bytes
@@ -3,9 +3,20 @@
"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"/>
+ <remark>
+ The role attribute for each top-level legalnotice element determines
+ the context in which the element is used: 1) no role attribute: part
+ of the default legalnotice, used for regular documentation that is
+ not released under GPL; 2) role = legalnotice-gpl: for manpage
+ legalnotices, which are released under GPL; 3) role =
+ legalnotice-all: included in legalnotice for all documentation.
+ </remark>
<para>
+ Copyright 2005-2007 MySQL AB
+ </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
@@ -24,7 +35,7 @@
granted above.
</para>
- <para>
+ <para role="legalnotice-all">
Please email <email>docs@stripped</email> for more information or
if you are interested in doing a translation.
</para>
Modified: trunk/mysqldoc-guide/Makefile.depends
===================================================================
--- trunk/mysqldoc-guide/Makefile.depends 2007-08-20 20:02:00 UTC (rev 7479)
+++ trunk/mysqldoc-guide/Makefile.depends 2007-08-20 20:02:17 UTC (rev 7480)
Changed blocks: 3, Lines Added: 1, Lines Deleted: 16; 1407 bytes
@@ -1,16 +1,3 @@
-copyright_INCLUDES =
-copyright_IMAGES =
-copyright_SOURCES = copyright.xml $(copyright_INCLUDES)
-copyright_IDMAPS =
-copyright.validpure: $(copyright_SOURCES)
-copyright.titles: $(copyright_SOURCES)
-copyright.useless: $(copyright_SOURCES)
-copyright.valid: $(copyright_SOURCES) $(copyright_IDMAPS)
-copyright.validwarn: $(copyright_SOURCES) $(copyright_IDMAPS)
-copyright-prepped.xml: $(copyright_SOURCES) $(copyright_IDMAPS)
-copyright-manprepped.xml: $(copyright_SOURCES) $(copyright_IDMAPS)
-copyright-remprepped.xml: $(copyright_SOURCES) $(copyright_IDMAPS)
-
formats_INCLUDES = \
../common/fixedchars.ent \
../refman-common/urls.ent \
@@ -28,8 +15,7 @@
formats-manprepped.xml: $(formats_SOURCES) $(formats_IDMAPS)
formats-remprepped.xml: $(formats_SOURCES) $(formats_IDMAPS)
-legalnotice_en_INCLUDES = \
- copyright.xml
+legalnotice_en_INCLUDES =
legalnotice_en_IMAGES =
legalnotice_en_SOURCES = legalnotice.en.xml $(legalnotice_en_INCLUDES)
legalnotice_en_IDMAPS =
@@ -46,7 +32,6 @@
../common/fixedchars.ent \
../refman-common/urls.ent \
all-entities.ent \
- copyright.xml \
formats.xml \
legalnotice.en.xml \
overview.xml \
Modified: trunk/mysqldoc-guide/legalnotice.de.xml
===================================================================
--- trunk/mysqldoc-guide/legalnotice.de.xml 2007-08-20 20:02:00 UTC (rev 7479)
+++ trunk/mysqldoc-guide/legalnotice.de.xml 2007-08-20 20:02:17 UTC (rev 7480)
Changed blocks: 2, Lines Added: 13, Lines Deleted: 2; 1351 bytes
@@ -3,9 +3,20 @@
"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"/>
+ <remark>
+ The role attribute for each top-level legalnotice element determines
+ the context in which the element is used: 1) no role attribute: part
+ of the default legalnotice, used for regular documentation that is
+ not released under GPL; 2) role = legalnotice-gpl: for manpage
+ legalnotices, which are released under GPL; 3) role =
+ legalnotice-all: included in legalnotice for all documentation.
+ </remark>
<para>
+ Copyright 2007 MySQL AB
+ </para>
+
+ <para>
Diese Dokumentation wird NICHT unter der GPL-Lizenz vertrieben. Die
Benutzung dieser Dokumentation unterliegt folgenden Bedingungen: Sie
dürfen diese Dokumentation ausschließich für private Zwecke
@@ -27,7 +38,7 @@
wurden.
</para>
- <para>
+ <para role="legalnotice-all">
Wenn Sie an weiteren Informationen interessiert sind, schreiben Sie
bitte an <email>docs@stripped</email>.
</para>
Modified: trunk/mysqldoc-guide/legalnotice.en.xml
===================================================================
--- trunk/mysqldoc-guide/legalnotice.en.xml 2007-08-20 20:02:00 UTC (rev 7479)
+++ trunk/mysqldoc-guide/legalnotice.en.xml 2007-08-20 20:02:17 UTC (rev 7480)
Changed blocks: 2, Lines Added: 13, Lines Deleted: 2; 1364 bytes
@@ -3,9 +3,20 @@
"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"/>
+ <remark>
+ The role attribute for each top-level legalnotice element determines
+ the context in which the element is used: 1) no role attribute: part
+ of the default legalnotice, used for regular documentation that is
+ not released under GPL; 2) role = legalnotice-gpl: for manpage
+ legalnotices, which are released under GPL; 3) role =
+ legalnotice-all: included in legalnotice for all documentation.
+ </remark>
<para>
+ Copyright 2007 MySQL AB
+ </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
@@ -24,7 +35,7 @@
granted above.
</para>
- <para>
+ <para role="legalnotice-all">
Please email <email>docs@stripped</email> for more information or
if you are interested in doing a translation.
</para>
Modified: trunk/mysqltest/legalnotice.en.xml
===================================================================
--- trunk/mysqltest/legalnotice.en.xml 2007-08-20 20:02:00 UTC (rev 7479)
+++ trunk/mysqltest/legalnotice.en.xml 2007-08-20 20:02:17 UTC (rev 7480)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 1; 533 bytes
@@ -60,7 +60,8 @@
</para>
<para role="legalnotice-all">
- Please email <email>docs@stripped</email> for more information.
+ Please email <email>docs@stripped</email> for more information or
+ if you are interested in doing a translation.
</para>
</legalnotice>
Modified: trunk/ndbapi/Makefile.depends
===================================================================
--- trunk/ndbapi/Makefile.depends 2007-08-20 20:02:00 UTC (rev 7479)
+++ trunk/ndbapi/Makefile.depends 2007-08-20 20:02:17 UTC (rev 7480)
Changed blocks: 3, Lines Added: 1, Lines Deleted: 16; 1425 bytes
@@ -1,16 +1,3 @@
-copyright_INCLUDES =
-copyright_IMAGES =
-copyright_SOURCES = copyright.xml $(copyright_INCLUDES)
-copyright_IDMAPS =
-copyright.validpure: $(copyright_SOURCES)
-copyright.titles: $(copyright_SOURCES)
-copyright.useless: $(copyright_SOURCES)
-copyright.valid: $(copyright_SOURCES) $(copyright_IDMAPS)
-copyright.validwarn: $(copyright_SOURCES) $(copyright_IDMAPS)
-copyright-prepped.xml: $(copyright_SOURCES) $(copyright_IDMAPS)
-copyright-manprepped.xml: $(copyright_SOURCES) $(copyright_IDMAPS)
-copyright-remprepped.xml: $(copyright_SOURCES) $(copyright_IDMAPS)
-
errors_INCLUDES = \
../common/fixedchars.ent \
../common/phrases.ent \
@@ -71,8 +58,7 @@
getting-started-manprepped.xml: $(getting_started_SOURCES) $(getting_started_IDMAPS)
getting-started-remprepped.xml: $(getting_started_SOURCES) $(getting_started_IDMAPS)
-legalnotice_en_INCLUDES = \
- copyright.xml
+legalnotice_en_INCLUDES =
legalnotice_en_IMAGES =
legalnotice_en_SOURCES = legalnotice.en.xml $(legalnotice_en_INCLUDES)
legalnotice_en_IDMAPS =
@@ -227,7 +213,6 @@
../common/phrases.ent \
../refman-common/urls.ent \
all-entities.ent \
- copyright.xml \
errors.xml \
examples.xml \
getting-started.xml \
Modified: trunk/ndbapi/legalnotice.en.xml
===================================================================
--- trunk/ndbapi/legalnotice.en.xml 2007-08-20 20:02:00 UTC (rev 7479)
+++ trunk/ndbapi/legalnotice.en.xml 2007-08-20 20:02:17 UTC (rev 7480)
Changed blocks: 2, Lines Added: 13, Lines Deleted: 2; 1345 bytes
@@ -3,9 +3,20 @@
"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"/>
+ <remark>
+ The role attribute for each top-level legalnotice element determines
+ the context in which the element is used: 1) no role attribute: part
+ of the default legalnotice, used for regular documentation that is
+ not released under GPL; 2) role = legalnotice-gpl: for manpage
+ legalnotices, which are released under GPL; 3) role =
+ legalnotice-all: included in legalnotice for all documentation.
+ </remark>
<para>
+ Copyright 2003-2007 MySQL AB
+ </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
@@ -24,7 +35,7 @@
granted above.
</para>
- <para>
+ <para role="legalnotice-all">
Please email <email>docs@stripped</email> for more information or
if you are interested in doing a translation.
</para>
Modified: trunk/proto-doc/Makefile.depends
===================================================================
--- trunk/proto-doc/Makefile.depends 2007-08-20 20:02:00 UTC (rev 7479)
+++ trunk/proto-doc/Makefile.depends 2007-08-20 20:02:17 UTC (rev 7480)
Changed blocks: 2, Lines Added: 1, Lines Deleted: 16; 1215 bytes
@@ -1,18 +1,4 @@
-copyright_INCLUDES =
-copyright_IMAGES =
-copyright_SOURCES = copyright.xml $(copyright_INCLUDES)
-copyright_IDMAPS =
-copyright.validpure: $(copyright_SOURCES)
-copyright.titles: $(copyright_SOURCES)
-copyright.useless: $(copyright_SOURCES)
-copyright.valid: $(copyright_SOURCES) $(copyright_IDMAPS)
-copyright.validwarn: $(copyright_SOURCES) $(copyright_IDMAPS)
-copyright-prepped.xml: $(copyright_SOURCES) $(copyright_IDMAPS)
-copyright-manprepped.xml: $(copyright_SOURCES) $(copyright_IDMAPS)
-copyright-remprepped.xml: $(copyright_SOURCES) $(copyright_IDMAPS)
-
-legalnotice_en_INCLUDES = \
- copyright.xml
+legalnotice_en_INCLUDES =
legalnotice_en_IMAGES =
legalnotice_en_SOURCES = legalnotice.en.xml $(legalnotice_en_INCLUDES)
legalnotice_en_IDMAPS =
@@ -28,7 +14,6 @@
proto_book_INCLUDES = \
../common/fixedchars.ent \
all-entities.ent \
- copyright.xml \
legalnotice.en.xml
proto_book_IMAGES =
proto_book_SOURCES = proto-book.xml $(proto_book_INCLUDES)
Modified: trunk/proto-doc/legalnotice.en.xml
===================================================================
--- trunk/proto-doc/legalnotice.en.xml 2007-08-20 20:02:00 UTC (rev 7479)
+++ trunk/proto-doc/legalnotice.en.xml 2007-08-20 20:02:17 UTC (rev 7480)
Changed blocks: 2, Lines Added: 13, Lines Deleted: 2; 1349 bytes
@@ -3,9 +3,20 @@
"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"/>
+ <remark>
+ The role attribute for each top-level legalnotice element determines
+ the context in which the element is used: 1) no role attribute: part
+ of the default legalnotice, used for regular documentation that is
+ not released under GPL; 2) role = legalnotice-gpl: for manpage
+ legalnotices, which are released under GPL; 3) role =
+ legalnotice-all: included in legalnotice for all documentation.
+ </remark>
<para>
+ Copyright 2007 MySQL AB
+ </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
@@ -24,7 +35,7 @@
granted above.
</para>
- <para>
+ <para role="legalnotice-all">
Please email <email>docs@stripped</email> for more information or
if you are interested in doing a translation.
</para>
Modified: trunk/pt/refman-5.1/legalnotice.en.xml
===================================================================
--- trunk/pt/refman-5.1/legalnotice.en.xml 2007-08-20 20:02:00 UTC (rev 7479)
+++ trunk/pt/refman-5.1/legalnotice.en.xml 2007-08-20 20:02:17 UTC (rev 7480)
Changed blocks: 2, Lines Added: 39, Lines Deleted: 3; 2374 bytes
@@ -3,9 +3,20 @@
"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"/>
+ <remark>
+ The role attribute for each top-level legalnotice element determines
+ the context in which the element is used: 1) no role attribute: part
+ of the default legalnotice, used for regular documentation that is
+ not released under GPL; 2) role = legalnotice-gpl: for manpage
+ legalnotices, which are released under GPL; 3) role =
+ legalnotice-all: included in legalnotice for all documentation.
+ </remark>
<para>
+ Copyright 1997-2007 MySQL AB
+ </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
@@ -24,8 +35,33 @@
granted above.
</para>
- <para>
- Please email <email>docs@stripped</email> for more information.
+ <para role="legalnotice-gpl">
+ Copyright 2007 MySQL AB
</para>
+ <para role="legalnotice-gpl">
+ This documentation is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as
+ published by the Free Software Foundation; version 2 of the License.
+ </para>
+
+ <para role="legalnotice-gpl">
+ This documentation is distributed in the hope that it will be
+ useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+ </para>
+
+ <para role="legalnotice-gpl">
+ You should have received a copy of the GNU General Public License
+ along with the program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301 USA or see http://www.gnu.org/licenses/.
+ </para>
+
+ <para role="legalnotice-all">
+ Please email <email>docs@stripped</email> for more information or
+ if you are interested in doing a translation.
+ </para>
+
</legalnotice>
Modified: trunk/query-browser/Makefile.depends
===================================================================
--- trunk/query-browser/Makefile.depends 2007-08-20 20:02:00 UTC (rev 7479)
+++ trunk/query-browser/Makefile.depends 2007-08-20 20:02:17 UTC (rev 7480)
Changed blocks: 3, Lines Added: 1, Lines Deleted: 16; 1687 bytes
@@ -39,19 +39,6 @@
connection-dialog-manprepped.xml: $(connection_dialog_SOURCES) $(connection_dialog_IDMAPS)
connection-dialog-remprepped.xml: $(connection_dialog_SOURCES) $(connection_dialog_IDMAPS)
-copyright_INCLUDES =
-copyright_IMAGES =
-copyright_SOURCES = copyright.xml $(copyright_INCLUDES)
-copyright_IDMAPS =
-copyright.validpure: $(copyright_SOURCES)
-copyright.titles: $(copyright_SOURCES)
-copyright.useless: $(copyright_SOURCES)
-copyright.valid: $(copyright_SOURCES) $(copyright_IDMAPS)
-copyright.validwarn: $(copyright_SOURCES) $(copyright_IDMAPS)
-copyright-prepped.xml: $(copyright_SOURCES) $(copyright_IDMAPS)
-copyright-manprepped.xml: $(copyright_SOURCES) $(copyright_IDMAPS)
-copyright-remprepped.xml: $(copyright_SOURCES) $(copyright_IDMAPS)
-
introduction_INCLUDES = \
../common/fixedchars.ent \
../gui-common/gui-common.ent \
@@ -68,8 +55,7 @@
introduction-manprepped.xml: $(introduction_SOURCES) $(introduction_IDMAPS)
introduction-remprepped.xml: $(introduction_SOURCES) $(introduction_IDMAPS)
-legalnotice_en_INCLUDES = \
- copyright.xml
+legalnotice_en_INCLUDES =
legalnotice_en_IMAGES =
legalnotice_en_SOURCES = legalnotice.en.xml $(legalnotice_en_INCLUDES)
legalnotice_en_IDMAPS =
@@ -153,7 +139,6 @@
all-entities.ent \
chapter-options-query-browser.xml \
connection-dialog.xml \
- copyright.xml \
images/published/blob-buttons.png \
images/published/buttonbar.png \
images/published/connection.png \
Modified: trunk/query-browser/legalnotice.en.xml
===================================================================
--- trunk/query-browser/legalnotice.en.xml 2007-08-20 20:02:00 UTC (rev 7479)
+++ trunk/query-browser/legalnotice.en.xml 2007-08-20 20:02:17 UTC (rev 7480)
Changed blocks: 2, Lines Added: 13, Lines Deleted: 2; 1366 bytes
@@ -3,9 +3,20 @@
"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"/>
+ <remark>
+ The role attribute for each top-level legalnotice element determines
+ the context in which the element is used: 1) no role attribute: part
+ of the default legalnotice, used for regular documentation that is
+ not released under GPL; 2) role = legalnotice-gpl: for manpage
+ legalnotices, which are released under GPL; 3) role =
+ legalnotice-all: included in legalnotice for all documentation.
+ </remark>
<para>
+ Copyright 2004-2007 MySQL AB
+ </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
@@ -24,7 +35,7 @@
granted above.
</para>
- <para>
+ <para role="legalnotice-all">
Please email <email>docs@stripped</email> for more information or
if you are interested in doing a translation.
</para>
Modified: trunk/refman-4.1/legalnotice.en.xml
===================================================================
--- trunk/refman-4.1/legalnotice.en.xml 2007-08-20 20:02:00 UTC (rev 7479)
+++ trunk/refman-4.1/legalnotice.en.xml 2007-08-20 20:02:17 UTC (rev 7480)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 1; 536 bytes
@@ -60,7 +60,8 @@
</para>
<para role="legalnotice-all">
- Please email <email>docs@stripped</email> for more information.
+ 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/legalnotice.en.xml
===================================================================
--- trunk/refman-5.0/legalnotice.en.xml 2007-08-20 20:02:00 UTC (rev 7479)
+++ trunk/refman-5.0/legalnotice.en.xml 2007-08-20 20:02:17 UTC (rev 7480)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 1; 536 bytes
@@ -60,7 +60,8 @@
</para>
<para role="legalnotice-all">
- Please email <email>docs@stripped</email> for more information.
+ 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/legalnotice.en.xml
===================================================================
--- trunk/refman-5.1/legalnotice.en.xml 2007-08-20 20:02:00 UTC (rev 7479)
+++ trunk/refman-5.1/legalnotice.en.xml 2007-08-20 20:02:17 UTC (rev 7480)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 1; 536 bytes
@@ -60,7 +60,8 @@
</para>
<para role="legalnotice-all">
- Please email <email>docs@stripped</email> for more information.
+ Please email <email>docs@stripped</email> for more information or
+ if you are interested in doing a translation.
</para>
</legalnotice>
Modified: trunk/refman-5.2/legalnotice.en.xml
===================================================================
--- trunk/refman-5.2/legalnotice.en.xml 2007-08-20 20:02:00 UTC (rev 7479)
+++ trunk/refman-5.2/legalnotice.en.xml 2007-08-20 20:02:17 UTC (rev 7480)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 1; 536 bytes
@@ -60,7 +60,8 @@
</para>
<para role="legalnotice-all">
- Please email <email>docs@stripped</email> for more information.
+ Please email <email>docs@stripped</email> for more information or
+ if you are interested in doing a translation.
</para>
</legalnotice>
Modified: trunk/ro/administrator/Makefile.depends
===================================================================
--- trunk/ro/administrator/Makefile.depends 2007-08-20 20:02:00 UTC (rev 7479)
+++ trunk/ro/administrator/Makefile.depends 2007-08-20 20:02:17 UTC (rev 7480)
Changed blocks: 3, Lines Added: 1, Lines Deleted: 16; 1691 bytes
@@ -32,7 +32,6 @@
catalogs.xml \
chapter-options-administrator.xml \
connection-dialog.xml \
- copyright.xml \
health.xml \
images/configure-service-mode-connection.png \
images/configure-service-mode-window.png \
@@ -191,19 +190,6 @@
connection-dialog-manprepped.xml: $(connection_dialog_SOURCES) $(connection_dialog_IDMAPS)
connection-dialog-remprepped.xml: $(connection_dialog_SOURCES) $(connection_dialog_IDMAPS)
-copyright_INCLUDES =
-copyright_IMAGES =
-copyright_SOURCES = copyright.xml $(copyright_INCLUDES)
-copyright_IDMAPS =
-copyright.validpure: $(copyright_SOURCES)
-copyright.titles: $(copyright_SOURCES)
-copyright.useless: $(copyright_SOURCES)
-copyright.valid: $(copyright_SOURCES) $(copyright_IDMAPS)
-copyright.validwarn: $(copyright_SOURCES) $(copyright_IDMAPS)
-copyright-prepped.xml: $(copyright_SOURCES) $(copyright_IDMAPS)
-copyright-manprepped.xml: $(copyright_SOURCES) $(copyright_IDMAPS)
-copyright-remprepped.xml: $(copyright_SOURCES) $(copyright_IDMAPS)
-
health_INCLUDES = \
../../common/fixedchars.ent \
../gui-common/gui-common.ent \
@@ -244,8 +230,7 @@
introduction-manprepped.xml: $(introduction_SOURCES) $(introduction_IDMAPS)
introduction-remprepped.xml: $(introduction_SOURCES) $(introduction_IDMAPS)
-legalnotice_en_INCLUDES = \
- copyright.xml
+legalnotice_en_INCLUDES =
legalnotice_en_IMAGES =
legalnotice_en_SOURCES = legalnotice.en.xml $(legalnotice_en_INCLUDES)
legalnotice_en_IDMAPS =
Modified: trunk/ro/administrator/legalnotice.en.xml
===================================================================
--- trunk/ro/administrator/legalnotice.en.xml 2007-08-20 20:02:00 UTC (rev 7479)
+++ trunk/ro/administrator/legalnotice.en.xml 2007-08-20 20:02:17 UTC (rev 7480)
Changed blocks: 2, Lines Added: 13, Lines Deleted: 2; 1375 bytes
@@ -3,9 +3,20 @@
"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"/>
+ <remark>
+ The role attribute for each top-level legalnotice element determines
+ the context in which the element is used: 1) no role attribute: part
+ of the default legalnotice, used for regular documentation that is
+ not released under GPL; 2) role = legalnotice-gpl: for manpage
+ legalnotices, which are released under GPL; 3) role =
+ legalnotice-all: included in legalnotice for all documentation.
+ </remark>
<para>
+ Copyright 2004-2007 MySQL AB
+ </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
@@ -24,7 +35,7 @@
granted above.
</para>
- <para>
+ <para role="legalnotice-all">
Please email <email>docs@stripped</email> for more information or
if you are interested in doing a translation.
</para>
Modified: trunk/sample-data/sakila/Makefile.depends
===================================================================
--- trunk/sample-data/sakila/Makefile.depends 2007-08-20 20:02:00 UTC (rev 7479)
+++ trunk/sample-data/sakila/Makefile.depends 2007-08-20 20:02:17 UTC (rev 7480)
Changed blocks: 2, Lines Added: 1, Lines Deleted: 16; 1327 bytes
@@ -13,21 +13,7 @@
changelog-manprepped.xml: $(changelog_SOURCES) $(changelog_IDMAPS)
changelog-remprepped.xml: $(changelog_SOURCES) $(changelog_IDMAPS)
-copyright_INCLUDES =
-copyright_IMAGES =
-copyright_SOURCES = copyright.xml $(copyright_INCLUDES)
-copyright_IDMAPS =
-copyright.validpure: $(copyright_SOURCES)
-copyright.titles: $(copyright_SOURCES)
-copyright.useless: $(copyright_SOURCES)
-copyright.valid: $(copyright_SOURCES) $(copyright_IDMAPS)
-copyright.validwarn: $(copyright_SOURCES) $(copyright_IDMAPS)
-copyright-prepped.xml: $(copyright_SOURCES) $(copyright_IDMAPS)
-copyright-manprepped.xml: $(copyright_SOURCES) $(copyright_IDMAPS)
-copyright-remprepped.xml: $(copyright_SOURCES) $(copyright_IDMAPS)
-
-legalnotice_en_INCLUDES = \
- copyright.xml
+legalnotice_en_INCLUDES =
legalnotice_en_IMAGES =
legalnotice_en_SOURCES = legalnotice.en.xml $(legalnotice_en_INCLUDES)
legalnotice_en_IDMAPS =
@@ -43,7 +29,6 @@
sakila_INCLUDES = \
all-entities.ent \
changelog.xml \
- copyright.xml \
images/sakila-schema.png \
legalnotice.en.xml \
sakila.ent
Modified: trunk/sample-data/sakila/legalnotice.en.xml
===================================================================
--- trunk/sample-data/sakila/legalnotice.en.xml 2007-08-20 20:02:00 UTC (rev 7479)
+++ trunk/sample-data/sakila/legalnotice.en.xml 2007-08-20 20:02:17 UTC (rev 7480)
Changed blocks: 2, Lines Added: 43, Lines Deleted: 5; 2510 bytes
@@ -1,10 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
-<note>
- <xi:include href="copyright.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+<legalnotice>
+ <remark>
+ The role attribute for each top-level legalnotice element determines
+ the context in which the element is used: 1) no role attribute: part
+ of the default legalnotice, used for regular documentation that is
+ not released under GPL; 2) role = legalnotice-gpl: for manpage
+ legalnotices, which are released under GPL; 3) role =
+ legalnotice-all: included in legalnotice for all documentation.
+ </remark>
+
<para>
+ Copyright 1997-2007 MySQL AB
+ </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
@@ -23,7 +35,33 @@
granted above.
</para>
- <para>
- Please email <email>docs@stripped</email> for more information.
+ <para role="legalnotice-gpl">
+ Copyright 2007 MySQL AB
</para>
-</note>
+
+ <para role="legalnotice-gpl">
+ This documentation is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as
+ published by the Free Software Foundation; version 2 of the License.
+ </para>
+
+ <para role="legalnotice-gpl">
+ This documentation is distributed in the hope that it will be
+ useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+ </para>
+
+ <para role="legalnotice-gpl">
+ You should have received a copy of the GNU General Public License
+ along with the program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301 USA or see http://www.gnu.org/licenses/.
+ </para>
+
+ <para role="legalnotice-all">
+ Please email <email>docs@stripped</email> for more information or
+ if you are interested in doing a translation.
+ </para>
+
+</legalnotice>
Modified: trunk/userguide/Makefile.depends
===================================================================
--- trunk/userguide/Makefile.depends 2007-08-20 20:02:00 UTC (rev 7479)
+++ trunk/userguide/Makefile.depends 2007-08-20 20:02:17 UTC (rev 7480)
Changed blocks: 3, Lines Added: 1, Lines Deleted: 16; 1524 bytes
@@ -11,19 +11,6 @@
configuring-manprepped.xml: $(configuring_SOURCES) $(configuring_IDMAPS)
configuring-remprepped.xml: $(configuring_SOURCES) $(configuring_IDMAPS)
-copyright_INCLUDES =
-copyright_IMAGES =
-copyright_SOURCES = copyright.xml $(copyright_INCLUDES)
-copyright_IDMAPS =
-copyright.validpure: $(copyright_SOURCES)
-copyright.titles: $(copyright_SOURCES)
-copyright.useless: $(copyright_SOURCES)
-copyright.valid: $(copyright_SOURCES) $(copyright_IDMAPS)
-copyright.validwarn: $(copyright_SOURCES) $(copyright_IDMAPS)
-copyright-prepped.xml: $(copyright_SOURCES) $(copyright_IDMAPS)
-copyright-manprepped.xml: $(copyright_SOURCES) $(copyright_IDMAPS)
-copyright-remprepped.xml: $(copyright_SOURCES) $(copyright_IDMAPS)
-
creating_INCLUDES =
creating_IMAGES =
creating_SOURCES = creating.xml $(creating_INCLUDES)
@@ -149,8 +136,7 @@
java-manprepped.xml: $(java_SOURCES) $(java_IDMAPS)
java-remprepped.xml: $(java_SOURCES) $(java_IDMAPS)
-legalnotice_en_INCLUDES = \
- copyright.xml
+legalnotice_en_INCLUDES =
legalnotice_en_IMAGES =
legalnotice_en_SOURCES = legalnotice.en.xml $(legalnotice_en_INCLUDES)
legalnotice_en_IDMAPS =
@@ -289,7 +275,6 @@
../refman-common/urls.ent \
all-entities.ent \
configuring.xml \
- copyright.xml \
creating.xml \
disaster.xml \
dotnet.xml \
Modified: trunk/userguide/legalnotice.en.xml
===================================================================
--- trunk/userguide/legalnotice.en.xml 2007-08-20 20:02:00 UTC (rev 7479)
+++ trunk/userguide/legalnotice.en.xml 2007-08-20 20:02:17 UTC (rev 7480)
Changed blocks: 2, Lines Added: 13, Lines Deleted: 2; 1354 bytes
@@ -3,9 +3,20 @@
"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"/>
+ <remark>
+ The role attribute for each top-level legalnotice element determines
+ the context in which the element is used: 1) no role attribute: part
+ of the default legalnotice, used for regular documentation that is
+ not released under GPL; 2) role = legalnotice-gpl: for manpage
+ legalnotices, which are released under GPL; 3) role =
+ legalnotice-all: included in legalnotice for all documentation.
+ </remark>
<para>
+ Copyright 2005-2007 MySQL AB
+ </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
@@ -24,7 +35,7 @@
granted above.
</para>
- <para>
+ <para role="legalnotice-all">
Please email <email>docs@stripped</email> for more information or
if you are interested in doing a translation.
</para>
Modified: trunk/workbench/Makefile.depends
===================================================================
--- trunk/workbench/Makefile.depends 2007-08-20 20:02:00 UTC (rev 7479)
+++ trunk/workbench/Makefile.depends 2007-08-20 20:02:17 UTC (rev 7480)
Changed blocks: 3, Lines Added: 1, Lines Deleted: 16; 1502 bytes
@@ -1,16 +1,3 @@
-copyright_INCLUDES =
-copyright_IMAGES =
-copyright_SOURCES = copyright.xml $(copyright_INCLUDES)
-copyright_IDMAPS =
-copyright.validpure: $(copyright_SOURCES)
-copyright.titles: $(copyright_SOURCES)
-copyright.useless: $(copyright_SOURCES)
-copyright.valid: $(copyright_SOURCES) $(copyright_IDMAPS)
-copyright.validwarn: $(copyright_SOURCES) $(copyright_IDMAPS)
-copyright-prepped.xml: $(copyright_SOURCES) $(copyright_IDMAPS)
-copyright-manprepped.xml: $(copyright_SOURCES) $(copyright_IDMAPS)
-copyright-remprepped.xml: $(copyright_SOURCES) $(copyright_IDMAPS)
-
getting_started_INCLUDES = \
../common/fixedchars.ent \
../gui-common/gui-common.ent \
@@ -29,8 +16,7 @@
getting-started-manprepped.xml: $(getting_started_SOURCES) $(getting_started_IDMAPS)
getting-started-remprepped.xml: $(getting_started_SOURCES) $(getting_started_IDMAPS)
-legalnotice_en_INCLUDES = \
- copyright.xml
+legalnotice_en_INCLUDES =
legalnotice_en_IMAGES =
legalnotice_en_SOURCES = legalnotice.en.xml $(legalnotice_en_INCLUDES)
legalnotice_en_IDMAPS =
@@ -118,7 +104,6 @@
../gui-common/mysql-enterprise.xml \
../gui-common/starting-all.xml \
all-entities.ent \
- copyright.xml \
getting-started.xml \
images/published/workbench-windows.png \
legalnotice.en.xml \
Modified: trunk/workbench/legalnotice.en.xml
===================================================================
--- trunk/workbench/legalnotice.en.xml 2007-08-20 20:02:00 UTC (rev 7479)
+++ trunk/workbench/legalnotice.en.xml 2007-08-20 20:02:17 UTC (rev 7480)
Changed blocks: 2, Lines Added: 13, Lines Deleted: 2; 1354 bytes
@@ -3,9 +3,20 @@
"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"/>
+ <remark>
+ The role attribute for each top-level legalnotice element determines
+ the context in which the element is used: 1) no role attribute: part
+ of the default legalnotice, used for regular documentation that is
+ not released under GPL; 2) role = legalnotice-gpl: for manpage
+ legalnotices, which are released under GPL; 3) role =
+ legalnotice-all: included in legalnotice for all documentation.
+ </remark>
<para>
+ Copyright 2004-2007 MySQL AB
+ </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
@@ -24,7 +35,7 @@
granted above.
</para>
- <para>
+ <para role="legalnotice-all">
Please email <email>docs@stripped</email> for more information or
if you are interested in doing a translation.
</para>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r7480 - in trunk: . administrator cy/query-browser guibook internals migration-toolkit mysqldoc-guide mysqltest ndbapi ... | paul | 20 Aug |
