Author: paul
Date: 2010-11-23 22:03:12 +0100 (Tue, 23 Nov 2010)
New Revision: 23949
Log:
r44582@arctic: paul | 2010-11-23 15:02:00 -0600
Update dependencies
Modified:
trunk/refman-5.5/Makefile.depends
trunk/refman-5.6/Makefile.depends
trunk/refman-6.0/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:44565
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:65930
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
+ 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:44582
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:65930
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
Modified: trunk/refman-5.5/Makefile.depends
===================================================================
--- trunk/refman-5.5/Makefile.depends 2010-11-23 20:55:44 UTC (rev 23948)
+++ trunk/refman-5.5/Makefile.depends 2010-11-23 21:03:12 UTC (rev 23949)
Changed blocks: 5, Lines Added: 4, Lines Deleted: 1; 2216 bytes
@@ -1689,7 +1689,6 @@
../refman-common/metadata/bug-reports.idmap \
../refman-common/metadata/information-sources.idmap \
metadata/apis-c.idmap \
- metadata/dba-mysqld-server-core.idmap \
metadata/dba-user-management-core.idmap \
metadata/errors-problems.idmap \
metadata/extending-mysql.idmap \
@@ -2178,6 +2177,7 @@
dynxml_local_manual_index_command_IMAGES =
dynxml_local_manual_index_command_SOURCES = dynxml-local-manual-index-command.xml $(dynxml_local_manual_index_command_INCLUDES)
dynxml_local_manual_index_command_IDMAPS = \
+ ../refman-5.1/metadata/installing-source-core.idmap \
../refman-common/metadata/apis-php.idmap \
../refman-common/metadata/bug-reports.idmap \
../refman-common/metadata/connector-cpp-core.idmap \
@@ -3038,6 +3038,7 @@
dynxml_local_manual_index_option_IMAGES =
dynxml_local_manual_index_option_SOURCES = dynxml-local-manual-index-option.xml $(dynxml_local_manual_index_option_INCLUDES)
dynxml_local_manual_index_option_IDMAPS = \
+ ../refman-5.1/metadata/installing-source-core.idmap \
../refman-common/metadata/apis-php.idmap \
../refman-common/metadata/bug-reports.idmap \
../refman-common/metadata/connector-net-connection-options.idmap \
@@ -3989,6 +3990,7 @@
dynxml_local_manual_index_IMAGES =
dynxml_local_manual_index_SOURCES = dynxml-local-manual-index.xml $(dynxml_local_manual_index_INCLUDES)
dynxml_local_manual_index_IDMAPS = \
+ ../refman-5.1/metadata/installing-source-core.idmap \
../refman-common/metadata/apis-eiffel.idmap \
../refman-common/metadata/apis-perl.idmap \
../refman-common/metadata/apis-php.idmap \
@@ -7463,6 +7465,7 @@
../refman-5.0/metadata/news-5.0-core.idmap \
../refman-5.0/metadata/windows-config-wizard.idmap \
../refman-5.1/metadata/faqs-core.idmap \
+ ../refman-5.1/metadata/installing-source-core.idmap \
../refman-5.1/metadata/introduction.idmap \
../refman-5.1/metadata/mysql-cluster-configuration-core.idmap \
../refman-5.1/metadata/mysql-cluster-multi-computer.idmap \
Modified: trunk/refman-5.6/Makefile.depends
===================================================================
--- trunk/refman-5.6/Makefile.depends 2010-11-23 20:55:44 UTC (rev 23948)
+++ trunk/refman-5.6/Makefile.depends 2010-11-23 21:03:12 UTC (rev 23949)
Changed blocks: 5, Lines Added: 4, Lines Deleted: 1; 2216 bytes
@@ -1688,7 +1688,6 @@
../refman-common/metadata/bug-reports.idmap \
../refman-common/metadata/information-sources.idmap \
metadata/apis-c.idmap \
- metadata/dba-mysqld-server-core.idmap \
metadata/dba-user-management-core.idmap \
metadata/errors-problems.idmap \
metadata/extending-mysql.idmap \
@@ -2124,6 +2123,7 @@
dynxml_local_manual_index_command_IMAGES =
dynxml_local_manual_index_command_SOURCES = dynxml-local-manual-index-command.xml $(dynxml_local_manual_index_command_INCLUDES)
dynxml_local_manual_index_command_IDMAPS = \
+ ../refman-5.1/metadata/installing-source-core.idmap \
../refman-common/metadata/apis-php.idmap \
../refman-common/metadata/bug-reports.idmap \
../refman-common/metadata/connector-cpp-core.idmap \
@@ -2984,6 +2984,7 @@
dynxml_local_manual_index_option_IMAGES =
dynxml_local_manual_index_option_SOURCES = dynxml-local-manual-index-option.xml $(dynxml_local_manual_index_option_INCLUDES)
dynxml_local_manual_index_option_IDMAPS = \
+ ../refman-5.1/metadata/installing-source-core.idmap \
../refman-common/metadata/apis-php.idmap \
../refman-common/metadata/bug-reports.idmap \
../refman-common/metadata/connector-net-connection-options.idmap \
@@ -3934,6 +3935,7 @@
dynxml_local_manual_index_IMAGES =
dynxml_local_manual_index_SOURCES = dynxml-local-manual-index.xml $(dynxml_local_manual_index_INCLUDES)
dynxml_local_manual_index_IDMAPS = \
+ ../refman-5.1/metadata/installing-source-core.idmap \
../refman-common/metadata/apis-eiffel.idmap \
../refman-common/metadata/apis-perl.idmap \
../refman-common/metadata/apis-php.idmap \
@@ -7079,6 +7081,7 @@
../refman-5.0/metadata/news-5.0-core.idmap \
../refman-5.0/metadata/windows-config-wizard.idmap \
../refman-5.1/metadata/faqs-core.idmap \
+ ../refman-5.1/metadata/installing-source-core.idmap \
../refman-5.1/metadata/introduction.idmap \
../refman-5.1/metadata/mysql-cluster-configuration-core.idmap \
../refman-5.1/metadata/mysql-cluster-multi-computer.idmap \
Modified: trunk/refman-6.0/Makefile.depends
===================================================================
--- trunk/refman-6.0/Makefile.depends 2010-11-23 20:55:44 UTC (rev 23948)
+++ trunk/refman-6.0/Makefile.depends 2010-11-23 21:03:12 UTC (rev 23949)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 0; 981 bytes
@@ -4929,6 +4929,7 @@
../refman-common/images/published/mysql-cfg-fig9b.png
installing_SOURCES = installing.xml $(installing_INCLUDES)
installing_IDMAPS = \
+ ../refman-5.0/metadata/installing.idmap \
../refman-common/metadata/bug-reports.idmap \
../refman-common/metadata/connector-net-core.idmap \
../refman-common/metadata/connector-odbc.idmap \
@@ -6338,6 +6339,7 @@
../mysql-monitor-common/metadata/mem-reference-core.idmap \
../refman-4.1/metadata/introduction.idmap \
../refman-4.1/metadata/sql-syntax-data-definition.idmap \
+ ../refman-5.0/metadata/installing.idmap \
../refman-5.0/metadata/introduction.idmap \
../refman-5.0/metadata/news-5.0-core.idmap \
../refman-5.0/metadata/windows-config-wizard.idmap \
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r23949 - in trunk: . refman-5.5 refman-5.6 refman-6.0 | paul.dubois | 23 Nov |
