Author: paul
Date: 2007-08-20 22:02:00 +0200 (Mon, 20 Aug 2007)
New Revision: 7479
Log:
r23873@frost: paul | 2007-08-20 14:10:40 -0500
Use GPL for manpage output. This involves the following changes to
document directories::
- Merge GPL text into legalnotice.en.xml, tagging each element
with identifiable role attribute
- Merge copyright.xml into legalnotice.en.xml (result is that we
have two copyright dates, one for regular legalnotice, one for
GPL legalnotice)
The document directories directly affected are those containing documents
from which manpages are produced:
- refman-4.1, refman-5.0, refman-5.1, refman-5.2
- mysqltest
Text selection is implemented with these processing changes:
- dbk-prep.xsl selects legalnotice text depending on $legalnotice.type
parameter value.
- xml-prep sets $legalnotice.type to "legalnotice-gpl" for manpage output
so that GPL text gets used.
Removed:
trunk/mysqltest/copyright.xml
trunk/refman-4.1/copyright.xml
trunk/refman-4.1/legalnotice-manpages.en.xml
trunk/refman-5.0/copyright.xml
trunk/refman-5.0/legalnotice-manpages.en.xml
trunk/refman-5.1/copyright.xml
trunk/refman-5.1/legalnotice-manpages.en.xml
trunk/refman-5.2/copyright.xml
Modified:
trunk/dynamic-docs/Makefile
trunk/dynamic-docs/Makefile.depends
trunk/falcon/Makefile.depends
trunk/make.d/xml-prep
trunk/mysqlqb/Makefile.depends
trunk/mysqltest/Makefile.depends
trunk/mysqltest/legalnotice.en.xml
trunk/refman-4.1/Makefile.depends
trunk/refman-4.1/legalnotice.en.xml
trunk/refman-5.0/Makefile.depends
trunk/refman-5.0/legalnotice.en.xml
trunk/refman-5.1/Makefile.depends
trunk/refman-5.1/legalnotice.en.xml
trunk/refman-5.2/Makefile.depends
trunk/refman-5.2/legalnotice.en.xml
trunk/xsl.d/dbk-prep.xsl
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:23872
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:23873
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:19696
Modified: trunk/dynamic-docs/Makefile
===================================================================
--- trunk/dynamic-docs/Makefile 2007-08-20 20:01:46 UTC (rev 7478)
+++ trunk/dynamic-docs/Makefile 2007-08-20 20:02:00 UTC (rev 7479)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 1; 438 bytes
@@ -71,7 +71,6 @@
include $(MAKE_DIR)/xml-help
include $(MAKE_DIR)/xml-remark
include $(MAKE_DIR)/xml-titles
-include $(MAKE_DIR)/fragments
include $(MAKE_DIR)/xml-depend
include $(MAKE_DIR)/xml-listing
Modified: trunk/dynamic-docs/Makefile.depends
===================================================================
--- trunk/dynamic-docs/Makefile.depends 2007-08-20 20:01:46 UTC (rev 7478)
+++ trunk/dynamic-docs/Makefile.depends 2007-08-20 20:02:00 UTC (rev 7479)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 1; 469 bytes
@@ -18,7 +18,6 @@
mysqld_vs_INCLUDES = \
../common/fixedchars.ent \
../common/phrases.ent \
- ../refman-5.1/copyright.xml \
../refman-5.1/legalnotice.en.xml \
../refman-common/urls.ent \
all-entities.ent \
Modified: trunk/falcon/Makefile.depends
===================================================================
--- trunk/falcon/Makefile.depends 2007-08-20 20:01:46 UTC (rev 7478)
+++ trunk/falcon/Makefile.depends 2007-08-20 20:02:00 UTC (rev 7479)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 1; 448 bytes
@@ -62,7 +62,6 @@
falcon_INCLUDES = \
../common/fixedchars.ent \
../common/phrases.ent \
- ../refman-5.1/copyright.xml \
../refman-5.1/legalnotice.en.xml \
../refman-common/urls.ent \
all-entities.ent \
Modified: trunk/make.d/xml-prep
===================================================================
--- trunk/make.d/xml-prep 2007-08-20 20:01:46 UTC (rev 7478)
+++ trunk/make.d/xml-prep 2007-08-20 20:02:00 UTC (rev 7479)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 0; 839 bytes
@@ -52,11 +52,14 @@
# For manpage preprocessing, suppress the mapping of <refentry>
# elements to <section> elements that is done by default.
+# Also, manpages are GPL rather than copyright, so select the GPL
+# copyright text from legalnotice.$(DOC_LANG).xml.
%-manprepped.xml: %.xml $(DBK_PREP_XSL_DEPS) $(GET_SVN_REVISION) $(BUG_PREP)
$(XSLTPROC) \
--stringparam repository.revision "`$(GET_SVN_REVISION)`" \
--param map.refentry.to.section 0 \
+ --stringparam legalnotice.type "legalnotice-gpl" \
--stringparam qandaset.style "$(QANDASET_STYLE)" \
$(DBK_PREP_XSL) $< > $@.tmp2
$(BUG_PREP) < $@.tmp2 > $@.tmp
Modified: trunk/mysqlqb/Makefile.depends
===================================================================
--- trunk/mysqlqb/Makefile.depends 2007-08-20 20:01:46 UTC (rev 7478)
+++ trunk/mysqlqb/Makefile.depends 2007-08-20 20:02:00 UTC (rev 7479)
Changed blocks: 5, Lines Added: 10, Lines Deleted: 4; 3157 bytes
@@ -17,6 +17,7 @@
../refman-5.0/metadata/dba-core.idmap \
../refman-5.0/metadata/errors-problems.idmap \
../refman-5.0/metadata/extending-mysql.idmap \
+ ../refman-5.0/metadata/functions-core.idmap \
../refman-5.0/metadata/information-schema.idmap \
../refman-5.0/metadata/installing-cs.idmap \
../refman-5.0/metadata/introduction.idmap \
@@ -36,13 +37,15 @@
../refman-5.0/metadata/se-merge.idmap \
../refman-5.0/metadata/se-myisam.idmap \
../refman-5.0/metadata/spatial-extensions.idmap \
+ ../refman-5.0/metadata/sql-syntax.idmap \
../refman-5.0/metadata/storage-engines.idmap \
../refman-5.0/metadata/stored-procedures.idmap \
../refman-5.0/metadata/triggers.idmap \
../refman-5.0/metadata/tutorial.idmap \
../refman-5.0/metadata/views.idmap \
../refman-common/metadata/bug-reports.idmap \
- ../refman-common/metadata/credits.idmap
+ ../refman-common/metadata/credits.idmap \
+ ../refman-common/metadata/regexp.idmap
mysqlqb.validpure: $(mysqlqb_SOURCES)
mysqlqb.titles: $(mysqlqb_SOURCES)
mysqlqb.useless: $(mysqlqb_SOURCES)
@@ -67,14 +70,16 @@
../refman-5.0/metadata/dba-core.idmap \
../refman-5.0/metadata/errors-problems.idmap \
../refman-5.0/metadata/extending-mysql.idmap \
+ ../refman-5.0/metadata/functions-core.idmap \
../refman-5.0/metadata/installing-cs.idmap \
../refman-5.0/metadata/language-structure.idmap \
../refman-5.0/metadata/optimization.idmap \
../refman-5.0/metadata/precision-math.idmap \
+ ../refman-5.0/metadata/sql-syntax.idmap \
../refman-5.0/metadata/stored-procedures.idmap \
../refman-5.0/metadata/tutorial.idmap \
../refman-common/metadata/credits.idmap \
- metadata/mysqlqb_statements.idmap
+ ../refman-common/metadata/regexp.idmap
mysqlqb_functions.validpure: $(mysqlqb_functions_SOURCES)
mysqlqb_functions.titles: $(mysqlqb_functions_SOURCES)
mysqlqb_functions.useless: $(mysqlqb_functions_SOURCES)
@@ -101,6 +106,7 @@
../refman-5.0/metadata/dba-core.idmap \
../refman-5.0/metadata/errors-problems.idmap \
../refman-5.0/metadata/extending-mysql.idmap \
+ ../refman-5.0/metadata/functions-core.idmap \
../refman-5.0/metadata/information-schema.idmap \
../refman-5.0/metadata/installing-cs.idmap \
../refman-5.0/metadata/introduction.idmap \
@@ -119,13 +125,13 @@
../refman-5.0/metadata/se-merge.idmap \
../refman-5.0/metadata/se-myisam.idmap \
../refman-5.0/metadata/spatial-extensions.idmap \
+ ../refman-5.0/metadata/sql-syntax.idmap \
../refman-5.0/metadata/storage-engines.idmap \
../refman-5.0/metadata/stored-procedures.idmap \
../refman-5.0/metadata/triggers.idmap \
../refman-5.0/metadata/tutorial.idmap \
../refman-5.0/metadata/views.idmap \
- ../refman-common/metadata/bug-reports.idmap \
- metadata/mysqlqb_functions.idmap
+ ../refman-common/metadata/bug-reports.idmap
mysqlqb_statements.validpure: $(mysqlqb_statements_SOURCES)
mysqlqb_statements.titles: $(mysqlqb_statements_SOURCES)
mysqlqb_statements.useless: $(mysqlqb_statements_SOURCES)
Modified: trunk/mysqltest/Makefile.depends
===================================================================
--- trunk/mysqltest/Makefile.depends 2007-08-20 20:01:46 UTC (rev 7478)
+++ trunk/mysqltest/Makefile.depends 2007-08-20 20:02:00 UTC (rev 7479)
Changed blocks: 3, Lines Added: 1, Lines Deleted: 16; 1549 bytes
@@ -28,19 +28,6 @@
components-manprepped.xml: $(components_SOURCES) $(components_IDMAPS)
components-remprepped.xml: $(components_SOURCES) $(components_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 \
all-entities.ent
@@ -56,8 +43,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 =
@@ -75,7 +61,6 @@
all-entities.ent \
command-reference.xml \
components.xml \
- copyright.xml \
introduction.xml \
legalnotice.en.xml \
preface.xml \
Modified: trunk/mysqltest/legalnotice.en.xml
===================================================================
--- trunk/mysqltest/legalnotice.en.xml 2007-08-20 20:01:46 UTC (rev 7478)
+++ trunk/mysqltest/legalnotice.en.xml 2007-08-20 20:02:00 UTC (rev 7479)
Changed blocks: 2, Lines Added: 38, Lines Deleted: 4; 2362 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 2006-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,9 +35,32 @@
granted above.
</para>
- <para>
- Please email <email>docs@stripped</email> for more information or
- if you are interested in doing a translation.
+ <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.
+ </para>
+
</legalnotice>
Modified: trunk/refman-4.1/Makefile.depends
===================================================================
--- trunk/refman-4.1/Makefile.depends 2007-08-20 20:01:46 UTC (rev 7478)
+++ trunk/refman-4.1/Makefile.depends 2007-08-20 20:02:00 UTC (rev 7479)
Changed blocks: 3, Lines Added: 1, Lines Deleted: 16; 1623 bytes
@@ -247,19 +247,6 @@
connectors-manprepped.xml: $(connectors_SOURCES) $(connectors_IDMAPS)
connectors-remprepped.xml: $(connectors_SOURCES) $(connectors_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)
-
data_types_INCLUDES = \
../common/fixedchars.ent \
../common/phrases.ent \
@@ -559,8 +546,7 @@
language-structure-manprepped.xml: $(language_structure_SOURCES) $(language_structure_IDMAPS)
language-structure-remprepped.xml: $(language_structure_SOURCES) $(language_structure_IDMAPS)
-legalnotice_en_INCLUDES = \
- copyright.xml
+legalnotice_en_INCLUDES =
legalnotice_en_IMAGES =
legalnotice_en_SOURCES = legalnotice.en.xml $(legalnotice_en_INCLUDES)
legalnotice_en_IDMAPS =
@@ -654,7 +640,6 @@
charset.xml \
client-utility-programs.xml \
connectors.xml \
- copyright.xml \
data-types.xml \
dynxml-generated-dba.xml \
dynxml-generated-functions.xml \
Modified: trunk/refman-4.1/legalnotice.en.xml
===================================================================
--- trunk/refman-4.1/legalnotice.en.xml 2007-08-20 20:01:46 UTC (rev 7478)
+++ trunk/refman-4.1/legalnotice.en.xml 2007-08-20 20:02:00 UTC (rev 7479)
Changed blocks: 2, Lines Added: 37, Lines Deleted: 2; 2229 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,7 +35,31 @@
granted above.
</para>
- <para>
+ <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.
</para>
Modified: trunk/refman-5.0/Makefile.depends
===================================================================
--- trunk/refman-5.0/Makefile.depends 2007-08-20 20:01:46 UTC (rev 7478)
+++ trunk/refman-5.0/Makefile.depends 2007-08-20 20:02:00 UTC (rev 7479)
Changed blocks: 3, Lines Added: 1, Lines Deleted: 16; 1623 bytes
@@ -249,19 +249,6 @@
connectors-manprepped.xml: $(connectors_SOURCES) $(connectors_IDMAPS)
connectors-remprepped.xml: $(connectors_SOURCES) $(connectors_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)
-
data_types_INCLUDES = \
../common/fixedchars.ent \
../common/phrases.ent \
@@ -826,8 +813,7 @@
language-structure-manprepped.xml: $(language_structure_SOURCES) $(language_structure_IDMAPS)
language-structure-remprepped.xml: $(language_structure_SOURCES) $(language_structure_IDMAPS)
-legalnotice_en_INCLUDES = \
- copyright.xml
+legalnotice_en_INCLUDES =
legalnotice_en_IMAGES =
legalnotice_en_SOURCES = legalnotice.en.xml $(legalnotice_en_INCLUDES)
legalnotice_en_IDMAPS =
@@ -924,7 +910,6 @@
charset.xml \
client-utility-programs.xml \
connectors.xml \
- copyright.xml \
data-types.xml \
dynxml-generated-dba.xml \
dynxml-generated-functions.xml \
Modified: trunk/refman-5.0/legalnotice.en.xml
===================================================================
--- trunk/refman-5.0/legalnotice.en.xml 2007-08-20 20:01:46 UTC (rev 7478)
+++ trunk/refman-5.0/legalnotice.en.xml 2007-08-20 20:02:00 UTC (rev 7479)
Changed blocks: 2, Lines Added: 37, Lines Deleted: 2; 2229 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,7 +35,31 @@
granted above.
</para>
- <para>
+ <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.
</para>
Modified: trunk/refman-5.1/Makefile.depends
===================================================================
--- trunk/refman-5.1/Makefile.depends 2007-08-20 20:01:46 UTC (rev 7478)
+++ trunk/refman-5.1/Makefile.depends 2007-08-20 20:02:00 UTC (rev 7479)
Changed blocks: 3, Lines Added: 1, Lines Deleted: 16; 1605 bytes
@@ -399,19 +399,6 @@
connectors-manprepped.xml: $(connectors_SOURCES) $(connectors_IDMAPS)
connectors-remprepped.xml: $(connectors_SOURCES) $(connectors_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)
-
data_types_INCLUDES = \
../common/fixedchars.ent \
../common/phrases.ent \
@@ -877,8 +864,7 @@
language-structure-manprepped.xml: $(language_structure_SOURCES) $(language_structure_IDMAPS)
language-structure-remprepped.xml: $(language_structure_SOURCES) $(language_structure_IDMAPS)
-legalnotice_en_INCLUDES = \
- copyright.xml
+legalnotice_en_INCLUDES =
legalnotice_en_IMAGES =
legalnotice_en_SOURCES = legalnotice.en.xml $(legalnotice_en_INCLUDES)
legalnotice_en_IDMAPS =
@@ -990,7 +976,6 @@
charset.xml \
client-utility-programs.xml \
connectors.xml \
- copyright.xml \
data-types.xml \
dba-core.xml \
dynxml-generated-dba.xml \
Modified: trunk/refman-5.1/legalnotice.en.xml
===================================================================
--- trunk/refman-5.1/legalnotice.en.xml 2007-08-20 20:01:46 UTC (rev 7478)
+++ trunk/refman-5.1/legalnotice.en.xml 2007-08-20 20:02:00 UTC (rev 7479)
Changed blocks: 2, Lines Added: 37, Lines Deleted: 2; 2229 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,7 +35,31 @@
granted above.
</para>
- <para>
+ <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.
</para>
Modified: trunk/refman-5.2/Makefile.depends
===================================================================
--- trunk/refman-5.2/Makefile.depends 2007-08-20 20:01:46 UTC (rev 7478)
+++ trunk/refman-5.2/Makefile.depends 2007-08-20 20:02:00 UTC (rev 7479)
Changed blocks: 3, Lines Added: 1, Lines Deleted: 16; 1605 bytes
@@ -399,19 +399,6 @@
connectors-manprepped.xml: $(connectors_SOURCES) $(connectors_IDMAPS)
connectors-remprepped.xml: $(connectors_SOURCES) $(connectors_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)
-
data_types_INCLUDES = \
../common/fixedchars.ent \
../common/phrases.ent \
@@ -873,8 +860,7 @@
language-structure-manprepped.xml: $(language_structure_SOURCES) $(language_structure_IDMAPS)
language-structure-remprepped.xml: $(language_structure_SOURCES) $(language_structure_IDMAPS)
-legalnotice_en_INCLUDES = \
- copyright.xml
+legalnotice_en_INCLUDES =
legalnotice_en_IMAGES =
legalnotice_en_SOURCES = legalnotice.en.xml $(legalnotice_en_INCLUDES)
legalnotice_en_IDMAPS =
@@ -986,7 +972,6 @@
charset.xml \
client-utility-programs.xml \
connectors.xml \
- copyright.xml \
data-types.xml \
dba-core.xml \
dynxml-generated-dba.xml \
Modified: trunk/refman-5.2/legalnotice.en.xml
===================================================================
--- trunk/refman-5.2/legalnotice.en.xml 2007-08-20 20:01:46 UTC (rev 7478)
+++ trunk/refman-5.2/legalnotice.en.xml 2007-08-20 20:02:00 UTC (rev 7479)
Changed blocks: 2, Lines Added: 37, Lines Deleted: 2; 2229 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,7 +35,31 @@
granted above.
</para>
- <para>
+ <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.
</para>
Modified: trunk/xsl.d/dbk-prep.xsl
===================================================================
--- trunk/xsl.d/dbk-prep.xsl 2007-08-20 20:01:46 UTC (rev 7478)
+++ trunk/xsl.d/dbk-prep.xsl 2007-08-20 20:02:00 UTC (rev 7479)
Changed blocks: 1, Lines Added: 55, Lines Deleted: 0; 2451 bytes
@@ -161,6 +161,61 @@
</xsl:template>
<!--
+ Our documentation normally is released under a non-GPL copyright.
+ Manpages produced from our documents *are* released under GPL. To
+ handle this, each top-level <legalnotice> element role attribute
+ indicates the context in which the element applies. The allowable
+ role values are:
+
+ no role attribute: The standard non-GPL copyright
+ legalnotice-gpl: The manpage GPL copyright
+ legalnotice-all: Applies in all contexts
+
+ The $legalnotice.type parameter determines which role values get
+ selected:
+
+ legalnotice-non-gpl: role not present
+ role="legalnotice-non-gpl"
+ role=legalnotice-all
+ (this is the default)
+ legalnotice-gpl: role=legalnotice-non-gpl"
+ role=legalnotice-all
+
+ If we're supposed to be producing the GPL legalnotice text, it's
+ an error if there is no GPL-specific text. For the regular
+ legalnotice, it's allowable for it to be missing.
+ -->
+
+ <xsl:param name="legalnotice.type" select="'legalnotice-non-gpl'"/>
+
+ <xsl:template match="legalnotice">
+ <legalnotice>
+ <xsl:copy-of select="@*"/>
+ <xsl:choose>
+ <xsl:when test="$legalnotice.type='legalnotice-non-gpl'">
+ <xsl:apply-templates select="*[not(@role)
+ or @role='legalnotice-all']"/>
+ </xsl:when>
+ <xsl:when test="$legalnotice.type='legalnotice-gpl'">
+ <xsl:if test="count(*[@role='legalnotice-gpl']) = 0">
+ <xsl:message terminate="yes">
+ <xsl:text>No GPL legalnotice text was found</xsl:text>
+ </xsl:message>
+ </xsl:if>
+ <xsl:apply-templates select="*[@role='legalnotice-gpl'
+ or @role='legalnotice-all']"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:message terminate="yes">
+ <xsl:text>Unknown legalnotice.type value: </xsl:text>
+ <xsl:value-of select="$legalnotice.type"/>
+ </xsl:message>
+ </xsl:otherwise>
+ </xsl:choose>
+ </legalnotice>
+ </xsl:template>
+
+ <!--
Map glossary tags to variable list
-->
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r7479 - in trunk: . dynamic-docs falcon make.d mysqlqb mysqltest refman-4.1 refman-5.0 refman-5.1 refman-5.2 xsl.d | paul | 20 Aug |
