Author: paul
Date: 2008-03-14 20:57:01 +0100 (Fri, 14 Mar 2008)
New Revision: 10241
Log:
r29996@frost: paul | 2008-03-14 14:29:10 -0500
Style consistency: Add _name a few places
Modified:
trunk/it/refman-5.1/mysql-cluster-utilities.xml
trunk/it/refman-5.1/programs-client-core.xml
trunk/it/refman-5.1/programs-miscellaneous.xml
trunk/it/refman-5.1/sql-syntax.xml
trunk/pt/refman-5.1/mysql-cluster-utilities.xml
trunk/pt/refman-5.1/programs-client-core.xml
trunk/pt/refman-5.1/programs-miscellaneous.xml
trunk/pt/refman-5.1/sql-syntax.xml
trunk/refman-4.1/programs-client.xml
trunk/refman-4.1/programs-miscellaneous.xml
trunk/refman-5.0/programs-client-core.xml
trunk/refman-5.0/programs-miscellaneous.xml
trunk/refman-5.1/mysql-cluster-utilities.xml
trunk/refman-5.1/programs-client-core.xml
trunk/refman-5.1/programs-miscellaneous.xml
trunk/refman-5.1/sql-syntax.xml
trunk/refman-6.0/programs-client-core.xml
trunk/refman-6.0/programs-miscellaneous.xml
trunk/refman-6.0/se-falcon-core.xml
trunk/refman-6.0/sql-syntax.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:29988
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:30059
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:29996
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:30059
Modified: trunk/it/refman-5.1/mysql-cluster-utilities.xml
===================================================================
--- trunk/it/refman-5.1/mysql-cluster-utilities.xml 2008-03-14 18:51:32 UTC (rev 10240)
+++ trunk/it/refman-5.1/mysql-cluster-utilities.xml 2008-03-14 19:57:01 UTC (rev 10241)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 1245 bytes
@@ -2811,7 +2811,7 @@
Typical usage is shown here:
<programlisting>
-ndb_size.pl [--database=<replaceable>db_name</replaceable>|ALL] [--hostname=<replaceable>host</replaceable>[:<replaceable>port</replaceable>]] [--socket=<replaceable>socket</replaceable>] [--user=<replaceable>user</replaceable>] [--password=<replaceable>password</replaceable>] [--help|-h] [--format=(html|text)] [--loadqueries=<replaceable>file</replaceable>] [--savequeries=<replaceable>file</replaceable>]
+ndb_size.pl [--database=<replaceable>db_name</replaceable>|ALL] [--hostname=<replaceable>host</replaceable>[:<replaceable>port</replaceable>]] [--socket=<replaceable>socket</replaceable>] [--user=<replaceable>user</replaceable>] [--password=<replaceable>password</replaceable>] [--help|-h] [--format=(html|text)] [--loadqueries=<replaceable>file_name</replaceable>] [--savequeries=<replaceable>file_name</replaceable>]
</programlisting>
<important>
Modified: trunk/it/refman-5.1/programs-client-core.xml
===================================================================
--- trunk/it/refman-5.1/programs-client-core.xml 2008-03-14 18:51:32 UTC (rev 10240)
+++ trunk/it/refman-5.1/programs-client-core.xml 2008-03-14 19:57:01 UTC (rev 10241)
Changed blocks: 2, Lines Added: 3, Lines Deleted: 3; 982 bytes
@@ -6257,8 +6257,8 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option>--result-file=<replaceable>file</replaceable></option>,
- <option>-r <replaceable>file</replaceable></option>
+ <option>--result-file=<replaceable>file_name</replaceable></option>,
+ <option>-r <replaceable>file_name</replaceable></option>
</para>
<para>
@@ -8855,7 +8855,7 @@
<secondary>mysqlslap</secondary>
</indexterm>
- <option>--csv[=<replaceable>file</replaceable>]</option>
+ <option>--csv[=<replaceable>file_name</replaceable>]</option>
</para>
<para>
Modified: trunk/it/refman-5.1/programs-miscellaneous.xml
===================================================================
--- trunk/it/refman-5.1/programs-miscellaneous.xml 2008-03-14 18:51:32 UTC (rev 10240)
+++ trunk/it/refman-5.1/programs-miscellaneous.xml 2008-03-14 19:57:01 UTC (rev 10241)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 1297 bytes
@@ -269,8 +269,8 @@
</para>
<programlisting>
-shell> <userinput>replace <replaceable>from</replaceable> <replaceable>to</replaceable> [<replaceable>from</replaceable> <replaceable>to</replaceable>] ... -- <replaceable>file</replaceable> [<replaceable>file</replaceable>] ...</userinput>
-shell> <userinput>replace <replaceable>from</replaceable> <replaceable>to</replaceable> [<replaceable>from</replaceable> <replaceable>to</replaceable>] ... < <replaceable>file</replaceable></userinput>
+shell> <userinput>replace <replaceable>from</replaceable> <replaceable>to</replaceable> [<replaceable>from</replaceable> <replaceable>to</replaceable>] ... -- <replaceable>file_name</replaceable> [<replaceable>file_name</replaceable>] ...</userinput>
+shell> <userinput>replace <replaceable>from</replaceable> <replaceable>to</replaceable> [<replaceable>from</replaceable> <replaceable>to</replaceable>] ... < <replaceable>file_name</replaceable></userinput>
</programlisting>
<para>
Modified: trunk/it/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/it/refman-5.1/sql-syntax.xml 2008-03-14 18:51:32 UTC (rev 10240)
+++ trunk/it/refman-5.1/sql-syntax.xml 2008-03-14 19:57:01 UTC (rev 10241)
Changed blocks: 6, Lines Added: 8, Lines Deleted: 8; 2642 bytes
@@ -225,7 +225,7 @@
<programlisting>
ALTER LOGFILE GROUP <replaceable>logfile_group</replaceable>
- ADD UNDOFILE '<replaceable>file</replaceable>'
+ ADD UNDOFILE '<replaceable>file_name</replaceable>'
[INITIAL_SIZE [=] <replaceable>size</replaceable>]
[WAIT]
ENGINE [=] <replaceable>engine_name</replaceable>
@@ -233,7 +233,7 @@
<para>
This statement adds an <literal>UNDO</literal> file named
- '<replaceable>file</replaceable>' to an existing log file group
+ '<replaceable>file_name</replaceable>' to an existing log file group
<replaceable>logfile_group</replaceable>. An <literal>ALTER
LOGFILE GROUP</literal> statement has one and only one
<literal>ADD UNDOFILE</literal> clause. No <literal>DROP
@@ -1969,8 +1969,8 @@
</indexterm>
<programlisting>
-ALTER TABLESPACE <replaceable>tablespace</replaceable>
- {ADD|DROP} DATAFILE '<replaceable>file</replaceable>'
+ALTER TABLESPACE <replaceable>tablespace_name</replaceable>
+ {ADD|DROP} DATAFILE '<replaceable>file_name</replaceable>'
[INITIAL_SIZE [=] <replaceable>size</replaceable>]
[WAIT]
ENGINE [=] <replaceable>engine_name</replaceable>
@@ -2009,7 +2009,7 @@
<para>
Using <literal>DROP DATAFILE</literal> with <literal>ALTER
TABLESPACE</literal> drops the data file
- '<replaceable>file</replaceable>' from the tablespace. This file
+ '<replaceable>file_name</replaceable>' from the tablespace. This file
must already have been added to the tablespace using
<literal>CREATE TABLESPACE</literal> or <literal>ALTER
TABLESPACE</literal>; otherwise an error will result.
@@ -5213,8 +5213,8 @@
</indexterm>
<programlisting>
-CREATE TABLESPACE <replaceable>tablespace</replaceable>
- ADD DATAFILE '<replaceable>file</replaceable>'
+CREATE TABLESPACE <replaceable>tablespace_name</replaceable>
+ ADD DATAFILE '<replaceable>file_name</replaceable>'
USE LOGFILE GROUP <replaceable>logfile_group</replaceable>
[EXTENT_SIZE [=] <replaceable>extent_size</replaceable>]
[INITIAL_SIZE [=] <replaceable>initial_size</replaceable>]
@@ -5820,7 +5820,7 @@
</indexterm>
<programlisting>
-DROP TABLESPACE <replaceable>tablespace</replaceable>
+DROP TABLESPACE <replaceable>tablespace_name</replaceable>
ENGINE [=] <replaceable>engine_name</replaceable>
</programlisting>
Modified: trunk/pt/refman-5.1/mysql-cluster-utilities.xml
===================================================================
--- trunk/pt/refman-5.1/mysql-cluster-utilities.xml 2008-03-14 18:51:32 UTC (rev 10240)
+++ trunk/pt/refman-5.1/mysql-cluster-utilities.xml 2008-03-14 19:57:01 UTC (rev 10241)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 1245 bytes
@@ -2811,7 +2811,7 @@
Typical usage is shown here:
<programlisting>
-ndb_size.pl [--database=<replaceable>db_name</replaceable>|ALL] [--hostname=<replaceable>host</replaceable>[:<replaceable>port</replaceable>]] [--socket=<replaceable>socket</replaceable>] [--user=<replaceable>user</replaceable>] [--password=<replaceable>password</replaceable>] [--help|-h] [--format=(html|text)] [--loadqueries=<replaceable>file</replaceable>] [--savequeries=<replaceable>file</replaceable>]
+ndb_size.pl [--database=<replaceable>db_name</replaceable>|ALL] [--hostname=<replaceable>host</replaceable>[:<replaceable>port</replaceable>]] [--socket=<replaceable>socket</replaceable>] [--user=<replaceable>user</replaceable>] [--password=<replaceable>password</replaceable>] [--help|-h] [--format=(html|text)] [--loadqueries=<replaceable>file_name</replaceable>] [--savequeries=<replaceable>file_name</replaceable>]
</programlisting>
<important>
Modified: trunk/pt/refman-5.1/programs-client-core.xml
===================================================================
--- trunk/pt/refman-5.1/programs-client-core.xml 2008-03-14 18:51:32 UTC (rev 10240)
+++ trunk/pt/refman-5.1/programs-client-core.xml 2008-03-14 19:57:01 UTC (rev 10241)
Changed blocks: 2, Lines Added: 3, Lines Deleted: 3; 982 bytes
@@ -6257,8 +6257,8 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option>--result-file=<replaceable>file</replaceable></option>,
- <option>-r <replaceable>file</replaceable></option>
+ <option>--result-file=<replaceable>file_name</replaceable></option>,
+ <option>-r <replaceable>file_name</replaceable></option>
</para>
<para>
@@ -8855,7 +8855,7 @@
<secondary>mysqlslap</secondary>
</indexterm>
- <option>--csv[=<replaceable>file</replaceable>]</option>
+ <option>--csv[=<replaceable>file_name</replaceable>]</option>
</para>
<para>
Modified: trunk/pt/refman-5.1/programs-miscellaneous.xml
===================================================================
--- trunk/pt/refman-5.1/programs-miscellaneous.xml 2008-03-14 18:51:32 UTC (rev 10240)
+++ trunk/pt/refman-5.1/programs-miscellaneous.xml 2008-03-14 19:57:01 UTC (rev 10241)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 1297 bytes
@@ -269,8 +269,8 @@
</para>
<programlisting>
-shell> <userinput>replace <replaceable>from</replaceable> <replaceable>to</replaceable> [<replaceable>from</replaceable> <replaceable>to</replaceable>] ... -- <replaceable>file</replaceable> [<replaceable>file</replaceable>] ...</userinput>
-shell> <userinput>replace <replaceable>from</replaceable> <replaceable>to</replaceable> [<replaceable>from</replaceable> <replaceable>to</replaceable>] ... < <replaceable>file</replaceable></userinput>
+shell> <userinput>replace <replaceable>from</replaceable> <replaceable>to</replaceable> [<replaceable>from</replaceable> <replaceable>to</replaceable>] ... -- <replaceable>file_name</replaceable> [<replaceable>file_name</replaceable>] ...</userinput>
+shell> <userinput>replace <replaceable>from</replaceable> <replaceable>to</replaceable> [<replaceable>from</replaceable> <replaceable>to</replaceable>] ... < <replaceable>file_name</replaceable></userinput>
</programlisting>
<para>
Modified: trunk/pt/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/pt/refman-5.1/sql-syntax.xml 2008-03-14 18:51:32 UTC (rev 10240)
+++ trunk/pt/refman-5.1/sql-syntax.xml 2008-03-14 19:57:01 UTC (rev 10241)
Changed blocks: 6, Lines Added: 8, Lines Deleted: 8; 2642 bytes
@@ -225,7 +225,7 @@
<programlisting>
ALTER LOGFILE GROUP <replaceable>logfile_group</replaceable>
- ADD UNDOFILE '<replaceable>file</replaceable>'
+ ADD UNDOFILE '<replaceable>file_name</replaceable>'
[INITIAL_SIZE [=] <replaceable>size</replaceable>]
[WAIT]
ENGINE [=] <replaceable>engine_name</replaceable>
@@ -233,7 +233,7 @@
<para>
This statement adds an <literal>UNDO</literal> file named
- '<replaceable>file</replaceable>' to an existing log file group
+ '<replaceable>file_name</replaceable>' to an existing log file group
<replaceable>logfile_group</replaceable>. An <literal>ALTER
LOGFILE GROUP</literal> statement has one and only one
<literal>ADD UNDOFILE</literal> clause. No <literal>DROP
@@ -1969,8 +1969,8 @@
</indexterm>
<programlisting>
-ALTER TABLESPACE <replaceable>tablespace</replaceable>
- {ADD|DROP} DATAFILE '<replaceable>file</replaceable>'
+ALTER TABLESPACE <replaceable>tablespace_name</replaceable>
+ {ADD|DROP} DATAFILE '<replaceable>file_name</replaceable>'
[INITIAL_SIZE [=] <replaceable>size</replaceable>]
[WAIT]
ENGINE [=] <replaceable>engine_name</replaceable>
@@ -2009,7 +2009,7 @@
<para>
Using <literal>DROP DATAFILE</literal> with <literal>ALTER
TABLESPACE</literal> drops the data file
- '<replaceable>file</replaceable>' from the tablespace. This file
+ '<replaceable>file_name</replaceable>' from the tablespace. This file
must already have been added to the tablespace using
<literal>CREATE TABLESPACE</literal> or <literal>ALTER
TABLESPACE</literal>; otherwise an error will result.
@@ -5213,8 +5213,8 @@
</indexterm>
<programlisting>
-CREATE TABLESPACE <replaceable>tablespace</replaceable>
- ADD DATAFILE '<replaceable>file</replaceable>'
+CREATE TABLESPACE <replaceable>tablespace_name</replaceable>
+ ADD DATAFILE '<replaceable>file_name</replaceable>'
USE LOGFILE GROUP <replaceable>logfile_group</replaceable>
[EXTENT_SIZE [=] <replaceable>extent_size</replaceable>]
[INITIAL_SIZE [=] <replaceable>initial_size</replaceable>]
@@ -5820,7 +5820,7 @@
</indexterm>
<programlisting>
-DROP TABLESPACE <replaceable>tablespace</replaceable>
+DROP TABLESPACE <replaceable>tablespace_name</replaceable>
ENGINE [=] <replaceable>engine_name</replaceable>
</programlisting>
Modified: trunk/refman-4.1/programs-client.xml
===================================================================
--- trunk/refman-4.1/programs-client.xml 2008-03-14 18:51:32 UTC (rev 10240)
+++ trunk/refman-4.1/programs-client.xml 2008-03-14 19:57:01 UTC (rev 10241)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 685 bytes
@@ -5700,8 +5700,8 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option>--result-file=<replaceable>file</replaceable></option>,
- <option>-r <replaceable>file</replaceable></option>
+ <option>--result-file=<replaceable>file_name</replaceable></option>,
+ <option>-r <replaceable>file_name</replaceable></option>
</para>
<para>
Modified: trunk/refman-4.1/programs-miscellaneous.xml
===================================================================
--- trunk/refman-4.1/programs-miscellaneous.xml 2008-03-14 18:51:32 UTC (rev 10240)
+++ trunk/refman-4.1/programs-miscellaneous.xml 2008-03-14 19:57:01 UTC (rev 10241)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 1288 bytes
@@ -269,8 +269,8 @@
</para>
<programlisting>
-shell> <userinput>replace <replaceable>from</replaceable> <replaceable>to</replaceable> [<replaceable>from</replaceable> <replaceable>to</replaceable>] ... -- <replaceable>file</replaceable> [<replaceable>file</replaceable>] ...</userinput>
-shell> <userinput>replace <replaceable>from</replaceable> <replaceable>to</replaceable> [<replaceable>from</replaceable> <replaceable>to</replaceable>] ... < <replaceable>file</replaceable></userinput>
+shell> <userinput>replace <replaceable>from</replaceable> <replaceable>to</replaceable> [<replaceable>from</replaceable> <replaceable>to</replaceable>] ... -- <replaceable>file_name</replaceable> [<replaceable>file_name</replaceable>] ...</userinput>
+shell> <userinput>replace <replaceable>from</replaceable> <replaceable>to</replaceable> [<replaceable>from</replaceable> <replaceable>to</replaceable>] ... < <replaceable>file_name</replaceable></userinput>
</programlisting>
<para>
Modified: trunk/refman-5.0/programs-client-core.xml
===================================================================
--- trunk/refman-5.0/programs-client-core.xml 2008-03-14 18:51:32 UTC (rev 10240)
+++ trunk/refman-5.0/programs-client-core.xml 2008-03-14 19:57:01 UTC (rev 10241)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 700 bytes
@@ -5984,8 +5984,8 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option>--result-file=<replaceable>file</replaceable></option>,
- <option>-r <replaceable>file</replaceable></option>
+ <option>--result-file=<replaceable>file_name</replaceable></option>,
+ <option>-r <replaceable>file_name</replaceable></option>
</para>
<para>
Modified: trunk/refman-5.0/programs-miscellaneous.xml
===================================================================
--- trunk/refman-5.0/programs-miscellaneous.xml 2008-03-14 18:51:32 UTC (rev 10240)
+++ trunk/refman-5.0/programs-miscellaneous.xml 2008-03-14 19:57:01 UTC (rev 10241)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 1288 bytes
@@ -269,8 +269,8 @@
</para>
<programlisting>
-shell> <userinput>replace <replaceable>from</replaceable> <replaceable>to</replaceable> [<replaceable>from</replaceable> <replaceable>to</replaceable>] ... -- <replaceable>file</replaceable> [<replaceable>file</replaceable>] ...</userinput>
-shell> <userinput>replace <replaceable>from</replaceable> <replaceable>to</replaceable> [<replaceable>from</replaceable> <replaceable>to</replaceable>] ... < <replaceable>file</replaceable></userinput>
+shell> <userinput>replace <replaceable>from</replaceable> <replaceable>to</replaceable> [<replaceable>from</replaceable> <replaceable>to</replaceable>] ... -- <replaceable>file_name</replaceable> [<replaceable>file_name</replaceable>] ...</userinput>
+shell> <userinput>replace <replaceable>from</replaceable> <replaceable>to</replaceable> [<replaceable>from</replaceable> <replaceable>to</replaceable>] ... < <replaceable>file_name</replaceable></userinput>
</programlisting>
<para>
Modified: trunk/refman-5.1/mysql-cluster-utilities.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-utilities.xml 2008-03-14 18:51:32 UTC (rev 10240)
+++ trunk/refman-5.1/mysql-cluster-utilities.xml 2008-03-14 19:57:01 UTC (rev 10241)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 1236 bytes
@@ -2803,7 +2803,7 @@
Typical usage is shown here:
<programlisting>
-ndb_size.pl [--database=<replaceable>db_name</replaceable>|ALL] [--hostname=<replaceable>host</replaceable>[:<replaceable>port</replaceable>]] [--socket=<replaceable>socket</replaceable>] [--user=<replaceable>user</replaceable>] [--password=<replaceable>password</replaceable>] [--help|-h] [--format=(html|text)] [--loadqueries=<replaceable>file</replaceable>] [--savequeries=<replaceable>file</replaceable>]
+ndb_size.pl [--database=<replaceable>db_name</replaceable>|ALL] [--hostname=<replaceable>host</replaceable>[:<replaceable>port</replaceable>]] [--socket=<replaceable>socket</replaceable>] [--user=<replaceable>user</replaceable>] [--password=<replaceable>password</replaceable>] [--help|-h] [--format=(html|text)] [--loadqueries=<replaceable>file_name</replaceable>] [--savequeries=<replaceable>file_name</replaceable>]
</programlisting>
<important>
Modified: trunk/refman-5.1/programs-client-core.xml
===================================================================
--- trunk/refman-5.1/programs-client-core.xml 2008-03-14 18:51:32 UTC (rev 10240)
+++ trunk/refman-5.1/programs-client-core.xml 2008-03-14 19:57:01 UTC (rev 10241)
Changed blocks: 2, Lines Added: 3, Lines Deleted: 3; 973 bytes
@@ -6258,8 +6258,8 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option>--result-file=<replaceable>file</replaceable></option>,
- <option>-r <replaceable>file</replaceable></option>
+ <option>--result-file=<replaceable>file_name</replaceable></option>,
+ <option>-r <replaceable>file_name</replaceable></option>
</para>
<para>
@@ -8858,7 +8858,7 @@
<secondary>mysqlslap</secondary>
</indexterm>
- <option>--csv[=<replaceable>file</replaceable>]</option>
+ <option>--csv[=<replaceable>file_name</replaceable>]</option>
</para>
<para>
Modified: trunk/refman-5.1/programs-miscellaneous.xml
===================================================================
--- trunk/refman-5.1/programs-miscellaneous.xml 2008-03-14 18:51:32 UTC (rev 10240)
+++ trunk/refman-5.1/programs-miscellaneous.xml 2008-03-14 19:57:01 UTC (rev 10241)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 1288 bytes
@@ -269,8 +269,8 @@
</para>
<programlisting>
-shell> <userinput>replace <replaceable>from</replaceable> <replaceable>to</replaceable> [<replaceable>from</replaceable> <replaceable>to</replaceable>] ... -- <replaceable>file</replaceable> [<replaceable>file</replaceable>] ...</userinput>
-shell> <userinput>replace <replaceable>from</replaceable> <replaceable>to</replaceable> [<replaceable>from</replaceable> <replaceable>to</replaceable>] ... < <replaceable>file</replaceable></userinput>
+shell> <userinput>replace <replaceable>from</replaceable> <replaceable>to</replaceable> [<replaceable>from</replaceable> <replaceable>to</replaceable>] ... -- <replaceable>file_name</replaceable> [<replaceable>file_name</replaceable>] ...</userinput>
+shell> <userinput>replace <replaceable>from</replaceable> <replaceable>to</replaceable> [<replaceable>from</replaceable> <replaceable>to</replaceable>] ... < <replaceable>file_name</replaceable></userinput>
</programlisting>
<para>
Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml 2008-03-14 18:51:32 UTC (rev 10240)
+++ trunk/refman-5.1/sql-syntax.xml 2008-03-14 19:57:01 UTC (rev 10241)
Changed blocks: 6, Lines Added: 8, Lines Deleted: 8; 2633 bytes
@@ -225,7 +225,7 @@
<programlisting>
ALTER LOGFILE GROUP <replaceable>logfile_group</replaceable>
- ADD UNDOFILE '<replaceable>file</replaceable>'
+ ADD UNDOFILE '<replaceable>file_name</replaceable>'
[INITIAL_SIZE [=] <replaceable>size</replaceable>]
[WAIT]
ENGINE [=] <replaceable>engine_name</replaceable>
@@ -233,7 +233,7 @@
<para>
This statement adds an <literal>UNDO</literal> file named
- '<replaceable>file</replaceable>' to an existing log file group
+ '<replaceable>file_name</replaceable>' to an existing log file group
<replaceable>logfile_group</replaceable>. An <literal>ALTER
LOGFILE GROUP</literal> statement has one and only one
<literal>ADD UNDOFILE</literal> clause. No <literal>DROP
@@ -1969,8 +1969,8 @@
</indexterm>
<programlisting>
-ALTER TABLESPACE <replaceable>tablespace</replaceable>
- {ADD|DROP} DATAFILE '<replaceable>file</replaceable>'
+ALTER TABLESPACE <replaceable>tablespace_name</replaceable>
+ {ADD|DROP} DATAFILE '<replaceable>file_name</replaceable>'
[INITIAL_SIZE [=] <replaceable>size</replaceable>]
[WAIT]
ENGINE [=] <replaceable>engine_name</replaceable>
@@ -2009,7 +2009,7 @@
<para>
Using <literal>DROP DATAFILE</literal> with <literal>ALTER
TABLESPACE</literal> drops the data file
- '<replaceable>file</replaceable>' from the tablespace. This file
+ '<replaceable>file_name</replaceable>' from the tablespace. This file
must already have been added to the tablespace using
<literal>CREATE TABLESPACE</literal> or <literal>ALTER
TABLESPACE</literal>; otherwise an error will result.
@@ -5213,8 +5213,8 @@
</indexterm>
<programlisting>
-CREATE TABLESPACE <replaceable>tablespace</replaceable>
- ADD DATAFILE '<replaceable>file</replaceable>'
+CREATE TABLESPACE <replaceable>tablespace_name</replaceable>
+ ADD DATAFILE '<replaceable>file_name</replaceable>'
USE LOGFILE GROUP <replaceable>logfile_group</replaceable>
[EXTENT_SIZE [=] <replaceable>extent_size</replaceable>]
[INITIAL_SIZE [=] <replaceable>initial_size</replaceable>]
@@ -5821,7 +5821,7 @@
</indexterm>
<programlisting>
-DROP TABLESPACE <replaceable>tablespace</replaceable>
+DROP TABLESPACE <replaceable>tablespace_name</replaceable>
ENGINE [=] <replaceable>engine_name</replaceable>
</programlisting>
Modified: trunk/refman-6.0/programs-client-core.xml
===================================================================
--- trunk/refman-6.0/programs-client-core.xml 2008-03-14 18:51:32 UTC (rev 10240)
+++ trunk/refman-6.0/programs-client-core.xml 2008-03-14 19:57:01 UTC (rev 10241)
Changed blocks: 2, Lines Added: 3, Lines Deleted: 3; 973 bytes
@@ -6282,8 +6282,8 @@
<secondary>mysqldump</secondary>
</indexterm>
- <option>--result-file=<replaceable>file</replaceable></option>,
- <option>-r <replaceable>file</replaceable></option>
+ <option>--result-file=<replaceable>file_name</replaceable></option>,
+ <option>-r <replaceable>file_name</replaceable></option>
</para>
<para>
@@ -8900,7 +8900,7 @@
<secondary>mysqlslap</secondary>
</indexterm>
- <option>--csv[=<replaceable>file</replaceable>]</option>
+ <option>--csv[=<replaceable>file_name</replaceable>]</option>
</para>
<para>
Modified: trunk/refman-6.0/programs-miscellaneous.xml
===================================================================
--- trunk/refman-6.0/programs-miscellaneous.xml 2008-03-14 18:51:32 UTC (rev 10240)
+++ trunk/refman-6.0/programs-miscellaneous.xml 2008-03-14 19:57:01 UTC (rev 10241)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 1288 bytes
@@ -269,8 +269,8 @@
</para>
<programlisting>
-shell> <userinput>replace <replaceable>from</replaceable> <replaceable>to</replaceable> [<replaceable>from</replaceable> <replaceable>to</replaceable>] ... -- <replaceable>file</replaceable> [<replaceable>file</replaceable>] ...</userinput>
-shell> <userinput>replace <replaceable>from</replaceable> <replaceable>to</replaceable> [<replaceable>from</replaceable> <replaceable>to</replaceable>] ... < <replaceable>file</replaceable></userinput>
+shell> <userinput>replace <replaceable>from</replaceable> <replaceable>to</replaceable> [<replaceable>from</replaceable> <replaceable>to</replaceable>] ... -- <replaceable>file_name</replaceable> [<replaceable>file_name</replaceable>] ...</userinput>
+shell> <userinput>replace <replaceable>from</replaceable> <replaceable>to</replaceable> [<replaceable>from</replaceable> <replaceable>to</replaceable>] ... < <replaceable>file_name</replaceable></userinput>
</programlisting>
<para>
Modified: trunk/refman-6.0/se-falcon-core.xml
===================================================================
--- trunk/refman-6.0/se-falcon-core.xml 2008-03-14 18:51:32 UTC (rev 10240)
+++ trunk/refman-6.0/se-falcon-core.xml 2008-03-14 19:57:01 UTC (rev 10241)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 639 bytes
@@ -811,8 +811,8 @@
TABLESPACE</literal> statement:
</para>
-<programlisting>CREATE TABLESPACE <replaceable>tablespace</replaceable>
- ADD DATAFILE <replaceable>'file'</replaceable>
+<programlisting>CREATE TABLESPACE <replaceable>tablespace_name</replaceable>
+ ADD DATAFILE '<replaceable>file_name</replaceable>'
ENGINE [=] Falcon</programlisting>
<para>
Modified: trunk/refman-6.0/sql-syntax.xml
===================================================================
--- trunk/refman-6.0/sql-syntax.xml 2008-03-14 18:51:32 UTC (rev 10240)
+++ trunk/refman-6.0/sql-syntax.xml 2008-03-14 19:57:01 UTC (rev 10241)
Changed blocks: 6, Lines Added: 8, Lines Deleted: 8; 2633 bytes
@@ -224,7 +224,7 @@
<programlisting>
ALTER LOGFILE GROUP <replaceable>logfile_group</replaceable>
- ADD UNDOFILE '<replaceable>file</replaceable>'
+ ADD UNDOFILE '<replaceable>file_name</replaceable>'
[INITIAL_SIZE [=] <replaceable>size</replaceable>]
[WAIT]
ENGINE [=] <replaceable>engine_name</replaceable>
@@ -232,7 +232,7 @@
<para>
This statement adds an <literal>UNDO</literal> file named
- '<replaceable>file</replaceable>' to an existing log file group
+ '<replaceable>file_name</replaceable>' to an existing log file group
<replaceable>logfile_group</replaceable>. An <literal>ALTER
LOGFILE GROUP</literal> statement has one and only one
<literal>ADD UNDOFILE</literal> clause. No <literal>DROP
@@ -1921,8 +1921,8 @@
</indexterm>
<programlisting>
-ALTER TABLESPACE <replaceable>tablespace</replaceable>
- {ADD|DROP} DATAFILE '<replaceable>file</replaceable>'
+ALTER TABLESPACE <replaceable>tablespace_name</replaceable>
+ {ADD|DROP} DATAFILE '<replaceable>file_name</replaceable>'
[INITIAL_SIZE [=] <replaceable>size</replaceable>]
[WAIT]
ENGINE [=] <replaceable>engine_name</replaceable>
@@ -1955,7 +1955,7 @@
<para>
Using <literal>DROP DATAFILE</literal> with <literal>ALTER
TABLESPACE</literal> drops the data file
- '<replaceable>file</replaceable>' from the tablespace. This file
+ '<replaceable>file_name</replaceable>' from the tablespace. This file
must already have been added to the tablespace using
<literal>CREATE TABLESPACE</literal> or <literal>ALTER
TABLESPACE</literal>; otherwise an error will result.
@@ -5117,8 +5117,8 @@
</indexterm>
<programlisting>
-CREATE TABLESPACE <replaceable>tablespace</replaceable>
- ADD DATAFILE '<replaceable>file</replaceable>'
+CREATE TABLESPACE <replaceable>tablespace_name</replaceable>
+ ADD DATAFILE '<replaceable>file_name</replaceable>'
USE LOGFILE GROUP <replaceable>logfile_group</replaceable>
[EXTENT_SIZE [=] <replaceable>extent_size</replaceable>]
[INITIAL_SIZE [=] <replaceable>initial_size</replaceable>]
@@ -5715,7 +5715,7 @@
</indexterm>
<programlisting>
-DROP TABLESPACE <replaceable>tablespace</replaceable>
+DROP TABLESPACE <replaceable>tablespace_name</replaceable>
ENGINE [=] <replaceable>engine_name</replaceable>
</programlisting>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r10241 - in trunk: . it/refman-5.1 pt/refman-5.1 refman-4.1 refman-5.0 refman-5.1 refman-6.0 | paul | 14 Mar |
