Author: paul
Date: 2007-09-05 01:20:46 +0200 (Wed, 05 Sep 2007)
New Revision: 7666
Log:
r29825@polar: paul | 2007-09-04 18:19:56 -0500
Update dependencies.
Modified:
trunk/cy/query-browser/Makefile.depends
trunk/falcon/Makefile.depends
trunk/guibook/Makefile.depends
trunk/mysqldoc-guide/Makefile.depends
trunk/query-browser/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:29816
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:24486
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:20005
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:29825
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:24486
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:20005
Modified: trunk/cy/query-browser/Makefile.depends
===================================================================
--- trunk/cy/query-browser/Makefile.depends 2007-09-04 23:14:48 UTC (rev 7665)
+++ trunk/cy/query-browser/Makefile.depends 2007-09-04 23:20:46 UTC (rev 7666)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 0; 577 bytes
@@ -107,6 +107,7 @@
../../userguide/../refman-common/urls.ent \
../../userguide/all-entities.ent \
../../userguide/excel-mysql.xml \
+ ../../userguide/userguide.ent \
../gui-common/../../common/fixedchars.ent \
../gui-common/../../refman-common/urls.ent \
../gui-common/../gui-common/gui-common.ent \
Modified: trunk/falcon/Makefile.depends
===================================================================
--- trunk/falcon/Makefile.depends 2007-09-04 23:14:48 UTC (rev 7665)
+++ trunk/falcon/Makefile.depends 2007-09-04 23:20:46 UTC (rev 7666)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 1; 565 bytes
@@ -110,7 +110,8 @@
all-entities.ent
news_falcon_IMAGES =
news_falcon_SOURCES = news-falcon.xml $(news_falcon_INCLUDES)
-news_falcon_IDMAPS =
+news_falcon_IDMAPS = \
+ metadata/se-falcon.idmap
news-falcon.validpure: $(news_falcon_SOURCES)
news-falcon.titles: $(news_falcon_SOURCES)
news-falcon.useless: $(news_falcon_SOURCES)
Modified: trunk/guibook/Makefile.depends
===================================================================
--- trunk/guibook/Makefile.depends 2007-09-04 23:14:48 UTC (rev 7665)
+++ trunk/guibook/Makefile.depends 2007-09-04 23:20:46 UTC (rev 7666)
Changed blocks: 2, Lines Added: 1, Lines Deleted: 1; 852 bytes
@@ -123,6 +123,7 @@
../userguide/../refman-common/urls.ent \
../userguide/all-entities.ent \
../userguide/excel-mysql.xml \
+ ../userguide/userguide.ent \
../workbench/../common/fixedchars.ent \
../workbench/../gui-common/gui-common.ent \
../workbench/all-entities.ent \
@@ -209,7 +210,6 @@
../refman-5.1/metadata/sql-syntax.idmap \
../refman-5.1/metadata/using-mysql-programs.idmap \
../refman-common/metadata/bug-reports.idmap \
- ../userguide/metadata/basic-administration.idmap \
../userguide/metadata/storage-engines.idmap
guibook.validpure: $(guibook_SOURCES)
guibook.titles: $(guibook_SOURCES)
Modified: trunk/mysqldoc-guide/Makefile.depends
===================================================================
--- trunk/mysqldoc-guide/Makefile.depends 2007-09-04 23:14:48 UTC (rev 7665)
+++ trunk/mysqldoc-guide/Makefile.depends 2007-09-04 23:20:46 UTC (rev 7666)
Changed blocks: 4, Lines Added: 35, Lines Deleted: 21; 3506 bytes
@@ -15,6 +15,23 @@
formats-manprepped.xml: $(formats_SOURCES) $(formats_IDMAPS)
formats-remprepped.xml: $(formats_SOURCES) $(formats_IDMAPS)
+formatting_guide_INCLUDES = \
+ ../common/fixedchars.ent \
+ ../refman-common/urls.ent \
+ all-entities.ent
+formatting_guide_IMAGES =
+formatting_guide_SOURCES = formatting-guide.xml $(formatting_guide_INCLUDES)
+formatting_guide_IDMAPS = \
+ metadata/styleguide.idmap
+formatting-guide.validpure: $(formatting_guide_SOURCES)
+formatting-guide.titles: $(formatting_guide_SOURCES)
+formatting-guide.useless: $(formatting_guide_SOURCES)
+formatting-guide.valid: $(formatting_guide_SOURCES) $(formatting_guide_IDMAPS)
+formatting-guide.validwarn: $(formatting_guide_SOURCES) $(formatting_guide_IDMAPS)
+formatting-guide-prepped.xml: $(formatting_guide_SOURCES) $(formatting_guide_IDMAPS)
+formatting-guide-manprepped.xml: $(formatting_guide_SOURCES) $(formatting_guide_IDMAPS)
+formatting-guide-remprepped.xml: $(formatting_guide_SOURCES) $(formatting_guide_IDMAPS)
+
legalnotice_en_INCLUDES =
legalnotice_en_IMAGES =
legalnotice_en_SOURCES = legalnotice.en.xml $(legalnotice_en_INCLUDES)
@@ -33,15 +50,15 @@
../refman-common/urls.ent \
all-entities.ent \
formats.xml \
+ formatting-guide.xml \
legalnotice.en.xml \
overview.xml \
- tools.xml \
- writing.xml
+ styleguide.xml \
+ tools.xml
mysqldoc_guide_IMAGES =
mysqldoc_guide_SOURCES = mysqldoc-guide.xml $(mysqldoc_guide_INCLUDES)
mysqldoc_guide_IDMAPS = \
- metadata/tools.de.idmap \
- metadata/writing.de.idmap
+ metadata/tools.de.idmap
mysqldoc-guide.validpure: $(mysqldoc_guide_SOURCES)
mysqldoc-guide.titles: $(mysqldoc_guide_SOURCES)
mysqldoc-guide.useless: $(mysqldoc_guide_SOURCES)
@@ -67,6 +84,20 @@
overview-manprepped.xml: $(overview_SOURCES) $(overview_IDMAPS)
overview-remprepped.xml: $(overview_SOURCES) $(overview_IDMAPS)
+styleguide_INCLUDES =
+styleguide_IMAGES =
+styleguide_SOURCES = styleguide.xml $(styleguide_INCLUDES)
+styleguide_IDMAPS = \
+ metadata/formatting-guide.idmap
+styleguide.validpure: $(styleguide_SOURCES)
+styleguide.titles: $(styleguide_SOURCES)
+styleguide.useless: $(styleguide_SOURCES)
+styleguide.valid: $(styleguide_SOURCES) $(styleguide_IDMAPS)
+styleguide.validwarn: $(styleguide_SOURCES) $(styleguide_IDMAPS)
+styleguide-prepped.xml: $(styleguide_SOURCES) $(styleguide_IDMAPS)
+styleguide-manprepped.xml: $(styleguide_SOURCES) $(styleguide_IDMAPS)
+styleguide-remprepped.xml: $(styleguide_SOURCES) $(styleguide_IDMAPS)
+
tools_INCLUDES = \
../common/fixedchars.ent \
../refman-common/urls.ent \
@@ -84,20 +115,3 @@
tools-manprepped.xml: $(tools_SOURCES) $(tools_IDMAPS)
tools-remprepped.xml: $(tools_SOURCES) $(tools_IDMAPS)
-writing_INCLUDES = \
- ../common/fixedchars.ent \
- ../refman-common/urls.ent \
- all-entities.ent
-writing_IMAGES =
-writing_SOURCES = writing.xml $(writing_INCLUDES)
-writing_IDMAPS = \
- metadata/writing.de.idmap
-writing.validpure: $(writing_SOURCES)
-writing.titles: $(writing_SOURCES)
-writing.useless: $(writing_SOURCES)
-writing.valid: $(writing_SOURCES) $(writing_IDMAPS)
-writing.validwarn: $(writing_SOURCES) $(writing_IDMAPS)
-writing-prepped.xml: $(writing_SOURCES) $(writing_IDMAPS)
-writing-manprepped.xml: $(writing_SOURCES) $(writing_IDMAPS)
-writing-remprepped.xml: $(writing_SOURCES) $(writing_IDMAPS)
-
Modified: trunk/query-browser/Makefile.depends
===================================================================
--- trunk/query-browser/Makefile.depends 2007-09-04 23:14:48 UTC (rev 7665)
+++ trunk/query-browser/Makefile.depends 2007-09-04 23:20:46 UTC (rev 7666)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 0; 501 bytes
@@ -136,6 +136,7 @@
../userguide/../refman-common/urls.ent \
../userguide/all-entities.ent \
../userguide/excel-mysql.xml \
+ ../userguide/userguide.ent \
all-entities.ent \
chapter-options-query-browser.xml \
connection-dialog.xml \
Modified: trunk/refman-4.1/Makefile.depends
===================================================================
--- trunk/refman-4.1/Makefile.depends 2007-09-04 23:14:48 UTC (rev 7665)
+++ trunk/refman-4.1/Makefile.depends 2007-09-04 23:20:46 UTC (rev 7666)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 0; 492 bytes
@@ -998,6 +998,7 @@
metadata/errors-problems.idmap \
metadata/functions-core.idmap \
metadata/mysql-cluster.idmap \
+ metadata/optimization.idmap \
metadata/se-innodb.idmap \
metadata/sql-syntax.idmap \
metadata/storage-engines.idmap
Modified: trunk/refman-5.0/Makefile.depends
===================================================================
--- trunk/refman-5.0/Makefile.depends 2007-09-04 23:14:48 UTC (rev 7665)
+++ trunk/refman-5.0/Makefile.depends 2007-09-04 23:20:46 UTC (rev 7666)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 0; 490 bytes
@@ -1409,6 +1409,7 @@
metadata/errors-problems.idmap \
metadata/functions-core.idmap \
metadata/mysql-cluster.idmap \
+ metadata/optimization.idmap \
metadata/se-innodb.idmap \
metadata/se-memory.idmap \
metadata/sql-syntax.idmap \
Modified: trunk/refman-5.1/Makefile.depends
===================================================================
--- trunk/refman-5.1/Makefile.depends 2007-09-04 23:14:48 UTC (rev 7665)
+++ trunk/refman-5.1/Makefile.depends 2007-09-04 23:20:46 UTC (rev 7666)
Changed blocks: 3, Lines Added: 3, Lines Deleted: 0; 1109 bytes
@@ -1388,6 +1388,7 @@
metadata/dba-core.idmap \
metadata/errors-problems.idmap \
metadata/mysql-cluster-ccsg-merge-temp.idmap \
+ metadata/optimization.idmap \
metadata/replication-implementation.idmap \
metadata/sql-syntax.idmap \
metadata/stored-procedures.idmap
@@ -1410,6 +1411,7 @@
replication_implementation_SOURCES = replication-implementation.xml $(replication_implementation_INCLUDES)
replication_implementation_IDMAPS = \
metadata/dba-core.idmap \
+ metadata/optimization.idmap \
metadata/replication-configuration.idmap \
metadata/replication-notes.idmap \
metadata/sql-syntax.idmap
@@ -1514,6 +1516,7 @@
metadata/functions-core.idmap \
metadata/information-schema.idmap \
metadata/mysql-cluster-ccsg-merge-temp.idmap \
+ metadata/optimization.idmap \
metadata/se-innodb.idmap \
metadata/se-memory.idmap \
metadata/sql-syntax.idmap \
Modified: trunk/refman-5.2/Makefile.depends
===================================================================
--- trunk/refman-5.2/Makefile.depends 2007-09-04 23:14:48 UTC (rev 7665)
+++ trunk/refman-5.2/Makefile.depends 2007-09-04 23:20:46 UTC (rev 7666)
Changed blocks: 10, Lines Added: 4, Lines Deleted: 9; 3244 bytes
@@ -734,7 +734,6 @@
information_schema_IMAGES =
information_schema_SOURCES = information-schema.xml $(information_schema_INCLUDES)
information_schema_IDMAPS = \
- ../refman-5.1/metadata/news-5.1.idmap \
metadata/charset.idmap \
metadata/dba-core.idmap \
metadata/events.idmap \
@@ -763,7 +762,6 @@
installing_IMAGES =
installing_SOURCES = installing.xml $(installing_INCLUDES)
installing_IDMAPS = \
- ../refman-5.1/metadata/news-5.1.idmap \
../refman-common/metadata/bug-reports.idmap \
../refman-common/metadata/information-sources.idmap \
metadata/apis-c.idmap \
@@ -777,6 +775,7 @@
metadata/ha.idmap \
metadata/language-structure.idmap \
metadata/mysql-cluster.idmap \
+ metadata/news-5.2.idmap \
metadata/news.idmap \
metadata/optimization.idmap \
metadata/replication-notes.idmap \
@@ -1128,8 +1127,6 @@
../falcon/metadata/se-falcon.idmap \
../ndbapi/metadata/errors.idmap \
../ndbapi/metadata/ndb-internals.idmap \
- ../ndbapi/metadata/ndbapi.idmap \
- ../refman-5.1/metadata/news-5.1.idmap \
../refman-common/metadata/gpl-license.idmap \
metadata/replication-topology.idmap
manual.validpure: $(manual_SOURCES)
@@ -1174,8 +1171,6 @@
mysql_cluster_IDMAPS = \
../ndbapi/metadata/errors.idmap \
../ndbapi/metadata/ndb-internals.idmap \
- ../ndbapi/metadata/ndbapi.idmap \
- ../refman-5.1/metadata/news-5.1.idmap \
../refman-common/metadata/bug-reports.idmap \
metadata/client-utility-programs.idmap \
metadata/data-types.idmap \
@@ -1295,13 +1290,11 @@
partitioning_IMAGES =
partitioning_SOURCES = partitioning.xml $(partitioning_INCLUDES)
partitioning_IDMAPS = \
- ../refman-5.1/metadata/news-5.1.idmap \
metadata/client-utility-programs.idmap \
metadata/dba-core.idmap \
metadata/errors-problems.idmap \
metadata/functions-core.idmap \
metadata/information-schema.idmap \
- metadata/installing.idmap \
metadata/mysql-cluster.idmap \
metadata/optimization.idmap \
metadata/sql-syntax.idmap
@@ -1363,6 +1356,7 @@
metadata/dba-core.idmap \
metadata/errors-problems.idmap \
metadata/mysql-cluster.idmap \
+ metadata/optimization.idmap \
metadata/replication-implementation.idmap \
metadata/sql-syntax.idmap \
metadata/stored-procedures.idmap
@@ -1385,6 +1379,7 @@
replication_implementation_SOURCES = replication-implementation.xml $(replication_implementation_INCLUDES)
replication_implementation_IDMAPS = \
metadata/dba-core.idmap \
+ metadata/optimization.idmap \
metadata/replication-configuration.idmap \
metadata/replication-notes.idmap \
metadata/sql-syntax.idmap
@@ -1489,6 +1484,7 @@
metadata/functions-core.idmap \
metadata/information-schema.idmap \
metadata/mysql-cluster.idmap \
+ metadata/optimization.idmap \
metadata/se-innodb.idmap \
metadata/se-memory.idmap \
metadata/sql-syntax.idmap \
@@ -1766,7 +1762,6 @@
sql_syntax_IMAGES =
sql_syntax_SOURCES = sql-syntax.xml $(sql_syntax_INCLUDES)
sql_syntax_IDMAPS = \
- ../refman-5.1/metadata/news-5.1.idmap \
../refman-common/metadata/bug-reports.idmap \
metadata/apis-c.idmap \
metadata/apis.idmap \
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r7666 - in trunk: . cy/query-browser falcon guibook mysqldoc-guide query-browser refman-4.1 refman-5.0 refman-5.1 refma... | paul | 5 Sep |
