List:Commits« Previous MessageNext Message »
From:martin.brown Date:October 2 2008 1:20pm
Subject:svn commit - mysqldoc@docsrva: r11945 - in trunk: mysqldoc-guide mysqlqb refman-4.1 refman-5.0 refman-5.1 refman-5.1-maria refman-6.0 refman-common to...
View as plain text  
Author: mcbrown
Date: 2008-10-02 15:20:25 +0200 (Thu, 02 Oct 2008)
New Revision: 11945

Log:
Merging the credits into the introduction



Modified:
   trunk/mysqldoc-guide/Makefile.depends
   trunk/mysqlqb/Makefile.depends
   trunk/refman-4.1/Makefile.depends
   trunk/refman-4.1/introduction.xml
   trunk/refman-4.1/manual.xml
   trunk/refman-5.0/Makefile.depends
   trunk/refman-5.0/introduction.xml
   trunk/refman-5.0/manual.xml
   trunk/refman-5.1-maria/Makefile.depends
   trunk/refman-5.1-maria/manual.xml
   trunk/refman-5.1/Makefile.depends
   trunk/refman-5.1/introduction.xml
   trunk/refman-5.1/manual.xml
   trunk/refman-6.0/Makefile.depends
   trunk/refman-6.0/introduction.xml
   trunk/refman-6.0/manual.xml
   trunk/refman-common/credits.xml
   trunk/topic-guides/topics-5.0/Makefile.depends
   trunk/topic-guides/topics-5.1/Makefile.depends
   trunk/topic-guides/topics-6.0/Makefile.depends


Modified: trunk/mysqldoc-guide/Makefile.depends
===================================================================
--- trunk/mysqldoc-guide/Makefile.depends	2008-10-02 09:14:47 UTC (rev 11944)
+++ trunk/mysqldoc-guide/Makefile.depends	2008-10-02 13:20:25 UTC (rev 11945)
Changed blocks: 3, Lines Added: 6, Lines Deleted: 3; 1998 bytes

@@ -46,7 +46,8 @@
 formatting_guide_IDMAPS = \
 	../mysqldoc-guide/metadata/entities.idmap \
 	../mysqldoc-guide/metadata/formatting-guide.idmap \
-	../mysqldoc-guide/metadata/styleguide.idmap
+	../mysqldoc-guide/metadata/mysqldoc-style-guide-aspec.xml.sg-capitalization.none.chapter.idmap \
+	../mysqldoc-guide/metadata/mysqldoc-style-guide-aspec.xml.sg-numbering.none.chapter.idmap
 formatting-guide.validpure: $(formatting_guide_SOURCES)
 formatting-guide.titles: $(formatting_guide_SOURCES)
 formatting-guide.useless: $(formatting_guide_SOURCES)

@@ -86,7 +87,8 @@
 mysqldoc_formatting_guide_IMAGES =
 mysqldoc_formatting_guide_SOURCES = mysqldoc-formatting-guide.xml $(mysqldoc_formatting_guide_INCLUDES)
 mysqldoc_formatting_guide_IDMAPS = \
-	../mysqldoc-guide/metadata/styleguide.idmap
+	../mysqldoc-guide/metadata/mysqldoc-style-guide-aspec.xml.sg-capitalization.none.chapter.idmap \
+	../mysqldoc-guide/metadata/mysqldoc-style-guide-aspec.xml.sg-numbering.none.chapter.idmap
 mysqldoc-formatting-guide.validpure: $(mysqldoc_formatting_guide_SOURCES)
 mysqldoc-formatting-guide.titles: $(mysqldoc_formatting_guide_SOURCES)
 mysqldoc-formatting-guide.useless: $(mysqldoc_formatting_guide_SOURCES)

@@ -115,7 +117,8 @@
 	../mysqldoc-guide/metadata/entities.idmap \
 	../mysqldoc-guide/metadata/formats.de.idmap \
 	../mysqldoc-guide/metadata/formatting-guide.idmap \
-	../mysqldoc-guide/metadata/styleguide.idmap \
+	../mysqldoc-guide/metadata/mysqldoc-style-guide-aspec.xml.sg-capitalization.none.chapter.idmap \
+	../mysqldoc-guide/metadata/mysqldoc-style-guide-aspec.xml.sg-numbering.none.chapter.idmap \
 	../mysqldoc-guide/metadata/tools.de.idmap
 mysqldoc-guide.validpure: $(mysqldoc_guide_SOURCES)
 mysqldoc-guide.titles: $(mysqldoc_guide_SOURCES)


Modified: trunk/mysqlqb/Makefile.depends
===================================================================
--- trunk/mysqlqb/Makefile.depends	2008-10-02 09:14:47 UTC (rev 11944)
+++ trunk/mysqlqb/Makefile.depends	2008-10-02 13:20:25 UTC (rev 11945)
Changed blocks: 13, Lines Added: 48, Lines Deleted: 48; 10565 bytes

@@ -52,13 +52,6 @@
 	../refman-5.0/metadata/se-merge.idmap \
 	../refman-5.0/metadata/se-myisam-core.idmap \
 	../refman-5.0/metadata/spatial-extensions.idmap \
-	../refman-5.0/metadata/sql-syntax-compound-statements.idmap \
-	../refman-5.0/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.0/metadata/sql-syntax-data-manipulation.idmap \
-	../refman-5.0/metadata/sql-syntax-replication.idmap \
-	../refman-5.0/metadata/sql-syntax-server-administration.idmap \
-	../refman-5.0/metadata/sql-syntax-transactions.idmap \
-	../refman-5.0/metadata/sql-syntax-utility.idmap \
 	../refman-5.0/metadata/storage-engines.idmap \
 	../refman-5.0/metadata/stored-programs-views.idmap \
 	../refman-5.0/metadata/stored-routines.idmap \

@@ -67,7 +60,14 @@
 	../refman-5.0/metadata/views.idmap \
 	../refman-common/metadata/bug-reports.idmap \
 	../refman-common/metadata/credits.idmap \
-	../refman-common/metadata/regexp.idmap
+	metadata/mysqlqb_functions.idmap \
+	metadata/sql-syntax-compound-statements.idmap \
+	metadata/sql-syntax-data-definition.idmap \
+	metadata/sql-syntax-data-manipulation.idmap \
+	metadata/sql-syntax-replication.idmap \
+	metadata/sql-syntax-server-administration.idmap \
+	metadata/sql-syntax-transactions.idmap \
+	metadata/sql-syntax-utility.idmap
 mysqlqb.validpure: $(mysqlqb_SOURCES)
 mysqlqb.titles: $(mysqlqb_SOURCES)
 mysqlqb.useless: $(mysqlqb_SOURCES)

@@ -99,13 +99,13 @@
 	../refman-5.0/metadata/language-structure-core.idmap \
 	../refman-5.0/metadata/optimization.idmap \
 	../refman-5.0/metadata/precision-math.idmap \
-	../refman-5.0/metadata/sql-syntax-compound-statements.idmap \
-	../refman-5.0/metadata/sql-syntax-data-manipulation.idmap \
 	../refman-5.0/metadata/stored-programs-views.idmap \
 	../refman-5.0/metadata/stored-routines.idmap \
 	../refman-5.0/metadata/tutorial.idmap \
 	../refman-common/metadata/credits.idmap \
-	../refman-common/metadata/regexp.idmap
+	metadata/mysqlqb_functions.idmap \
+	metadata/sql-syntax-compound-statements.idmap \
+	metadata/sql-syntax-data-manipulation.idmap
 mysqlqb_functions.validpure: $(mysqlqb_functions_SOURCES)
 mysqlqb_functions.titles: $(mysqlqb_functions_SOURCES)
 mysqlqb_functions.useless: $(mysqlqb_functions_SOURCES)

@@ -151,13 +151,13 @@
 sql_syntax_compound_statements_SOURCES = sql-syntax-compound-statements.xml $(sql_syntax_compound_statements_INCLUDES)
 sql_syntax_compound_statements_IDMAPS = \
 	../refman-5.0/metadata/errors-problems.idmap \
-	../refman-5.0/metadata/functions-core.idmap \
 	../refman-5.0/metadata/language-structure-core.idmap \
 	../refman-5.0/metadata/restrictions.idmap \
-	../refman-5.0/metadata/sql-syntax-compound-statements.idmap \
-	../refman-5.0/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.0/metadata/sql-syntax-server-administration.idmap \
-	../refman-5.0/metadata/stored-programs-views.idmap
+	../refman-5.0/metadata/stored-programs-views.idmap \
+	metadata/mysqlqb_functions.idmap \
+	metadata/sql-syntax-compound-statements.idmap \
+	metadata/sql-syntax-data-definition.idmap \
+	metadata/sql-syntax-server-administration.idmap
 sql-syntax-compound-statements.validpure: $(sql_syntax_compound_statements_SOURCES)
 sql-syntax-compound-statements.titles: $(sql_syntax_compound_statements_SOURCES)
 sql-syntax-compound-statements.useless: $(sql_syntax_compound_statements_SOURCES)

@@ -181,7 +181,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/installing-core.idmap \
 	../refman-5.0/metadata/internationalization.idmap \
 	../refman-5.0/metadata/introduction.idmap \

@@ -200,15 +199,16 @@
 	../refman-5.0/metadata/se-merge.idmap \
 	../refman-5.0/metadata/se-myisam-core.idmap \
 	../refman-5.0/metadata/spatial-extensions.idmap \
-	../refman-5.0/metadata/sql-syntax-compound-statements.idmap \
-	../refman-5.0/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.0/metadata/sql-syntax-data-manipulation.idmap \
-	../refman-5.0/metadata/sql-syntax-server-administration.idmap \
 	../refman-5.0/metadata/storage-engines.idmap \
 	../refman-5.0/metadata/stored-programs-views.idmap \
 	../refman-5.0/metadata/stored-routines.idmap \
 	../refman-5.0/metadata/tutorial.idmap \
-	../refman-5.0/metadata/views.idmap
+	../refman-5.0/metadata/views.idmap \
+	metadata/mysqlqb_functions.idmap \
+	metadata/sql-syntax-compound-statements.idmap \
+	metadata/sql-syntax-data-definition.idmap \
+	metadata/sql-syntax-data-manipulation.idmap \
+	metadata/sql-syntax-server-administration.idmap
 sql-syntax-data-definition.validpure: $(sql_syntax_data_definition_SOURCES)
 sql-syntax-data-definition.titles: $(sql_syntax_data_definition_SOURCES)
 sql-syntax-data-definition.useless: $(sql_syntax_data_definition_SOURCES)

@@ -232,7 +232,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/introduction.idmap \
 	../refman-5.0/metadata/language-structure-core.idmap \
 	../refman-5.0/metadata/optimization.idmap \

@@ -244,11 +243,12 @@
 	../refman-5.0/metadata/se-innodb-core.idmap \
 	../refman-5.0/metadata/se-memory.idmap \
 	../refman-5.0/metadata/se-myisam-core.idmap \
-	../refman-5.0/metadata/sql-syntax-compound-statements.idmap \
-	../refman-5.0/metadata/sql-syntax-data-manipulation.idmap \
-	../refman-5.0/metadata/sql-syntax-server-administration.idmap \
-	../refman-5.0/metadata/sql-syntax-transactions.idmap \
-	../refman-5.0/metadata/tutorial.idmap
+	../refman-5.0/metadata/tutorial.idmap \
+	metadata/mysqlqb_functions.idmap \
+	metadata/sql-syntax-compound-statements.idmap \
+	metadata/sql-syntax-data-manipulation.idmap \
+	metadata/sql-syntax-server-administration.idmap \
+	metadata/sql-syntax-transactions.idmap
 sql-syntax-data-manipulation.validpure: $(sql_syntax_data_manipulation_SOURCES)
 sql-syntax-data-manipulation.titles: $(sql_syntax_data_manipulation_SOURCES)
 sql-syntax-data-manipulation.useless: $(sql_syntax_data_manipulation_SOURCES)

@@ -268,8 +268,8 @@
 sql_syntax_prepared_statements_SOURCES = sql-syntax-prepared-statements.xml $(sql_syntax_prepared_statements_INCLUDES)
 sql_syntax_prepared_statements_IDMAPS = \
 	../refman-5.0/metadata/apis-c.idmap \
-	../refman-5.0/metadata/sql-syntax-data-manipulation.idmap \
-	../refman-5.0/metadata/stored-routines.idmap
+	../refman-5.0/metadata/stored-routines.idmap \
+	metadata/sql-syntax-data-manipulation.idmap
 sql-syntax-prepared-statements.validpure: $(sql_syntax_prepared_statements_SOURCES)
 sql-syntax-prepared-statements.titles: $(sql_syntax_prepared_statements_SOURCES)
 sql-syntax-prepared-statements.useless: $(sql_syntax_prepared_statements_SOURCES)

@@ -289,10 +289,10 @@
 sql_syntax_replication_SOURCES = sql-syntax-replication.xml $(sql_syntax_replication_INCLUDES)
 sql_syntax_replication_IDMAPS = \
 	../refman-5.0/metadata/dba-core.idmap \
-	../refman-5.0/metadata/functions-core.idmap \
 	../refman-5.0/metadata/replication-configuration.idmap \
-	../refman-5.0/metadata/sql-syntax-replication.idmap \
-	../refman-5.0/metadata/sql-syntax-server-administration.idmap
+	metadata/mysqlqb_functions.idmap \
+	metadata/sql-syntax-replication.idmap \
+	metadata/sql-syntax-server-administration.idmap
 sql-syntax-replication.validpure: $(sql_syntax_replication_SOURCES)
 sql-syntax-replication.titles: $(sql_syntax_replication_SOURCES)
 sql-syntax-replication.useless: $(sql_syntax_replication_SOURCES)

@@ -329,16 +329,16 @@
 	../refman-5.0/metadata/se-archive.idmap \
 	../refman-5.0/metadata/se-innodb-core.idmap \
 	../refman-5.0/metadata/se-myisam-core.idmap \
-	../refman-5.0/metadata/sql-syntax-compound-statements.idmap \
-	../refman-5.0/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.0/metadata/sql-syntax-data-manipulation.idmap \
-	../refman-5.0/metadata/sql-syntax-replication.idmap \
-	../refman-5.0/metadata/sql-syntax-server-administration.idmap \
-	../refman-5.0/metadata/sql-syntax-transactions.idmap \
-	../refman-5.0/metadata/sql-syntax-utility.idmap \
 	../refman-5.0/metadata/storage-engines.idmap \
 	../refman-5.0/metadata/triggers.idmap \
-	../refman-common/metadata/bug-reports.idmap
+	../refman-common/metadata/bug-reports.idmap \
+	metadata/sql-syntax-compound-statements.idmap \
+	metadata/sql-syntax-data-definition.idmap \
+	metadata/sql-syntax-data-manipulation.idmap \
+	metadata/sql-syntax-replication.idmap \
+	metadata/sql-syntax-server-administration.idmap \
+	metadata/sql-syntax-transactions.idmap \
+	metadata/sql-syntax-utility.idmap
 sql-syntax-server-administration.validpure: $(sql_syntax_server_administration_SOURCES)
 sql-syntax-server-administration.titles: $(sql_syntax_server_administration_SOURCES)
 sql-syntax-server-administration.useless: $(sql_syntax_server_administration_SOURCES)

@@ -361,14 +361,14 @@
 	../refman-5.0/metadata/connectors-apis.idmap \
 	../refman-5.0/metadata/dba-core.idmap \
 	../refman-5.0/metadata/errors-problems.idmap \
-	../refman-5.0/metadata/functions-core.idmap \
 	../refman-5.0/metadata/introduction.idmap \
 	../refman-5.0/metadata/optimization.idmap \
 	../refman-5.0/metadata/restrictions.idmap \
 	../refman-5.0/metadata/se-innodb-core.idmap \
-	../refman-5.0/metadata/sql-syntax-compound-statements.idmap \
-	../refman-5.0/metadata/sql-syntax-server-administration.idmap \
-	../refman-5.0/metadata/sql-syntax-transactions.idmap
+	metadata/mysqlqb_functions.idmap \
+	metadata/sql-syntax-compound-statements.idmap \
+	metadata/sql-syntax-server-administration.idmap \
+	metadata/sql-syntax-transactions.idmap
 sql-syntax-transactions.validpure: $(sql_syntax_transactions_SOURCES)
 sql-syntax-transactions.titles: $(sql_syntax_transactions_SOURCES)
 sql-syntax-transactions.useless: $(sql_syntax_transactions_SOURCES)

@@ -389,9 +389,9 @@
 sql_syntax_utility_IDMAPS = \
 	../refman-5.0/metadata/dba-core.idmap \
 	../refman-5.0/metadata/optimization.idmap \
-	../refman-5.0/metadata/sql-syntax-data-definition.idmap \
-	../refman-5.0/metadata/sql-syntax-server-administration.idmap \
-	../refman-5.0/metadata/sql-syntax-utility.idmap
+	metadata/sql-syntax-data-definition.idmap \
+	metadata/sql-syntax-server-administration.idmap \
+	metadata/sql-syntax-utility.idmap
 sql-syntax-utility.validpure: $(sql_syntax_utility_SOURCES)
 sql-syntax-utility.titles: $(sql_syntax_utility_SOURCES)
 sql-syntax-utility.useless: $(sql_syntax_utility_SOURCES)


Modified: trunk/refman-4.1/Makefile.depends
===================================================================
--- trunk/refman-4.1/Makefile.depends	2008-10-02 09:14:47 UTC (rev 11944)
+++ trunk/refman-4.1/Makefile.depends	2008-10-02 13:20:25 UTC (rev 11945)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 978 bytes

@@ -739,6 +739,7 @@
 	../refman-common/../common/fixedchars.ent \
 	../refman-common/all-entities.ent \
 	../refman-common/bug-reports.xml \
+	../refman-common/credits.xml \
 	../refman-common/information-sources.xml \
 	../refman-common/manual-conventions.en.xml \
 	../refman-common/urls.ent \

@@ -777,8 +778,7 @@
 	../refman-4.1/metadata/tutorial.idmap \
 	../refman-common/metadata/connector-j.idmap \
 	../refman-common/metadata/connector-net.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/credits.idmap
+	../refman-common/metadata/connector-odbc.idmap
 introduction.validpure: $(introduction_SOURCES)
 introduction.titles: $(introduction_SOURCES)
 introduction.useless: $(introduction_SOURCES)


Modified: trunk/refman-4.1/introduction.xml
===================================================================
--- trunk/refman-4.1/introduction.xml	2008-10-02 09:14:47 UTC (rev 11944)
+++ trunk/refman-4.1/introduction.xml	2008-10-02 13:20:25 UTC (rev 11945)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 0; 399 bytes

@@ -3077,4 +3077,6 @@
 
   </section>
 
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../refman-common/credits.xml"/>
+
 </chapter>


Modified: trunk/refman-4.1/manual.xml
===================================================================
--- trunk/refman-4.1/manual.xml	2008-10-02 09:14:47 UTC (rev 11944)
+++ trunk/refman-4.1/manual.xml	2008-10-02 13:20:25 UTC (rev 11945)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 2; 456 bytes

@@ -76,8 +76,6 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="restrictions.xml"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../refman-common/credits.xml"/>
-
   <index/>
 
 </book>


Modified: trunk/refman-5.0/Makefile.depends
===================================================================
--- trunk/refman-5.0/Makefile.depends	2008-10-02 09:14:47 UTC (rev 11944)
+++ trunk/refman-5.0/Makefile.depends	2008-10-02 13:20:25 UTC (rev 11945)
Changed blocks: 8, Lines Added: 8, Lines Deleted: 8; 3419 bytes

@@ -614,7 +614,7 @@
 	../refman-5.0/metadata/faqs.idmap \
 	../refman-5.0/metadata/functions-core.idmap \
 	../refman-5.0/metadata/installing-core.idmap \
-	../refman-5.0/metadata/installing-cs-core.idmap \
+	../refman-5.0/metadata/installing-cs.idmap \
 	../refman-5.0/metadata/installing-es.idmap \
 	../refman-5.0/metadata/internationalization.idmap \
 	../refman-5.0/metadata/introduction.idmap \

@@ -1110,7 +1110,7 @@
 	../refman-5.0/metadata/errors-problems.idmap \
 	../refman-5.0/metadata/extending-mysql.idmap \
 	../refman-5.0/metadata/installing-core.idmap \
-	../refman-5.0/metadata/installing-cs-core.idmap \
+	../refman-5.0/metadata/installing-cs.idmap \
 	../refman-5.0/metadata/internationalization.idmap \
 	../refman-5.0/metadata/mysql-cluster-configuration.idmap \
 	../refman-5.0/metadata/programs-admin-util-core.idmap \

@@ -1146,7 +1146,7 @@
 	../refman-5.0/metadata/errors-problems.idmap \
 	../refman-5.0/metadata/extending-mysql.idmap \
 	../refman-5.0/metadata/installing-core.idmap \
-	../refman-5.0/metadata/installing-cs-core.idmap \
+	../refman-5.0/metadata/installing-cs.idmap \
 	../refman-5.0/metadata/language-structure-core.idmap \
 	../refman-5.0/metadata/optimization.idmap \
 	../refman-5.0/metadata/se-innodb-core.idmap \

@@ -1282,7 +1282,7 @@
 installing_cs_IDMAPS = \
 	../refman-5.0/metadata/extending-mysql.idmap \
 	../refman-5.0/metadata/installing-core.idmap \
-	../refman-5.0/metadata/installing-cs-core.idmap \
+	../refman-5.0/metadata/installing-cs.idmap \
 	../refman-5.0/metadata/news.idmap \
 	../refman-5.0/metadata/optimization.idmap \
 	../refman-common/metadata/information-sources.idmap

@@ -1369,6 +1369,7 @@
 	../refman-common/../common/fixedchars.ent \
 	../refman-common/all-entities.ent \
 	../refman-common/bug-reports.xml \
+	../refman-common/credits.xml \
 	../refman-common/information-sources.xml \
 	../refman-common/manual-conventions.en.xml \
 	../refman-common/urls.ent \

@@ -1388,7 +1389,7 @@
 	../refman-5.0/metadata/functions-core.idmap \
 	../refman-5.0/metadata/information-schema.idmap \
 	../refman-5.0/metadata/installing-core.idmap \
-	../refman-5.0/metadata/installing-cs-core.idmap \
+	../refman-5.0/metadata/installing-cs.idmap \
 	../refman-5.0/metadata/internationalization.idmap \
 	../refman-5.0/metadata/introduction.idmap \
 	../refman-5.0/metadata/language-structure-core.idmap \

@@ -1416,8 +1417,7 @@
 	../refman-5.0/metadata/views.idmap \
 	../refman-common/metadata/connector-j.idmap \
 	../refman-common/metadata/connector-net.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/credits.idmap
+	../refman-common/metadata/connector-odbc.idmap
 introduction.validpure: $(introduction_SOURCES)
 introduction.titles: $(introduction_SOURCES)
 introduction.useless: $(introduction_SOURCES)

@@ -1889,7 +1889,7 @@
 	../refman-5.0/metadata/functions-core.idmap \
 	../refman-5.0/metadata/information-schema.idmap \
 	../refman-5.0/metadata/installing-core.idmap \
-	../refman-5.0/metadata/installing-cs-core.idmap \
+	../refman-5.0/metadata/installing-cs.idmap \
 	../refman-5.0/metadata/installing-es.idmap \
 	../refman-5.0/metadata/installing-version.idmap \
 	../refman-5.0/metadata/internationalization.idmap \


Modified: trunk/refman-5.0/introduction.xml
===================================================================
--- trunk/refman-5.0/introduction.xml	2008-10-02 09:14:47 UTC (rev 11944)
+++ trunk/refman-5.0/introduction.xml	2008-10-02 13:20:25 UTC (rev 11945)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 0; 399 bytes

@@ -2923,4 +2923,6 @@
 
   </section>
 
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../refman-common/credits.xml"/>
+
 </chapter>


Modified: trunk/refman-5.0/manual.xml
===================================================================
--- trunk/refman-5.0/manual.xml	2008-10-02 09:14:47 UTC (rev 11944)
+++ trunk/refman-5.0/manual.xml	2008-10-02 13:20:25 UTC (rev 11945)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 2; 458 bytes

@@ -111,8 +111,6 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="restrictions.xml"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../refman-common/credits.xml"/>
-
   <index/>
 
 </book>


Modified: trunk/refman-5.1/Makefile.depends
===================================================================
--- trunk/refman-5.1/Makefile.depends	2008-10-02 09:14:47 UTC (rev 11944)
+++ trunk/refman-5.1/Makefile.depends	2008-10-02 13:20:25 UTC (rev 11945)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 979 bytes

@@ -1317,6 +1317,7 @@
 	../refman-common/../common/fixedchars.ent \
 	../refman-common/all-entities.ent \
 	../refman-common/bug-reports.xml \
+	../refman-common/credits.xml \
 	../refman-common/information-sources.xml \
 	../refman-common/manual-conventions.en.xml \
 	../refman-common/urls.ent \

@@ -1366,8 +1367,7 @@
 	../refman-5.1/metadata/views.idmap \
 	../refman-common/metadata/connector-j.idmap \
 	../refman-common/metadata/connector-net.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/credits.idmap
+	../refman-common/metadata/connector-odbc.idmap
 introduction.validpure: $(introduction_SOURCES)
 introduction.titles: $(introduction_SOURCES)
 introduction.useless: $(introduction_SOURCES)


Modified: trunk/refman-5.1/introduction.xml
===================================================================
--- trunk/refman-5.1/introduction.xml	2008-10-02 09:14:47 UTC (rev 11944)
+++ trunk/refman-5.1/introduction.xml	2008-10-02 13:20:25 UTC (rev 11945)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 0; 399 bytes

@@ -3044,4 +3044,6 @@
 
   </section>
 
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../refman-common/credits.xml"/>
+
 </chapter>


Modified: trunk/refman-5.1/manual.xml
===================================================================
--- trunk/refman-5.1/manual.xml	2008-10-02 09:14:47 UTC (rev 11944)
+++ trunk/refman-5.1/manual.xml	2008-10-02 13:20:25 UTC (rev 11945)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 2; 456 bytes

@@ -94,8 +94,6 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="restrictions.xml"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../refman-common/credits.xml"/>
-
   <index/>
 
 </book>


Modified: trunk/refman-5.1-maria/Makefile.depends
===================================================================
--- trunk/refman-5.1-maria/Makefile.depends	2008-10-02 09:14:47 UTC (rev 11944)
+++ trunk/refman-5.1-maria/Makefile.depends	2008-10-02 13:20:25 UTC (rev 11945)
Changed blocks: 3, Lines Added: 2, Lines Deleted: 1; 1350 bytes

@@ -360,6 +360,7 @@
 	../refman-5.1/../refman-common/connector-net.xml \
 	../refman-5.1/../refman-common/connector-odbc.xml \
 	../refman-5.1/../refman-common/connector-vstudioplugin.xml \
+	../refman-5.1/../refman-common/credits.xml \
 	../refman-5.1/../refman-common/images/published/active-master-mysql-server.png \
 	../refman-5.1/../refman-common/images/published/blackhole-1.png \
 	../refman-5.1/../refman-common/images/published/cmxj-overview.png \

@@ -501,7 +502,6 @@
 	../refman-5.1/views.xml \
 	../refman-common/../common/fixedchars.ent \
 	../refman-common/all-entities.ent \
-	../refman-common/credits.xml \
 	../refman-common/ha-drbd.xml \
 	../refman-common/ha-heartbeat.xml \
 	../refman-common/ha-memcached-core.xml \

@@ -665,6 +665,7 @@
 	../refman-common/metadata/connector-net.idmap \
 	../refman-common/metadata/connector-odbc.idmap \
 	../refman-common/metadata/connector-vstudioplugin.idmap \
+	../refman-common/metadata/credits.idmap \
 	../refman-common/metadata/information-sources.idmap \
 	../refman-common/metadata/what-is.en.idmap
 manual.validpure: $(manual_SOURCES)


Modified: trunk/refman-5.1-maria/manual.xml
===================================================================
--- trunk/refman-5.1-maria/manual.xml	2008-10-02 09:14:47 UTC (rev 11944)
+++ trunk/refman-5.1-maria/manual.xml	2008-10-02 13:20:25 UTC (rev 11945)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 2; 490 bytes

@@ -100,8 +100,6 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../refman-5.1/restrictions.xml"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../refman-common/credits.xml"/>
-
   <index/>
 
 </book>


Modified: trunk/refman-6.0/Makefile.depends
===================================================================
--- trunk/refman-6.0/Makefile.depends	2008-10-02 09:14:47 UTC (rev 11944)
+++ trunk/refman-6.0/Makefile.depends	2008-10-02 13:20:25 UTC (rev 11945)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 979 bytes

@@ -1197,6 +1197,7 @@
 	../refman-common/../common/fixedchars.ent \
 	../refman-common/all-entities.ent \
 	../refman-common/bug-reports.xml \
+	../refman-common/credits.xml \
 	../refman-common/information-sources.xml \
 	../refman-common/manual-conventions.en.xml \
 	../refman-common/urls.ent \

@@ -1245,8 +1246,7 @@
 	../refman-6.0/metadata/views.idmap \
 	../refman-common/metadata/connector-j.idmap \
 	../refman-common/metadata/connector-net.idmap \
-	../refman-common/metadata/connector-odbc.idmap \
-	../refman-common/metadata/credits.idmap
+	../refman-common/metadata/connector-odbc.idmap
 introduction.validpure: $(introduction_SOURCES)
 introduction.titles: $(introduction_SOURCES)
 introduction.useless: $(introduction_SOURCES)


Modified: trunk/refman-6.0/introduction.xml
===================================================================
--- trunk/refman-6.0/introduction.xml	2008-10-02 09:14:47 UTC (rev 11944)
+++ trunk/refman-6.0/introduction.xml	2008-10-02 13:20:25 UTC (rev 11945)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 0; 399 bytes

@@ -2886,4 +2886,6 @@
 
   </section>
 
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../refman-common/credits.xml"/>
+
 </chapter>


Modified: trunk/refman-6.0/manual.xml
===================================================================
--- trunk/refman-6.0/manual.xml	2008-10-02 09:14:47 UTC (rev 11944)
+++ trunk/refman-6.0/manual.xml	2008-10-02 13:20:25 UTC (rev 11945)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 2; 456 bytes

@@ -98,8 +98,6 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="restrictions.xml"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../refman-common/credits.xml"/>
-
   <index/>
 
 </book>


Modified: trunk/refman-common/credits.xml
===================================================================
--- trunk/refman-common/credits.xml	2008-10-02 09:14:47 UTC (rev 11944)
+++ trunk/refman-common/credits.xml	2008-10-02 13:20:25 UTC (rev 11945)
Changed blocks: 2, Lines Added: 3, Lines Deleted: 3; 696 bytes

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
 "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
 [
   <!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
 ]>
-<appendix id='credits'>
+<section id='credits'>
 
   <title>Credits</title>
 

@@ -2500,4 +2500,4 @@
 
   </section>
 
-</appendix>
+</section>


Modified: trunk/topic-guides/topics-5.0/Makefile.depends
===================================================================
--- trunk/topic-guides/topics-5.0/Makefile.depends	2008-10-02 09:14:47 UTC (rev 11944)
+++ trunk/topic-guides/topics-5.0/Makefile.depends	2008-10-02 13:20:25 UTC (rev 11945)
Changed blocks: 13, Lines Added: 67, Lines Deleted: 17; 11804 bytes

@@ -9,10 +9,12 @@
 dynxml_local_mysql_security_faq_IMAGES =
 dynxml_local_mysql_security_faq_SOURCES = dynxml-local-mysql-security-faq.xml $(dynxml_local_mysql_security_faq_INCLUDES)
 dynxml_local_mysql_security_faq_IDMAPS = \
-		../../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/installing-core.idmap
+	metadata/mysql-linuxunix-excerpt-aspec.xml.linux.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.post-installation.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.security.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.user-account-management.none.chapter.idmap
 dynxml-local-mysql-security-faq.validpure: $(dynxml_local_mysql_security_faq_SOURCES)
 dynxml-local-mysql-security-faq.titles: $(dynxml_local_mysql_security_faq_SOURCES)
 dynxml-local-mysql-security-faq.useless: $(dynxml_local_mysql_security_faq_SOURCES)

@@ -38,7 +40,6 @@
 mysql_backup_excerpt_IMAGES =
 mysql_backup_excerpt_SOURCES = mysql-backup-excerpt.xml $(mysql_backup_excerpt_INCLUDES)
 mysql_backup_excerpt_IDMAPS = \
-		../../refman-5.0/metadata/backup.idmap \
 		../../refman-5.0/metadata/dba-core.idmap \
 		../../refman-5.0/metadata/programs-admin-util-core.idmap \
 		../../refman-5.0/metadata/programs-client-core.idmap \

@@ -47,7 +48,9 @@
 		../../refman-5.0/metadata/replication.idmap \
 		../../refman-5.0/metadata/sql-syntax-data-manipulation.idmap \
 		../../refman-5.0/metadata/sql-syntax-server-administration.idmap \
-		../../refman-5.0/metadata/sql-syntax-transactions.idmap
+		../../refman-5.0/metadata/sql-syntax-transactions.idmap \
+	metadata/mysql-backup-excerpt-aspec.xml.replication-solutions-backups.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.backup-and-recovery.none.chapter.idmap
 mysql-backup-excerpt.validpure: $(mysql_backup_excerpt_SOURCES)
 mysql-backup-excerpt.titles: $(mysql_backup_excerpt_SOURCES)
 mysql-backup-excerpt.useless: $(mysql_backup_excerpt_SOURCES)

@@ -84,11 +87,22 @@
 		../../refman-5.0/metadata/mysql-cluster-configuration.idmap \
 		../../refman-5.0/metadata/mysql-cluster-utilities.idmap \
 		../../refman-5.0/metadata/programs-admin-util-core.idmap \
-		../../refman-5.0/metadata/programs-server-core.idmap \
 		../../refman-5.0/metadata/programs-using.idmap \
 		../../refman-5.0/metadata/se-bdb-core.idmap \
 		../../refman-5.0/metadata/se-innodb-core.idmap \
-	../../refman-common/metadata/bug-reports.idmap
+	../../refman-common/metadata/bug-reports.idmap \
+	metadata/mysql-linuxunix-excerpt-aspec.xml.installing-binary.none.chapter.idmap \
+	metadata/mysql-linuxunix-excerpt-aspec.xml.linux-rpm.none.chapter.idmap \
+	metadata/mysql-linuxunix-excerpt-aspec.xml.linux.none.chapter.idmap \
+	metadata/mysql-linuxunix-excerpt-aspec.xml.solaris-installation.none.chapter.idmap \
+	metadata/mysql-linuxunix-excerpt-aspec.xml.solaris.none.chapter.idmap \
+	metadata/mysql-linuxunix-excerpt-aspec.xml.unix-post-installation.none.chapter.idmap \
+	metadata/mysql-macosx-excerpt-aspec.xml.mac-os-x-installation.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.post-installation.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.privilege-system.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.security.none.chapter.idmap \
+	metadata/mysql-startstop-excerpt-aspec.xml.programs-server.none.chapter.idmap \
+	metadata/mysql-windows-excerpt-aspec.xml.windows-installation.none.chapter.idmap
 mysql-linuxunix-excerpt.validpure: $(mysql_linuxunix_excerpt_SOURCES)
 mysql-linuxunix-excerpt.titles: $(mysql_linuxunix_excerpt_SOURCES)
 mysql-linuxunix-excerpt.useless: $(mysql_linuxunix_excerpt_SOURCES)

@@ -113,7 +127,9 @@
 mysql_macosx_excerpt_IDMAPS = \
 		../../refman-5.0/metadata/installing-core.idmap \
 		../../refman-5.0/metadata/programs-installation.idmap \
-		../../refman-5.0/metadata/programs-using.idmap
+		../../refman-5.0/metadata/programs-using.idmap \
+	metadata/mysql-macosx-excerpt-aspec.xml.mac-os-x-installation.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.post-installation.none.chapter.idmap
 mysql-macosx-excerpt.validpure: $(mysql_macosx_excerpt_SOURCES)
 mysql-macosx-excerpt.titles: $(mysql_macosx_excerpt_SOURCES)
 mysql-macosx-excerpt.useless: $(mysql_macosx_excerpt_SOURCES)

@@ -145,7 +161,6 @@
 mysql_security_excerpt_SOURCES = mysql-security-excerpt.xml $(mysql_security_excerpt_INCLUDES)
 mysql_security_excerpt_IDMAPS = \
 		../../refman-5.0/metadata/apis-c.idmap \
-		../../refman-5.0/metadata/backup.idmap \
 		../../refman-5.0/metadata/dba-core.idmap \
 		../../refman-5.0/metadata/errors-problems.idmap \
 		../../refman-5.0/metadata/extending-mysql.idmap \

@@ -160,7 +175,6 @@
 		../../refman-5.0/metadata/programs-admin-util-core.idmap \
 		../../refman-5.0/metadata/programs-client-core.idmap \
 		../../refman-5.0/metadata/programs-installation.idmap \
-		../../refman-5.0/metadata/programs-server-core.idmap \
 		../../refman-5.0/metadata/programs-using.idmap \
 		../../refman-5.0/metadata/programs.idmap \
 		../../refman-5.0/metadata/replication-configuration.idmap \

@@ -175,7 +189,20 @@
 		../../refman-5.0/metadata/sql-syntax.idmap \
 		../../refman-5.0/metadata/stored-programs-views.idmap \
 	../../refman-common/metadata/apis-php.idmap \
-	../../refman-common/metadata/bug-reports.idmap
+	../../refman-common/metadata/bug-reports.idmap \
+	metadata/mysql-backup-excerpt-aspec.xml.innodb-backup.none.chapter.idmap \
+	metadata/mysql-linuxunix-excerpt-aspec.xml.linux-rpm.none.chapter.idmap \
+	metadata/mysql-linuxunix-excerpt-aspec.xml.linux.none.chapter.idmap \
+	metadata/mysql-linuxunix-excerpt-aspec.xml.unix-post-installation.none.chapter.idmap \
+	metadata/mysql-macosx-excerpt-aspec.xml.mac-os-x-installation.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.backup-and-recovery.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.post-installation.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.privilege-system.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.security.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.user-account-management.none.chapter.idmap \
+	metadata/mysql-startstop-excerpt-aspec.xml.programs-server.none.chapter.idmap \
+	metadata/mysql-startstop-excerpt-aspec.xml.windows-server-first-start.none.chapter.idmap \
+	metadata/mysql-windows-excerpt-aspec.xml.windows-installation.none.chapter.idmap
 mysql-security-excerpt.validpure: $(mysql_security_excerpt_SOURCES)
 mysql-security-excerpt.titles: $(mysql_security_excerpt_SOURCES)
 mysql-security-excerpt.useless: $(mysql_security_excerpt_SOURCES)

@@ -215,8 +242,12 @@
 		../../refman-5.0/metadata/installing-core.idmap \
 		../../refman-5.0/metadata/installing-cs.idmap \
 		../../refman-5.0/metadata/programs-admin-util-core.idmap \
-		../../refman-5.0/metadata/programs-server-core.idmap \
-	../../refman-common/metadata/bug-reports.idmap
+	../../refman-common/metadata/bug-reports.idmap \
+	metadata/mysql-linuxunix-excerpt-aspec.xml.solaris-installation.none.chapter.idmap \
+	metadata/mysql-linuxunix-excerpt-aspec.xml.solaris.none.chapter.idmap \
+	metadata/mysql-linuxunix-excerpt-aspec.xml.unix-post-installation.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.post-installation.none.chapter.idmap \
+	metadata/mysql-startstop-excerpt-aspec.xml.programs-server.none.chapter.idmap
 mysql-solaris-excerpt.validpure: $(mysql_solaris_excerpt_SOURCES)
 mysql-solaris-excerpt.titles: $(mysql_solaris_excerpt_SOURCES)
 mysql-solaris-excerpt.useless: $(mysql_solaris_excerpt_SOURCES)

@@ -254,12 +285,20 @@
 		../../refman-5.0/metadata/optimization.idmap \
 		../../refman-5.0/metadata/programs-admin-util-core.idmap \
 		../../refman-5.0/metadata/programs-installation.idmap \
-		../../refman-5.0/metadata/programs-server-core.idmap \
 		../../refman-5.0/metadata/programs-using.idmap \
 		../../refman-5.0/metadata/se-innodb-core.idmap \
 		../../refman-5.0/metadata/sql-syntax-server-administration.idmap \
 	../../refman-common/metadata/bug-reports.idmap \
-	../../refman-common/metadata/information-sources.idmap
+	../../refman-common/metadata/information-sources.idmap \
+	metadata/mysql-linuxunix-excerpt-aspec.xml.unix-post-installation.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.post-installation.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.user-account-management.none.chapter.idmap \
+	metadata/mysql-sourcebuild-excerpt-aspec.xml.compilation-problems.none.chapter.idmap \
+	metadata/mysql-sourcebuild-excerpt-aspec.xml.configure-options.none.chapter.idmap \
+	metadata/mysql-sourcebuild-excerpt-aspec.xml.installing-source-tree.none.chapter.idmap \
+	metadata/mysql-sourcebuild-excerpt-aspec.xml.windows-source-build.none.chapter.idmap \
+	metadata/mysql-startstop-excerpt-aspec.xml.programs-server.none.chapter.idmap \
+	metadata/mysql-windows-excerpt-aspec.xml.windows-installation.none.chapter.idmap
 mysql-sourcebuild-excerpt.validpure: $(mysql_sourcebuild_excerpt_SOURCES)
 mysql-sourcebuild-excerpt.titles: $(mysql_sourcebuild_excerpt_SOURCES)
 mysql-sourcebuild-excerpt.useless: $(mysql_sourcebuild_excerpt_SOURCES)

@@ -293,7 +332,14 @@
 		../../refman-5.0/metadata/programs-server-core.idmap \
 		../../refman-5.0/metadata/programs-using.idmap \
 		../../refman-5.0/metadata/sql-syntax-server-administration.idmap \
-	../../refman-common/metadata/bug-reports.idmap
+	../../refman-common/metadata/bug-reports.idmap \
+	metadata/mysql-linuxunix-excerpt-aspec.xml.linux-rpm.none.chapter.idmap \
+	metadata/mysql-linuxunix-excerpt-aspec.xml.unix-post-installation.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.post-installation.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.privilege-system.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.security.none.chapter.idmap \
+	metadata/mysql-startstop-excerpt-aspec.xml.programs-server.none.chapter.idmap \
+	metadata/mysql-windows-excerpt-aspec.xml.windows-installation.none.chapter.idmap
 mysql-startstop-excerpt.validpure: $(mysql_startstop_excerpt_SOURCES)
 mysql-startstop-excerpt.titles: $(mysql_startstop_excerpt_SOURCES)
 mysql-startstop-excerpt.useless: $(mysql_startstop_excerpt_SOURCES)

@@ -347,7 +393,6 @@
 	../../refman-5.0/images/published/mysql-es-win32-fig4.png
 mysql_windows_excerpt_SOURCES = mysql-windows-excerpt.xml $(mysql_windows_excerpt_INCLUDES)
 mysql_windows_excerpt_IDMAPS = \
-		../../refman-5.0/metadata/backup.idmap \
 		../../refman-5.0/metadata/connectors-apis.idmap \
 		../../refman-5.0/metadata/dba-core.idmap \
 		../../refman-5.0/metadata/installing-core.idmap \

@@ -358,7 +403,12 @@
 		../../refman-5.0/metadata/restrictions.idmap \
 		../../refman-5.0/metadata/sql-syntax-data-definition.idmap \
 	../../refman-common/metadata/bug-reports.idmap \
-	../../refman-common/metadata/information-sources.idmap
+	../../refman-common/metadata/information-sources.idmap \
+	metadata/mysql-backup-excerpt-aspec.xml.backup.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.post-installation.none.chapter.idmap \
+	metadata/mysql-sourcebuild-excerpt-aspec.xml.installing-source-tree.none.chapter.idmap \
+	metadata/mysql-sourcebuild-excerpt-aspec.xml.windows-source-build.none.chapter.idmap \
+	metadata/mysql-windows-excerpt-aspec.xml.windows-installation.none.chapter.idmap
 mysql-windows-excerpt.validpure: $(mysql_windows_excerpt_SOURCES)
 mysql-windows-excerpt.titles: $(mysql_windows_excerpt_SOURCES)
 mysql-windows-excerpt.useless: $(mysql_windows_excerpt_SOURCES)


Modified: trunk/topic-guides/topics-5.1/Makefile.depends
===================================================================
--- trunk/topic-guides/topics-5.1/Makefile.depends	2008-10-02 09:14:47 UTC (rev 11944)
+++ trunk/topic-guides/topics-5.1/Makefile.depends	2008-10-02 13:20:25 UTC (rev 11945)
Changed blocks: 13, Lines Added: 67, Lines Deleted: 17; 11638 bytes

@@ -9,10 +9,12 @@
 dynxml_local_mysql_security_faq_IMAGES =
 dynxml_local_mysql_security_faq_SOURCES = dynxml-local-mysql-security-faq.xml $(dynxml_local_mysql_security_faq_INCLUDES)
 dynxml_local_mysql_security_faq_IDMAPS = \
-		../../refman-5.1/metadata/dba-core.idmap \
 		../../refman-5.1/metadata/errors-problems-core.idmap \
 		../../refman-5.1/metadata/extending-mysql.idmap \
-		../../refman-5.1/metadata/installing-core.idmap
+	metadata/mysql-linuxunix-excerpt-aspec.xml.linux.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.post-installation.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.security.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.user-account-management.none.chapter.idmap
 dynxml-local-mysql-security-faq.validpure: $(dynxml_local_mysql_security_faq_SOURCES)
 dynxml-local-mysql-security-faq.titles: $(dynxml_local_mysql_security_faq_SOURCES)
 dynxml-local-mysql-security-faq.useless: $(dynxml_local_mysql_security_faq_SOURCES)

@@ -38,7 +40,6 @@
 mysql_backup_excerpt_IMAGES =
 mysql_backup_excerpt_SOURCES = mysql-backup-excerpt.xml $(mysql_backup_excerpt_INCLUDES)
 mysql_backup_excerpt_IDMAPS = \
-		../../refman-5.1/metadata/backup.idmap \
 		../../refman-5.1/metadata/dba-core.idmap \
 		../../refman-5.1/metadata/programs-admin-util-core.idmap \
 		../../refman-5.1/metadata/programs-client-core.idmap \

@@ -47,7 +48,9 @@
 		../../refman-5.1/metadata/replication.idmap \
 		../../refman-5.1/metadata/sql-syntax-data-manipulation.idmap \
 		../../refman-5.1/metadata/sql-syntax-server-administration.idmap \
-		../../refman-5.1/metadata/sql-syntax-transactions.idmap
+		../../refman-5.1/metadata/sql-syntax-transactions.idmap \
+	metadata/mysql-backup-excerpt-aspec.xml.replication-solutions-backups.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.backup-and-recovery.none.chapter.idmap
 mysql-backup-excerpt.validpure: $(mysql_backup_excerpt_SOURCES)
 mysql-backup-excerpt.titles: $(mysql_backup_excerpt_SOURCES)
 mysql-backup-excerpt.useless: $(mysql_backup_excerpt_SOURCES)

@@ -83,10 +86,21 @@
 		../../refman-5.1/metadata/mysql-cluster-configuration.idmap \
 		../../refman-5.1/metadata/mysql-cluster-utilities.idmap \
 		../../refman-5.1/metadata/programs-admin-util-core.idmap \
-		../../refman-5.1/metadata/programs-server-core.idmap \
 		../../refman-5.1/metadata/programs-using.idmap \
 		../../refman-5.1/metadata/se-innodb-core.idmap \
-	../../refman-common/metadata/bug-reports.idmap
+	../../refman-common/metadata/bug-reports.idmap \
+	metadata/mysql-linuxunix-excerpt-aspec.xml.installing-binary.none.chapter.idmap \
+	metadata/mysql-linuxunix-excerpt-aspec.xml.linux-rpm.none.chapter.idmap \
+	metadata/mysql-linuxunix-excerpt-aspec.xml.linux.none.chapter.idmap \
+	metadata/mysql-linuxunix-excerpt-aspec.xml.solaris-installation.none.chapter.idmap \
+	metadata/mysql-linuxunix-excerpt-aspec.xml.solaris.none.chapter.idmap \
+	metadata/mysql-linuxunix-excerpt-aspec.xml.unix-post-installation.none.chapter.idmap \
+	metadata/mysql-macosx-excerpt-aspec.xml.mac-os-x-installation.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.post-installation.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.privilege-system.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.security.none.chapter.idmap \
+	metadata/mysql-startstop-excerpt-aspec.xml.programs-server.none.chapter.idmap \
+	metadata/mysql-windows-excerpt-aspec.xml.windows-installation.none.chapter.idmap
 mysql-linuxunix-excerpt.validpure: $(mysql_linuxunix_excerpt_SOURCES)
 mysql-linuxunix-excerpt.titles: $(mysql_linuxunix_excerpt_SOURCES)
 mysql-linuxunix-excerpt.useless: $(mysql_linuxunix_excerpt_SOURCES)

@@ -111,7 +125,9 @@
 mysql_macosx_excerpt_IDMAPS = \
 		../../refman-5.1/metadata/installing-core.idmap \
 		../../refman-5.1/metadata/programs-installation.idmap \
-		../../refman-5.1/metadata/programs-using.idmap
+		../../refman-5.1/metadata/programs-using.idmap \
+	metadata/mysql-macosx-excerpt-aspec.xml.mac-os-x-installation.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.post-installation.none.chapter.idmap
 mysql-macosx-excerpt.validpure: $(mysql_macosx_excerpt_SOURCES)
 mysql-macosx-excerpt.titles: $(mysql_macosx_excerpt_SOURCES)
 mysql-macosx-excerpt.useless: $(mysql_macosx_excerpt_SOURCES)

@@ -143,7 +159,6 @@
 mysql_security_excerpt_SOURCES = mysql-security-excerpt.xml $(mysql_security_excerpt_INCLUDES)
 mysql_security_excerpt_IDMAPS = \
 		../../refman-5.1/metadata/apis-c.idmap \
-		../../refman-5.1/metadata/backup.idmap \
 		../../refman-5.1/metadata/dba-core.idmap \
 		../../refman-5.1/metadata/errors-problems-core.idmap \
 		../../refman-5.1/metadata/extending-mysql.idmap \

@@ -158,7 +173,6 @@
 		../../refman-5.1/metadata/programs-admin-util-core.idmap \
 		../../refman-5.1/metadata/programs-client-core.idmap \
 		../../refman-5.1/metadata/programs-installation.idmap \
-		../../refman-5.1/metadata/programs-server-core.idmap \
 		../../refman-5.1/metadata/programs-using.idmap \
 		../../refman-5.1/metadata/programs.idmap \
 		../../refman-5.1/metadata/replication-configuration.idmap \

@@ -173,7 +187,20 @@
 		../../refman-5.1/metadata/stored-programs-views.idmap \
 	../../refman-common/metadata/apis-php.idmap \
 	../../refman-common/metadata/bug-reports.idmap \
-	../../refman-common/metadata/ha.idmap
+	../../refman-common/metadata/ha.idmap \
+	metadata/mysql-backup-excerpt-aspec.xml.innodb-backup.none.chapter.idmap \
+	metadata/mysql-linuxunix-excerpt-aspec.xml.linux-rpm.none.chapter.idmap \
+	metadata/mysql-linuxunix-excerpt-aspec.xml.linux.none.chapter.idmap \
+	metadata/mysql-linuxunix-excerpt-aspec.xml.unix-post-installation.none.chapter.idmap \
+	metadata/mysql-macosx-excerpt-aspec.xml.mac-os-x-installation.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.backup-and-recovery.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.post-installation.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.privilege-system.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.security.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.user-account-management.none.chapter.idmap \
+	metadata/mysql-startstop-excerpt-aspec.xml.programs-server.none.chapter.idmap \
+	metadata/mysql-startstop-excerpt-aspec.xml.windows-server-first-start.none.chapter.idmap \
+	metadata/mysql-windows-excerpt-aspec.xml.windows-installation.none.chapter.idmap
 mysql-security-excerpt.validpure: $(mysql_security_excerpt_SOURCES)
 mysql-security-excerpt.titles: $(mysql_security_excerpt_SOURCES)
 mysql-security-excerpt.useless: $(mysql_security_excerpt_SOURCES)

@@ -212,8 +239,12 @@
 mysql_solaris_excerpt_IDMAPS = \
 		../../refman-5.1/metadata/installing-core.idmap \
 		../../refman-5.1/metadata/programs-admin-util-core.idmap \
-		../../refman-5.1/metadata/programs-server-core.idmap \
-	../../refman-common/metadata/bug-reports.idmap
+	../../refman-common/metadata/bug-reports.idmap \
+	metadata/mysql-linuxunix-excerpt-aspec.xml.solaris-installation.none.chapter.idmap \
+	metadata/mysql-linuxunix-excerpt-aspec.xml.solaris.none.chapter.idmap \
+	metadata/mysql-linuxunix-excerpt-aspec.xml.unix-post-installation.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.post-installation.none.chapter.idmap \
+	metadata/mysql-startstop-excerpt-aspec.xml.programs-server.none.chapter.idmap
 mysql-solaris-excerpt.validpure: $(mysql_solaris_excerpt_SOURCES)
 mysql-solaris-excerpt.titles: $(mysql_solaris_excerpt_SOURCES)
 mysql-solaris-excerpt.useless: $(mysql_solaris_excerpt_SOURCES)

@@ -250,11 +281,19 @@
 		../../refman-5.1/metadata/optimization.idmap \
 		../../refman-5.1/metadata/programs-admin-util-core.idmap \
 		../../refman-5.1/metadata/programs-installation.idmap \
-		../../refman-5.1/metadata/programs-server-core.idmap \
 		../../refman-5.1/metadata/programs-using.idmap \
 		../../refman-5.1/metadata/se-innodb-core.idmap \
 	../../refman-common/metadata/bug-reports.idmap \
-	../../refman-common/metadata/information-sources.idmap
+	../../refman-common/metadata/information-sources.idmap \
+	metadata/mysql-linuxunix-excerpt-aspec.xml.unix-post-installation.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.post-installation.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.user-account-management.none.chapter.idmap \
+	metadata/mysql-sourcebuild-excerpt-aspec.xml.compilation-problems.none.chapter.idmap \
+	metadata/mysql-sourcebuild-excerpt-aspec.xml.configure-options.none.chapter.idmap \
+	metadata/mysql-sourcebuild-excerpt-aspec.xml.installing-source-tree.none.chapter.idmap \
+	metadata/mysql-sourcebuild-excerpt-aspec.xml.windows-source-build.none.chapter.idmap \
+	metadata/mysql-startstop-excerpt-aspec.xml.programs-server.none.chapter.idmap \
+	metadata/mysql-windows-excerpt-aspec.xml.windows-installation.none.chapter.idmap
 mysql-sourcebuild-excerpt.validpure: $(mysql_sourcebuild_excerpt_SOURCES)
 mysql-sourcebuild-excerpt.titles: $(mysql_sourcebuild_excerpt_SOURCES)
 mysql-sourcebuild-excerpt.useless: $(mysql_sourcebuild_excerpt_SOURCES)

@@ -289,7 +328,14 @@
 		../../refman-5.1/metadata/programs-server-core.idmap \
 		../../refman-5.1/metadata/programs-using.idmap \
 		../../refman-5.1/metadata/sql-syntax-server-administration.idmap \
-	../../refman-common/metadata/bug-reports.idmap
+	../../refman-common/metadata/bug-reports.idmap \
+	metadata/mysql-linuxunix-excerpt-aspec.xml.linux-rpm.none.chapter.idmap \
+	metadata/mysql-linuxunix-excerpt-aspec.xml.unix-post-installation.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.post-installation.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.privilege-system.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.security.none.chapter.idmap \
+	metadata/mysql-startstop-excerpt-aspec.xml.programs-server.none.chapter.idmap \
+	metadata/mysql-windows-excerpt-aspec.xml.windows-installation.none.chapter.idmap
 mysql-startstop-excerpt.validpure: $(mysql_startstop_excerpt_SOURCES)
 mysql-startstop-excerpt.titles: $(mysql_startstop_excerpt_SOURCES)
 mysql-startstop-excerpt.useless: $(mysql_startstop_excerpt_SOURCES)

@@ -315,7 +361,6 @@
 mysql_windows_excerpt_IMAGES =
 mysql_windows_excerpt_SOURCES = mysql-windows-excerpt.xml $(mysql_windows_excerpt_INCLUDES)
 mysql_windows_excerpt_IDMAPS = \
-		../../refman-5.1/metadata/backup.idmap \
 		../../refman-5.1/metadata/dba-core.idmap \
 		../../refman-5.1/metadata/installing-core.idmap \
 		../../refman-5.1/metadata/language-structure-core.idmap \

@@ -327,7 +372,12 @@
 	../../refman-common/metadata/bug-reports.idmap \
 	../../refman-common/metadata/connector-net.idmap \
 	../../refman-common/metadata/connector-odbc.idmap \
-	../../refman-common/metadata/information-sources.idmap
+	../../refman-common/metadata/information-sources.idmap \
+	metadata/mysql-backup-excerpt-aspec.xml.backup.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.post-installation.none.chapter.idmap \
+	metadata/mysql-sourcebuild-excerpt-aspec.xml.installing-source-tree.none.chapter.idmap \
+	metadata/mysql-sourcebuild-excerpt-aspec.xml.windows-source-build.none.chapter.idmap \
+	metadata/mysql-windows-excerpt-aspec.xml.windows-installation.none.chapter.idmap
 mysql-windows-excerpt.validpure: $(mysql_windows_excerpt_SOURCES)
 mysql-windows-excerpt.titles: $(mysql_windows_excerpt_SOURCES)
 mysql-windows-excerpt.useless: $(mysql_windows_excerpt_SOURCES)


Modified: trunk/topic-guides/topics-6.0/Makefile.depends
===================================================================
--- trunk/topic-guides/topics-6.0/Makefile.depends	2008-10-02 09:14:47 UTC (rev 11944)
+++ trunk/topic-guides/topics-6.0/Makefile.depends	2008-10-02 13:20:25 UTC (rev 11945)
Changed blocks: 13, Lines Added: 67, Lines Deleted: 18; 11945 bytes

@@ -9,10 +9,12 @@
 dynxml_local_mysql_security_faq_IMAGES =
 dynxml_local_mysql_security_faq_SOURCES = dynxml-local-mysql-security-faq.xml $(dynxml_local_mysql_security_faq_INCLUDES)
 dynxml_local_mysql_security_faq_IDMAPS = \
-		../../refman-6.0/metadata/dba-core.idmap \
 		../../refman-6.0/metadata/errors-problems.idmap \
 		../../refman-6.0/metadata/extending-mysql.idmap \
-		../../refman-6.0/metadata/installing-core.idmap
+	metadata/mysql-linuxunix-excerpt-aspec.xml.linux.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.post-installation.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.security.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.user-account-management.none.chapter.idmap
 dynxml-local-mysql-security-faq.validpure: $(dynxml_local_mysql_security_faq_SOURCES)
 dynxml-local-mysql-security-faq.titles: $(dynxml_local_mysql_security_faq_SOURCES)
 dynxml-local-mysql-security-faq.useless: $(dynxml_local_mysql_security_faq_SOURCES)

@@ -38,7 +40,6 @@
 mysql_backup_excerpt_IMAGES =
 mysql_backup_excerpt_SOURCES = mysql-backup-excerpt.xml $(mysql_backup_excerpt_INCLUDES)
 mysql_backup_excerpt_IDMAPS = \
-		../../refman-6.0/metadata/backup.idmap \
 		../../refman-6.0/metadata/dba-core.idmap \
 		../../refman-6.0/metadata/programs-admin-util-core.idmap \
 		../../refman-6.0/metadata/programs-client-core.idmap \

@@ -47,7 +48,9 @@
 		../../refman-6.0/metadata/replication.idmap \
 		../../refman-6.0/metadata/sql-syntax-data-manipulation.idmap \
 		../../refman-6.0/metadata/sql-syntax-server-administration.idmap \
-		../../refman-6.0/metadata/sql-syntax-transactions.idmap
+		../../refman-6.0/metadata/sql-syntax-transactions.idmap \
+	metadata/mysql-backup-excerpt-aspec.xml.replication-solutions-backups.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.backup-and-recovery.none.chapter.idmap
 mysql-backup-excerpt.validpure: $(mysql_backup_excerpt_SOURCES)
 mysql-backup-excerpt.titles: $(mysql_backup_excerpt_SOURCES)
 mysql-backup-excerpt.useless: $(mysql_backup_excerpt_SOURCES)

@@ -81,12 +84,23 @@
 		../../refman-6.0/metadata/installing-core.idmap \
 		../../refman-6.0/metadata/internationalization.idmap \
 		../../refman-6.0/metadata/programs-admin-util-core.idmap \
-		../../refman-6.0/metadata/programs-server-core.idmap \
 		../../refman-6.0/metadata/programs-using.idmap \
 		../../refman-6.0/metadata/se-innodb-core.idmap \
 	../../refman-5.1/metadata/mysql-cluster-configuration.idmap \
 	../../refman-5.1/metadata/mysql-cluster-utilities.idmap \
-	../../refman-common/metadata/bug-reports.idmap
+	../../refman-common/metadata/bug-reports.idmap \
+	metadata/mysql-linuxunix-excerpt-aspec.xml.installing-binary.none.chapter.idmap \
+	metadata/mysql-linuxunix-excerpt-aspec.xml.linux-rpm.none.chapter.idmap \
+	metadata/mysql-linuxunix-excerpt-aspec.xml.linux.none.chapter.idmap \
+	metadata/mysql-linuxunix-excerpt-aspec.xml.solaris-installation.none.chapter.idmap \
+	metadata/mysql-linuxunix-excerpt-aspec.xml.solaris.none.chapter.idmap \
+	metadata/mysql-linuxunix-excerpt-aspec.xml.unix-post-installation.none.chapter.idmap \
+	metadata/mysql-macosx-excerpt-aspec.xml.mac-os-x-installation.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.post-installation.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.privilege-system.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.security.none.chapter.idmap \
+	metadata/mysql-startstop-excerpt-aspec.xml.programs-server.none.chapter.idmap \
+	metadata/mysql-windows-excerpt-aspec.xml.windows-installation.none.chapter.idmap
 mysql-linuxunix-excerpt.validpure: $(mysql_linuxunix_excerpt_SOURCES)
 mysql-linuxunix-excerpt.titles: $(mysql_linuxunix_excerpt_SOURCES)
 mysql-linuxunix-excerpt.useless: $(mysql_linuxunix_excerpt_SOURCES)

@@ -111,7 +125,9 @@
 mysql_macosx_excerpt_IDMAPS = \
 		../../refman-6.0/metadata/installing-core.idmap \
 		../../refman-6.0/metadata/programs-installation.idmap \
-		../../refman-6.0/metadata/programs-using.idmap
+		../../refman-6.0/metadata/programs-using.idmap \
+	metadata/mysql-macosx-excerpt-aspec.xml.mac-os-x-installation.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.post-installation.none.chapter.idmap
 mysql-macosx-excerpt.validpure: $(mysql_macosx_excerpt_SOURCES)
 mysql-macosx-excerpt.titles: $(mysql_macosx_excerpt_SOURCES)
 mysql-macosx-excerpt.useless: $(mysql_macosx_excerpt_SOURCES)

@@ -143,7 +159,6 @@
 mysql_security_excerpt_SOURCES = mysql-security-excerpt.xml $(mysql_security_excerpt_INCLUDES)
 mysql_security_excerpt_IDMAPS = \
 		../../refman-6.0/metadata/apis-c.idmap \
-		../../refman-6.0/metadata/backup.idmap \
 		../../refman-6.0/metadata/dba-core.idmap \
 		../../refman-6.0/metadata/errors-problems.idmap \
 		../../refman-6.0/metadata/extending-mysql.idmap \

@@ -155,7 +170,6 @@
 		../../refman-6.0/metadata/programs-admin-util-core.idmap \
 		../../refman-6.0/metadata/programs-client-core.idmap \
 		../../refman-6.0/metadata/programs-installation.idmap \
-		../../refman-6.0/metadata/programs-server-core.idmap \
 		../../refman-6.0/metadata/programs-using.idmap \
 		../../refman-6.0/metadata/programs.idmap \
 		../../refman-6.0/metadata/replication-configuration.idmap \

@@ -173,7 +187,20 @@
 	../../refman-5.1/metadata/mysql-cluster.idmap \
 	../../refman-common/metadata/apis-php.idmap \
 	../../refman-common/metadata/bug-reports.idmap \
-	../../refman-common/metadata/ha.idmap
+	../../refman-common/metadata/ha.idmap \
+	metadata/mysql-backup-excerpt-aspec.xml.innodb-backup.none.chapter.idmap \
+	metadata/mysql-linuxunix-excerpt-aspec.xml.linux-rpm.none.chapter.idmap \
+	metadata/mysql-linuxunix-excerpt-aspec.xml.linux.none.chapter.idmap \
+	metadata/mysql-linuxunix-excerpt-aspec.xml.unix-post-installation.none.chapter.idmap \
+	metadata/mysql-macosx-excerpt-aspec.xml.mac-os-x-installation.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.backup-and-recovery.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.post-installation.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.privilege-system.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.security.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.user-account-management.none.chapter.idmap \
+	metadata/mysql-startstop-excerpt-aspec.xml.programs-server.none.chapter.idmap \
+	metadata/mysql-startstop-excerpt-aspec.xml.windows-server-first-start.none.chapter.idmap \
+	metadata/mysql-windows-excerpt-aspec.xml.windows-installation.none.chapter.idmap
 mysql-security-excerpt.validpure: $(mysql_security_excerpt_SOURCES)
 mysql-security-excerpt.titles: $(mysql_security_excerpt_SOURCES)
 mysql-security-excerpt.useless: $(mysql_security_excerpt_SOURCES)

@@ -212,8 +239,12 @@
 mysql_solaris_excerpt_IDMAPS = \
 		../../refman-6.0/metadata/installing-core.idmap \
 		../../refman-6.0/metadata/programs-admin-util-core.idmap \
-		../../refman-6.0/metadata/programs-server-core.idmap \
-	../../refman-common/metadata/bug-reports.idmap
+	../../refman-common/metadata/bug-reports.idmap \
+	metadata/mysql-linuxunix-excerpt-aspec.xml.solaris-installation.none.chapter.idmap \
+	metadata/mysql-linuxunix-excerpt-aspec.xml.solaris.none.chapter.idmap \
+	metadata/mysql-linuxunix-excerpt-aspec.xml.unix-post-installation.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.post-installation.none.chapter.idmap \
+	metadata/mysql-startstop-excerpt-aspec.xml.programs-server.none.chapter.idmap
 mysql-solaris-excerpt.validpure: $(mysql_solaris_excerpt_SOURCES)
 mysql-solaris-excerpt.titles: $(mysql_solaris_excerpt_SOURCES)
 mysql-solaris-excerpt.useless: $(mysql_solaris_excerpt_SOURCES)

@@ -250,11 +281,19 @@
 		../../refman-6.0/metadata/optimization.idmap \
 		../../refman-6.0/metadata/programs-admin-util-core.idmap \
 		../../refman-6.0/metadata/programs-installation.idmap \
-		../../refman-6.0/metadata/programs-server-core.idmap \
 		../../refman-6.0/metadata/programs-using.idmap \
 		../../refman-6.0/metadata/se-innodb-core.idmap \
 	../../refman-common/metadata/bug-reports.idmap \
-	../../refman-common/metadata/information-sources.idmap
+	../../refman-common/metadata/information-sources.idmap \
+	metadata/mysql-linuxunix-excerpt-aspec.xml.unix-post-installation.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.post-installation.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.user-account-management.none.chapter.idmap \
+	metadata/mysql-sourcebuild-excerpt-aspec.xml.compilation-problems.none.chapter.idmap \
+	metadata/mysql-sourcebuild-excerpt-aspec.xml.configure-options.none.chapter.idmap \
+	metadata/mysql-sourcebuild-excerpt-aspec.xml.installing-source-tree.none.chapter.idmap \
+	metadata/mysql-sourcebuild-excerpt-aspec.xml.windows-source-build.none.chapter.idmap \
+	metadata/mysql-startstop-excerpt-aspec.xml.programs-server.none.chapter.idmap \
+	metadata/mysql-windows-excerpt-aspec.xml.windows-installation.none.chapter.idmap
 mysql-sourcebuild-excerpt.validpure: $(mysql_sourcebuild_excerpt_SOURCES)
 mysql-sourcebuild-excerpt.titles: $(mysql_sourcebuild_excerpt_SOURCES)
 mysql-sourcebuild-excerpt.useless: $(mysql_sourcebuild_excerpt_SOURCES)

@@ -286,11 +325,17 @@
 		../../refman-6.0/metadata/dba-core.idmap \
 		../../refman-6.0/metadata/installing-core.idmap \
 		../../refman-6.0/metadata/programs-admin-util-core.idmap \
-		../../refman-6.0/metadata/programs-server-core.idmap \
 		../../refman-6.0/metadata/programs-using.idmap \
 		../../refman-6.0/metadata/sql-syntax-server-administration.idmap \
 	../../refman-5.1/metadata/programs-admin-util-core.idmap \
-	../../refman-common/metadata/bug-reports.idmap
+	../../refman-common/metadata/bug-reports.idmap \
+	metadata/mysql-linuxunix-excerpt-aspec.xml.linux-rpm.none.chapter.idmap \
+	metadata/mysql-linuxunix-excerpt-aspec.xml.unix-post-installation.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.post-installation.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.privilege-system.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.security.none.chapter.idmap \
+	metadata/mysql-startstop-excerpt-aspec.xml.programs-server.none.chapter.idmap \
+	metadata/mysql-windows-excerpt-aspec.xml.windows-installation.none.chapter.idmap
 mysql-startstop-excerpt.validpure: $(mysql_startstop_excerpt_SOURCES)
 mysql-startstop-excerpt.titles: $(mysql_startstop_excerpt_SOURCES)
 mysql-startstop-excerpt.useless: $(mysql_startstop_excerpt_SOURCES)

@@ -316,7 +361,6 @@
 mysql_windows_excerpt_IMAGES =
 mysql_windows_excerpt_SOURCES = mysql-windows-excerpt.xml $(mysql_windows_excerpt_INCLUDES)
 mysql_windows_excerpt_IDMAPS = \
-		../../refman-6.0/metadata/backup.idmap \
 		../../refman-6.0/metadata/dba-core.idmap \
 		../../refman-6.0/metadata/installing-core.idmap \
 		../../refman-6.0/metadata/language-structure-core.idmap \

@@ -328,7 +372,12 @@
 	../../refman-common/metadata/bug-reports.idmap \
 	../../refman-common/metadata/connector-net.idmap \
 	../../refman-common/metadata/connector-odbc.idmap \
-	../../refman-common/metadata/information-sources.idmap
+	../../refman-common/metadata/information-sources.idmap \
+	metadata/mysql-backup-excerpt-aspec.xml.backup.none.chapter.idmap \
+	metadata/mysql-security-excerpt-aspec.xml.post-installation.none.chapter.idmap \
+	metadata/mysql-sourcebuild-excerpt-aspec.xml.installing-source-tree.none.chapter.idmap \
+	metadata/mysql-sourcebuild-excerpt-aspec.xml.windows-source-build.none.chapter.idmap \
+	metadata/mysql-windows-excerpt-aspec.xml.windows-installation.none.chapter.idmap
 mysql-windows-excerpt.validpure: $(mysql_windows_excerpt_SOURCES)
 mysql-windows-excerpt.titles: $(mysql_windows_excerpt_SOURCES)
 mysql-windows-excerpt.useless: $(mysql_windows_excerpt_SOURCES)


Thread
svn commit - mysqldoc@docsrva: r11945 - in trunk: mysqldoc-guide mysqlqb refman-4.1 refman-5.0 refman-5.1 refman-5.1-maria refman-6.0 refman-common to...martin.brown2 Oct