Author: paul
Date: 2005-11-11 21:06:59 +0100 (Fri, 11 Nov 2005)
New Revision: 316
Log:
r957@kite-hub: paul | 2005-11-11 13:39:33 -0600
Kill a couple of todos regarding node names.
Modified:
trunk/
trunk/refman-4.1/database-administration.xml
trunk/refman-4.1/renamed-nodes.txt
trunk/refman-4.1/storage-engines.xml
trunk/refman-5.0/database-administration.xml
trunk/refman-5.0/renamed-nodes.txt
trunk/refman-5.0/storage-engines.xml
trunk/refman-5.1/database-administration.xml
trunk/refman-5.1/renamed-nodes.txt
trunk/refman-5.1/storage-engines.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:3648
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:932
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:3648
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:957
Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml 2005-11-11 18:09:50 UTC (rev 315)
+++ trunk/refman-4.1/database-administration.xml 2005-11-11 20:06:59 UTC (rev 316)
@@ -39,7 +39,7 @@
This section provides an overview of the server and related
programs, and information about server startup scripts.
Information about configuring the server itself is given in
- <xref linkend="configuring-mysql"/>.
+ <xref linkend="mysqld"/>.
</para>
<section id="server-side-overview">
@@ -84,7 +84,7 @@
The SQL daemon (that is, the MySQL server). To use client
programs, this program must be running, because clients gain
access to databases by connecting to the server. See
- <xref linkend="configuring-mysql"/>.
+ <xref linkend="mysqld"/>.
</para>
</listitem>
@@ -214,7 +214,7 @@
A utility to describe, check, optimize, and repair
<literal>MyISAM</literal> tables.
<command>myisamchk</command> is described in
- <xref linkend="myisamchk-syntax"/>.
+ <xref linkend="myisamchk"/>.
</para>
</listitem>
@@ -1910,13 +1910,8 @@
<title>fake title for mysqld manpage section wrapper</title>
- <remark role="todo">
- Change id from configuring-mysql to mysqld when renamed-nodes.txt
- works again.
- </remark>
+ <refentry id="mysqld">
- <refentry id="configuring-mysql">
-
<indexterm>
<primary><command>mysqld</command></primary>
<secondary>MySQL server</secondary>
@@ -17141,13 +17136,8 @@
<title>fake title for myisamchk manpage section wrapper</title>
- <remark role="todo">
- Rename node to "myisamchk" when renamed-nodes.txt is mirrored
- properly.
- </remark>
+ <refentry id="myisamchk">
- <refentry id="myisamchk-syntax">
-
<indexterm>
<primary><command>myisamchk</command></primary>
</indexterm>
@@ -18710,7 +18700,7 @@
The options that you can use for table maintenance with
<command>myisamchk</command> and <command>isamchk</command>
are described in several of the earlier subsections of
- <xref linkend="myisamchk-syntax"/>.
+ <xref linkend="myisamchk"/>.
</para>
<para>
@@ -18992,7 +18982,7 @@
<para>
For a full description of all available options, see
- <xref linkend="myisamchk-syntax"/>.
+ <xref linkend="myisamchk"/>.
</para>
</refsection>
Modified: trunk/refman-4.1/renamed-nodes.txt
===================================================================
--- trunk/refman-4.1/renamed-nodes.txt 2005-11-11 18:09:50 UTC (rev 315)
+++ trunk/refman-4.1/renamed-nodes.txt 2005-11-11 20:06:59 UTC (rev 316)
@@ -81,3 +81,5 @@
windows-running windows-testing
fulltext-todo fulltext-search
+configuring-mysql mysqld
+myisamchk-syntax myisamchk
Modified: trunk/refman-4.1/storage-engines.xml
===================================================================
--- trunk/refman-4.1/storage-engines.xml 2005-11-11 18:09:50 UTC (rev 315)
+++ trunk/refman-4.1/storage-engines.xml 2005-11-11 20:06:59 UTC (rev 316)
@@ -1418,7 +1418,7 @@
or repair a table with the <command>myisamchk</command>
command. See <xref linkend="check-table"/>,
<xref linkend="repair-table"/>, and
- <xref linkend="myisamchk-syntax"/>.
+ <xref linkend="myisamchk"/>.
</para>
<para>
Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml 2005-11-11 18:09:50 UTC (rev 315)
+++ trunk/refman-5.0/database-administration.xml 2005-11-11 20:06:59 UTC (rev 316)
@@ -39,7 +39,7 @@
This section provides an overview of the server and related
programs, and information about server startup scripts.
Information about configuring the server itself is given in
- <xref linkend="configuring-mysql"/>.
+ <xref linkend="mysqld"/>.
</para>
<section id="server-side-overview">
@@ -84,7 +84,7 @@
The SQL daemon (that is, the MySQL server). To use client
programs, this program must be running, because clients gain
access to databases by connecting to the server. See
- <xref linkend="configuring-mysql"/>.
+ <xref linkend="mysqld"/>.
</para>
</listitem>
@@ -214,7 +214,7 @@
A utility to describe, check, optimize, and repair
<literal>MyISAM</literal> tables.
<command>myisamchk</command> is described in
- <xref linkend="myisamchk-syntax"/>.
+ <xref linkend="myisamchk"/>.
</para>
</listitem>
@@ -2720,13 +2720,8 @@
<title>fake title for mysqld manpage section wrapper</title>
- <remark role="todo">
- Change id from configuring-mysql to mysqld when renamed-nodes.txt
- works again.
- </remark>
+ <refentry id="mysqld">
- <refentry id="configuring-mysql">
-
<indexterm>
<primary><command>mysqld</command></primary>
<secondary>MySQL server</secondary>
@@ -19263,13 +19258,8 @@
<title>fake title for myisamchk manpage section wrapper</title>
- <remark role="todo">
- Rename node to "myisamchk" when renamed-nodes.txt is mirrored
- properly.
- </remark>
+ <refentry id="myisamchk">
- <refentry id="myisamchk-syntax">
-
<indexterm>
<primary><command>myisamchk</command></primary>
</indexterm>
@@ -20788,7 +20778,7 @@
<para>
The options that you can use for table maintenance with
<command>myisamchk</command> are described in several of the
- earlier subsections of <xref linkend="myisamchk-syntax"/>.
+ earlier subsections of <xref linkend="myisamchk"/>.
</para>
<para>
@@ -21068,7 +21058,7 @@
<para>
For a full description of these options, see
- <xref linkend="myisamchk-syntax"/>.
+ <xref linkend="myisamchk"/>.
</para>
</refsection>
Modified: trunk/refman-5.0/renamed-nodes.txt
===================================================================
--- trunk/refman-5.0/renamed-nodes.txt 2005-11-11 18:09:50 UTC (rev 315)
+++ trunk/refman-5.0/renamed-nodes.txt 2005-11-11 20:06:59 UTC (rev 316)
@@ -378,3 +378,5 @@
beos operating-system-specific-notes
open-bsd-2-8 operating-system-specific-notes
fulltext-todo fulltext-search
+configuring-mysql mysqld
+myisamchk-syntax myisamchk
Modified: trunk/refman-5.0/storage-engines.xml
===================================================================
--- trunk/refman-5.0/storage-engines.xml 2005-11-11 18:09:50 UTC (rev 315)
+++ trunk/refman-5.0/storage-engines.xml 2005-11-11 20:06:59 UTC (rev 316)
@@ -1425,7 +1425,7 @@
or repair a table with the <command>myisamchk</command>
command. See <xref linkend="check-table"/>,
<xref linkend="repair-table"/>, and
- <xref linkend="myisamchk-syntax"/>.
+ <xref linkend="myisamchk"/>.
</para>
<para>
Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml 2005-11-11 18:09:50 UTC (rev 315)
+++ trunk/refman-5.1/database-administration.xml 2005-11-11 20:06:59 UTC (rev 316)
@@ -39,7 +39,7 @@
This section provides an overview of the server and related
programs, and information about server startup scripts.
Information about configuring the server itself is given in
- <xref linkend="configuring-mysql"/>.
+ <xref linkend="mysqld"/>.
</para>
<section id="server-side-overview">
@@ -84,7 +84,7 @@
The SQL daemon (that is, the MySQL server). To use client
programs, this program must be running, because clients gain
access to databases by connecting to the server. See
- <xref linkend="configuring-mysql"/>.
+ <xref linkend="mysqld"/>.
</para>
</listitem>
@@ -214,7 +214,7 @@
A utility to describe, check, optimize, and repair
<literal>MyISAM</literal> tables.
<command>myisamchk</command> is described in
- <xref linkend="myisamchk-syntax"/>.
+ <xref linkend="myisamchk"/>.
</para>
</listitem>
@@ -2705,13 +2705,8 @@
<title>fake title for mysqld manpage section wrapper</title>
- <remark role="todo">
- Change id from configuring-mysql to mysqld when renamed-nodes.txt
- works again.
- </remark>
+ <refentry id="mysqld">
- <refentry id="configuring-mysql">
-
<indexterm>
<primary><command>mysqld</command></primary>
<secondary>MySQL server</secondary>
@@ -19142,13 +19137,8 @@
<title>fake title for myisamchk manpage section wrapper</title>
- <remark role="todo">
- Rename node to "myisamchk" when renamed-nodes.txt is mirrored
- properly.
- </remark>
+ <refentry id="myisamchk">
- <refentry id="myisamchk-syntax">
-
<indexterm>
<primary><command>myisamchk</command></primary>
</indexterm>
@@ -20663,7 +20653,7 @@
<para>
The options that you can use for table maintenance with
<command>myisamchk</command> are described in several of the
- earlier subsections of <xref linkend="myisamchk-syntax"/>.
+ earlier subsections of <xref linkend="myisamchk"/>.
</para>
<para>
@@ -20943,7 +20933,7 @@
<para>
For a full description of these options, see
- <xref linkend="myisamchk-syntax"/>.
+ <xref linkend="myisamchk"/>.
</para>
</refsection>
Modified: trunk/refman-5.1/renamed-nodes.txt
===================================================================
--- trunk/refman-5.1/renamed-nodes.txt 2005-11-11 18:09:50 UTC (rev 315)
+++ trunk/refman-5.1/renamed-nodes.txt 2005-11-11 20:06:59 UTC (rev 316)
@@ -81,3 +81,5 @@
windows-running windows-testing
fulltext-todo fulltext-search
+configuring-mysql mysqld
+myisamchk-syntax myisamchk
Modified: trunk/refman-5.1/storage-engines.xml
===================================================================
--- trunk/refman-5.1/storage-engines.xml 2005-11-11 18:09:50 UTC (rev 315)
+++ trunk/refman-5.1/storage-engines.xml 2005-11-11 20:06:59 UTC (rev 316)
@@ -1425,7 +1425,7 @@
or repair a table with the <command>myisamchk</command>
command. See <xref linkend="check-table"/>,
<xref linkend="repair-table"/>, and
- <xref linkend="myisamchk-syntax"/>.
+ <xref linkend="myisamchk"/>.
</para>
<para>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r316 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 11 Nov |
