svn commit - mysqldoc@docsrva: r7149 - in trunk: . mysqlqb refman-4.1 refman-5.0 refman-5.1 refman-5.2

[paul]

Author: paul
Date: 2007-07-19 00:08:05 +0200 (Thu, 19 Jul 2007)
New Revision: 7149

Log:
 r27752@polar:  paul | 2007-07-18 17:07:45 -0500
 Error: xref ID "refman-4-1" not found internally or externally
 Document manual.xml does not validate
 make: *** [manual.valid] Error 1
 
 Update dependencies.


Modified:
   trunk/mysqlqb/Makefile.depends
   trunk/refman-4.1/Makefile.depends
   trunk/refman-5.0/Makefile.depends
   trunk/refman-5.1/Makefile.depends
   trunk/refman-5.2/Makefile.depends

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:27748
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:22722
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:18941
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:27752
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:22722
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:18941


Modified: trunk/mysqlqb/Makefile.depends
===================================================================
--- trunk/mysqlqb/Makefile.depends	2007-07-18 21:47:09 UTC (rev 7148)
+++ trunk/mysqlqb/Makefile.depends	2007-07-18 22:08:05 UTC (rev 7149)
Changed blocks: 5, Lines Added: 4, Lines Deleted: 10; 3157 bytes

@@ -17,7 +17,6 @@
 	../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 \

@@ -37,15 +36,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 \
-	../refman-common/metadata/credits.idmap \
-	../refman-common/metadata/regexp.idmap
+	../refman-common/metadata/credits.idmap
 mysqlqb.validpure: $(mysqlqb_SOURCES)
 mysqlqb.titles: $(mysqlqb_SOURCES)
 mysqlqb.useless: $(mysqlqb_SOURCES)

@@ -70,16 +67,14 @@
 	../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 \
-	../refman-common/metadata/regexp.idmap
+	metadata/mysqlqb_statements.idmap
 mysqlqb_functions.validpure: $(mysqlqb_functions_SOURCES)
 mysqlqb_functions.titles: $(mysqlqb_functions_SOURCES)
 mysqlqb_functions.useless: $(mysqlqb_functions_SOURCES)

@@ -106,7 +101,6 @@
 	../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 \

@@ -125,13 +119,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
+	../refman-common/metadata/bug-reports.idmap \
+	metadata/mysqlqb_functions.idmap
 mysqlqb_statements.validpure: $(mysqlqb_statements_SOURCES)
 mysqlqb_statements.titles: $(mysqlqb_statements_SOURCES)
 mysqlqb_statements.useless: $(mysqlqb_statements_SOURCES)


Modified: trunk/refman-4.1/Makefile.depends
===================================================================
--- trunk/refman-4.1/Makefile.depends	2007-07-18 21:47:09 UTC (rev 7148)
+++ trunk/refman-4.1/Makefile.depends	2007-07-18 22:08:05 UTC (rev 7149)
Changed blocks: 2, Lines Added: 10, Lines Deleted: 0; 1325 bytes

@@ -296,6 +296,11 @@
 dynxml_generated_dba_IMAGES =
 dynxml_generated_dba_SOURCES = dynxml-generated-dba.xml $(dynxml_generated_dba_INCLUDES)
 dynxml_generated_dba_IDMAPS = \
+	../refman-5.0/metadata/dba-core.idmap \
+	../refman-5.0/metadata/replication.idmap \
+	../refman-5.0/metadata/se-bdb.idmap \
+	../refman-5.0/metadata/se-innodb.idmap \
+	../refman-5.0/metadata/using-mysql-programs.idmap \
 	../refman-common/metadata/bug-reports.idmap \
 	../refman-common/metadata/information-sources.idmap \
 	metadata/apis-c.idmap \

@@ -755,8 +760,13 @@
 manual_IDMAPS = \
 	../ndbapi/metadata/errors.idmap \
 	../ndbapi/metadata/ndb-internals.idmap \
+	../refman-5.0/metadata/dba-core.idmap \
 	../refman-5.0/metadata/information-schema.idmap \
+	../refman-5.0/metadata/replication.idmap \
+	../refman-5.0/metadata/se-bdb.idmap \
+	../refman-5.0/metadata/se-innodb.idmap \
 	../refman-5.0/metadata/stored-procedures.idmap \
+	../refman-5.0/metadata/using-mysql-programs.idmap \
 	../refman-5.1/metadata/introduction.idmap \
 	../refman-common/metadata/gpl-license.idmap \
 	metadata/dba-core.idmap \


Modified: trunk/refman-5.0/Makefile.depends
===================================================================
--- trunk/refman-5.0/Makefile.depends	2007-07-18 21:47:09 UTC (rev 7148)
+++ trunk/refman-5.0/Makefile.depends	2007-07-18 22:08:05 UTC (rev 7149)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 0; 891 bytes

@@ -340,6 +340,7 @@
 dynxml_generated_dba_IMAGES =
 dynxml_generated_dba_SOURCES = dynxml-generated-dba.xml $(dynxml_generated_dba_INCLUDES)
 dynxml_generated_dba_IDMAPS = \
+	../refman-4.1/metadata/manual.idmap \
 	../refman-common/metadata/bug-reports.idmap \
 	../refman-common/metadata/information-sources.idmap \
 	metadata/apis-c.idmap \

@@ -1107,6 +1108,7 @@
 	../ndbapi/metadata/errors.idmap \
 	../ndbapi/metadata/ndb-internals.idmap \
 	../refman-4.1/metadata/introduction.idmap \
+	../refman-4.1/metadata/manual.idmap \
 	../refman-5.1/metadata/introduction.idmap \
 	../refman-common/metadata/gpl-license.idmap \
 	metadata/dba-core.idmap \


Modified: trunk/refman-5.1/Makefile.depends
===================================================================
--- trunk/refman-5.1/Makefile.depends	2007-07-18 21:47:09 UTC (rev 7148)
+++ trunk/refman-5.1/Makefile.depends	2007-07-18 22:08:05 UTC (rev 7149)
Changed blocks: 2, Lines Added: 6, Lines Deleted: 0; 1140 bytes

@@ -465,6 +465,9 @@
 dynxml_generated_dba_IMAGES =
 dynxml_generated_dba_SOURCES = dynxml-generated-dba.xml $(dynxml_generated_dba_INCLUDES)
 dynxml_generated_dba_IDMAPS = \
+	../refman-4.1/metadata/dba-core.idmap \
+	../refman-5.0/metadata/dba-core.idmap \
+	../refman-5.0/metadata/se-bdb.idmap \
 	../refman-common/metadata/bug-reports.idmap \
 	../refman-common/metadata/information-sources.idmap \
 	metadata/apis-c.idmap \

@@ -1100,8 +1103,11 @@
 	../ndbapi/metadata/ndb-classes.idmap \
 	../ndbapi/metadata/ndb-internals.idmap \
 	../ndbapi/metadata/ndbapi.idmap \
+	../refman-4.1/metadata/dba-core.idmap \
 	../refman-4.1/metadata/introduction.idmap \
 	../refman-4.1/metadata/mysql-cluster.idmap \
+	../refman-5.0/metadata/dba-core.idmap \
+	../refman-5.0/metadata/se-bdb.idmap \
 	../refman-common/metadata/gpl-license.idmap \
 	metadata/functions-core.idmap \
 	metadata/replication-topology.idmap


Modified: trunk/refman-5.2/Makefile.depends
===================================================================
--- trunk/refman-5.2/Makefile.depends	2007-07-18 21:47:09 UTC (rev 7148)
+++ trunk/refman-5.2/Makefile.depends	2007-07-18 22:08:05 UTC (rev 7149)
Changed blocks: 3, Lines Added: 10, Lines Deleted: 1; 1622 bytes

@@ -465,6 +465,10 @@
 dynxml_generated_dba_IMAGES =
 dynxml_generated_dba_SOURCES = dynxml-generated-dba.xml $(dynxml_generated_dba_INCLUDES)
 dynxml_generated_dba_IDMAPS = \
+	../refman-4.1/metadata/dba-core.idmap \
+	../refman-5.0/metadata/dba-core.idmap \
+	../refman-5.0/metadata/replication.idmap \
+	../refman-5.0/metadata/se-bdb.idmap \
 	../refman-common/metadata/bug-reports.idmap \
 	../refman-common/metadata/information-sources.idmap \
 	metadata/apis-c.idmap \

@@ -1096,9 +1100,13 @@
 	../falcon/metadata/se-falcon.idmap \
 	../ndbapi/metadata/errors.idmap \
 	../ndbapi/metadata/ndb-internals.idmap \
+	../refman-4.1/metadata/dba-core.idmap \
 	../refman-4.1/metadata/introduction.idmap \
 	../refman-4.1/metadata/mysql-cluster.idmap \
 	../refman-4.1/metadata/sql-syntax.idmap \
+	../refman-5.0/metadata/dba-core.idmap \
+	../refman-5.0/metadata/replication.idmap \
+	../refman-5.0/metadata/se-bdb.idmap \
 	../refman-5.1/metadata/introduction.idmap \
 	../refman-5.1/metadata/news-5.1.idmap \
 	../refman-common/metadata/gpl-license.idmap \

@@ -1180,7 +1188,8 @@
 news_5_2_SOURCES = news-5.2.xml $(news_5_2_INCLUDES)
 news_5_2_IDMAPS = \
 	../falcon/metadata/news-falcon.idmap \
-	metadata/introduction.idmap
+	metadata/introduction.idmap \
+	metadata/sql-syntax.idmap
 news-5.2.validpure: $(news_5_2_SOURCES)
 news-5.2.titles: $(news_5_2_SOURCES)
 news-5.2.useless: $(news_5_2_SOURCES)