List:Commits« Previous MessageNext Message »
From:paul Date:May 8 2008 6:55pm
Subject:svn commit - mysqldoc@docsrva: r10696 - in trunk: . it/refman-5.1 pt/refman-5.1
View as plain text  
Author: paul
Date: 2008-05-08 18:55:46 +0200 (Thu, 08 May 2008)
New Revision: 10696

Log:
 r31253@frost:  paul | 2008-05-08 11:45:44 -0500
 Sync translations


Modified:
   trunk/it/refman-5.1/programs-admin-util-core.xml
   trunk/it/refman-5.1/programs-client-core.xml
   trunk/it/refman-5.1/programs-using.xml
   trunk/pt/refman-5.1/programs-admin-util-core.xml
   trunk/pt/refman-5.1/programs-client-core.xml
   trunk/pt/refman-5.1/programs-using.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:31252
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:31182
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:31253
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:31182


Modified: trunk/it/refman-5.1/programs-admin-util-core.xml
===================================================================
--- trunk/it/refman-5.1/programs-admin-util-core.xml	2008-05-08 16:55:40 UTC (rev 10695)
+++ trunk/it/refman-5.1/programs-admin-util-core.xml	2008-05-08 16:55:46 UTC (rev 10696)
Changed blocks: 9, Lines Added: 57, Lines Deleted: 1; 3802 bytes

@@ -55,7 +55,7 @@
 </programlisting>
 
       <para>
-        <command>innodchecksum</command> understands the options
+        <command>innochecksum</command> understands the options
         described in the following list. For options that refer to page
         numbers, the numbers are zero-based.
       </para>

@@ -5580,6 +5580,13 @@
 
       <title>Description</title>
 
+      <important>
+        <para>
+          MySQL Instance Manager has been deprecated and will be removed
+          in MySQL 6.0.
+        </para>
+      </important>
+
       <para>
         <command>mysqlmanager</command> is the MySQL Instance Manager
         (IM). This program monitors and manages MySQL Database Server

@@ -5673,6 +5680,13 @@
 
       <title>MySQL Instance Manager Command Options</title>
 
+      <important>
+        <para>
+          MySQL Instance Manager has been deprecated and will be removed
+          in MySQL 6.0.
+        </para>
+      </important>
+
       <para>
         The MySQL Instance Manager supports a number of command options.
         For a brief listing, invoke <command>mysqlmanager</command> with

@@ -6462,6 +6476,13 @@
 
       <title>MySQL Instance Manager Configuration Files</title>
 
+      <important>
+        <para>
+          MySQL Instance Manager has been deprecated and will be removed
+          in MySQL 6.0.
+        </para>
+      </important>
+
       <para>
         Instance Manager uses its standard configuration file unless it
         is started with a <option>--defaults-file</option> option that

@@ -6603,6 +6624,13 @@
 
       <title>Starting the MySQL Server with MySQL Instance Manager</title>
 
+      <important>
+        <para>
+          MySQL Instance Manager has been deprecated and will be removed
+          in MySQL 6.0.
+        </para>
+      </important>
+
       <para>
         This section discusses how Instance Manager starts server
         instances when it starts. However, before you start Instance

@@ -6772,6 +6800,13 @@
 
       <title>Instance Manager User and Password Management</title>
 
+      <important>
+        <para>
+          MySQL Instance Manager has been deprecated and will be removed
+          in MySQL 6.0.
+        </para>
+      </important>
+
       <para>
         The Instance Manager stores its user information in a password
         file. On Windows, the default is

@@ -7046,6 +7081,13 @@
 
       <title>MySQL Server Instance Status Monitoring</title>
 
+      <important>
+        <para>
+          MySQL Instance Manager has been deprecated and will be removed
+          in MySQL 6.0.
+        </para>
+      </important>
+
       <para>
         To monitor the status of each guarded server instance, the MySQL
         Instance Manager attempts to connect to the instance at regular

@@ -7161,6 +7203,13 @@
 
       <title>Connecting to MySQL Instance Manager</title>
 
+      <important>
+        <para>
+          MySQL Instance Manager has been deprecated and will be removed
+          in MySQL 6.0.
+        </para>
+      </important>
+
       <para>
         After you set up a password file for the MySQL Instance Manager
         and Instance Manager is running, you can connect to it. The

@@ -7186,6 +7235,13 @@
 
       <title>MySQL Instance Manager Commands</title>
 
+      <important>
+        <para>
+          MySQL Instance Manager has been deprecated and will be removed
+          in MySQL 6.0.
+        </para>
+      </important>
+
       <para>
         After you connect to MySQL Instance Manager, you can issue
         commands. The following general principles apply to Instance


Modified: trunk/it/refman-5.1/programs-client-core.xml
===================================================================
--- trunk/it/refman-5.1/programs-client-core.xml	2008-05-08 16:55:40 UTC (rev 10695)
+++ trunk/it/refman-5.1/programs-client-core.xml	2008-05-08 16:55:46 UTC (rev 10696)
Changed blocks: 4, Lines Added: 19, Lines Deleted: 16; 3160 bytes

@@ -2735,7 +2735,7 @@
           <para>
             Print debugging information and memory and CPU usage
             statistics when the program exits. This option was added in
-            MySQL 5.1.21.
+            MySQL 5.1.14.
           </para>
         </listitem>
 

@@ -4955,9 +4955,10 @@
         memory can be a problem if you are dumping large tables. To dump
         tables row by row, use the <option>--quick</option> option (or
         <option>--opt</option>, which enables
<option>--quick</option>).
-        <option>--opt</option> (and hence
<option>--quick</option>) is
-        enabled by default as of MySQL &current-series; to enable memory
-        buffering, use <option>--skip-quick</option>.
+        The <option>--opt</option> option (and hence
+        <option>--quick</option>) is enabled by default in MySQL
+        &current-series;; to enable memory buffering, use
+        <option>--skip-quick</option>.
       </para>
 
       <para>

@@ -6661,17 +6662,19 @@
           </para>
 
           <para>
-            Add <literal>SET TIME_ZONE='+00:00'</literal> to the dump
-            file so that <literal>TIMESTAMP</literal> columns can be
-            dumped and reloaded between servers in different time zones.
-            Without this option, <literal>TIMESTAMP</literal> columns
-            are dumped and reloaded in the time zones local to the
-            source and destination servers, which can cause the values
-            to change. <option>--tz-utc</option> also protects against
-            changes due to daylight saving time.
-            <option>--tz-utc</option> is enabled by default. To disable
-            it, use <option>--skip-tz-utc</option>. This option was
-            added in MySQL 5.1.2.
+            This option enables <literal>TIMESTAMP</literal> columns to
+            be dumped and reloaded between servers in different time
+            zones. <command>mysqldump</command> sets its connection time
+            zone to UTC and adds <literal>SET
+            TIME_ZONE='+00:00'</literal> to the dump file. Without this
+            option, <literal>TIMESTAMP</literal> columns are dumped and
+            reloaded in the time zones local to the source and
+            destination servers, which can cause the values to change.
+            <option>--tz-utc</option> also protects against changes due
+            to daylight saving time. <option>--tz-utc</option> is
+            enabled by default. To disable it, use
+            <option>--skip-tz-utc</option>. This option was added in
+            MySQL 5.1.2.
           </para>
         </listitem>
 

@@ -8038,7 +8041,7 @@
         <command>mysqlshow</command> supports the following options:
       </para>
 
-      <para condition="dynamic:optvar:commandoptions" role="5.1:mysqlimport:all"/>
+      <para condition="dynamic:optvar:commandoptions" role="5.1:mysqlshow:all"/>
 
       <itemizedlist>
 


Modified: trunk/it/refman-5.1/programs-using.xml
===================================================================
--- trunk/it/refman-5.1/programs-using.xml	2008-05-08 16:55:40 UTC (rev 10695)
+++ trunk/it/refman-5.1/programs-using.xml	2008-05-08 16:55:46 UTC (rev 10696)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 852 bytes

@@ -120,8 +120,8 @@
       environment variable setting. That enables you to run a program by
       typing only its name, not its entire pathname. For example, if
       <command>mysql</command> is installed in
-      <filename>/usr/local/mysql/bin</filename>, you'll be able to run
-      it by invoking it as <command>mysql</command>; it will not be
+      <filename>/usr/local/mysql/bin</filename>, you can run the program
+      by invoking it as <command>mysql</command>, and it is not
       necessary to invoke it as
       <command>/usr/local/mysql/bin/mysql</command>.
     </para>


Modified: trunk/pt/refman-5.1/programs-admin-util-core.xml
===================================================================
--- trunk/pt/refman-5.1/programs-admin-util-core.xml	2008-05-08 16:55:40 UTC (rev 10695)
+++ trunk/pt/refman-5.1/programs-admin-util-core.xml	2008-05-08 16:55:46 UTC (rev 10696)
Changed blocks: 9, Lines Added: 57, Lines Deleted: 1; 3802 bytes

@@ -55,7 +55,7 @@
 </programlisting>
 
       <para>
-        <command>innodchecksum</command> understands the options
+        <command>innochecksum</command> understands the options
         described in the following list. For options that refer to page
         numbers, the numbers are zero-based.
       </para>

@@ -5580,6 +5580,13 @@
 
       <title>Description</title>
 
+      <important>
+        <para>
+          MySQL Instance Manager has been deprecated and will be removed
+          in MySQL 6.0.
+        </para>
+      </important>
+
       <para>
         <command>mysqlmanager</command> is the MySQL Instance Manager
         (IM). This program monitors and manages MySQL Database Server

@@ -5673,6 +5680,13 @@
 
       <title>MySQL Instance Manager Command Options</title>
 
+      <important>
+        <para>
+          MySQL Instance Manager has been deprecated and will be removed
+          in MySQL 6.0.
+        </para>
+      </important>
+
       <para>
         The MySQL Instance Manager supports a number of command options.
         For a brief listing, invoke <command>mysqlmanager</command> with

@@ -6462,6 +6476,13 @@
 
       <title>MySQL Instance Manager Configuration Files</title>
 
+      <important>
+        <para>
+          MySQL Instance Manager has been deprecated and will be removed
+          in MySQL 6.0.
+        </para>
+      </important>
+
       <para>
         Instance Manager uses its standard configuration file unless it
         is started with a <option>--defaults-file</option> option that

@@ -6603,6 +6624,13 @@
 
       <title>Starting the MySQL Server with MySQL Instance Manager</title>
 
+      <important>
+        <para>
+          MySQL Instance Manager has been deprecated and will be removed
+          in MySQL 6.0.
+        </para>
+      </important>
+
       <para>
         This section discusses how Instance Manager starts server
         instances when it starts. However, before you start Instance

@@ -6772,6 +6800,13 @@
 
       <title>Instance Manager User and Password Management</title>
 
+      <important>
+        <para>
+          MySQL Instance Manager has been deprecated and will be removed
+          in MySQL 6.0.
+        </para>
+      </important>
+
       <para>
         The Instance Manager stores its user information in a password
         file. On Windows, the default is

@@ -7046,6 +7081,13 @@
 
       <title>MySQL Server Instance Status Monitoring</title>
 
+      <important>
+        <para>
+          MySQL Instance Manager has been deprecated and will be removed
+          in MySQL 6.0.
+        </para>
+      </important>
+
       <para>
         To monitor the status of each guarded server instance, the MySQL
         Instance Manager attempts to connect to the instance at regular

@@ -7161,6 +7203,13 @@
 
       <title>Connecting to MySQL Instance Manager</title>
 
+      <important>
+        <para>
+          MySQL Instance Manager has been deprecated and will be removed
+          in MySQL 6.0.
+        </para>
+      </important>
+
       <para>
         After you set up a password file for the MySQL Instance Manager
         and Instance Manager is running, you can connect to it. The

@@ -7186,6 +7235,13 @@
 
       <title>MySQL Instance Manager Commands</title>
 
+      <important>
+        <para>
+          MySQL Instance Manager has been deprecated and will be removed
+          in MySQL 6.0.
+        </para>
+      </important>
+
       <para>
         After you connect to MySQL Instance Manager, you can issue
         commands. The following general principles apply to Instance


Modified: trunk/pt/refman-5.1/programs-client-core.xml
===================================================================
--- trunk/pt/refman-5.1/programs-client-core.xml	2008-05-08 16:55:40 UTC (rev 10695)
+++ trunk/pt/refman-5.1/programs-client-core.xml	2008-05-08 16:55:46 UTC (rev 10696)
Changed blocks: 4, Lines Added: 19, Lines Deleted: 16; 3160 bytes

@@ -2735,7 +2735,7 @@
           <para>
             Print debugging information and memory and CPU usage
             statistics when the program exits. This option was added in
-            MySQL 5.1.21.
+            MySQL 5.1.14.
           </para>
         </listitem>
 

@@ -4955,9 +4955,10 @@
         memory can be a problem if you are dumping large tables. To dump
         tables row by row, use the <option>--quick</option> option (or
         <option>--opt</option>, which enables
<option>--quick</option>).
-        <option>--opt</option> (and hence
<option>--quick</option>) is
-        enabled by default as of MySQL &current-series; to enable memory
-        buffering, use <option>--skip-quick</option>.
+        The <option>--opt</option> option (and hence
+        <option>--quick</option>) is enabled by default in MySQL
+        &current-series;; to enable memory buffering, use
+        <option>--skip-quick</option>.
       </para>
 
       <para>

@@ -6661,17 +6662,19 @@
           </para>
 
           <para>
-            Add <literal>SET TIME_ZONE='+00:00'</literal> to the dump
-            file so that <literal>TIMESTAMP</literal> columns can be
-            dumped and reloaded between servers in different time zones.
-            Without this option, <literal>TIMESTAMP</literal> columns
-            are dumped and reloaded in the time zones local to the
-            source and destination servers, which can cause the values
-            to change. <option>--tz-utc</option> also protects against
-            changes due to daylight saving time.
-            <option>--tz-utc</option> is enabled by default. To disable
-            it, use <option>--skip-tz-utc</option>. This option was
-            added in MySQL 5.1.2.
+            This option enables <literal>TIMESTAMP</literal> columns to
+            be dumped and reloaded between servers in different time
+            zones. <command>mysqldump</command> sets its connection time
+            zone to UTC and adds <literal>SET
+            TIME_ZONE='+00:00'</literal> to the dump file. Without this
+            option, <literal>TIMESTAMP</literal> columns are dumped and
+            reloaded in the time zones local to the source and
+            destination servers, which can cause the values to change.
+            <option>--tz-utc</option> also protects against changes due
+            to daylight saving time. <option>--tz-utc</option> is
+            enabled by default. To disable it, use
+            <option>--skip-tz-utc</option>. This option was added in
+            MySQL 5.1.2.
           </para>
         </listitem>
 

@@ -8038,7 +8041,7 @@
         <command>mysqlshow</command> supports the following options:
       </para>
 
-      <para condition="dynamic:optvar:commandoptions" role="5.1:mysqlimport:all"/>
+      <para condition="dynamic:optvar:commandoptions" role="5.1:mysqlshow:all"/>
 
       <itemizedlist>
 


Modified: trunk/pt/refman-5.1/programs-using.xml
===================================================================
--- trunk/pt/refman-5.1/programs-using.xml	2008-05-08 16:55:40 UTC (rev 10695)
+++ trunk/pt/refman-5.1/programs-using.xml	2008-05-08 16:55:46 UTC (rev 10696)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 852 bytes

@@ -120,8 +120,8 @@
       environment variable setting. That enables you to run a program by
       typing only its name, not its entire pathname. For example, if
       <command>mysql</command> is installed in
-      <filename>/usr/local/mysql/bin</filename>, you'll be able to run
-      it by invoking it as <command>mysql</command>; it will not be
+      <filename>/usr/local/mysql/bin</filename>, you can run the program
+      by invoking it as <command>mysql</command>, and it is not
       necessary to invoke it as
       <command>/usr/local/mysql/bin/mysql</command>.
     </para>


Thread
svn commit - mysqldoc@docsrva: r10696 - in trunk: . it/refman-5.1 pt/refman-5.1paul8 May 2008