Author: paul
Date: 2006-01-21 21:31:46 +0100 (Sat, 21 Jan 2006)
New Revision: 973
Log:
r6531@frost: paul | 2006-01-21 13:07:16 -0600
"Command-Line Options" -> "Command Options"
(because they can also be used in option files, not just
on the command line.)
Modified:
trunk/
trunk/refman-common/titles.en.ent
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6526
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2396
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6531
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2396
Modified: trunk/refman-common/titles.en.ent
===================================================================
--- trunk/refman-common/titles.en.ent 2006-01-21 19:01:59 UTC (rev 972)
+++ trunk/refman-common/titles.en.ent 2006-01-21 20:31:46 UTC (rev 973)
@@ -561,7 +561,7 @@
<!ENTITY title-installing-myodbc "How to Install MyODBC">
<!ENTITY title-installing-source "MySQL Installation Using a Source Distribution">
<!ENTITY title-installing-source-tree "Installing from the Development Source Tree">
-<!ENTITY title-instance-manager-command-line-options "MySQL Instance Manager Command-Line Options">
+<!ENTITY title-instance-manager-command-line-options "MySQL Instance Manager Command Options">
<!ENTITY title-instance-manager-commands "Commands Recognized by the MySQL Instance Manager">
<!ENTITY title-instance-manager-configuration-files "MySQL Instance Manager Configuration Files">
<!ENTITY title-instance-manager-for-manpage "the MySQL Instance Manager">
@@ -1485,7 +1485,7 @@
<!ENTITY title-selecting-all "Selecting All Data">
<!ENTITY title-selecting-columns "Selecting Particular Columns">
<!ENTITY title-selecting-rows "Selecting Particular Rows">
-<!ENTITY title-server-options "<command>mysqld</command> Command-Line Options">
+<!ENTITY title-server-options "<command>mysqld</command> Command Options">
<!ENTITY title-server-parameters "Tuning Server Parameters">
<!ENTITY title-server-shutdown "The MySQL Server Shutdown Process">
<!ENTITY title-server-side-overview "Overview of the Server-Side Scripts and Utilities">
@@ -1550,7 +1550,7 @@
<!ENTITY title-sql-mode "Selecting SQL Modes">
<!ENTITY title-sql-syntax "SQL Statement Syntax">
<!ENTITY title-sqlps "SQL Syntax for Prepared Statements">
-<!ENTITY title-ssl-options "SSL Command-Line Options">
+<!ENTITY title-ssl-options "SSL Command Options">
<!ENTITY title-stability "MySQL Stability">
<!ENTITY title-standards "What Standards MySQL Follows">
<!ENTITY title-start-slave "<literal>START SLAVE</literal> Syntax">
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r973 - in trunk: . refman-common | paul | 21 Jan |
