Author: jstephens
Date: 2010-10-27 17:25:23 +0200 (Wed, 27 Oct 2010)
New Revision: 23427
Log:
Move MCM 3rd-party licenses to appendix (Thanks, Paul!)
Removed:
trunk/cluster-manager-1.0/preface-core.xml
Renamed/Moved:
trunk/cluster-manager-1.0/preface.xml (from rev 23423, trunk/cluster-manager-1.0/preface-core.xml)
Modified:
trunk/cluster-manager-1.0/Makefile.depends
trunk/cluster-manager-1.0/cluster-manager.xml
Modified: trunk/cluster-manager-1.0/Makefile.depends
===================================================================
--- trunk/cluster-manager-1.0/Makefile.depends 2010-10-27 14:43:33 UTC (rev 23426)
+++ trunk/cluster-manager-1.0/Makefile.depends 2010-10-27 15:25:23 UTC (rev 23427)
Changed blocks: 5, Lines Added: 68, Lines Deleted: 48; 8946 bytes
@@ -18,17 +18,18 @@
../refman-common/urls.ent \
all-entities.ent \
dynxml-local-mcm-attribute-tables.xml \
+ dynxml-local-mcm-licenses-third-party.xml \
dynxml-local-mcm-news.xml \
- dynxml-local-preface.xml \
images/published/mcm-arch.png \
legalnotice.en.xml \
mcm-attribute-tables-core.xml \
mcm-client-commands.xml \
mcm-install.xml \
mcm-issues.xml \
+ mcm-licenses-third-party-core.xml \
mcm-news-core.xml \
mcm.ent \
- preface-core.xml
+ preface.xml
cluster_manager_IMAGES = \
images/published/mcm-arch.png
cluster_manager_SOURCES = cluster-manager.xml $(cluster_manager_INCLUDES)
@@ -91,6 +92,38 @@
dynxml-local-mcm-attribute-tables-manprepped.xml: $(dynxml_local_mcm_attribute_tables_SOURCES) $(dynxml_local_mcm_attribute_tables_IDMAPS)
dynxml-local-mcm-attribute-tables-remprepped.xml: $(dynxml_local_mcm_attribute_tables_SOURCES) $(dynxml_local_mcm_attribute_tables_IDMAPS)
dynxml-local-mcm-attribute-tables.xml: $(dynxml_local_mcm_attribute_tables_IDMAPS) $(dynxml_local_mcm_attribute_tables_INCLUDES)
+dynxml_local_mcm_licenses_third_party_INCLUDES = \
+ ../../mysqldoc/dynamic-docs/licenses/products.xml \
+ ../common/all-entities.ent \
+ ../common/fixedchars.ent \
+ ../common/license-libevent.xml \
+ ../common/license-lpeg.xml \
+ ../common/license-luafilesystem.xml \
+ ../common/license-md5.xml \
+ ../common/license-sha1-in-c.xml \
+ ../common/phrases.ent \
+ ../refman-common/urls.ent \
+ all-entities.ent \
+ mcm-licenses-third-party-core.xml \
+ mcm.ent
+dynxml_local_mcm_licenses_third_party_IMAGES =
+dynxml_local_mcm_licenses_third_party_SOURCES = dynxml-local-mcm-licenses-third-party.xml $(dynxml_local_mcm_licenses_third_party_INCLUDES)
+dynxml_local_mcm_licenses_third_party_IDMAPS = \
+ ../common/metadata/license-libevent.idmap \
+ ../common/metadata/license-lpeg.idmap \
+ ../common/metadata/license-luafilesystem.idmap \
+ ../common/metadata/license-md5.idmap \
+ ../common/metadata/license-sha1-in-c.idmap
+dynxml-local-mcm-licenses-third-party.validpure: $(dynxml_local_mcm_licenses_third_party_SOURCES)
+dynxml-local-mcm-licenses-third-party.titles: $(dynxml_local_mcm_licenses_third_party_SOURCES)
+dynxml-local-mcm-licenses-third-party.useless: $(dynxml_local_mcm_licenses_third_party_SOURCES)
+dynxml-local-mcm-licenses-third-party.valid: $(dynxml_local_mcm_licenses_third_party_SOURCES) $(dynxml_local_mcm_licenses_third_party_IDMAPS)
+dynxml-local-mcm-licenses-third-party.validwarn: $(dynxml_local_mcm_licenses_third_party_SOURCES) $(dynxml_local_mcm_licenses_third_party_IDMAPS)
+dynxml-local-mcm-licenses-third-party-prepped.xml: $(dynxml_local_mcm_licenses_third_party_SOURCES) $(dynxml_local_mcm_licenses_third_party_IDMAPS)
+dynxml-local-mcm-licenses-third-party-helpprepped.xml: $(dynxml_local_mcm_licenses_third_party_SOURCES) $(dynxml_local_mcm_licenses_third_party_IDMAPS)
+dynxml-local-mcm-licenses-third-party-manprepped.xml: $(dynxml_local_mcm_licenses_third_party_SOURCES) $(dynxml_local_mcm_licenses_third_party_IDMAPS)
+dynxml-local-mcm-licenses-third-party-remprepped.xml: $(dynxml_local_mcm_licenses_third_party_SOURCES) $(dynxml_local_mcm_licenses_third_party_IDMAPS)
+dynxml-local-mcm-licenses-third-party.xml: $(dynxml_local_mcm_licenses_third_party_IDMAPS) $(dynxml_local_mcm_licenses_third_party_INCLUDES)
dynxml_local_mcm_news_INCLUDES = \
../../mysqldoc/dynamic-docs/changelog/cluster-manager-versions.xml \
../../mysqldoc/dynamic-docs/changelog/cluster-manager.xml \
@@ -115,39 +148,6 @@
dynxml-local-mcm-news-manprepped.xml: $(dynxml_local_mcm_news_SOURCES) $(dynxml_local_mcm_news_IDMAPS)
dynxml-local-mcm-news-remprepped.xml: $(dynxml_local_mcm_news_SOURCES) $(dynxml_local_mcm_news_IDMAPS)
dynxml-local-mcm-news.xml: $(dynxml_local_mcm_news_IDMAPS) $(dynxml_local_mcm_news_INCLUDES)
-dynxml_local_preface_INCLUDES = \
- ../../mysqldoc/dynamic-docs/licenses/products.xml \
- ../common/all-entities.ent \
- ../common/fixedchars.ent \
- ../common/license-libevent.xml \
- ../common/license-lpeg.xml \
- ../common/license-luafilesystem.xml \
- ../common/license-md5.xml \
- ../common/license-sha1-in-c.xml \
- ../common/phrases.ent \
- ../refman-common/urls.ent \
- all-entities.ent \
- mcm.ent \
- preface-core.xml
-dynxml_local_preface_IMAGES =
-dynxml_local_preface_SOURCES = dynxml-local-preface.xml $(dynxml_local_preface_INCLUDES)
-dynxml_local_preface_IDMAPS = \
- ../common/metadata/license-libevent.idmap \
- ../common/metadata/license-lpeg.idmap \
- ../common/metadata/license-luafilesystem.idmap \
- ../common/metadata/license-md5.idmap \
- ../common/metadata/license-sha1-in-c.idmap \
- ../refman-5.1/metadata/mysql-cluster.idmap
-dynxml-local-preface.validpure: $(dynxml_local_preface_SOURCES)
-dynxml-local-preface.titles: $(dynxml_local_preface_SOURCES)
-dynxml-local-preface.useless: $(dynxml_local_preface_SOURCES)
-dynxml-local-preface.valid: $(dynxml_local_preface_SOURCES) $(dynxml_local_preface_IDMAPS)
-dynxml-local-preface.validwarn: $(dynxml_local_preface_SOURCES) $(dynxml_local_preface_IDMAPS)
-dynxml-local-preface-prepped.xml: $(dynxml_local_preface_SOURCES) $(dynxml_local_preface_IDMAPS)
-dynxml-local-preface-helpprepped.xml: $(dynxml_local_preface_SOURCES) $(dynxml_local_preface_IDMAPS)
-dynxml-local-preface-manprepped.xml: $(dynxml_local_preface_SOURCES) $(dynxml_local_preface_IDMAPS)
-dynxml-local-preface-remprepped.xml: $(dynxml_local_preface_SOURCES) $(dynxml_local_preface_IDMAPS)
-dynxml-local-preface.xml: $(dynxml_local_preface_IDMAPS) $(dynxml_local_preface_INCLUDES)
legalnotice_en_INCLUDES = \
../common/fixedchars.ent \
../common/legalnotice-misc-non-refman.en.xml \
@@ -260,6 +260,20 @@
mcm-issues-manprepped.xml: $(mcm_issues_SOURCES) $(mcm_issues_IDMAPS)
mcm-issues-remprepped.xml: $(mcm_issues_SOURCES) $(mcm_issues_IDMAPS)
+mcm_licenses_third_party_core_INCLUDES =
+mcm_licenses_third_party_core_IMAGES =
+mcm_licenses_third_party_core_SOURCES = mcm-licenses-third-party-core.xml $(mcm_licenses_third_party_core_INCLUDES)
+mcm_licenses_third_party_core_IDMAPS =
+mcm-licenses-third-party-core.validpure: $(mcm_licenses_third_party_core_SOURCES)
+mcm-licenses-third-party-core.titles: $(mcm_licenses_third_party_core_SOURCES)
+mcm-licenses-third-party-core.useless: $(mcm_licenses_third_party_core_SOURCES)
+mcm-licenses-third-party-core.valid: $(mcm_licenses_third_party_core_SOURCES) $(mcm_licenses_third_party_core_IDMAPS)
+mcm-licenses-third-party-core.validwarn: $(mcm_licenses_third_party_core_SOURCES) $(mcm_licenses_third_party_core_IDMAPS)
+mcm-licenses-third-party-core-prepped.xml: $(mcm_licenses_third_party_core_SOURCES) $(mcm_licenses_third_party_core_IDMAPS)
+mcm-licenses-third-party-core-helpprepped.xml: $(mcm_licenses_third_party_core_SOURCES) $(mcm_licenses_third_party_core_IDMAPS)
+mcm-licenses-third-party-core-manprepped.xml: $(mcm_licenses_third_party_core_SOURCES) $(mcm_licenses_third_party_core_IDMAPS)
+mcm-licenses-third-party-core-remprepped.xml: $(mcm_licenses_third_party_core_SOURCES) $(mcm_licenses_third_party_core_IDMAPS)
+
mcm_news_core_INCLUDES =
mcm_news_core_IMAGES =
mcm_news_core_SOURCES = mcm-news-core.xml $(mcm_news_core_INCLUDES)
@@ -274,18 +288,24 @@
mcm-news-core-manprepped.xml: $(mcm_news_core_SOURCES) $(mcm_news_core_IDMAPS)
mcm-news-core-remprepped.xml: $(mcm_news_core_SOURCES) $(mcm_news_core_IDMAPS)
-preface_core_INCLUDES =
-preface_core_IMAGES =
-preface_core_SOURCES = preface-core.xml $(preface_core_INCLUDES)
-preface_core_IDMAPS =
-preface-core.validpure: $(preface_core_SOURCES)
-preface-core.titles: $(preface_core_SOURCES)
-preface-core.useless: $(preface_core_SOURCES)
-preface-core.valid: $(preface_core_SOURCES) $(preface_core_IDMAPS)
-preface-core.validwarn: $(preface_core_SOURCES) $(preface_core_IDMAPS)
-preface-core-prepped.xml: $(preface_core_SOURCES) $(preface_core_IDMAPS)
-preface-core-helpprepped.xml: $(preface_core_SOURCES) $(preface_core_IDMAPS)
-preface-core-manprepped.xml: $(preface_core_SOURCES) $(preface_core_IDMAPS)
-preface-core-remprepped.xml: $(preface_core_SOURCES) $(preface_core_IDMAPS)
+preface_INCLUDES = \
+ ../common/fixedchars.ent \
+ ../common/phrases.ent \
+ ../refman-common/urls.ent \
+ all-entities.ent \
+ mcm.ent
+preface_IMAGES =
+preface_SOURCES = preface.xml $(preface_INCLUDES)
+preface_IDMAPS = \
+ ../refman-5.1/metadata/mysql-cluster.idmap
+preface.validpure: $(preface_SOURCES)
+preface.titles: $(preface_SOURCES)
+preface.useless: $(preface_SOURCES)
+preface.valid: $(preface_SOURCES) $(preface_IDMAPS)
+preface.validwarn: $(preface_SOURCES) $(preface_IDMAPS)
+preface-prepped.xml: $(preface_SOURCES) $(preface_IDMAPS)
+preface-helpprepped.xml: $(preface_SOURCES) $(preface_IDMAPS)
+preface-manprepped.xml: $(preface_SOURCES) $(preface_IDMAPS)
+preface-remprepped.xml: $(preface_SOURCES) $(preface_IDMAPS)
# End of dependencies
Modified: trunk/cluster-manager-1.0/cluster-manager.xml
===================================================================
--- trunk/cluster-manager-1.0/cluster-manager.xml 2010-10-27 14:43:33 UTC (rev 23426)
+++ trunk/cluster-manager-1.0/cluster-manager.xml 2010-10-27 15:25:23 UTC (rev 23427)
Changed blocks: 2, Lines Added: 4, Lines Deleted: 2; 952 bytes
@@ -86,7 +86,7 @@
</bookinfo>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dynxml-local-preface.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="preface.xml"/>
<chapter id="mcm-overview">
@@ -481,8 +481,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mcm-issues.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dynxml-local-mcm-attribute-tables.xml"/>
-
+
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dynxml-local-mcm-news.xml"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dynxml-local-mcm-licenses-third-party.xml"/>
<index/>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r23427 - trunk/cluster-manager-1.0 | jon.stephens | 27 Oct |
