Author: paul
Date: 2007-04-24 20:55:53 +0200 (Tue, 24 Apr 2007)
New Revision: 6168
Log:
r24042@polar: paul | 2007-04-24 13:19:20 -0500
Kill some todo's, no-longer-relevant remarks.
Modified:
trunk/refman-4.1/preface.xml
trunk/refman-5.0/preface.xml
trunk/refman-5.1/preface.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:24040
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:19584
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:14593
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:24042
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:19584
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:14593
Modified: trunk/refman-4.1/preface.xml
===================================================================
--- trunk/refman-4.1/preface.xml 2007-04-24 18:28:41 UTC (rev 6167)
+++ trunk/refman-4.1/preface.xml 2007-04-24 18:55:53 UTC (rev 6168)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 19; 1328 bytes
@@ -14,25 +14,8 @@
System through version ¤t-version;. It is applicable for older
versions of the MySQL software (such as 3.23 or 4.0-production)
because functional changes are indicated with reference to a version
- number.
-
- <remark>
- Update following as appropriate.
- </remark>
-
- For later MySQL releases, see the appropriately-numbered edition of
- this manual.
+ number. For later MySQL releases, see the appropriately-numbered
+ edition of this manual.
</para>
- <remark>
- Copyright ©1997-2007 TcX AB, Detron HB and MySQL Finland AB
- This manual is NOT distributed under a GPL style license. Use of the
- manual is subject to the following terms: - Conversion to other
- formats is allowed, but the actual content may not be altered or
- edited in any way. - You may create a printed copy for your own
- personal use. - For all other uses, such as selling printed copies
- or using the manual in whole or in part within another publication,
- prior written agreement from MySQL AB is required.
- </remark>
-
</preface>
Modified: trunk/refman-5.0/preface.xml
===================================================================
--- trunk/refman-5.0/preface.xml 2007-04-24 18:28:41 UTC (rev 6167)
+++ trunk/refman-5.0/preface.xml 2007-04-24 18:55:53 UTC (rev 6168)
Changed blocks: 1, Lines Added: 10, Lines Deleted: 24; 2339 bytes
@@ -9,36 +9,22 @@
<title>Preface</title>
+ <remark role="note">
+ Next para also appears in introduction.xml
+ </remark>
+
<para>
This is the Reference Manual for the MySQL Database System, version
- ¤t-series;, up to release ¤t-version;. It is not
+ ¤t-series;, through release ¤t-version;. It is not
intended for use with older versions of the MySQL software due to
the many functional and other differences between MySQL
- ¤t-series; and previous versions.
-
- <remark role="todo">
- Update next sentence with a link when it's been determined how
- this should be handled. Likely to be something like
- &base-url-docs;en/4-1/ ?
- </remark>
-
- If you are using an earlier release of the MySQL software, please
- refer to the <citetitle>&title-refman-previous;</citetitle>, which
- provides coverage of the 3.22, 3.23, 4.0, and 4.1 series of MySQL
- software releases. Differences between minor versions of MySQL
+ ¤t-series; and previous versions. If you are using a version
+ &previous-series; release of the MySQL software, please refer to the
+ <ulink url="&base-url-refman;/&previous-series;/en/"><citetitle>&title-refman-previous;</citetitle></ulink>,
+ which covers the 3.23, 4.0, and 4.1 series of MySQL software
+ releases. Differences between minor versions of MySQL
¤t-series; are noted in the present text with reference to
release numbers (¤t-series;.<replaceable>x</replaceable>).
</para>
- <remark>
- Copyright ©1997-2007 TcX AB, Detron HB and MySQL Finland AB
- This manual is NOT distributed under a GPL style license. Use of the
- manual is subject to the following terms: - Conversion to other
- formats is allowed, but the actual content may not be altered or
- edited in any way. - You may create a printed copy for your own
- personal use. - For all other uses, such as selling printed copies
- or using the manual in whole or in part within another publication,
- prior written agreement from MySQL AB is required.
- </remark>
-
</preface>
Modified: trunk/refman-5.1/preface.xml
===================================================================
--- trunk/refman-5.1/preface.xml 2007-04-24 18:28:41 UTC (rev 6167)
+++ trunk/refman-5.1/preface.xml 2007-04-24 18:55:53 UTC (rev 6168)
Changed blocks: 1, Lines Added: 15, Lines Deleted: 27; 2708 bytes
@@ -9,38 +9,26 @@
<title>Preface</title>
+ <remark role="note">
+ Next para also appears in introduction.xml
+ </remark>
+
<para>
This is the Reference Manual for the MySQL Database System, version
- ¤t-series;, up to release ¤t-version;. It is not
+ ¤t-series;, through release ¤t-version;. It is not
intended for use with older versions of the MySQL software due to
the many functional and other differences between MySQL
- ¤t-series; and previous versions.
-
- <remark role="todo">
- Update next sentence with a link when it's been determined how
- this should be handled. Likely to be something like
- &base-url-docs;en/4-1/ ?
- </remark>
-
- If you are using an earlier release of the MySQL software, please
- refer to the <citetitle>&title-refman-previous;</citetitle>, which
- provides coverage of MySQL &previous-series;, or to the
- <citetitle>MySQL 3.23, 4.0, 4.1 Reference Manual</citetitle>, which
- covers MySQL 4.1 and all earlier versions of MySQL. Differences
- between minor versions of MySQL ¤t-series; are noted in the
- present text with reference to release numbers
+ ¤t-series; and previous versions. If you are using an earlier
+ release of the MySQL software, please refer to the
+ <ulink url="&base-url-refman;/&previous-series;/en/"><citetitle>&title-refman-previous;</citetitle></ulink>,
+ which covers the &previous-series; series of MySQL software
+ releases, or to
+ <ulink url="&base-url-refman;/4.1/en/"><citetitle>MySQL 3.23, 4.0,
+ 4.1 Reference Manual</citetitle></ulink>, which covers the 3.23,
+ 4.0, and 4.1 series of MySQL software releases. Differences between
+ minor versions of MySQL ¤t-series; are noted in the present
+ text with reference to release numbers
(¤t-series;.<replaceable>x</replaceable>).
</para>
- <remark>
- Copyright ©1997-2007 TcX AB, Detron HB, and MySQL Finland AB
- This manual is NOT distributed under a GPL style license. Use of the
- manual is subject to the following terms: - Conversion to other
- formats is allowed, but the actual content may not be altered or
- edited in any way. - You may create a printed copy for your own
- personal use. - For all other uses, such as selling printed copies
- or using the manual in whole or in part within another publication,
- prior written agreement from MySQL AB is required.
- </remark>
-
</preface>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r6168 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 24 Apr |
