List:Commits« Previous MessageNext Message »
From:paul.dubois Date:January 4 2011 6:09pm
Subject:svn commit - mysqldoc@docsrva: r24627 - in trunk: . refman-5.5
View as plain text  
Author: paul
Date: 2011-01-04 19:09:55 +0100 (Tue, 04 Jan 2011)
New Revision: 24627

Log:
 r45848@arctic:  paul | 2011-01-04 12:08:42 -0600
 Update dependencies


Modified:
   trunk/refman-5.5/Makefile
   trunk/refman-5.5/Makefile.depends

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:45847
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:66486
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
ebeeeee4-b232-4669-a521-231442eced53:/mysqldoc-local/mysqldoc/trunk:43569
   + 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:45848
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:66486
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
ebeeeee4-b232-4669-a521-231442eced53:/mysqldoc-local/mysqldoc/trunk:43569


Modified: trunk/refman-5.5/Makefile
===================================================================
--- trunk/refman-5.5/Makefile	2011-01-04 18:09:43 UTC (rev 24626)
+++ trunk/refman-5.5/Makefile	2011-01-04 18:09:55 UTC (rev 24627)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 687 bytes

@@ -57,7 +57,7 @@
 include $(MAKE_DIR)/default-target
 
 # Files for which to generate dependencies
-DEPEND_FILES = innodb-section.arbitrary news-monitor-2.1.arbitrary monitor-refman-chapter.arbitrary workbench-refman-chapter.arbitrary manual.xml
+DEPEND_FILES = innodb-section.arbitrary news-monitor-2.3.arbitrary monitor-refman-chapter.arbitrary workbench-refman-chapter.arbitrary manual.xml
 
 manual.wc: manual-prepped.xml
 	$(XMLWORDCOUNT) manual-prepped.xml


Modified: trunk/refman-5.5/Makefile.depends
===================================================================
--- trunk/refman-5.5/Makefile.depends	2011-01-04 18:09:43 UTC (rev 24626)
+++ trunk/refman-5.5/Makefile.depends	2011-01-04 18:09:55 UTC (rev 24627)
Changed blocks: 23, Lines Added: 118, Lines Deleted: 86; 28274 bytes

@@ -1641,19 +1641,25 @@
 	../common/license-antlr-2.xml \
 	../common/license-antlr-3.xml \
 	../common/license-apache-2-0.xml \
+	../common/license-apache-commons-beanutils-16.xml \
+	../common/license-apache-commons-beanutils.xml \
 	../common/license-apache-commons-chain.xml \
+	../common/license-apache-commons-codec.xml \
 	../common/license-apache-commons-collections.xml \
 	../common/license-apache-commons-dbcp.xml \
 	../common/license-apache-commons-digester.xml \
+	../common/license-apache-commons-exec.xml \
 	../common/license-apache-commons-fileupload.xml \
+	../common/license-apache-commons-httpclient.xml \
 	../common/license-apache-commons-io.xml \
 	../common/license-apache-commons-lang.xml \
 	../common/license-apache-commons-logging.xml \
-	../common/license-apache-commons-math.xml \
 	../common/license-apache-commons-pool.xml \
 	../common/license-apache-commons-validator.xml \
+	../common/license-apache-portable-runtime.xml \
 	../common/license-apache-struts-206.xml \
 	../common/license-apache-tiles.xml \
+	../common/license-apache-tomcat-native-library.xml \
 	../common/license-asm.xml \
 	../common/license-boost.xml \
 	../common/license-cairo.xml \

@@ -1673,6 +1679,8 @@
 	../common/license-google-io-rate-patch.xml \
 	../common/license-google-smp-patch.xml \
 	../common/license-google-tcmalloc.xml \
+	../common/license-httpclient.xml \
+	../common/license-httpcore.xml \
 	../common/license-jdom.xml \
 	../common/license-jquery.xml \
 	../common/license-jqueryui.xml \

@@ -1688,6 +1696,7 @@
 	../common/license-lua.xml \
 	../common/license-luafilesystem.xml \
 	../common/license-md5.xml \
+	../common/license-mime4j.xml \
 	../common/license-nt-servc.xml \
 	../common/license-ognl.xml \
 	../common/license-openpam.xml \

@@ -1700,8 +1709,7 @@
 	../common/license-sha1-in-c.xml \
 	../common/license-slf4j.xml \
 	../common/license-spring-framework.xml \
-	../common/license-stringtemplate.xml \
-	../common/license-tomcat.xml \
+	../common/license-tomcat-2010.xml \
 	../common/license-us-secure-hash.xml \
 	../common/license-xwork-204.xml \
 	../common/license-zlib.xml \

@@ -1721,19 +1729,25 @@
 	../common/metadata/license-antlr-2.idmap \
 	../common/metadata/license-antlr-3.idmap \
 	../common/metadata/license-apache-2-0.idmap \
+	../common/metadata/license-apache-commons-beanutils-16.idmap \
+	../common/metadata/license-apache-commons-beanutils.idmap \
 	../common/metadata/license-apache-commons-chain.idmap \
+	../common/metadata/license-apache-commons-codec.idmap \
 	../common/metadata/license-apache-commons-collections.idmap \
 	../common/metadata/license-apache-commons-dbcp.idmap \
 	../common/metadata/license-apache-commons-digester.idmap \
+	../common/metadata/license-apache-commons-exec.idmap \
 	../common/metadata/license-apache-commons-fileupload.idmap \
+	../common/metadata/license-apache-commons-httpclient.idmap \
 	../common/metadata/license-apache-commons-io.idmap \
 	../common/metadata/license-apache-commons-lang.idmap \
 	../common/metadata/license-apache-commons-logging.idmap \
-	../common/metadata/license-apache-commons-math.idmap \
 	../common/metadata/license-apache-commons-pool.idmap \
 	../common/metadata/license-apache-commons-validator.idmap \
+	../common/metadata/license-apache-portable-runtime.idmap \
 	../common/metadata/license-apache-struts-206.idmap \
 	../common/metadata/license-apache-tiles.idmap \
+	../common/metadata/license-apache-tomcat-native-library.idmap \
 	../common/metadata/license-asm.idmap \
 	../common/metadata/license-boost.idmap \
 	../common/metadata/license-cairo.idmap \

@@ -1753,6 +1767,8 @@
 	../common/metadata/license-google-io-rate-patch.idmap \
 	../common/metadata/license-google-smp-patch.idmap \
 	../common/metadata/license-google-tcmalloc.idmap \
+	../common/metadata/license-httpclient.idmap \
+	../common/metadata/license-httpcore.idmap \
 	../common/metadata/license-jdom.idmap \
 	../common/metadata/license-jquery.idmap \
 	../common/metadata/license-jqueryui.idmap \

@@ -1768,6 +1784,7 @@
 	../common/metadata/license-lua.idmap \
 	../common/metadata/license-luafilesystem.idmap \
 	../common/metadata/license-md5.idmap \
+	../common/metadata/license-mime4j.idmap \
 	../common/metadata/license-nt-servc.idmap \
 	../common/metadata/license-ognl.idmap \
 	../common/metadata/license-openpam.idmap \

@@ -1780,8 +1797,7 @@
 	../common/metadata/license-sha1-in-c.idmap \
 	../common/metadata/license-slf4j.idmap \
 	../common/metadata/license-spring-framework.idmap \
-	../common/metadata/license-stringtemplate.idmap \
-	../common/metadata/license-tomcat.idmap \
+	../common/metadata/license-tomcat-2010.idmap \
 	../common/metadata/license-us-secure-hash.idmap \
 	../common/metadata/license-xwork-204.idmap \
 	../common/metadata/license-zlib.idmap

@@ -6014,19 +6030,25 @@
 	../common/license-antlr-2.xml \
 	../common/license-antlr-3.xml \
 	../common/license-apache-2-0.xml \
+	../common/license-apache-commons-beanutils-16.xml \
+	../common/license-apache-commons-beanutils.xml \
 	../common/license-apache-commons-chain.xml \
+	../common/license-apache-commons-codec.xml \
 	../common/license-apache-commons-collections.xml \
 	../common/license-apache-commons-dbcp.xml \
 	../common/license-apache-commons-digester.xml \
+	../common/license-apache-commons-exec.xml \
 	../common/license-apache-commons-fileupload.xml \
+	../common/license-apache-commons-httpclient.xml \
 	../common/license-apache-commons-io.xml \
 	../common/license-apache-commons-lang.xml \
 	../common/license-apache-commons-logging.xml \
-	../common/license-apache-commons-math.xml \
 	../common/license-apache-commons-pool.xml \
 	../common/license-apache-commons-validator.xml \
+	../common/license-apache-portable-runtime.xml \
 	../common/license-apache-struts-206.xml \
 	../common/license-apache-tiles.xml \
+	../common/license-apache-tomcat-native-library.xml \
 	../common/license-asm.xml \
 	../common/license-boost.xml \
 	../common/license-cairo.xml \

@@ -6046,6 +6068,8 @@
 	../common/license-google-io-rate-patch.xml \
 	../common/license-google-smp-patch.xml \
 	../common/license-google-tcmalloc.xml \
+	../common/license-httpclient.xml \
+	../common/license-httpcore.xml \
 	../common/license-jdom.xml \
 	../common/license-jquery.xml \
 	../common/license-jqueryui.xml \

@@ -6061,6 +6085,7 @@
 	../common/license-lua.xml \
 	../common/license-luafilesystem.xml \
 	../common/license-md5.xml \
+	../common/license-mime4j.xml \
 	../common/license-nt-servc.xml \
 	../common/license-ognl.xml \
 	../common/license-openpam.xml \

@@ -6073,8 +6098,7 @@
 	../common/license-sha1-in-c.xml \
 	../common/license-slf4j.xml \
 	../common/license-spring-framework.xml \
-	../common/license-stringtemplate.xml \
-	../common/license-tomcat.xml \
+	../common/license-tomcat-2010.xml \
 	../common/license-us-secure-hash.xml \
 	../common/license-xwork-204.xml \
 	../common/license-zlib.xml \

@@ -6781,10 +6805,10 @@
 	monitor-refman-chapter-aspec.xml.mem-whatsnew.none.section.xml \
 	monitor-refman-chapter-base.xml \
 	news-5.5-core.xml \
-	news-monitor-2.1-arbitrary.xml \
-	news-monitor-2.1-aspec.xml \
-	news-monitor-2.1-aspec.xml.mem-news.none.section.xml \
-	news-monitor-2.1-base.xml \
+	news-monitor-2.3-arbitrary.xml \
+	news-monitor-2.3-aspec.xml \
+	news-monitor-2.3-aspec.xml.mem-news.none.section.xml \
+	news-monitor-2.3-base.xml \
 	news.xml \
 	optimization.xml \
 	partitioning.xml \

@@ -7180,19 +7204,25 @@
 	../common/metadata/license-antlr-2.idmap \
 	../common/metadata/license-antlr-3.idmap \
 	../common/metadata/license-apache-2-0.idmap \
+	../common/metadata/license-apache-commons-beanutils-16.idmap \
+	../common/metadata/license-apache-commons-beanutils.idmap \
 	../common/metadata/license-apache-commons-chain.idmap \
+	../common/metadata/license-apache-commons-codec.idmap \
 	../common/metadata/license-apache-commons-collections.idmap \
 	../common/metadata/license-apache-commons-dbcp.idmap \
 	../common/metadata/license-apache-commons-digester.idmap \
+	../common/metadata/license-apache-commons-exec.idmap \
 	../common/metadata/license-apache-commons-fileupload.idmap \
+	../common/metadata/license-apache-commons-httpclient.idmap \
 	../common/metadata/license-apache-commons-io.idmap \
 	../common/metadata/license-apache-commons-lang.idmap \
 	../common/metadata/license-apache-commons-logging.idmap \
-	../common/metadata/license-apache-commons-math.idmap \
 	../common/metadata/license-apache-commons-pool.idmap \
 	../common/metadata/license-apache-commons-validator.idmap \
+	../common/metadata/license-apache-portable-runtime.idmap \
 	../common/metadata/license-apache-struts-206.idmap \
 	../common/metadata/license-apache-tiles.idmap \
+	../common/metadata/license-apache-tomcat-native-library.idmap \
 	../common/metadata/license-asm.idmap \
 	../common/metadata/license-boost.idmap \
 	../common/metadata/license-cairo.idmap \

@@ -7212,6 +7242,8 @@
 	../common/metadata/license-google-io-rate-patch.idmap \
 	../common/metadata/license-google-smp-patch.idmap \
 	../common/metadata/license-google-tcmalloc.idmap \
+	../common/metadata/license-httpclient.idmap \
+	../common/metadata/license-httpcore.idmap \
 	../common/metadata/license-jdom.idmap \
 	../common/metadata/license-jquery.idmap \
 	../common/metadata/license-jqueryui.idmap \

@@ -7227,6 +7259,7 @@
 	../common/metadata/license-lua.idmap \
 	../common/metadata/license-luafilesystem.idmap \
 	../common/metadata/license-md5.idmap \
+	../common/metadata/license-mime4j.idmap \
 	../common/metadata/license-nt-servc.idmap \
 	../common/metadata/license-ognl.idmap \
 	../common/metadata/license-openpam.idmap \

@@ -7239,8 +7272,7 @@
 	../common/metadata/license-sha1-in-c.idmap \
 	../common/metadata/license-slf4j.idmap \
 	../common/metadata/license-spring-framework.idmap \
-	../common/metadata/license-stringtemplate.idmap \
-	../common/metadata/license-tomcat.idmap \
+	../common/metadata/license-tomcat-2010.idmap \
 	../common/metadata/license-us-secure-hash.idmap \
 	../common/metadata/license-xwork-204.idmap \
 	../common/metadata/license-zlib.idmap \

@@ -7854,7 +7886,7 @@
 news-5.5-core-manprepped.xml: $(news_5_5_core_SOURCES) $(news_5_5_core_IDMAPS)
 news-5.5-core-remprepped.xml: $(news_5_5_core_SOURCES) $(news_5_5_core_IDMAPS)
 
-news_monitor_2_1_arbitrary_INCLUDES = \
+news_monitor_2_3_arbitrary_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
 	../common/product-versions.ent \

@@ -7864,51 +7896,51 @@
 	../refman-common/urls.ent \
 	../workbench/workbench.ent \
 	all-entities.ent \
-	news-monitor-2.1-aspec.xml \
-	news-monitor-2.1-base.xml \
+	news-monitor-2.3-aspec.xml \
+	news-monitor-2.3-base.xml \
 	versions.ent
-news_monitor_2_1_arbitrary_IMAGES =
-news_monitor_2_1_arbitrary_SOURCES = news-monitor-2.1-arbitrary.xml $(news_monitor_2_1_arbitrary_INCLUDES)
-news_monitor_2_1_arbitrary_IDMAPS =
-news-monitor-2.1-arbitrary.validpure: $(news_monitor_2_1_arbitrary_SOURCES)
-news-monitor-2.1-arbitrary.titles: $(news_monitor_2_1_arbitrary_SOURCES)
-news-monitor-2.1-arbitrary.useless: $(news_monitor_2_1_arbitrary_SOURCES)
-news-monitor-2.1-arbitrary.valid: $(news_monitor_2_1_arbitrary_SOURCES) $(news_monitor_2_1_arbitrary_IDMAPS)
-news-monitor-2.1-arbitrary.validwarn: $(news_monitor_2_1_arbitrary_SOURCES) $(news_monitor_2_1_arbitrary_IDMAPS)
-news-monitor-2.1-arbitrary-prepped.xml: $(news_monitor_2_1_arbitrary_SOURCES) $(news_monitor_2_1_arbitrary_IDMAPS)
-news-monitor-2.1-arbitrary-helpprepped.xml: $(news_monitor_2_1_arbitrary_SOURCES) $(news_monitor_2_1_arbitrary_IDMAPS)
-news-monitor-2.1-arbitrary-manprepped.xml: $(news_monitor_2_1_arbitrary_SOURCES) $(news_monitor_2_1_arbitrary_IDMAPS)
-news-monitor-2.1-arbitrary-remprepped.xml: $(news_monitor_2_1_arbitrary_SOURCES) $(news_monitor_2_1_arbitrary_IDMAPS)
+news_monitor_2_3_arbitrary_IMAGES =
+news_monitor_2_3_arbitrary_SOURCES = news-monitor-2.3-arbitrary.xml $(news_monitor_2_3_arbitrary_INCLUDES)
+news_monitor_2_3_arbitrary_IDMAPS =
+news-monitor-2.3-arbitrary.validpure: $(news_monitor_2_3_arbitrary_SOURCES)
+news-monitor-2.3-arbitrary.titles: $(news_monitor_2_3_arbitrary_SOURCES)
+news-monitor-2.3-arbitrary.useless: $(news_monitor_2_3_arbitrary_SOURCES)
+news-monitor-2.3-arbitrary.valid: $(news_monitor_2_3_arbitrary_SOURCES) $(news_monitor_2_3_arbitrary_IDMAPS)
+news-monitor-2.3-arbitrary.validwarn: $(news_monitor_2_3_arbitrary_SOURCES) $(news_monitor_2_3_arbitrary_IDMAPS)
+news-monitor-2.3-arbitrary-prepped.xml: $(news_monitor_2_3_arbitrary_SOURCES) $(news_monitor_2_3_arbitrary_IDMAPS)
+news-monitor-2.3-arbitrary-helpprepped.xml: $(news_monitor_2_3_arbitrary_SOURCES) $(news_monitor_2_3_arbitrary_IDMAPS)
+news-monitor-2.3-arbitrary-manprepped.xml: $(news_monitor_2_3_arbitrary_SOURCES) $(news_monitor_2_3_arbitrary_IDMAPS)
+news-monitor-2.3-arbitrary-remprepped.xml: $(news_monitor_2_3_arbitrary_SOURCES) $(news_monitor_2_3_arbitrary_IDMAPS)
 
-news_monitor_2_1_aspec_INCLUDES =
-news_monitor_2_1_aspec_IMAGES =
-news_monitor_2_1_aspec_SOURCES = news-monitor-2.1-aspec.xml $(news_monitor_2_1_aspec_INCLUDES)
-news_monitor_2_1_aspec_IDMAPS =
-news-monitor-2.1-aspec.validpure: $(news_monitor_2_1_aspec_SOURCES)
-news-monitor-2.1-aspec.titles: $(news_monitor_2_1_aspec_SOURCES)
-news-monitor-2.1-aspec.useless: $(news_monitor_2_1_aspec_SOURCES)
-news-monitor-2.1-aspec.valid: $(news_monitor_2_1_aspec_SOURCES) $(news_monitor_2_1_aspec_IDMAPS)
-news-monitor-2.1-aspec.validwarn: $(news_monitor_2_1_aspec_SOURCES) $(news_monitor_2_1_aspec_IDMAPS)
-news-monitor-2.1-aspec-prepped.xml: $(news_monitor_2_1_aspec_SOURCES) $(news_monitor_2_1_aspec_IDMAPS)
-news-monitor-2.1-aspec-helpprepped.xml: $(news_monitor_2_1_aspec_SOURCES) $(news_monitor_2_1_aspec_IDMAPS)
-news-monitor-2.1-aspec-manprepped.xml: $(news_monitor_2_1_aspec_SOURCES) $(news_monitor_2_1_aspec_IDMAPS)
-news-monitor-2.1-aspec-remprepped.xml: $(news_monitor_2_1_aspec_SOURCES) $(news_monitor_2_1_aspec_IDMAPS)
+news_monitor_2_3_aspec_INCLUDES =
+news_monitor_2_3_aspec_IMAGES =
+news_monitor_2_3_aspec_SOURCES = news-monitor-2.3-aspec.xml $(news_monitor_2_3_aspec_INCLUDES)
+news_monitor_2_3_aspec_IDMAPS =
+news-monitor-2.3-aspec.validpure: $(news_monitor_2_3_aspec_SOURCES)
+news-monitor-2.3-aspec.titles: $(news_monitor_2_3_aspec_SOURCES)
+news-monitor-2.3-aspec.useless: $(news_monitor_2_3_aspec_SOURCES)
+news-monitor-2.3-aspec.valid: $(news_monitor_2_3_aspec_SOURCES) $(news_monitor_2_3_aspec_IDMAPS)
+news-monitor-2.3-aspec.validwarn: $(news_monitor_2_3_aspec_SOURCES) $(news_monitor_2_3_aspec_IDMAPS)
+news-monitor-2.3-aspec-prepped.xml: $(news_monitor_2_3_aspec_SOURCES) $(news_monitor_2_3_aspec_IDMAPS)
+news-monitor-2.3-aspec-helpprepped.xml: $(news_monitor_2_3_aspec_SOURCES) $(news_monitor_2_3_aspec_IDMAPS)
+news-monitor-2.3-aspec-manprepped.xml: $(news_monitor_2_3_aspec_SOURCES) $(news_monitor_2_3_aspec_IDMAPS)
+news-monitor-2.3-aspec-remprepped.xml: $(news_monitor_2_3_aspec_SOURCES) $(news_monitor_2_3_aspec_IDMAPS)
 
-news_monitor_2_1_base_INCLUDES =
-news_monitor_2_1_base_IMAGES =
-news_monitor_2_1_base_SOURCES = news-monitor-2.1-base.xml $(news_monitor_2_1_base_INCLUDES)
-news_monitor_2_1_base_IDMAPS =
-news-monitor-2.1-base.validpure: $(news_monitor_2_1_base_SOURCES)
-news-monitor-2.1-base.titles: $(news_monitor_2_1_base_SOURCES)
-news-monitor-2.1-base.useless: $(news_monitor_2_1_base_SOURCES)
-news-monitor-2.1-base.valid: $(news_monitor_2_1_base_SOURCES) $(news_monitor_2_1_base_IDMAPS)
-news-monitor-2.1-base.validwarn: $(news_monitor_2_1_base_SOURCES) $(news_monitor_2_1_base_IDMAPS)
-news-monitor-2.1-base-prepped.xml: $(news_monitor_2_1_base_SOURCES) $(news_monitor_2_1_base_IDMAPS)
-news-monitor-2.1-base-helpprepped.xml: $(news_monitor_2_1_base_SOURCES) $(news_monitor_2_1_base_IDMAPS)
-news-monitor-2.1-base-manprepped.xml: $(news_monitor_2_1_base_SOURCES) $(news_monitor_2_1_base_IDMAPS)
-news-monitor-2.1-base-remprepped.xml: $(news_monitor_2_1_base_SOURCES) $(news_monitor_2_1_base_IDMAPS)
+news_monitor_2_3_base_INCLUDES =
+news_monitor_2_3_base_IMAGES =
+news_monitor_2_3_base_SOURCES = news-monitor-2.3-base.xml $(news_monitor_2_3_base_INCLUDES)
+news_monitor_2_3_base_IDMAPS =
+news-monitor-2.3-base.validpure: $(news_monitor_2_3_base_SOURCES)
+news-monitor-2.3-base.titles: $(news_monitor_2_3_base_SOURCES)
+news-monitor-2.3-base.useless: $(news_monitor_2_3_base_SOURCES)
+news-monitor-2.3-base.valid: $(news_monitor_2_3_base_SOURCES) $(news_monitor_2_3_base_IDMAPS)
+news-monitor-2.3-base.validwarn: $(news_monitor_2_3_base_SOURCES) $(news_monitor_2_3_base_IDMAPS)
+news-monitor-2.3-base-prepped.xml: $(news_monitor_2_3_base_SOURCES) $(news_monitor_2_3_base_IDMAPS)
+news-monitor-2.3-base-helpprepped.xml: $(news_monitor_2_3_base_SOURCES) $(news_monitor_2_3_base_IDMAPS)
+news-monitor-2.3-base-manprepped.xml: $(news_monitor_2_3_base_SOURCES) $(news_monitor_2_3_base_IDMAPS)
+news-monitor-2.3-base-remprepped.xml: $(news_monitor_2_3_base_SOURCES) $(news_monitor_2_3_base_IDMAPS)
 
-news_monitor_2_1_INCLUDES = \
+news_monitor_2_3_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \
 	../common/product-versions.ent \

@@ -7918,21 +7950,21 @@
 	../refman-common/urls.ent \
 	../workbench/workbench.ent \
 	all-entities.ent \
-	news-monitor-2.1-aspec.xml \
-	news-monitor-2.1-base.xml \
+	news-monitor-2.3-aspec.xml \
+	news-monitor-2.3-base.xml \
 	versions.ent
-news_monitor_2_1_IMAGES =
-news_monitor_2_1_SOURCES = news-monitor-2.1.xml $(news_monitor_2_1_INCLUDES)
-news_monitor_2_1_IDMAPS =
-news-monitor-2.1.validpure: $(news_monitor_2_1_SOURCES)
-news-monitor-2.1.titles: $(news_monitor_2_1_SOURCES)
-news-monitor-2.1.useless: $(news_monitor_2_1_SOURCES)
-news-monitor-2.1.valid: $(news_monitor_2_1_SOURCES) $(news_monitor_2_1_IDMAPS)
-news-monitor-2.1.validwarn: $(news_monitor_2_1_SOURCES) $(news_monitor_2_1_IDMAPS)
-news-monitor-2.1-prepped.xml: $(news_monitor_2_1_SOURCES) $(news_monitor_2_1_IDMAPS)
-news-monitor-2.1-helpprepped.xml: $(news_monitor_2_1_SOURCES) $(news_monitor_2_1_IDMAPS)
-news-monitor-2.1-manprepped.xml: $(news_monitor_2_1_SOURCES) $(news_monitor_2_1_IDMAPS)
-news-monitor-2.1-remprepped.xml: $(news_monitor_2_1_SOURCES) $(news_monitor_2_1_IDMAPS)
+news_monitor_2_3_IMAGES =
+news_monitor_2_3_SOURCES = news-monitor-2.3.xml $(news_monitor_2_3_INCLUDES)
+news_monitor_2_3_IDMAPS =
+news-monitor-2.3.validpure: $(news_monitor_2_3_SOURCES)
+news-monitor-2.3.titles: $(news_monitor_2_3_SOURCES)
+news-monitor-2.3.useless: $(news_monitor_2_3_SOURCES)
+news-monitor-2.3.valid: $(news_monitor_2_3_SOURCES) $(news_monitor_2_3_IDMAPS)
+news-monitor-2.3.validwarn: $(news_monitor_2_3_SOURCES) $(news_monitor_2_3_IDMAPS)
+news-monitor-2.3-prepped.xml: $(news_monitor_2_3_SOURCES) $(news_monitor_2_3_IDMAPS)
+news-monitor-2.3-helpprepped.xml: $(news_monitor_2_3_SOURCES) $(news_monitor_2_3_IDMAPS)
+news-monitor-2.3-manprepped.xml: $(news_monitor_2_3_SOURCES) $(news_monitor_2_3_IDMAPS)
+news-monitor-2.3-remprepped.xml: $(news_monitor_2_3_SOURCES) $(news_monitor_2_3_IDMAPS)
 
 news_INCLUDES = \
 	../../mysqldoc/dynamic-docs/changelog/connector-cpp-versions.xml \

@@ -7979,10 +8011,10 @@
 	dynxml-common-news-vstudioplugin.xml \
 	dynxml-local-news-5.5.xml \
 	news-5.5-core.xml \
-	news-monitor-2.1-arbitrary.xml \
-	news-monitor-2.1-aspec.xml \
-	news-monitor-2.1-aspec.xml.mem-news.none.section.xml \
-	news-monitor-2.1-base.xml \
+	news-monitor-2.3-arbitrary.xml \
+	news-monitor-2.3-aspec.xml \
+	news-monitor-2.3-aspec.xml.mem-news.none.section.xml \
+	news-monitor-2.3-base.xml \
 	versions.ent
 news_IMAGES =
 news_SOURCES = news.xml $(news_INCLUDES)

@@ -10020,6 +10052,16 @@
 
 
 # This rules sets the rebuild for fragments of an arby file when a source file has changed
+news-monitor-2.3-aspec.xml.mem-news.none.section.xml: ../mysql-monitor-2.3/version.ent ../common/product-versions.ent news-monitor-2.3-base.xml versions.ent ../mysql-monitor-2.3/enterprise.ent ../mysql-monitor-2.3/news-core.xml ../refman-common/urls.ent all-entities.ent ../common/phrases.ent ../mysql-monitor-2.3/metadata/news-core.idmap ../common/fixedchars.ent ../workbench/workbench.ent news-monitor-2.3-aspec.xml
+	$(MAKE) news-monitor-2.3.arbitraryforce
+
+# This rules sets the fragments of a final arby file to be dependent for the -arbitrary (true) target
+news-monitor-2.3-arbitrary.xml: news-monitor-2.3-aspec.xml.mem-news.none.section.xml
+	$(MAKE) news-monitor-2.3.arbitrary
+	cp news-monitor-2.3.arbitrary news-monitor-2.3-arbitrary.xml
+
+
+# This rules sets the rebuild for fragments of an arby file when a source file has changed
 monitor-refman-chapter-aspec.xml.mem-query-analyzer.none.section.xml monitor-refman-chapter-aspec.xml.mem-replication.none.section.xml monitor-refman-chapter-aspec.xml.mem-install.none.section.xml monitor-refman-chapter-aspec.xml.mem-graphs.none.section.xml monitor-refman-chapter-aspec.xml.mem-reference.none.section.xml monitor-refman-chapter-aspec.xml.mem-dashboard-settings.none.section.xml monitor-refman-chapter-aspec.xml.mem-whatsnew.none.section.xml monitor-refman-chapter-aspec.xml.mem-introduction.none.chapter.xml monitor-refman-chapter-aspec.xml.mem-faq.none.section.xml monitor-refman-chapter-aspec.xml.mem-dashboard.none.section.xml monitor-refman-chapter-aspec.xml.mem-advisors.none.section.xml monitor-refman-chapter-aspec.xml.mem-events.none.section.xml: ../mysql-monitor-2.3/install-agent.xml ../mysql-monitor-2.3/install-user-roles.xml ../mysql-monitor-2.3/install-upgrades.xml ../mysql-monitor-2.3/images/published/settings-http-proxy.png ../mysql-monitor-2.3/images/p!
 ublished/user-preferences.png ../mysql-monitor-2.3/metadata/mem-reference.idmap ../mysql-monitor-2.3/metadata/mem-reference-advgraph-core.idmap ../mysql-monitor-2.3/images/published/monitor-install-win5.png ../mysql-monitor-2.3/metadata/installation-reference.idmap ../mysql-monitor-2.3/images/generated/mem-overview-agent-proxy-autosvg.png ../mysql-monitor-2.3/images/published/settings-users.png ../mysql-monitor-2.3/metadata/install-upgrades.idmap ../mysql-monitor-2.3/images/published/settings-logs.png ../mysql-monitor-2.3/metadata/dashboard-events.idmap ../mysql-monitor-2.3/images/published/monitor-migration-progress.png ../mysql-monitor-2.3/dynxml-local-mem-reference-advgraph.xml ../mysql-monitor-2.3/images/published/monitor-update-install-4.png ../mysql-monitor-2.3/install-server.xml ../mysql-monitor-2.3/../common/fixedchars.ent ../mysql-monitor-2.3/metadata/dashboard-replication.idmap ../mysql-monitor-2.3/dashboard-advisors.xml ../mysql-monitor-2.3/introduction.xml ../my!
 sql-monitor-2.3/dashboard-replication.xml ../mysql-monitor-2.3!
 /metadat
a/dashboard-overview.idmap ../mysql-monitor-2.3/install-unattended-core.xml ../mysql-monitor-2.3/dashboard-settings.xml versions.ent ../mysql-monitor-2.3/install-postinstall.xml ../mysql-monitor-2.3/images/published/monitor-install-win4.png ../mysql-monitor-2.3/images/published/settings-ldap.png ../common/phrases.ent ../mysql-monitor-2.3/metadata/dashboard-advisors.idmap ../mysql-monitor-2.3/metadata/dashboard-query-analyzer.idmap ../mysql-monitor-2.3/images/published/settings-advisorbundle.png ../mysql-monitor-2.3/images/published/settings-credentials.png ../mysql-monitor-2.3/dashboard-whatsnew.xml ../mysql-monitor-2.3/metadata/install-agent.idmap ../mysql-monitor-2.3/images/published/monitor-migration-check.png ../mysql-monitor-2.3/images/published/agent-install-win6.png ../mysql-monitor-2.3/images/published/mem-server-rename.png ../mysql-monitor-2.3/dashboard-query-analyzer.xml ../mysql-monitor-2.3/images/published/notification-groups.png ../mysql-monitor-2.3/images/publi!
 shed/monitor-update-install-2.png ../mysql-monitor-2.3/metadata/introduction.idmap ../mysql-monitor-2.3/images/published/settings-data-purge.png ../mysql-monitor-2.3/images/published/agent-install-osx4.png ../mysql-monitor-2.3/metadata/install-user-roles.idmap ../mysql-monitor-2.3/../../mysqldoc/dynamic-docs/metadata-titles.en.xml ../mysql-monitor-2.3/images/published/warning_alert.png ../mysql-monitor-2.3/images/published/success_alert_21.png monitor-refman-chapter-aspec.xml ../mysql-monitor-2.3/images/published/monitor-update-install-9.png ../mysql-monitor-2.3/images/published/settings-server-hostname.png ../mysql-monitor-2.3/dashboard-graphs.xml ../common/fixedchars.ent ../mysql-monitor-2.3/images/published/monitor-migration-confirm.png ../mysql-monitor-2.3/../dynamic-docs/command-optvars/mysql-monitor-agent-installer.xml ../mysql-monitor-2.3/metadata/install-server.idmap ../mysql-monitor-2.3/images/published/mem-replication.png ../mysql-monitor-2.3/images/generated/mem-!
 overview-server-autosvg.png ../mysql-monitor-2.3/images/publis!
 hed/mem-
advisor-scheduling.png ../mysql-monitor-2.3/images/published/mem-server-popup.png ../mysql-monitor-2.3/images/published/monitor-install-osx5.png ../mysql-monitor-2.3/enterprise.ent ../mysql-monitor-2.3/images/published/settings-email.png ../mysql-monitor-2.3/faq-core.xml ../mysql-monitor-2.3/metadata/faq-core.idmap ../mysql-monitor-2.3/images/published/mem-quan-main.png ../mysql-monitor-2.3/images/published/agent-install-osx5.png ../refman-common/urls.ent all-entities.ent ../mysql-monitor-2.3/images/published/monitor-install-osx6.png ../mysql-monitor-2.3/dashboard-overview.xml ../workbench/workbench.ent ../mysql-monitor-2.3/metadata/dashboard-whatsnew.idmap ../mysql-monitor-2.3/install-uninstall.xml ../mysql-monitor-2.3/metadata/dashboard-settings.idmap ../mysql-monitor-2.3/metadata/install-uninstall.idmap ../mysql-monitor-2.3/version.ent ../mysql-monitor-2.3/images/published/mem-events-screen.png ../mysql-monitor-2.3/images/published/settings-snmp.png monitor-refman-chapter!
 -base.xml ../mysql-monitor-2.3/all-entities.ent ../common/product-versions.ent ../mysql-monitor-2.3/../dynamic-docs/command-optvars/mysql-monitor-server-installer.xml ../mysql-monitor-2.3/metadata/install-postinstall.idmap ../mysql-monitor-2.3/dynxml-local-install-unattended.xml ../mysql-monitor-2.3/mem-reference-advgraph-core.xml ../mysql-monitor-2.3/images/published/dashboard-whatsnew-configure.png ../mysql-monitor-2.3/images/published/monitor-update-install-7.png ../mysql-monitor-2.3/images/published/critical_alert.png ../mysql-monitor-2.3/images/published/dashboard-whatsnew.png ../mysql-monitor-2.3/images/published/mem-edit-advisor.png ../mysql-monitor-2.3/../mysql-monitor-common/urls.ent ../mysql-monitor-2.3/images/published/settings-server-locale.png ../mysql-monitor-2.3/images/published/unknown_alert.png ../mysql-monitor-2.3/mem-reference.xml ../mysql-monitor-2.3/images/published/agent-install-osx7.png ../mysql-monitor-2.3/installation-reference.xml ../mysql-monitor-!
 2.3/images/published/info_alert.png ../mysql-monitor-2.3/dashb!
 oard-eve
nts.xml ../mysql-monitor-2.3/images/published/monitor-install-osx2.png ../mysql-monitor-2.3/metadata/dashboard-graphs.idmap ../mysql-monitor-2.3/images/published/settings-config-reinventory.png ../mysql-monitor-2.3/images/published/mem-settings-servers.png ../mysql-monitor-2.3/../common/phrases.ent ../mysql-monitor-2.3/images/generated/mem-overview-autosvg.png ../mysql-monitor-2.3/images/published/notification-group-edit.png ../mysql-monitor-2.3/images/published/agent-install-win4.png ../mysql-monitor-2.3/images/published/first-dashboard-login.png ../mysql-monitor-2.3/../dynamic-docs/mem-advgraph/graph-desc.xml ../mysql-monitor-2.3/metadata/install-unattended-core.idmap
 	$(MAKE) monitor-refman-chapter.arbitraryforce
 

@@ -10038,14 +10080,4 @@
 	$(MAKE) workbench-refman-chapter.arbitrary
 	cp workbench-refman-chapter.arbitrary workbench-refman-chapter-arbitrary.xml
 
-
-# This rules sets the rebuild for fragments of an arby file when a source file has changed
-news-monitor-2.1-aspec.xml.mem-news.none.section.xml: ../mysql-monitor-2.3/version.ent ../common/product-versions.ent versions.ent ../mysql-monitor-2.3/enterprise.ent ../mysql-monitor-2.3/news-core.xml ../refman-common/urls.ent news-monitor-2.1-aspec.xml all-entities.ent ../common/phrases.ent ../mysql-monitor-2.3/metadata/news-core.idmap ../common/fixedchars.ent ../workbench/workbench.ent news-monitor-2.1-base.xml
-	$(MAKE) news-monitor-2.1.arbitraryforce
-
-# This rules sets the fragments of a final arby file to be dependent for the -arbitrary (true) target
-news-monitor-2.1-arbitrary.xml: news-monitor-2.1-aspec.xml.mem-news.none.section.xml
-	$(MAKE) news-monitor-2.1.arbitrary
-	cp news-monitor-2.1.arbitrary news-monitor-2.1-arbitrary.xml
-
 # End of dependencies


Thread
svn commit - mysqldoc@docsrva: r24627 - in trunk: . refman-5.5paul.dubois4 Jan