List:Commits« Previous MessageNext Message »
From:paul.dubois Date:March 17 2009 3:59pm
Subject:svn commit - mysqldoc@docsrva: r14263 - in trunk: . mysqlqb refman-4.1 refman-5.0 refman-5.1 refman-5.1-maria refman-6.0
View as plain text  
Author: paul
Date: 2009-03-17 16:59:31 +0100 (Tue, 17 Mar 2009)
New Revision: 14263

Log:
 r37220@arctic:  paul | 2009-03-17 11:00:37 -0500
 Update dependencies


Modified:
   trunk/mysqlqb/Makefile.depends
   trunk/refman-4.1/Makefile.depends
   trunk/refman-4.1/functions-core.xml
   trunk/refman-5.0/Makefile.depends
   trunk/refman-5.0/functions-core.xml
   trunk/refman-5.1-maria/Makefile.depends
   trunk/refman-5.1/Makefile.depends
   trunk/refman-5.1/functions-core.xml
   trunk/refman-6.0/Makefile.depends
   trunk/refman-6.0/functions-core.xml

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


Modified: trunk/mysqlqb/Makefile.depends
===================================================================
--- trunk/mysqlqb/Makefile.depends	2009-03-17 15:59:23 UTC (rev 14262)
+++ trunk/mysqlqb/Makefile.depends	2009-03-17 15:59:31 UTC (rev 14263)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 0; 546 bytes

@@ -69,6 +69,7 @@
 	../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
 mysqlqb.validpure: $(mysqlqb_SOURCES)
 mysqlqb.titles: $(mysqlqb_SOURCES)


Modified: trunk/refman-4.1/Makefile.depends
===================================================================
--- trunk/refman-4.1/Makefile.depends	2009-03-17 15:59:23 UTC (rev 14262)
+++ trunk/refman-4.1/Makefile.depends	2009-03-17 15:59:31 UTC (rev 14263)
Changed blocks: 5, Lines Added: 6, Lines Deleted: 1; 2133 bytes

@@ -699,7 +699,8 @@
 	../refman-4.1/metadata/language-structure.idmap \
 	../refman-4.1/metadata/optimization.idmap \
 	../refman-4.1/metadata/sql-syntax-data-manipulation.idmap \
-	../refman-4.1/metadata/tutorial.idmap
+	../refman-4.1/metadata/tutorial.idmap \
+	../refman-common/metadata/credits.idmap
 dynxml-local-functions.validpure: $(dynxml_local_functions_SOURCES)
 dynxml-local-functions.titles: $(dynxml_local_functions_SOURCES)
 dynxml-local-functions.useless: $(dynxml_local_functions_SOURCES)

@@ -796,6 +797,7 @@
 	../refman-4.1/metadata/dba-mysqld-server-core.idmap \
 	../refman-4.1/metadata/dba-user-management-core.idmap \
 	../refman-4.1/metadata/errors-problems.idmap \
+	../refman-4.1/metadata/programs-using.idmap \
 	../refman-4.1/metadata/replication-options-core.idmap \
 	../refman-4.1/metadata/replication.idmap \
 	../refman-4.1/metadata/sql-syntax-replication.idmap

@@ -1010,6 +1012,7 @@
 	../refman-common/../common/phrases.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 \

@@ -1148,6 +1151,7 @@
 	../refman-common/connector-odbc.xml \
 	../refman-common/connector-vstudioplugin.xml \
 	../refman-common/copyright.en.xml \
+	../refman-common/credits.xml \
 	../refman-common/images/published/blackhole-1.png \
 	../refman-common/images/published/cluster-components-1.png \
 	../refman-common/images/published/cluster-security-network-1.png \

@@ -2336,6 +2340,7 @@
 	../refman-4.1/metadata/functions-core.idmap \
 	../refman-4.1/metadata/mysql-cluster.idmap \
 	../refman-4.1/metadata/optimization.idmap \
+	../refman-4.1/metadata/programs-using.idmap \
 	../refman-4.1/metadata/replication-options-core.idmap \
 	../refman-4.1/metadata/replication.idmap \
 	../refman-4.1/metadata/se-innodb-core.idmap \


Modified: trunk/refman-4.1/functions-core.xml
===================================================================
--- trunk/refman-4.1/functions-core.xml	2009-03-17 15:59:23 UTC (rev 14262)
+++ trunk/refman-4.1/functions-core.xml	2009-03-17 15:59:31 UTC (rev 14263)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 3; 797 bytes

@@ -4508,9 +4508,8 @@
       <para>
         MySQL uses Henry Spencer's implementation of regular
         expressions, which is aimed at conformance with POSIX 1003.2.
-         See <xref linkend="credits"/>.
-        MySQL uses the extended version to support pattern-matching
-        operations performed with the
+        See <xref linkend="credits"/>. MySQL uses the extended version
+        to support pattern-matching operations performed with the
         <literal role="op">REGEXP</literal> operator in SQL statements.
       </para>
 


Modified: trunk/refman-5.0/Makefile.depends
===================================================================
--- trunk/refman-5.0/Makefile.depends	2009-03-17 15:59:23 UTC (rev 14262)
+++ trunk/refman-5.0/Makefile.depends	2009-03-17 15:59:31 UTC (rev 14263)
Changed blocks: 14, Lines Added: 28, Lines Deleted: 5; 6815 bytes

@@ -785,7 +785,8 @@
 	../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-5.0/metadata/tutorial.idmap \
+	../refman-common/metadata/credits.idmap
 dynxml-local-functions.validpure: $(dynxml_local_functions_SOURCES)
 dynxml-local-functions.titles: $(dynxml_local_functions_SOURCES)
 dynxml-local-functions.useless: $(dynxml_local_functions_SOURCES)

@@ -1329,9 +1330,9 @@
 	../mysql-monitor-2.0/enterprise.ent \
 	../mysql-monitor-2.0/urls.ent \
 	../mysql-monitor-2.0/version.ent \
-	../refman-5.0/replication-options-core.xml \
 	../refman-common/urls.ent \
 	all-entities.ent \
+	replication-options-core.xml \
 	versions.ent
 dynxml_local_replication_options_IMAGES =
 dynxml_local_replication_options_SOURCES = dynxml-local-replication-options.xml $(dynxml_local_replication_options_INCLUDES)

@@ -1340,9 +1341,11 @@
 	../refman-5.0/metadata/dba-mysqld-server-core.idmap \
 	../refman-5.0/metadata/dba-user-management-core.idmap \
 	../refman-5.0/metadata/errors-problems.idmap \
+	../refman-5.0/metadata/programs-using.idmap \
 	../refman-5.0/metadata/replication-configuration.idmap \
 	../refman-5.0/metadata/replication-implementation.idmap \
 	../refman-5.0/metadata/replication-notes.idmap \
+	../refman-5.0/metadata/replication-options-core.idmap \
 	../refman-5.0/metadata/sql-syntax-replication.idmap \
 	../refman-5.0/metadata/stored-programs-views.idmap
 dynxml-local-replication-options.validpure: $(dynxml_local_replication_options_SOURCES)

@@ -1796,6 +1799,7 @@
 	../refman-common/../common/phrases.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 \

@@ -2062,7 +2066,6 @@
 	../mysql-monitor-2.0/news-monitor-core.xml \
 	../mysql-monitor-2.0/urls.ent \
 	../mysql-monitor-2.0/version.ent \
-	../refman-5.0/replication-options-core.xml \
 	../refman-common/../common/fixedchars.ent \
 	../refman-common/../common/phrases.ent \
 	../refman-common/../dynamic-docs/faq/memcached.xml \

@@ -2095,6 +2098,7 @@
 	../refman-common/connector-ooo.xml \
 	../refman-common/connector-vstudioplugin.xml \
 	../refman-common/copyright.en.xml \
+	../refman-common/credits.xml \
 	../refman-common/dynxml-common-ha-memcached.xml \
 	../refman-common/dynxml-common-mysql-proxy.xml \
 	../refman-common/ha-drbd.xml \

@@ -2313,6 +2317,7 @@
 	replication-configuration.xml \
 	replication-implementation.xml \
 	replication-notes.xml \
+	replication-options-core.xml \
 	replication-solutions.xml \
 	replication.xml \
 	restrictions.xml \

@@ -2563,6 +2568,7 @@
 	../refman-5.0/metadata/replication-configuration.idmap \
 	../refman-5.0/metadata/replication-implementation.idmap \
 	../refman-5.0/metadata/replication-notes.idmap \
+	../refman-5.0/metadata/replication-options-core.idmap \
 	../refman-5.0/metadata/replication-solutions.idmap \
 	../refman-5.0/metadata/replication.idmap \
 	../refman-5.0/metadata/restrictions.idmap \

@@ -4012,10 +4018,10 @@
 	../mysql-monitor-2.0/enterprise.ent \
 	../mysql-monitor-2.0/urls.ent \
 	../mysql-monitor-2.0/version.ent \
-	../refman-5.0/replication-options-core.xml \
 	../refman-common/urls.ent \
 	all-entities.ent \
 	dynxml-local-replication-options.xml \
+	replication-options-core.xml \
 	versions.ent
 replication_configuration_IMAGES =
 replication_configuration_SOURCES = replication-configuration.xml $(replication_configuration_INCLUDES)

@@ -4025,9 +4031,11 @@
 	../refman-5.0/metadata/dba-user-management-core.idmap \
 	../refman-5.0/metadata/errors-problems.idmap \
 	../refman-5.0/metadata/optimization.idmap \
+	../refman-5.0/metadata/programs-using.idmap \
 	../refman-5.0/metadata/replication-configuration.idmap \
 	../refman-5.0/metadata/replication-implementation.idmap \
 	../refman-5.0/metadata/replication-notes.idmap \
+	../refman-5.0/metadata/replication-options-core.idmap \
 	../refman-5.0/metadata/sql-syntax-replication.idmap \
 	../refman-5.0/metadata/sql-syntax-server-administration.idmap \
 	../refman-5.0/metadata/stored-programs-views.idmap

@@ -4101,6 +4109,19 @@
 replication-notes-manprepped.xml: $(replication_notes_SOURCES) $(replication_notes_IDMAPS)
 replication-notes-remprepped.xml: $(replication_notes_SOURCES) $(replication_notes_IDMAPS)
 
+replication_options_core_INCLUDES =
+replication_options_core_IMAGES =
+replication_options_core_SOURCES = replication-options-core.xml $(replication_options_core_INCLUDES)
+replication_options_core_IDMAPS =
+replication-options-core.validpure: $(replication_options_core_SOURCES)
+replication-options-core.titles: $(replication_options_core_SOURCES)
+replication-options-core.useless: $(replication_options_core_SOURCES)
+replication-options-core.valid: $(replication_options_core_SOURCES) $(replication_options_core_IDMAPS)
+replication-options-core.validwarn: $(replication_options_core_SOURCES) $(replication_options_core_IDMAPS)
+replication-options-core-prepped.xml: $(replication_options_core_SOURCES) $(replication_options_core_IDMAPS)
+replication-options-core-manprepped.xml: $(replication_options_core_SOURCES) $(replication_options_core_IDMAPS)
+replication-options-core-remprepped.xml: $(replication_options_core_SOURCES) $(replication_options_core_IDMAPS)
+
 replication_solutions_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \

@@ -4145,7 +4166,6 @@
 	../mysql-monitor-2.0/enterprise.ent \
 	../mysql-monitor-2.0/urls.ent \
 	../mysql-monitor-2.0/version.ent \
-	../refman-5.0/replication-options-core.xml \
 	../refman-common/images/published/multi-db.png \
 	../refman-common/images/published/redundancy-after.png \
 	../refman-common/images/published/redundancy-before.png \

@@ -4157,6 +4177,7 @@
 	replication-configuration.xml \
 	replication-implementation.xml \
 	replication-notes.xml \
+	replication-options-core.xml \
 	replication-solutions.xml \
 	versions.ent
 replication_IMAGES = \

@@ -4175,9 +4196,11 @@
 	../refman-5.0/metadata/mysql-cluster.idmap \
 	../refman-5.0/metadata/optimization.idmap \
 	../refman-5.0/metadata/programs-client-core.idmap \
+	../refman-5.0/metadata/programs-using.idmap \
 	../refman-5.0/metadata/replication-configuration.idmap \
 	../refman-5.0/metadata/replication-implementation.idmap \
 	../refman-5.0/metadata/replication-notes.idmap \
+	../refman-5.0/metadata/replication-options-core.idmap \
 	../refman-5.0/metadata/replication-solutions.idmap \
 	../refman-5.0/metadata/se-innodb-core.idmap \
 	../refman-5.0/metadata/se-memory.idmap \


Modified: trunk/refman-5.0/functions-core.xml
===================================================================
--- trunk/refman-5.0/functions-core.xml	2009-03-17 15:59:23 UTC (rev 14262)
+++ trunk/refman-5.0/functions-core.xml	2009-03-17 15:59:31 UTC (rev 14263)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 3; 797 bytes

@@ -4666,9 +4666,8 @@
       <para>
         MySQL uses Henry Spencer's implementation of regular
         expressions, which is aimed at conformance with POSIX 1003.2.
-         See <xref linkend="credits"/>.
-        MySQL uses the extended version to support pattern-matching
-        operations performed with the
+        See <xref linkend="credits"/>. MySQL uses the extended version
+        to support pattern-matching operations performed with the
         <literal role="op">REGEXP</literal> operator in SQL statements.
       </para>
 


Modified: trunk/refman-5.1/Makefile.depends
===================================================================
--- trunk/refman-5.1/Makefile.depends	2009-03-17 15:59:23 UTC (rev 14262)
+++ trunk/refman-5.1/Makefile.depends	2009-03-17 15:59:31 UTC (rev 14263)
Changed blocks: 8, Lines Added: 9, Lines Deleted: 3; 3289 bytes

@@ -870,7 +870,8 @@
 	../refman-5.1/metadata/sql-syntax-transactions.idmap \
 	../refman-5.1/metadata/stored-programs-views.idmap \
 	../refman-5.1/metadata/stored-routines.idmap \
-	../refman-5.1/metadata/tutorial.idmap
+	../refman-5.1/metadata/tutorial.idmap \
+	../refman-common/metadata/credits.idmap
 dynxml-local-functions.validpure: $(dynxml_local_functions_SOURCES)
 dynxml-local-functions.titles: $(dynxml_local_functions_SOURCES)
 dynxml-local-functions.useless: $(dynxml_local_functions_SOURCES)

@@ -1426,6 +1427,7 @@
 	../refman-5.1/metadata/dba-user-management-core.idmap \
 	../refman-5.1/metadata/errors-problems-core.idmap \
 	../refman-5.1/metadata/mysql-cluster-optvar-core.idmap \
+	../refman-5.1/metadata/programs-using.idmap \
 	../refman-5.1/metadata/replication-configuration.idmap \
 	../refman-5.1/metadata/replication-implementation.idmap \
 	../refman-5.1/metadata/replication-notes.idmap \

@@ -1837,7 +1839,7 @@
 	../refman-5.1/metadata/stored-routines.idmap \
 	../refman-5.1/metadata/triggers.idmap \
 	../refman-5.1/metadata/views.idmap \
-	../refman-6.0/metadata/manual.idmap \
+	../refman-6.0/metadata/manual-sun.idmap \
 	../refman-common/metadata/apis-php.idmap \
 	../refman-common/metadata/connector-j.idmap \
 	../refman-common/metadata/connector-mxj.idmap \

@@ -1954,6 +1956,7 @@
 	../refman-common/../common/phrases.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 \

@@ -2287,6 +2290,7 @@
 	../refman-common/connector-ooo.xml \
 	../refman-common/connector-vstudioplugin.xml \
 	../refman-common/copyright.en.xml \
+	../refman-common/credits.xml \
 	../refman-common/dynxml-common-ha-memcached.xml \
 	../refman-common/dynxml-common-mysql-proxy.xml \
 	../refman-common/ha-drbd.xml \

@@ -2821,7 +2825,7 @@
 	../refman-5.1/metadata/tutorial.idmap \
 	../refman-5.1/metadata/views.idmap \
 	../refman-6.0/metadata/introduction.idmap \
-	../refman-6.0/metadata/manual.idmap \
+	../refman-6.0/metadata/manual-sun.idmap \
 	../refman-common/metadata/apis-php-mysql.idmap \
 	../refman-common/metadata/apis-php-mysqli.idmap \
 	../refman-common/metadata/apis-php-pdo-mysql.idmap \

@@ -4330,6 +4334,7 @@
 	../refman-5.1/metadata/mysql-cluster-replication.idmap \
 	../refman-5.1/metadata/optimization.idmap \
 	../refman-5.1/metadata/programs-admin-util-core.idmap \
+	../refman-5.1/metadata/programs-using.idmap \
 	../refman-5.1/metadata/replication-configuration.idmap \
 	../refman-5.1/metadata/replication-implementation.idmap \
 	../refman-5.1/metadata/replication-notes.idmap \

@@ -4511,6 +4516,7 @@
 	../refman-5.1/metadata/optimization.idmap \
 	../refman-5.1/metadata/programs-admin-util-core.idmap \
 	../refman-5.1/metadata/programs-client-core.idmap \
+	../refman-5.1/metadata/programs-using.idmap \
 	../refman-5.1/metadata/replication-configuration.idmap \
 	../refman-5.1/metadata/replication-implementation.idmap \
 	../refman-5.1/metadata/replication-notes.idmap \


Modified: trunk/refman-5.1/functions-core.xml
===================================================================
--- trunk/refman-5.1/functions-core.xml	2009-03-17 15:59:23 UTC (rev 14262)
+++ trunk/refman-5.1/functions-core.xml	2009-03-17 15:59:31 UTC (rev 14263)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 3; 797 bytes

@@ -4596,9 +4596,8 @@
       <para>
         MySQL uses Henry Spencer's implementation of regular
         expressions, which is aimed at conformance with POSIX 1003.2.
-         See <xref linkend="credits"/>.
-        MySQL uses the extended version to support pattern-matching
-        operations performed with the
+        See <xref linkend="credits"/>. MySQL uses the extended version
+        to support pattern-matching operations performed with the
         <literal role="op">REGEXP</literal> operator in SQL statements.
       </para>
 


Modified: trunk/refman-5.1-maria/Makefile.depends
===================================================================
--- trunk/refman-5.1-maria/Makefile.depends	2009-03-17 15:59:23 UTC (rev 14262)
+++ trunk/refman-5.1-maria/Makefile.depends	2009-03-17 15:59:31 UTC (rev 14263)
Changed blocks: 3, Lines Added: 3, Lines Deleted: 1; 1478 bytes

@@ -493,6 +493,7 @@
 	../refman-5.1/../refman-common/connector-ooo.xml \
 	../refman-5.1/../refman-common/connector-vstudioplugin.xml \
 	../refman-5.1/../refman-common/copyright.en.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 \

@@ -906,7 +907,7 @@
 	../refman-5.1/metadata/news.idmap \
 	../refman-5.1/metadata/storage-engines-core.idmap \
 	../refman-6.0/metadata/introduction.idmap \
-	../refman-6.0/metadata/manual.idmap \
+	../refman-6.0/metadata/manual-sun.idmap \
 	../refman-6.0/metadata/se-maria-core.idmap \
 	../refman-common/metadata/apis-cplusplus.idmap \
 	../refman-common/metadata/apis-eiffel.idmap \

@@ -926,6 +927,7 @@
 	../refman-common/metadata/connector-odbc.idmap \
 	../refman-common/metadata/connector-ooo.idmap \
 	../refman-common/metadata/connector-vstudioplugin.idmap \
+	../refman-common/metadata/credits.idmap \
 	../refman-common/metadata/ha-memcached-core.idmap \
 	../refman-common/metadata/information-sources.idmap \
 	../refman-common/metadata/load-balancer.idmap \


Modified: trunk/refman-6.0/Makefile.depends
===================================================================
--- trunk/refman-6.0/Makefile.depends	2009-03-17 15:59:23 UTC (rev 14262)
+++ trunk/refman-6.0/Makefile.depends	2009-03-17 15:59:31 UTC (rev 14263)
Changed blocks: 14, Lines Added: 28, Lines Deleted: 5; 6826 bytes

@@ -849,7 +849,8 @@
 	../refman-6.0/metadata/sql-syntax-data-manipulation.idmap \
 	../refman-6.0/metadata/stored-programs-views.idmap \
 	../refman-6.0/metadata/stored-routines.idmap \
-	../refman-6.0/metadata/tutorial.idmap
+	../refman-6.0/metadata/tutorial.idmap \
+	../refman-common/metadata/credits.idmap
 dynxml-local-functions.validpure: $(dynxml_local_functions_SOURCES)
 dynxml-local-functions.titles: $(dynxml_local_functions_SOURCES)
 dynxml-local-functions.useless: $(dynxml_local_functions_SOURCES)

@@ -1230,9 +1231,9 @@
 	../mysql-monitor-2.0/enterprise.ent \
 	../mysql-monitor-2.0/urls.ent \
 	../mysql-monitor-2.0/version.ent \
-	../refman-6.0/replication-options-core.xml \
 	../refman-common/urls.ent \
 	all-entities.ent \
+	replication-options-core.xml \
 	versions.ent
 dynxml_local_replication_options_IMAGES =
 dynxml_local_replication_options_SOURCES = dynxml-local-replication-options.xml $(dynxml_local_replication_options_INCLUDES)

@@ -1240,9 +1241,11 @@
 	../refman-6.0/metadata/dba-log-files.idmap \
 	../refman-6.0/metadata/dba-mysqld-server-core.idmap \
 	../refman-6.0/metadata/errors-problems.idmap \
+	../refman-6.0/metadata/programs-using.idmap \
 	../refman-6.0/metadata/replication-configuration.idmap \
 	../refman-6.0/metadata/replication-implementation.idmap \
 	../refman-6.0/metadata/replication-notes.idmap \
+	../refman-6.0/metadata/replication-options-core.idmap \
 	../refman-6.0/metadata/sql-syntax-replication.idmap \
 	../refman-6.0/metadata/stored-programs-views.idmap
 dynxml-local-replication-options.validpure: $(dynxml_local_replication_options_SOURCES)

@@ -1821,6 +1824,7 @@
 	../refman-common/../common/phrases.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 \

@@ -2015,7 +2019,6 @@
 	../mysql-monitor-2.0/urls.ent \
 	../mysql-monitor-2.0/version.ent \
 	../refman-6.0/images/published/dtrace-groups.png \
-	../refman-6.0/replication-options-core.xml \
 	../refman-common/../common/fixedchars.ent \
 	../refman-common/../common/phrases.ent \
 	../refman-common/../dynamic-docs/faq/memcached.xml \

@@ -2048,6 +2051,7 @@
 	../refman-common/connector-ooo.xml \
 	../refman-common/connector-vstudioplugin.xml \
 	../refman-common/copyright.en.xml \
+	../refman-common/credits.xml \
 	../refman-common/dynxml-common-ha-memcached.xml \
 	../refman-common/dynxml-common-mysql-proxy.xml \
 	../refman-common/ha-drbd.xml \

@@ -2255,6 +2259,7 @@
 	replication-configuration.xml \
 	replication-implementation.xml \
 	replication-notes.xml \
+	replication-options-core.xml \
 	replication-solutions.xml \
 	replication.xml \
 	restrictions.xml \

@@ -2494,6 +2499,7 @@
 	../refman-6.0/metadata/replication-configuration.idmap \
 	../refman-6.0/metadata/replication-implementation.idmap \
 	../refman-6.0/metadata/replication-notes.idmap \
+	../refman-6.0/metadata/replication-options-core.idmap \
 	../refman-6.0/metadata/replication-solutions.idmap \
 	../refman-6.0/metadata/replication.idmap \
 	../refman-6.0/metadata/restrictions.idmap \

@@ -3416,10 +3422,10 @@
 	../mysql-monitor-2.0/enterprise.ent \
 	../mysql-monitor-2.0/urls.ent \
 	../mysql-monitor-2.0/version.ent \
-	../refman-6.0/replication-options-core.xml \
 	../refman-common/urls.ent \
 	all-entities.ent \
 	dynxml-local-replication-options.xml \
+	replication-options-core.xml \
 	versions.ent
 replication_configuration_IMAGES =
 replication_configuration_SOURCES = replication-configuration.xml $(replication_configuration_INCLUDES)

@@ -3431,9 +3437,11 @@
 	../refman-6.0/metadata/errors-problems.idmap \
 	../refman-6.0/metadata/optimization.idmap \
 	../refman-6.0/metadata/programs-admin-util-core.idmap \
+	../refman-6.0/metadata/programs-using.idmap \
 	../refman-6.0/metadata/replication-configuration.idmap \
 	../refman-6.0/metadata/replication-implementation.idmap \
 	../refman-6.0/metadata/replication-notes.idmap \
+	../refman-6.0/metadata/replication-options-core.idmap \
 	../refman-6.0/metadata/sql-syntax-replication.idmap \
 	../refman-6.0/metadata/sql-syntax-server-administration.idmap \
 	../refman-6.0/metadata/stored-programs-views.idmap

@@ -3516,6 +3524,19 @@
 replication-notes-manprepped.xml: $(replication_notes_SOURCES) $(replication_notes_IDMAPS)
 replication-notes-remprepped.xml: $(replication_notes_SOURCES) $(replication_notes_IDMAPS)
 
+replication_options_core_INCLUDES =
+replication_options_core_IMAGES =
+replication_options_core_SOURCES = replication-options-core.xml $(replication_options_core_INCLUDES)
+replication_options_core_IDMAPS =
+replication-options-core.validpure: $(replication_options_core_SOURCES)
+replication-options-core.titles: $(replication_options_core_SOURCES)
+replication-options-core.useless: $(replication_options_core_SOURCES)
+replication-options-core.valid: $(replication_options_core_SOURCES) $(replication_options_core_IDMAPS)
+replication-options-core.validwarn: $(replication_options_core_SOURCES) $(replication_options_core_IDMAPS)
+replication-options-core-prepped.xml: $(replication_options_core_SOURCES) $(replication_options_core_IDMAPS)
+replication-options-core-manprepped.xml: $(replication_options_core_SOURCES) $(replication_options_core_IDMAPS)
+replication-options-core-remprepped.xml: $(replication_options_core_SOURCES) $(replication_options_core_IDMAPS)
+
 replication_solutions_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \

@@ -3583,7 +3604,6 @@
 	../mysql-monitor-2.0/enterprise.ent \
 	../mysql-monitor-2.0/urls.ent \
 	../mysql-monitor-2.0/version.ent \
-	../refman-6.0/replication-options-core.xml \
 	../refman-common/images/published/multi-db.png \
 	../refman-common/images/published/redundancy-after.png \
 	../refman-common/images/published/redundancy-before.png \

@@ -3607,6 +3627,7 @@
 	replication-configuration.xml \
 	replication-implementation.xml \
 	replication-notes.xml \
+	replication-options-core.xml \
 	replication-solutions.xml \
 	versions.ent
 replication_IMAGES = \

@@ -3641,9 +3662,11 @@
 	../refman-6.0/metadata/optimization.idmap \
 	../refman-6.0/metadata/programs-admin-util-core.idmap \
 	../refman-6.0/metadata/programs-client-core.idmap \
+	../refman-6.0/metadata/programs-using.idmap \
 	../refman-6.0/metadata/replication-configuration.idmap \
 	../refman-6.0/metadata/replication-implementation.idmap \
 	../refman-6.0/metadata/replication-notes.idmap \
+	../refman-6.0/metadata/replication-options-core.idmap \
 	../refman-6.0/metadata/replication-solutions.idmap \
 	../refman-6.0/metadata/se-innodb-core.idmap \
 	../refman-6.0/metadata/se-memory-core.idmap \


Modified: trunk/refman-6.0/functions-core.xml
===================================================================
--- trunk/refman-6.0/functions-core.xml	2009-03-17 15:59:23 UTC (rev 14262)
+++ trunk/refman-6.0/functions-core.xml	2009-03-17 15:59:31 UTC (rev 14263)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 3; 797 bytes

@@ -5038,9 +5038,8 @@
       <para>
         MySQL uses Henry Spencer's implementation of regular
         expressions, which is aimed at conformance with POSIX 1003.2.
-         See <xref linkend="credits"/>.
-        MySQL uses the extended version to support pattern-matching
-        operations performed with the
+        See <xref linkend="credits"/>. MySQL uses the extended version
+        to support pattern-matching operations performed with the
         <literal role="op">REGEXP</literal> operator in SQL statements.
       </para>
 


Thread
svn commit - mysqldoc@docsrva: r14263 - in trunk: . mysqlqb refman-4.1 refman-5.0 refman-5.1 refman-5.1-maria refman-6.0paul.dubois17 Mar