Author: paul
Date: 2006-12-05 21:11:29 +0100 (Tue, 05 Dec 2006)
New Revision: 4114
Log:
r16706@polar: paul | 2006-12-05 13:56:31 -0600
Remove a few todos.
Modified:
trunk/refman-4.1/introduction.xml
trunk/refman-4.1/versions.ent
trunk/refman-5.0/introduction.xml
trunk/refman-5.1/introduction.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:16705
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:13158
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:12611
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:16706
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:13158
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:12611
Modified: trunk/refman-4.1/introduction.xml
===================================================================
--- trunk/refman-4.1/introduction.xml 2006-12-05 20:11:10 UTC (rev 4113)
+++ trunk/refman-4.1/introduction.xml 2006-12-05 20:11:29 UTC (rev 4114)
Changed blocks: 3, Lines Added: 9, Lines Deleted: 20; 2216 bytes
@@ -172,14 +172,10 @@
¤t-version;. It is also applicable for versions of the MySQL
software previous to ¤t-series; (such as 3.23 or 4.0)
because functional changes are indicated with reference to version
- numbers.
-
- <remark role="todo">
- Update following as appropriate.
- </remark>
-
- For later MySQL releases, see the appropriately-numbered edition
- of this manual.
+ numbers. For later MySQL releases, see the appropriately-numbered
+ edition of this manual. For example, if you are using a version
+ &next-series; release of the MySQL software, please refer to the
+ <ulink url="&base-url-refman;/&next-series;/en/"><citetitle>&title-refman-next;</citetitle></ulink>.
</para>
<para>
@@ -212,11 +208,6 @@
format. The HTML version and other formats are produced
automatically, primarily using the DocBook XSL stylesheets. For
information about DocBook, see <ulink url="http://docbook.org/"/>
-
- <remark role="todo">
- [SH] We might want to add details about creating CHM, PDF, INFO,
- ...
- </remark>
</para>
<para>
@@ -231,15 +222,13 @@
</programlisting>
<para>
- If you have any suggestions concerning additions or corrections to
- this manual, please send them to the documentation team at
- <email>docs@stripped</email>.
+ If you have questions about using MySQL, you can ask them using
+ our mailing lists or forums. See <xref linkend="mailing-lists"/>,
+ and <xref linkend="forums"/>. If you have suggestions concerning
+ additions or corrections to the manual itself, please send them to
+ the documentation team at <email>docs@stripped</email>.
</para>
- <remark role="todo">
- Update following as appropriate.
- </remark>
-
<para>
This manual was originally written by David Axmark and Michael
<quote>Monty</quote> Widenius. It is maintained by the MySQL
Modified: trunk/refman-4.1/versions.ent
===================================================================
--- trunk/refman-4.1/versions.ent 2006-12-05 20:11:10 UTC (rev 4113)
+++ trunk/refman-4.1/versions.ent 2006-12-05 20:11:29 UTC (rev 4114)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 0; 742 bytes
@@ -3,7 +3,9 @@
This file contains only entities for which the value varies per
version of the manual.
-->
+<!ENTITY title-refman-next "MySQL 5.0 Reference Manual"><!-- Title of Manual next edition -->
<!ENTITY current-series "4.1"><!-- Current MySQL release series -->
<!ENTITY previous-series "4.0"><!-- Previous MySQL release series -->
+<!ENTITY next-series "5.0"><!-- Next MySQL release series -->
<!ENTITY current-version "4.1.22"><!-- Latest 4.1.x Version - update with new releases -->
Modified: trunk/refman-5.0/introduction.xml
===================================================================
--- trunk/refman-5.0/introduction.xml 2006-12-05 20:11:10 UTC (rev 4113)
+++ trunk/refman-5.0/introduction.xml 2006-12-05 20:11:29 UTC (rev 4114)
Changed blocks: 3, Lines Added: 13, Lines Deleted: 27; 2925 bytes
@@ -185,21 +185,14 @@
version ¤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 a version &previous-series; release of the MySQL
- software, please refer to the
- <citetitle>&title-refman-previous;</citetitle>, 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>).
+ ¤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>
<para>
@@ -232,11 +225,6 @@
format. The HTML version and other formats are produced
automatically, primarily using the DocBook XSL stylesheets. For
information about DocBook, see <ulink url="http://docbook.org/"/>
-
- <remark role="todo">
- [SH] We might want to add details about creating CHM, PDF, INFO,
- ...
- </remark>
</para>
<para>
@@ -251,15 +239,13 @@
</programlisting>
<para>
- If you have any suggestions concerning additions or corrections to
- this manual, please send them to the documentation team at
- <email>docs@stripped</email>.
+ If you have questions about using MySQL, you can ask them using
+ our mailing lists or forums. See <xref linkend="mailing-lists"/>,
+ and <xref linkend="forums"/>. If you have suggestions concerning
+ additions or corrections to the manual itself, please send them to
+ the documentation team at <email>docs@stripped</email>.
</para>
- <remark role="todo">
- Update following as appropriate.
- </remark>
-
<para>
This manual was originally written by David Axmark and Michael
<quote>Monty</quote> Widenius. It is maintained by the MySQL
Modified: trunk/refman-5.1/introduction.xml
===================================================================
--- trunk/refman-5.1/introduction.xml 2006-12-05 20:11:10 UTC (rev 4113)
+++ trunk/refman-5.1/introduction.xml 2006-12-05 20:11:29 UTC (rev 4114)
Changed blocks: 3, Lines Added: 16, Lines Deleted: 28; 3238 bytes
@@ -185,22 +185,17 @@
version ¤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
- covers the &previous-series; series of MySQL software releases, or
- to <citetitle>MySQL 3.23, 4.0, 4.1 Reference Manual</citetitle>,
- 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>).
+ ¤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>
<para>
@@ -233,11 +228,6 @@
format. The HTML version and other formats are produced
automatically, primarily using the DocBook XSL stylesheets. For
information about DocBook, see <ulink url="http://docbook.org/"/>
-
- <remark role="todo">
- [SH] We might want to add details about creating CHM, PDF, INFO,
- ...
- </remark>
</para>
<para>
@@ -252,15 +242,13 @@
</programlisting>
<para>
- If you have any suggestions concerning additions or corrections to
- this manual, please send them to the documentation team at
- <email>docs@stripped</email>.
+ If you have questions about using MySQL, you can ask them using
+ our mailing lists or forums. See <xref linkend="mailing-lists"/>,
+ and <xref linkend="forums"/>. If you have suggestions concerning
+ additions or corrections to the manual itself, please send them to
+ the documentation team at <email>docs@stripped</email>.
</para>
- <remark role="todo">
- Update following as appropriate.
- </remark>
-
<para>
This manual was originally written by David Axmark and Michael
<quote>Monty</quote> Widenius. It is maintained by the MySQL
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r4114 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 5 Dec |
