Author: paul
Date: 2006-01-30 16:01:20 +0100 (Mon, 30 Jan 2006)
New Revision: 1125
Log:
r6911@frost: paul | 2006-01-30 09:00:46 -0600
Post file-move fixups. (Adjust pathnames, run make depend)
Modified:
trunk/
trunk/refman-4.1/Makefile
trunk/refman-4.1/manual.xml
trunk/refman-5.0/Makefile
trunk/refman-5.0/manual.xml
trunk/refman-5.1/Makefile
trunk/refman-5.1/manual.xml
trunk/refman-common/regexp.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6910
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2588
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6911
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2588
Modified: trunk/refman-4.1/Makefile
===================================================================
--- trunk/refman-4.1/Makefile 2006-01-30 15:00:57 UTC (rev 1124)
+++ trunk/refman-4.1/Makefile 2006-01-30 15:01:20 UTC (rev 1125)
@@ -44,7 +44,7 @@
MANUAL_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/titles.en.ent
-MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml preface.xml introduction.xml ../refman-common/manual-conventions.en.xml ../refman-common/what-is-mysql-ab.en.xml ../refman-common/what-is.en.xml ../refman-common/maxdb.en.xml ../refman-common/information-sources.xml ../refman-common/bug-reports.xml installing.xml tutorial.xml using-mysql-programs.xml database-administration.xml replication.xml optimization.xml client-utility-programs.xml language-structure.xml reservedwords.xml ../refman-common/reserved-new-4.0.xml ../refman-common/reserved-new-4.1.xml charset.xml data-types.xml functions.xml sql-syntax.xml storage-engines.xml innodb.xml images/blackhole-1.png ndbcluster.xml images/cluster-components-1.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png images/multi-comp-1.png spatial-extensions.xml apis.xml connectors.xml connector-odbc.xml images/myarchitecture.png images/mydsn-icon.png images/mydsn.png images/mydsn-setup.png images/mydsn-example.png images/mydsn!
-test-success.png images/mydsn-test-fail.png images/mydsn-options.png images/mydsn-icon.png images/mydsn.png images/mydsn-trace.png images/myaccess.png images/myaccess-odbc.png images/mydsn-trace.png images/mydll-properties.png images/mydsn-options.png images/myflowchart.png connector-net.xml ../refman-common/news-connector-net.xml connector-j.xml ../refman-common/news-connector-j.xml connector-mxj.xml extending-mysql.xml problems.xml error-handling.xml errmsgs-server.xml errmsgs-client.xml ../refman-common/credits.xml news.xml ../refman-common/news-4.1.xml ../refman-common/news-4.0.xml ../refman-common/news-3.23.xml ../refman-common/news-innodb.xml ../refman-common/news-cluster.xml ../refman-common/news-myodbc.xml porting.xml ../refman-common/environment-variables.xml regexp.xml limits.xml restrictions.xml ../refman-common/gpl-license.xml ../refman-common/mysql-floss-license-exception.xml
+MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml preface.xml introduction.xml ../refman-common/manual-conventions.en.xml ../refman-common/what-is-mysql-ab.en.xml ../refman-common/what-is.en.xml ../refman-common/maxdb.en.xml ../refman-common/information-sources.xml ../refman-common/bug-reports.xml installing.xml tutorial.xml using-mysql-programs.xml database-administration.xml replication.xml optimization.xml client-utility-programs.xml language-structure.xml reservedwords.xml ../refman-common/reserved-new-4.0.xml ../refman-common/reserved-new-4.1.xml charset.xml data-types.xml functions.xml sql-syntax.xml storage-engines.xml innodb.xml images/blackhole-1.png ndbcluster.xml images/cluster-components-1.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png images/multi-comp-1.png spatial-extensions.xml apis.xml connectors.xml connector-odbc.xml images/myarchitecture.png images/mydsn-icon.png images/mydsn.png images/mydsn-setup.png images/mydsn-example.png images/mydsn!
-test-success.png images/mydsn-test-fail.png images/mydsn-options.png images/mydsn-icon.png images/mydsn.png images/mydsn-trace.png images/myaccess.png images/myaccess-odbc.png images/mydsn-trace.png images/mydll-properties.png images/mydsn-options.png images/myflowchart.png connector-net.xml ../refman-common/news-connector-net.xml connector-j.xml ../refman-common/news-connector-j.xml connector-mxj.xml extending-mysql.xml problems.xml error-handling.xml errmsgs-server.xml errmsgs-client.xml ../refman-common/credits.xml news.xml ../refman-common/news-4.1.xml ../refman-common/news-4.0.xml ../refman-common/news-3.23.xml ../refman-common/news-innodb.xml ../refman-common/news-cluster.xml ../refman-common/news-myodbc.xml porting.xml ../refman-common/environment-variables.xml ../refman-common/regexp.xml limits.xml restrictions.xml ../refman-common/gpl-license.xml ../refman-common/mysql-floss-license-exception.xml
manual-prepped.xml: $(MANUAL_SRCS)
manual-manprepped.xml: $(MANUAL_SRCS)
Modified: trunk/refman-4.1/manual.xml
===================================================================
--- trunk/refman-4.1/manual.xml 2006-01-30 15:00:57 UTC (rev 1124)
+++ trunk/refman-4.1/manual.xml 2006-01-30 15:01:20 UTC (rev 1125)
@@ -86,7 +86,7 @@
<xi:include href="../refman-common/environment-variables.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="regexp.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="../refman-common/regexp.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="limits.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
Modified: trunk/refman-5.0/Makefile
===================================================================
--- trunk/refman-5.0/Makefile 2006-01-30 15:00:57 UTC (rev 1124)
+++ trunk/refman-5.0/Makefile 2006-01-30 15:01:20 UTC (rev 1125)
@@ -44,7 +44,7 @@
MANUAL_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/titles.en.ent
-MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml preface.xml introduction.xml ../refman-common/manual-conventions.en.xml ../refman-common/what-is-mysql-ab.en.xml ../refman-common/what-is.en.xml ../refman-common/maxdb.en.xml ../refman-common/information-sources.xml ../refman-common/bug-reports.xml installing.xml tutorial.xml using-mysql-programs.xml database-administration.xml replication.xml optimization.xml client-utility-programs.xml language-structure.xml reservedwords.xml ../refman-common/reserved-new-5.0.xml charset.xml data-types.xml functions.xml sql-syntax.xml storage-engines.xml innodb.xml images/blackhole-1.png ndbcluster.xml images/cluster-components-1.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png images/multi-comp-1.png spatial-extensions.xml stored-procedures.xml triggers.xml views.xml information-schema.xml precision-math.xml apis.xml connectors.xml connector-odbc.xml images/myarchitecture.png images/mydsn-icon.png images/mydsn.png images/myds!
n-setup.png images/mydsn-example.png images/mydsn-test-success.png images/mydsn-test-fail.png images/mydsn-options.png images/mydsn-icon.png images/mydsn.png images/mydsn-trace.png images/myaccess.png images/myaccess-odbc.png images/mydsn-trace.png images/mydll-properties.png images/mydsn-options.png images/myflowchart.png connector-net.xml ../refman-common/news-connector-net.xml connector-j.xml ../refman-common/news-connector-j.xml connector-mxj.xml extending-mysql.xml problems.xml error-handling.xml errmsgs-server.xml errmsgs-client.xml ../refman-common/credits.xml news.xml ../refman-common/news-5.0.xml ../refman-common/news-cluster.xml ../refman-common/news-myodbc.xml porting.xml ../refman-common/environment-variables.xml regexp.xml limits.xml restrictions.xml ../refman-common/gpl-license.xml ../refman-common/mysql-floss-license-exception.xml
+MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml preface.xml introduction.xml ../refman-common/manual-conventions.en.xml ../refman-common/what-is-mysql-ab.en.xml ../refman-common/what-is.en.xml ../refman-common/maxdb.en.xml ../refman-common/information-sources.xml ../refman-common/bug-reports.xml installing.xml tutorial.xml using-mysql-programs.xml database-administration.xml replication.xml optimization.xml client-utility-programs.xml language-structure.xml reservedwords.xml ../refman-common/reserved-new-5.0.xml charset.xml data-types.xml functions.xml sql-syntax.xml storage-engines.xml innodb.xml images/blackhole-1.png ndbcluster.xml images/cluster-components-1.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png images/multi-comp-1.png spatial-extensions.xml stored-procedures.xml triggers.xml views.xml information-schema.xml precision-math.xml apis.xml connectors.xml connector-odbc.xml images/myarchitecture.png images/mydsn-icon.png images/mydsn.png images/myds!
n-setup.png images/mydsn-example.png images/mydsn-test-success.png images/mydsn-test-fail.png images/mydsn-options.png images/mydsn-icon.png images/mydsn.png images/mydsn-trace.png images/myaccess.png images/myaccess-odbc.png images/mydsn-trace.png images/mydll-properties.png images/mydsn-options.png images/myflowchart.png connector-net.xml ../refman-common/news-connector-net.xml connector-j.xml ../refman-common/news-connector-j.xml connector-mxj.xml extending-mysql.xml problems.xml error-handling.xml errmsgs-server.xml errmsgs-client.xml ../refman-common/credits.xml news.xml ../refman-common/news-5.0.xml ../refman-common/news-cluster.xml ../refman-common/news-myodbc.xml porting.xml ../refman-common/environment-variables.xml ../refman-common/regexp.xml limits.xml restrictions.xml ../refman-common/gpl-license.xml ../refman-common/mysql-floss-license-exception.xml
manual-prepped.xml: $(MANUAL_SRCS)
manual-manprepped.xml: $(MANUAL_SRCS)
Modified: trunk/refman-5.0/manual.xml
===================================================================
--- trunk/refman-5.0/manual.xml 2006-01-30 15:00:57 UTC (rev 1124)
+++ trunk/refman-5.0/manual.xml 2006-01-30 15:01:20 UTC (rev 1125)
@@ -96,7 +96,7 @@
<xi:include href="../refman-common/environment-variables.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="regexp.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="../refman-common/regexp.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="limits.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
Modified: trunk/refman-5.1/Makefile
===================================================================
--- trunk/refman-5.1/Makefile 2006-01-30 15:00:57 UTC (rev 1124)
+++ trunk/refman-5.1/Makefile 2006-01-30 15:01:20 UTC (rev 1125)
@@ -44,7 +44,7 @@
MANUAL_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/titles.en.ent
-MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml preface.xml introduction.xml ../refman-common/manual-conventions.en.xml ../refman-common/what-is-mysql-ab.en.xml ../refman-common/what-is.en.xml ../refman-common/maxdb.en.xml ../refman-common/information-sources.xml ../refman-common/bug-reports.xml installing.xml tutorial.xml using-mysql-programs.xml database-administration.xml replication.xml optimization.xml client-utility-programs.xml language-structure.xml reservedwords.xml ../refman-common/reserved-new-5.1.xml charset.xml data-types.xml functions.xml sql-syntax.xml storage-engines.xml innodb.xml images/blackhole-1.png custom-engine.xml images/custom-engine-overview.png ndbcluster.xml images/cluster-components-1.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png images/multi-comp-1.png partitioning.xml spatial-extensions.xml stored-procedures.xml triggers.xml views.xml information-schema.xml precision-math.xml apis.xml connectors.xml connector-odbc.xml images/!
myarchitecture.png images/mydsn-icon.png images/mydsn.png images/mydsn-setup.png images/mydsn-example.png images/mydsn-test-success.png images/mydsn-test-fail.png images/mydsn-options.png images/mydsn-icon.png images/mydsn.png images/mydsn-trace.png images/myaccess.png images/myaccess-odbc.png images/mydsn-trace.png images/mydll-properties.png images/mydsn-options.png images/myflowchart.png connector-net.xml ../refman-common/news-connector-net.xml connector-j.xml ../refman-common/news-connector-j.xml connector-mxj.xml extending-mysql.xml problems.xml error-handling.xml errmsgs-server.xml errmsgs-client.xml ../refman-common/credits.xml news.xml ../refman-common/news-5.1.xml ../refman-common/news-myodbc.xml porting.xml ../refman-common/environment-variables.xml regexp.xml limits.xml restrictions.xml ../refman-common/gpl-license.xml ../refman-common/mysql-floss-license-exception.xml
+MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml preface.xml introduction.xml ../refman-common/manual-conventions.en.xml ../refman-common/what-is-mysql-ab.en.xml ../refman-common/what-is.en.xml ../refman-common/maxdb.en.xml ../refman-common/information-sources.xml ../refman-common/bug-reports.xml installing.xml tutorial.xml using-mysql-programs.xml database-administration.xml replication.xml optimization.xml client-utility-programs.xml language-structure.xml reservedwords.xml ../refman-common/reserved-new-5.1.xml charset.xml data-types.xml functions.xml sql-syntax.xml storage-engines.xml innodb.xml images/blackhole-1.png custom-engine.xml images/custom-engine-overview.png ndbcluster.xml images/cluster-components-1.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png images/multi-comp-1.png partitioning.xml spatial-extensions.xml stored-procedures.xml triggers.xml views.xml information-schema.xml precision-math.xml apis.xml connectors.xml connector-odbc.xml images/!
myarchitecture.png images/mydsn-icon.png images/mydsn.png images/mydsn-setup.png images/mydsn-example.png images/mydsn-test-success.png images/mydsn-test-fail.png images/mydsn-options.png images/mydsn-icon.png images/mydsn.png images/mydsn-trace.png images/myaccess.png images/myaccess-odbc.png images/mydsn-trace.png images/mydll-properties.png images/mydsn-options.png images/myflowchart.png connector-net.xml ../refman-common/news-connector-net.xml connector-j.xml ../refman-common/news-connector-j.xml connector-mxj.xml extending-mysql.xml problems.xml error-handling.xml errmsgs-server.xml errmsgs-client.xml ../refman-common/credits.xml news.xml ../refman-common/news-5.1.xml ../refman-common/news-myodbc.xml porting.xml ../refman-common/environment-variables.xml ../refman-common/regexp.xml limits.xml restrictions.xml ../refman-common/gpl-license.xml ../refman-common/mysql-floss-license-exception.xml
manual-prepped.xml: $(MANUAL_SRCS)
manual-manprepped.xml: $(MANUAL_SRCS)
Modified: trunk/refman-5.1/manual.xml
===================================================================
--- trunk/refman-5.1/manual.xml 2006-01-30 15:00:57 UTC (rev 1124)
+++ trunk/refman-5.1/manual.xml 2006-01-30 15:01:20 UTC (rev 1125)
@@ -103,7 +103,7 @@
<xi:include href="../refman-common/environment-variables.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="regexp.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="../refman-common/regexp.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="limits.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
Modified: trunk/refman-common/regexp.xml
===================================================================
--- trunk/refman-common/regexp.xml 2006-01-30 15:00:57 UTC (rev 1124)
+++ trunk/refman-common/regexp.xml 2006-01-30 15:01:20 UTC (rev 1125)
@@ -2,12 +2,10 @@
<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
[
- <!ENTITY % fixedchars.entities SYSTEM "../refman-common/fixedchars.ent">
+ <!ENTITY % fixedchars.entities SYSTEM "fixedchars.ent">
%fixedchars.entities;
- <!ENTITY % title.entities SYSTEM "../refman-common/titles.en.ent">
+ <!ENTITY % title.entities SYSTEM "titles.en.ent">
%title.entities;
- <!ENTITY % versions.entities SYSTEM "versions.ent">
- %versions.entities;
]>
<appendix id="regexp">
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r1125 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-common | paul | 30 Jan |
