List:Commits« Previous MessageNext Message »
From:paul Date:August 31 2006 2:37pm
Subject:svn commit - mysqldoc@docsrva: r3172 - in trunk: . refman-4.1 refman-5.0 refman-5.1
View as plain text  
Author: paul
Date: 2006-08-31 16:37:39 +0200 (Thu, 31 Aug 2006)
New Revision: 3172

Log:
 r13281@polar:  paul | 2006-08-31 09:35:51 -0500
 Make Xinclude path changes, update dependencies.


Modified:
   trunk/refman-4.1/Makefile
   trunk/refman-4.1/language-structure.xml
   trunk/refman-4.1/news-3.19.xml
   trunk/refman-4.1/news-3.20.xml
   trunk/refman-4.1/news-3.21.xml
   trunk/refman-4.1/news-3.22.xml
   trunk/refman-4.1/news-3.23.xml
   trunk/refman-4.1/news-4.0.xml
   trunk/refman-4.1/news-4.1.xml
   trunk/refman-4.1/news.xml
   trunk/refman-5.0/Makefile
   trunk/refman-5.0/language-structure.xml
   trunk/refman-5.0/news-5.0.xml
   trunk/refman-5.0/news.xml
   trunk/refman-5.1/Makefile
   trunk/refman-5.1/language-structure.xml
   trunk/refman-5.1/news-5.1.xml
   trunk/refman-5.1/news.xml

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:13280
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14164
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:9971
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:13281
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14164
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:9971


Modified: trunk/refman-4.1/Makefile
===================================================================
--- trunk/refman-4.1/Makefile	2006-08-31 14:37:06 UTC (rev 3171)
+++ trunk/refman-4.1/Makefile	2006-08-31 14:37:39 UTC (rev 3172)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 6090 bytes

@@ -38,7 +38,7 @@
 
 MANUAL_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/urls.ent ../refman-common/phrases.ent
 
-MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml apis.xml charset.xml client-utility-programs.xml connector-j.xml connector-mxj.xml connector-net.xml connector-odbc.xml connector-php.xml connectors.xml copyright.xml database-administration.xml data-types.xml errmsgs-client.xml errmsgs-server.xml error-handling.xml extending-mysql.xml functions.xml images/blackhole-1.png images/cluster-components-1.png images/cluster-upgrade-downgrade-table.png images/cmxj-overview.png images/cnet-win-install-step1.png images/cnet-win-install-step2.png images/cnet-win-install-step3.png images/cnet-win-install-step4.png images/cnet-win-install-step6.png images/multi-comp-1.png images/myaccess-odbc.png images/myaccess.png images/myarchitecture.png images/myflowchart.png images/myodbc-excel-step1.png images/myodbc-excel-step2.png images/myodbc-excel-step3.png images/myodbc-excel-step4.png images/myodbc-excel-step5.png images/myodbc-macosx-install-step1.png images/myodbc-macosx-install-step2.png im!
 ages/myodbc-macosx-install-step3.png images/myodbc-macosx-install-step4.png images/myodbc-macosx-install-step5.png images/myodbc-macosx-install-step6.png images/myodbc-macosx-odbcadmin-adddsn.png images/myodbc-macosx-odbcadmin-main.png images/myodbc-macosx-odbcadmin-sampledsn.png images/myodbc-macosx-odbcadmin-tracing.png images/myodbc-win-install-step1.png images/myodbc-win-install-step2.png images/myodbc-win-install-step3.png images/myodbc-win-install-step4.png images/myodbc-win-odbcadmin-adddsn.png images/myodbc-win-odbcadmin-advanced.png images/myodbc-win-odbcadmin-driverselect.png images/myodbc-win-odbcadmin-main.png images/myodbc-win-odbcadmin-options.png images/myodbc-win-odbcadmin-sampledsn.png images/myodbc-win-tracing.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png innodb.xml installing.xml introduction.xml language-structure.xml legalnotice.en.xml limits.xml mysql-cluster.xml news.xml optimization.xml porting.xml preface.xml problems.xml ../refm!
 an-common/bug-reports.xml ../refman-common/credits.xml ../refm!
 an-commo
n/environment-variables.xml ../refman-common/gpl-license.xml ../refman-common/information-sources.xml ../refman-common/manual-conventions.en.xml ../refman-common/maxdb.en.xml ../refman-common/mysql-floss-license-exception.xml ../refman-common/news-3.23.xml ../refman-common/news-4.0.xml ../refman-common/news-4.1.xml ../refman-common/news-cluster.xml ../refman-common/news-connector-j.xml ../refman-common/news-connector-net.xml ../refman-common/news-innodb.xml ../refman-common/news-myodbc.xml ../refman-common/regexp.xml ../refman-common/reserved-new-4.0.xml ../refman-common/reserved-new-4.1.xml ../refman-common/what-is.en.xml ../refman-common/what-is-mysql-ab.en.xml replication.xml reservedwords.xml restrictions.xml spatial-extensions.xml sql-syntax.xml storage-engines.xml tutorial.xml using-mysql-programs.xml 
+MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml apis.xml charset.xml client-utility-programs.xml connector-j.xml connector-mxj.xml connector-net.xml connector-odbc.xml connector-php.xml connectors.xml copyright.xml database-administration.xml data-types.xml errmsgs-client.xml errmsgs-server.xml error-handling.xml extending-mysql.xml functions.xml images/blackhole-1.png images/cluster-components-1.png images/cluster-upgrade-downgrade-table.png images/cmxj-overview.png images/cnet-win-install-step1.png images/cnet-win-install-step2.png images/cnet-win-install-step3.png images/cnet-win-install-step4.png images/cnet-win-install-step6.png images/multi-comp-1.png images/myaccess-odbc.png images/myaccess.png images/myarchitecture.png images/myflowchart.png images/myodbc-excel-step1.png images/myodbc-excel-step2.png images/myodbc-excel-step3.png images/myodbc-excel-step4.png images/myodbc-excel-step5.png images/myodbc-macosx-install-step1.png images/myodbc-macosx-install-step2.png im!
 ages/myodbc-macosx-install-step3.png images/myodbc-macosx-install-step4.png images/myodbc-macosx-install-step5.png images/myodbc-macosx-install-step6.png images/myodbc-macosx-odbcadmin-adddsn.png images/myodbc-macosx-odbcadmin-main.png images/myodbc-macosx-odbcadmin-sampledsn.png images/myodbc-macosx-odbcadmin-tracing.png images/myodbc-win-install-step1.png images/myodbc-win-install-step2.png images/myodbc-win-install-step3.png images/myodbc-win-install-step4.png images/myodbc-win-odbcadmin-adddsn.png images/myodbc-win-odbcadmin-advanced.png images/myodbc-win-odbcadmin-driverselect.png images/myodbc-win-odbcadmin-main.png images/myodbc-win-odbcadmin-options.png images/myodbc-win-odbcadmin-sampledsn.png images/myodbc-win-tracing.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png innodb.xml installing.xml introduction.xml language-structure.xml legalnotice.en.xml limits.xml mysql-cluster.xml news-3.23.xml news-4.0.xml news-4.1.xml news.xml optimization.xml port!
 ing.xml preface.xml problems.xml ../refman-common/bug-reports.!
 xml ../r
efman-common/credits.xml ../refman-common/environment-variables.xml ../refman-common/gpl-license.xml ../refman-common/information-sources.xml ../refman-common/manual-conventions.en.xml ../refman-common/maxdb.en.xml ../refman-common/mysql-floss-license-exception.xml ../refman-common/news-cluster.xml ../refman-common/news-connector-j.xml ../refman-common/news-connector-net.xml ../refman-common/news-innodb.xml ../refman-common/news-myodbc.xml ../refman-common/regexp.xml ../refman-common/what-is.en.xml ../refman-common/what-is-mysql-ab.en.xml replication.xml reserved-new-4.0.xml reserved-new-4.1.xml reservedwords.xml restrictions.xml spatial-extensions.xml sql-syntax.xml storage-engines.xml tutorial.xml using-mysql-programs.xml 
 
 manual-prepped.xml: $(MANUAL_SRCS)
 manual-manprepped.xml: $(MANUAL_SRCS)


Modified: trunk/refman-4.1/language-structure.xml
===================================================================
--- trunk/refman-4.1/language-structure.xml	2006-08-31 14:37:06 UTC (rev 3171)
+++ trunk/refman-4.1/language-structure.xml	2006-08-31 14:37:39 UTC (rev 3172)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 857 bytes

@@ -1758,9 +1758,9 @@
 
     <xi:include href="reservedwords.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
-    <xi:include href="../refman-common/reserved-new-4.0.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="reserved-new-4.0.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
-    <xi:include href="../refman-common/reserved-new-4.1.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="reserved-new-4.1.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
     <para>
       MySQL allows some keywords to be used as unquoted identifiers


Modified: trunk/refman-4.1/news-3.19.xml
===================================================================
--- trunk/refman-4.1/news-3.19.xml	2006-08-31 14:37:06 UTC (rev 3171)
+++ trunk/refman-4.1/news-3.19.xml	2006-08-31 14:37:39 UTC (rev 3172)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 709 bytes

@@ -2,9 +2,9 @@
 <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
 "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
 [
-  <!ENTITY % fixedchars.entities  SYSTEM "fixedchars.ent">
+  <!ENTITY % fixedchars.entities  SYSTEM "../refman-common/fixedchars.ent">
   %fixedchars.entities;
-  <!ENTITY % urls.entities       SYSTEM "urls.ent">
+  <!ENTITY % urls.entities       SYSTEM "../refman-common/urls.ent">
   %urls.entities;
 ]>
 <section id="news-3-19-x">


Modified: trunk/refman-4.1/news-3.20.xml
===================================================================
--- trunk/refman-4.1/news-3.20.xml	2006-08-31 14:37:06 UTC (rev 3171)
+++ trunk/refman-4.1/news-3.20.xml	2006-08-31 14:37:39 UTC (rev 3172)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 709 bytes

@@ -2,9 +2,9 @@
 <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
 "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
 [
-  <!ENTITY % fixedchars.entities  SYSTEM "fixedchars.ent">
+  <!ENTITY % fixedchars.entities  SYSTEM "../refman-common/fixedchars.ent">
   %fixedchars.entities;
-  <!ENTITY % urls.entities       SYSTEM "urls.ent">
+  <!ENTITY % urls.entities       SYSTEM "../refman-common/urls.ent">
   %urls.entities;
 ]>
 <section id="news-3-20-x">


Modified: trunk/refman-4.1/news-3.21.xml
===================================================================
--- trunk/refman-4.1/news-3.21.xml	2006-08-31 14:37:06 UTC (rev 3171)
+++ trunk/refman-4.1/news-3.21.xml	2006-08-31 14:37:39 UTC (rev 3172)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 709 bytes

@@ -2,9 +2,9 @@
 <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
 "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
 [
-  <!ENTITY % fixedchars.entities  SYSTEM "fixedchars.ent">
+  <!ENTITY % fixedchars.entities  SYSTEM "../refman-common/fixedchars.ent">
   %fixedchars.entities;
-  <!ENTITY % urls.entities       SYSTEM "urls.ent">
+  <!ENTITY % urls.entities       SYSTEM "../refman-common/urls.ent">
   %urls.entities;
 ]>
 <section id="news-3-21-x">


Modified: trunk/refman-4.1/news-3.22.xml
===================================================================
--- trunk/refman-4.1/news-3.22.xml	2006-08-31 14:37:06 UTC (rev 3171)
+++ trunk/refman-4.1/news-3.22.xml	2006-08-31 14:37:39 UTC (rev 3172)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 709 bytes

@@ -2,9 +2,9 @@
 <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
 "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
 [
-  <!ENTITY % fixedchars.entities  SYSTEM "fixedchars.ent">
+  <!ENTITY % fixedchars.entities  SYSTEM "../refman-common/fixedchars.ent">
   %fixedchars.entities;
-  <!ENTITY % urls.entities       SYSTEM "urls.ent">
+  <!ENTITY % urls.entities       SYSTEM "../refman-common/urls.ent">
   %urls.entities;
 ]>
 <section id="news-3-22-x">


Modified: trunk/refman-4.1/news-3.23.xml
===================================================================
--- trunk/refman-4.1/news-3.23.xml	2006-08-31 14:37:06 UTC (rev 3171)
+++ trunk/refman-4.1/news-3.23.xml	2006-08-31 14:37:39 UTC (rev 3172)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 709 bytes

@@ -2,9 +2,9 @@
 <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
 "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
 [
-  <!ENTITY % fixedchars.entities  SYSTEM "fixedchars.ent">
+  <!ENTITY % fixedchars.entities  SYSTEM "../refman-common/fixedchars.ent">
   %fixedchars.entities;
-  <!ENTITY % urls.entities       SYSTEM "urls.ent">
+  <!ENTITY % urls.entities       SYSTEM "../refman-common/urls.ent">
   %urls.entities;
 ]>
 <section id="news-3-23-x">


Modified: trunk/refman-4.1/news-4.0.xml
===================================================================
--- trunk/refman-4.1/news-4.0.xml	2006-08-31 14:37:06 UTC (rev 3171)
+++ trunk/refman-4.1/news-4.0.xml	2006-08-31 14:37:39 UTC (rev 3172)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 705 bytes

@@ -2,9 +2,9 @@
 <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
 "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
 [
-  <!ENTITY % fixedchars.entities  SYSTEM "fixedchars.ent">
+  <!ENTITY % fixedchars.entities  SYSTEM "../refman-common/fixedchars.ent">
   %fixedchars.entities;
-  <!ENTITY % urls.entities       SYSTEM "urls.ent">
+  <!ENTITY % urls.entities       SYSTEM "../refman-common/urls.ent">
   %urls.entities;
 ]>
 <section id="news-4-0-x">


Modified: trunk/refman-4.1/news-4.1.xml
===================================================================
--- trunk/refman-4.1/news-4.1.xml	2006-08-31 14:37:06 UTC (rev 3171)
+++ trunk/refman-4.1/news-4.1.xml	2006-08-31 14:37:39 UTC (rev 3172)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 705 bytes

@@ -2,9 +2,9 @@
 <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
 "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
 [
-  <!ENTITY % fixedchars.entities  SYSTEM "fixedchars.ent">
+  <!ENTITY % fixedchars.entities  SYSTEM "../refman-common/fixedchars.ent">
   %fixedchars.entities;
-  <!ENTITY % urls.entities       SYSTEM "urls.ent">
+  <!ENTITY % urls.entities       SYSTEM "../refman-common/urls.ent">
   %urls.entities;
 ]>
 <section id="news-4-1-x">


Modified: trunk/refman-4.1/news.xml
===================================================================
--- trunk/refman-4.1/news.xml	2006-08-31 14:37:06 UTC (rev 3171)
+++ trunk/refman-4.1/news.xml	2006-08-31 14:37:39 UTC (rev 3172)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 3; 965 bytes

@@ -67,11 +67,11 @@
     entity reference in urls.ent and use this for the title text.
   </remark>
 
-  <xi:include href="../refman-common/news-4.1.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include href="news-4.1.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
-  <xi:include href="../refman-common/news-4.0.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include href="news-4.0.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
-  <xi:include href="../refman-common/news-3.23.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include href="news-3.23.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
   <xi:include href="../refman-common/news-innodb.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
 


Modified: trunk/refman-5.0/Makefile
===================================================================
--- trunk/refman-5.0/Makefile	2006-08-31 14:37:06 UTC (rev 3171)
+++ trunk/refman-5.0/Makefile	2006-08-31 14:37:39 UTC (rev 3172)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 6369 bytes

@@ -38,7 +38,7 @@
 
 MANUAL_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/urls.ent ../refman-common/phrases.ent
 
-MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml apis.xml charset.xml client-utility-programs.xml connector-j.xml connector-mxj.xml connector-net.xml connector-odbc.xml connector-php.xml connectors.xml copyright.xml database-administration.xml data-types.xml errmsgs-client.xml errmsgs-server.xml error-handling.xml extending-mysql.xml functions.xml images/blackhole-1.png images/cluster-components-1.png images/cluster-upgrade-downgrade-table.png images/cmxj-overview.png images/cnet-win-install-step1.png images/cnet-win-install-step2.png images/cnet-win-install-step3.png images/cnet-win-install-step4.png images/cnet-win-install-step6.png images/multi-comp-1.png images/myaccess-odbc.png images/myaccess.png images/myarchitecture.png images/myflowchart.png images/myodbc-excel-step1.png images/myodbc-excel-step2.png images/myodbc-excel-step3.png images/myodbc-excel-step4.png images/myodbc-excel-step5.png images/myodbc-macosx-install-step1.png images/myodbc-macosx-install-step2.png im!
 ages/myodbc-macosx-install-step3.png images/myodbc-macosx-install-step4.png images/myodbc-macosx-install-step5.png images/myodbc-macosx-install-step6.png images/myodbc-macosx-odbcadmin-adddsn.png images/myodbc-macosx-odbcadmin-main.png images/myodbc-macosx-odbcadmin-sampledsn.png images/myodbc-macosx-odbcadmin-tracing.png images/myodbc-win-install-step1.png images/myodbc-win-install-step2.png images/myodbc-win-install-step3.png images/myodbc-win-install-step4.png images/myodbc-win-odbcadmin-adddsn.png images/myodbc-win-odbcadmin-advanced.png images/myodbc-win-odbcadmin-driverselect.png images/myodbc-win-odbcadmin-main.png images/myodbc-win-odbcadmin-options.png images/myodbc-win-odbcadmin-sampledsn.png images/myodbc-win-tracing.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png information-schema.xml innodb.xml installing.xml introduction.xml language-structure.xml legalnotice.en.xml limits.xml mysql-cluster.xml news.xml optimization.xml porting.xml precision!
 -math.xml preface.xml problems.xml ../refman-common/bug-report!
 s.xml ..
/refman-common/cjk-faq.en.xml ../refman-common/credits.xml ../refman-common/environment-variables.xml ../refman-common/gpl-license.xml ../refman-common/information-sources.xml ../refman-common/manual-conventions.en.xml ../refman-common/maxdb.en.xml ../refman-common/mysql-floss-license-exception.xml ../refman-common/news-5.0.xml ../refman-common/news-cluster.xml ../refman-common/news-connector-j.xml ../refman-common/news-connector-net.xml ../refman-common/news-myodbc.xml ../refman-common/regexp.xml ../refman-common/reserved-new-5.0.xml ../refman-common/what-is.en.xml ../refman-common/what-is-mysql-ab.en.xml replication.xml reservedwords.xml restrictions.xml se-archive.xml se-bdb.xml se-blackhole.xml se-csv.xml se-example.xml se-federated.xml se-memory.xml se-merge.xml se-myisam.xml spatial-extensions.xml sql-syntax.xml storage-engines.xml stored-procedures.xml triggers.xml tutorial.xml using-mysql-programs.xml views.xml 
+MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml apis.xml charset.xml client-utility-programs.xml connector-j.xml connector-mxj.xml connector-net.xml connector-odbc.xml connector-php.xml connectors.xml copyright.xml database-administration.xml data-types.xml errmsgs-client.xml errmsgs-server.xml error-handling.xml extending-mysql.xml functions.xml images/blackhole-1.png images/cluster-components-1.png images/cluster-upgrade-downgrade-table.png images/cmxj-overview.png images/cnet-win-install-step1.png images/cnet-win-install-step2.png images/cnet-win-install-step3.png images/cnet-win-install-step4.png images/cnet-win-install-step6.png images/multi-comp-1.png images/myaccess-odbc.png images/myaccess.png images/myarchitecture.png images/myflowchart.png images/myodbc-excel-step1.png images/myodbc-excel-step2.png images/myodbc-excel-step3.png images/myodbc-excel-step4.png images/myodbc-excel-step5.png images/myodbc-macosx-install-step1.png images/myodbc-macosx-install-step2.png im!
 ages/myodbc-macosx-install-step3.png images/myodbc-macosx-install-step4.png images/myodbc-macosx-install-step5.png images/myodbc-macosx-install-step6.png images/myodbc-macosx-odbcadmin-adddsn.png images/myodbc-macosx-odbcadmin-main.png images/myodbc-macosx-odbcadmin-sampledsn.png images/myodbc-macosx-odbcadmin-tracing.png images/myodbc-win-install-step1.png images/myodbc-win-install-step2.png images/myodbc-win-install-step3.png images/myodbc-win-install-step4.png images/myodbc-win-odbcadmin-adddsn.png images/myodbc-win-odbcadmin-advanced.png images/myodbc-win-odbcadmin-driverselect.png images/myodbc-win-odbcadmin-main.png images/myodbc-win-odbcadmin-options.png images/myodbc-win-odbcadmin-sampledsn.png images/myodbc-win-tracing.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png information-schema.xml innodb.xml installing.xml introduction.xml language-structure.xml legalnotice.en.xml limits.xml mysql-cluster.xml news-5.0.xml news.xml optimization.xml porting.!
 xml precision-math.xml preface.xml problems.xml ../refman-comm!
 on/bug-r
eports.xml ../refman-common/cjk-faq.en.xml ../refman-common/credits.xml ../refman-common/environment-variables.xml ../refman-common/gpl-license.xml ../refman-common/information-sources.xml ../refman-common/manual-conventions.en.xml ../refman-common/maxdb.en.xml ../refman-common/mysql-floss-license-exception.xml ../refman-common/news-cluster.xml ../refman-common/news-connector-j.xml ../refman-common/news-connector-net.xml ../refman-common/news-myodbc.xml ../refman-common/regexp.xml ../refman-common/what-is.en.xml ../refman-common/what-is-mysql-ab.en.xml replication.xml reserved-new-5.0.xml reservedwords.xml restrictions.xml se-archive.xml se-bdb.xml se-blackhole.xml se-csv.xml se-example.xml se-federated.xml se-memory.xml se-merge.xml se-myisam.xml spatial-extensions.xml sql-syntax.xml storage-engines.xml stored-procedures.xml triggers.xml tutorial.xml using-mysql-programs.xml views.xml 
 
 manual-prepped.xml: $(MANUAL_SRCS)
 manual-manprepped.xml: $(MANUAL_SRCS)


Modified: trunk/refman-5.0/language-structure.xml
===================================================================
--- trunk/refman-5.0/language-structure.xml	2006-08-31 14:37:06 UTC (rev 3171)
+++ trunk/refman-5.0/language-structure.xml	2006-08-31 14:37:39 UTC (rev 3172)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 659 bytes

@@ -1697,7 +1697,7 @@
 
     <xi:include href="reservedwords.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
-    <xi:include href="../refman-common/reserved-new-5.0.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="reserved-new-5.0.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
     <para>
       MySQL allows some keywords to be used as unquoted identifiers


Modified: trunk/refman-5.0/news-5.0.xml
===================================================================
--- trunk/refman-5.0/news-5.0.xml	2006-08-31 14:37:06 UTC (rev 3171)
+++ trunk/refman-5.0/news-5.0.xml	2006-08-31 14:37:39 UTC (rev 3172)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 705 bytes

@@ -2,9 +2,9 @@
 <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
 "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
 [
-  <!ENTITY % fixedchars.entities  SYSTEM "fixedchars.ent">
+  <!ENTITY % fixedchars.entities  SYSTEM "../refman-common/fixedchars.ent">
   %fixedchars.entities;
-  <!ENTITY % urls.entities       SYSTEM "urls.ent">
+  <!ENTITY % urls.entities       SYSTEM "../refman-common/urls.ent">
   %urls.entities;
 ]>
 <section id="news-5-0-x">


Modified: trunk/refman-5.0/news.xml
===================================================================
--- trunk/refman-5.0/news.xml	2006-08-31 14:37:06 UTC (rev 3171)
+++ trunk/refman-5.0/news.xml	2006-08-31 14:37:39 UTC (rev 3172)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 606 bytes

@@ -74,7 +74,7 @@
     entity reference in urls.ent and use this for the title text.
   </remark>
 
-  <xi:include href="../refman-common/news-5.0.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include href="news-5.0.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
   <xi:include href="../refman-common/news-cluster.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
 


Modified: trunk/refman-5.1/Makefile
===================================================================
--- trunk/refman-5.1/Makefile	2006-08-31 14:37:06 UTC (rev 3171)
+++ trunk/refman-5.1/Makefile	2006-08-31 14:37:39 UTC (rev 3172)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 6733 bytes

@@ -38,7 +38,7 @@
 
 MANUAL_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/urls.ent ../refman-common/phrases.ent
 
-MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml apis.xml charset.xml client-utility-programs.xml connector-j.xml connector-mxj.xml connector-net.xml connector-odbc.xml connector-php.xml connectors.xml copyright.xml custom-engine.xml database-administration.xml data-types.xml errmsgs-client.xml errmsgs-server.xml error-handling.xml events.xml extending-mysql.xml functions.xml images/blackhole-1.png images/cluster-components-1.png images/cluster-replication-binlog-injector.png images/cluster-replication-overview.png images/cluster-upgrade-downgrade-table.png images/cmxj-overview.png images/cnet-win-install-step1.png images/cnet-win-install-step2.png images/cnet-win-install-step3.png images/cnet-win-install-step4.png images/cnet-win-install-step6.png images/custom-engine-overview.png images/multi-comp-1.png images/myaccess-odbc.png images/myaccess.png images/myarchitecture.png images/myflowchart.png images/myodbc-excel-step1.png images/myodbc-excel-step2.png images/myodbc-excel-!
 step3.png images/myodbc-excel-step4.png images/myodbc-excel-step5.png images/myodbc-macosx-install-step1.png images/myodbc-macosx-install-step2.png images/myodbc-macosx-install-step3.png images/myodbc-macosx-install-step4.png images/myodbc-macosx-install-step5.png images/myodbc-macosx-install-step6.png images/myodbc-macosx-odbcadmin-adddsn.png images/myodbc-macosx-odbcadmin-main.png images/myodbc-macosx-odbcadmin-sampledsn.png images/myodbc-macosx-odbcadmin-tracing.png images/myodbc-win-install-step1.png images/myodbc-win-install-step2.png images/myodbc-win-install-step3.png images/myodbc-win-install-step4.png images/myodbc-win-odbcadmin-adddsn.png images/myodbc-win-odbcadmin-advanced.png images/myodbc-win-odbcadmin-driverselect.png images/myodbc-win-odbcadmin-main.png images/myodbc-win-odbcadmin-options.png images/myodbc-win-odbcadmin-sampledsn.png images/myodbc-win-tracing.png images/pluggable-storage-overview.png images/replicas-groups-1-1.png images/replicas-groups-1-2.!
 png information-schema.xml innodb.xml installing.xml introduct!
 ion.xml 
language-structure.xml legalnotice.en.xml limits.xml mysql-cluster.xml news.xml optimization.xml partitioning.xml pluggable-storage.xml porting.xml precision-math.xml preface.xml problems.xml ../refman-common/bug-reports.xml ../refman-common/cjk-faq.en.xml ../refman-common/credits.xml ../refman-common/environment-variables.xml ../refman-common/gpl-license.xml ../refman-common/information-sources.xml ../refman-common/manual-conventions.en.xml ../refman-common/maxdb.en.xml ../refman-common/mysql-floss-license-exception.xml ../refman-common/news-5.1.xml ../refman-common/news-connector-j.xml ../refman-common/news-connector-net.xml ../refman-common/news-myodbc.xml ../refman-common/regexp.xml ../refman-common/reserved-new-5.1.xml ../refman-common/what-is.en.xml ../refman-common/what-is-mysql-ab.en.xml replication.xml reservedwords.xml restrictions.xml se-archive.xml se-blackhole.xml se-csv.xml se-example.xml se-federated.xml se-memory.xml se-merge.xml se-myisam.xml spatial-extensi!
 ons.xml sql-syntax.xml storage-engines.xml stored-procedures.xml triggers.xml tutorial.xml using-mysql-programs.xml views.xml 
+MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml apis.xml charset.xml client-utility-programs.xml connector-j.xml connector-mxj.xml connector-net.xml connector-odbc.xml connector-php.xml connectors.xml copyright.xml custom-engine.xml database-administration.xml data-types.xml errmsgs-client.xml errmsgs-server.xml error-handling.xml events.xml extending-mysql.xml functions.xml images/blackhole-1.png images/cluster-components-1.png images/cluster-replication-binlog-injector.png images/cluster-replication-overview.png images/cluster-upgrade-downgrade-table.png images/cmxj-overview.png images/cnet-win-install-step1.png images/cnet-win-install-step2.png images/cnet-win-install-step3.png images/cnet-win-install-step4.png images/cnet-win-install-step6.png images/custom-engine-overview.png images/multi-comp-1.png images/myaccess-odbc.png images/myaccess.png images/myarchitecture.png images/myflowchart.png images/myodbc-excel-step1.png images/myodbc-excel-step2.png images/myodbc-excel-!
 step3.png images/myodbc-excel-step4.png images/myodbc-excel-step5.png images/myodbc-macosx-install-step1.png images/myodbc-macosx-install-step2.png images/myodbc-macosx-install-step3.png images/myodbc-macosx-install-step4.png images/myodbc-macosx-install-step5.png images/myodbc-macosx-install-step6.png images/myodbc-macosx-odbcadmin-adddsn.png images/myodbc-macosx-odbcadmin-main.png images/myodbc-macosx-odbcadmin-sampledsn.png images/myodbc-macosx-odbcadmin-tracing.png images/myodbc-win-install-step1.png images/myodbc-win-install-step2.png images/myodbc-win-install-step3.png images/myodbc-win-install-step4.png images/myodbc-win-odbcadmin-adddsn.png images/myodbc-win-odbcadmin-advanced.png images/myodbc-win-odbcadmin-driverselect.png images/myodbc-win-odbcadmin-main.png images/myodbc-win-odbcadmin-options.png images/myodbc-win-odbcadmin-sampledsn.png images/myodbc-win-tracing.png images/pluggable-storage-overview.png images/replicas-groups-1-1.png images/replicas-groups-1-2.!
 png information-schema.xml innodb.xml installing.xml introduct!
 ion.xml 
language-structure.xml legalnotice.en.xml limits.xml mysql-cluster.xml news-5.1.xml news.xml optimization.xml partitioning.xml pluggable-storage.xml porting.xml precision-math.xml preface.xml problems.xml ../refman-common/bug-reports.xml ../refman-common/cjk-faq.en.xml ../refman-common/credits.xml ../refman-common/environment-variables.xml ../refman-common/gpl-license.xml ../refman-common/information-sources.xml ../refman-common/manual-conventions.en.xml ../refman-common/maxdb.en.xml ../refman-common/mysql-floss-license-exception.xml ../refman-common/news-connector-j.xml ../refman-common/news-connector-net.xml ../refman-common/news-myodbc.xml ../refman-common/regexp.xml ../refman-common/what-is.en.xml ../refman-common/what-is-mysql-ab.en.xml replication.xml reserved-new-5.1.xml reservedwords.xml restrictions.xml se-archive.xml se-blackhole.xml se-csv.xml se-example.xml se-federated.xml se-memory.xml se-merge.xml se-myisam.xml spatial-extensions.xml sql-syntax.xml storage-eng!
 ines.xml stored-procedures.xml triggers.xml tutorial.xml using-mysql-programs.xml views.xml 
 
 manual-prepped.xml: $(MANUAL_SRCS)
 manual-manprepped.xml: $(MANUAL_SRCS)


Modified: trunk/refman-5.1/language-structure.xml
===================================================================
--- trunk/refman-5.1/language-structure.xml	2006-08-31 14:37:06 UTC (rev 3171)
+++ trunk/refman-5.1/language-structure.xml	2006-08-31 14:37:39 UTC (rev 3172)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 659 bytes

@@ -1820,7 +1820,7 @@
 
     <xi:include href="reservedwords.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
-    <xi:include href="../refman-common/reserved-new-5.1.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="reserved-new-5.1.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
     <para>
       MySQL allows some keywords to be used as unquoted identifiers


Modified: trunk/refman-5.1/news-5.1.xml
===================================================================
--- trunk/refman-5.1/news-5.1.xml	2006-08-31 14:37:06 UTC (rev 3171)
+++ trunk/refman-5.1/news-5.1.xml	2006-08-31 14:37:39 UTC (rev 3172)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 705 bytes

@@ -2,9 +2,9 @@
 <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
 "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
 [
-  <!ENTITY % fixedchars.entities  SYSTEM "fixedchars.ent">
+  <!ENTITY % fixedchars.entities  SYSTEM "../refman-common/fixedchars.ent">
   %fixedchars.entities;
-  <!ENTITY % urls.entities       SYSTEM "urls.ent">
+  <!ENTITY % urls.entities       SYSTEM "../refman-common/urls.ent">
   %urls.entities;
 ]>
 <section id="news-5-1-x">


Modified: trunk/refman-5.1/news.xml
===================================================================
--- trunk/refman-5.1/news.xml	2006-08-31 14:37:06 UTC (rev 3171)
+++ trunk/refman-5.1/news.xml	2006-08-31 14:37:39 UTC (rev 3172)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 558 bytes

@@ -69,7 +69,7 @@
     version instead.
   </para>
 
-  <xi:include href="../refman-common/news-5.1.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include href="news-5.1.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
   <xi:include href="../refman-common/news-myodbc.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
 


Thread
svn commit - mysqldoc@docsrva: r3172 - in trunk: . refman-4.1 refman-5.0 refman-5.1paul31 Aug