List:Commits« Previous MessageNext Message »
From:paul Date:May 19 2008 7:11pm
Subject:svn commit - mysqldoc@docsrva: r10773 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-6.0
View as plain text  
Author: paul
Date: 2008-05-19 21:11:08 +0200 (Mon, 19 May 2008)
New Revision: 10773

Log:
 r31506@frost:  paul | 2008-05-19 13:57:06 -0500
 Update Unix instructions for resetting root password (Bug#36476)


Modified:
   trunk/refman-4.1/errors-problems.xml
   trunk/refman-5.0/errors-problems.xml
   trunk/refman-5.1/errors-problems-core.xml
   trunk/refman-6.0/errors-problems.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:31505
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:31325
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:31506
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:31325


Modified: trunk/refman-4.1/errors-problems.xml
===================================================================
--- trunk/refman-4.1/errors-problems.xml	2008-05-19 19:11:01 UTC (rev 10772)
+++ trunk/refman-4.1/errors-problems.xml	2008-05-19 19:11:08 UTC (rev 10773)
Changed blocks: 9, Lines Added: 60, Lines Deleted: 35; 7580 bytes

@@ -2736,7 +2736,9 @@
                 <literal>FLUSH</literal> statement tells the server to
                 reload the grant tables into memory.
               </para>
+            </listitem>
 
+            <listitem>
               <para>
                 Save the file with any name. For this example, the file
                 will be <filename>C:\mysql-init.txt</filename>.

@@ -2771,9 +2773,8 @@
 
               <para>
                 The server executes the contents of the file named by
-                the <option>--init-file</option> option at server
-                startup, changing each <literal>root</literal> account
-                password.
+                the <option>--init-file</option> option at startup,
+                changing each <literal>root</literal> account password.
               </para>
 
               <para>

@@ -2830,8 +2831,8 @@
           </orderedlist>
 
           <para>
-            You should now be able to connect as <literal>root</literal>
-            using the new password.
+            You should now be able to connect to MySQL as
+            <literal>root</literal> using the new password.
           </para>
 
         </section>

@@ -2854,16 +2855,33 @@
 
           <para>
             In a Unix environment, the procedure for resetting the MySQL
-            <literal>root</literal> password is as follows:
+            <literal>root</literal> password follows. When you use these
+            instructions, you should start the server so that it runs
+            using the same Unix login account that you normally run the
+            server as. For example, if you run the server using the
+            <literal>mysql</literal> login account, you should log in as
+            <literal>mysql</literal> before using the instructions. The
+            following instructions assume that you run the server from
+            the <literal>mysql</literal> login account and that you have
+            logged in as that user. (Alternatively, you can log in as
+            <literal>root</literal> and start <command>mysqld</command>
+            with the <option>--user=mysql</option> option. If you start
+            the server as <literal>root</literal> without using
+            <option>--user</option>, the server may create
+            <literal>root</literal>-owned files in the data directory,
+            such as log files, that will cause permission-related
+            problems for future server startups. If that happens, you
+            must either change the ownership of the files to
+            <literal>mysql</literal> or remove them.)
           </para>
 
           <orderedlist>
 
             <listitem>
               <para>
-                Log on to your system as either the Unix
-                <literal>root</literal> user or as the same user that
-                the <command>mysqld</command> server runs as.
+                Log on to your system as the Unix
+                <literal>mysql</literal> user that the the
+                <command>mysqld</command> server runs as.
               </para>
             </listitem>
 

@@ -2903,15 +2921,29 @@
 
             <listitem>
               <para>
-                Create a text file and place the following command
-                within it on a single line:
+                Create a text file and place the following statements in
+                it. Replace the password with the password that you want
+                to use.
               </para>
 
 <programlisting>
-SET PASSWORD FOR 'root'@'localhost' = PASSWORD('MyNewPassword');
+UPDATE mysql.user SET Password=PASSWORD('MyNewPass') WHERE User='root';
+FLUSH PRIVILEGES;
 </programlisting>
 
               <para>
+                The <literal>UPDATE</literal> and
+                <literal>FLUSH</literal> statements each must be written
+                on a single line. The <literal>UPDATE</literal>
+                statement resets the password for all existing
+                <literal>root</literal> accounts, and the
+                <literal>FLUSH</literal> statement tells the server to
+                reload the grant tables into memory.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
                 Save the file with any name. For this example, the file
                 will be <filename>/home/me/mysql-init</filename>. The
                 file contains the password, so it should not be saved

@@ -2930,8 +2962,9 @@
 </programlisting>
 
               <para>
-                The contents of the init-file are executed at server
-                startup, changing the root password.
+                The server executes the contents of the file named by
+                the <option>--init-file</option> option at startup,
+                changing each <literal>root</literal> account password.
               </para>
             </listitem>
 

@@ -2942,17 +2975,16 @@
               </para>
             </listitem>
 
-            <listitem>
-              <para>
-                You should be able to connect using the new password.
-              </para>
-            </listitem>
-
           </orderedlist>
 
           <para>
+            You should now be able to connect to MySQL as
+            <literal>root</literal> using the new password.
+          </para>
+
+          <para>
             Alternatively, on any platform, you can set the new password
-            using the <command>mysql</command> client(but this approach
+            using the <command>mysql</command> client (but this approach
             is less secure):
           </para>
 

@@ -2961,9 +2993,7 @@
             <listitem>
               <para>
                 Stop <command>mysqld</command> and restart it with the
-                <option>--skip-grant-tables --user=root</option> options
-                (Windows users omit the <option>--user=root</option>
-                portion).
+                <option>--skip-grant-tables</option> option.
               </para>
             </listitem>
 

@@ -2974,34 +3004,29 @@
               </para>
 
 <programlisting>
-shell&gt; <userinput>mysql -u root</userinput>
+shell&gt; <userinput>mysql</userinput>
 </programlisting>
             </listitem>
 
             <listitem>
               <para>
                 Issue the following statements in the
-                <command>mysql</command> client:
+                <command>mysql</command> client. Replace the password
+                with the password that you want to use.
               </para>
 
 <programlisting>
-mysql&gt; <userinput>UPDATE mysql.user SET Password=PASSWORD('<replaceable>newpwd</replaceable>')</userinput>
+mysql&gt; <userinput>UPDATE mysql.user SET Password=PASSWORD('MyNewPass')</userinput>
     -&gt;                   <userinput>WHERE User='root';</userinput>
 mysql&gt; <userinput>FLUSH PRIVILEGES;</userinput>
 </programlisting>
-
-              <para>
-                Replace <quote><replaceable>newpwd</replaceable></quote>
-                with the actual <literal>root</literal> password that
-                you want to use.
-              </para>
             </listitem>
 
           </orderedlist>
 
           <para>
-            You should now be able to connect as <literal>root</literal>
-            using the new password.
+            You should now be able to connect to MySQL as
+            <literal>root</literal> using the new password.
           </para>
 
         </section>


Modified: trunk/refman-5.0/errors-problems.xml
===================================================================
--- trunk/refman-5.0/errors-problems.xml	2008-05-19 19:11:01 UTC (rev 10772)
+++ trunk/refman-5.0/errors-problems.xml	2008-05-19 19:11:08 UTC (rev 10773)
Changed blocks: 9, Lines Added: 60, Lines Deleted: 35; 7580 bytes

@@ -2653,7 +2653,9 @@
                 <literal>FLUSH</literal> statement tells the server to
                 reload the grant tables into memory.
               </para>
+            </listitem>
 
+            <listitem>
               <para>
                 Save the file with any name. For this example, the file
                 will be <filename>C:\mysql-init.txt</filename>.

@@ -2688,9 +2690,8 @@
 
               <para>
                 The server executes the contents of the file named by
-                the <option>--init-file</option> option at server
-                startup, changing each <literal>root</literal> account
-                password.
+                the <option>--init-file</option> option at startup,
+                changing each <literal>root</literal> account password.
               </para>
 
               <para>

@@ -2747,8 +2748,8 @@
           </orderedlist>
 
           <para>
-            You should now be able to connect as <literal>root</literal>
-            using the new password.
+            You should now be able to connect to MySQL as
+            <literal>root</literal> using the new password.
           </para>
 
         </section>

@@ -2771,16 +2772,33 @@
 
           <para>
             In a Unix environment, the procedure for resetting the MySQL
-            <literal>root</literal> password is as follows:
+            <literal>root</literal> password follows. When you use these
+            instructions, you should start the server so that it runs
+            using the same Unix login account that you normally run the
+            server as. For example, if you run the server using the
+            <literal>mysql</literal> login account, you should log in as
+            <literal>mysql</literal> before using the instructions. The
+            following instructions assume that you run the server from
+            the <literal>mysql</literal> login account and that you have
+            logged in as that user. (Alternatively, you can log in as
+            <literal>root</literal> and start <command>mysqld</command>
+            with the <option>--user=mysql</option> option. If you start
+            the server as <literal>root</literal> without using
+            <option>--user</option>, the server may create
+            <literal>root</literal>-owned files in the data directory,
+            such as log files, that will cause permission-related
+            problems for future server startups. If that happens, you
+            must either change the ownership of the files to
+            <literal>mysql</literal> or remove them.)
           </para>
 
           <orderedlist>
 
             <listitem>
               <para>
-                Log on to your system as either the Unix
-                <literal>root</literal> user or as the same user that
-                the <command>mysqld</command> server runs as.
+                Log on to your system as the Unix
+                <literal>mysql</literal> user that the the
+                <command>mysqld</command> server runs as.
               </para>
             </listitem>
 

@@ -2820,15 +2838,29 @@
 
             <listitem>
               <para>
-                Create a text file and place the following command
-                within it on a single line:
+                Create a text file and place the following statements in
+                it. Replace the password with the password that you want
+                to use.
               </para>
 
 <programlisting>
-SET PASSWORD FOR 'root'@'localhost' = PASSWORD('MyNewPassword');
+UPDATE mysql.user SET Password=PASSWORD('MyNewPass') WHERE User='root';
+FLUSH PRIVILEGES;
 </programlisting>
 
               <para>
+                The <literal>UPDATE</literal> and
+                <literal>FLUSH</literal> statements each must be written
+                on a single line. The <literal>UPDATE</literal>
+                statement resets the password for all existing
+                <literal>root</literal> accounts, and the
+                <literal>FLUSH</literal> statement tells the server to
+                reload the grant tables into memory.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
                 Save the file with any name. For this example, the file
                 will be <filename>/home/me/mysql-init</filename>. The
                 file contains the password, so it should not be saved

@@ -2847,8 +2879,9 @@
 </programlisting>
 
               <para>
-                The contents of the init-file are executed at server
-                startup, changing the root password.
+                The server executes the contents of the file named by
+                the <option>--init-file</option> option at startup,
+                changing each <literal>root</literal> account password.
               </para>
             </listitem>
 

@@ -2859,17 +2892,16 @@
               </para>
             </listitem>
 
-            <listitem>
-              <para>
-                You should be able to connect using the new password.
-              </para>
-            </listitem>
-
           </orderedlist>
 
           <para>
+            You should now be able to connect to MySQL as
+            <literal>root</literal> using the new password.
+          </para>
+
+          <para>
             Alternatively, on any platform, you can set the new password
-            using the <command>mysql</command> client(but this approach
+            using the <command>mysql</command> client (but this approach
             is less secure):
           </para>
 

@@ -2878,9 +2910,7 @@
             <listitem>
               <para>
                 Stop <command>mysqld</command> and restart it with the
-                <option>--skip-grant-tables --user=root</option> options
-                (Windows users omit the <option>--user=root</option>
-                portion).
+                <option>--skip-grant-tables</option> option.
               </para>
             </listitem>
 

@@ -2891,34 +2921,29 @@
               </para>
 
 <programlisting>
-shell&gt; <userinput>mysql -u root</userinput>
+shell&gt; <userinput>mysql</userinput>
 </programlisting>
             </listitem>
 
             <listitem>
               <para>
                 Issue the following statements in the
-                <command>mysql</command> client:
+                <command>mysql</command> client. Replace the password
+                with the password that you want to use.
               </para>
 
 <programlisting>
-mysql&gt; <userinput>UPDATE mysql.user SET Password=PASSWORD('<replaceable>newpwd</replaceable>')</userinput>
+mysql&gt; <userinput>UPDATE mysql.user SET Password=PASSWORD('MyNewPass')</userinput>
     -&gt;                   <userinput>WHERE User='root';</userinput>
 mysql&gt; <userinput>FLUSH PRIVILEGES;</userinput>
 </programlisting>
-
-              <para>
-                Replace <quote><replaceable>newpwd</replaceable></quote>
-                with the actual <literal>root</literal> password that
-                you want to use.
-              </para>
             </listitem>
 
           </orderedlist>
 
           <para>
-            You should now be able to connect as <literal>root</literal>
-            using the new password.
+            You should now be able to connect to MySQL as
+            <literal>root</literal> using the new password.
           </para>
 
         </section>


Modified: trunk/refman-5.1/errors-problems-core.xml
===================================================================
--- trunk/refman-5.1/errors-problems-core.xml	2008-05-19 19:11:01 UTC (rev 10772)
+++ trunk/refman-5.1/errors-problems-core.xml	2008-05-19 19:11:08 UTC (rev 10773)
Changed blocks: 9, Lines Added: 60, Lines Deleted: 35; 7595 bytes

@@ -2656,7 +2656,9 @@
                 <literal>FLUSH</literal> statement tells the server to
                 reload the grant tables into memory.
               </para>
+            </listitem>
 
+            <listitem>
               <para>
                 Save the file with any name. For this example, the file
                 will be <filename>C:\mysql-init.txt</filename>.

@@ -2691,9 +2693,8 @@
 
               <para>
                 The server executes the contents of the file named by
-                the <option>--init-file</option> option at server
-                startup, changing each <literal>root</literal> account
-                password.
+                the <option>--init-file</option> option at startup,
+                changing each <literal>root</literal> account password.
               </para>
 
               <para>

@@ -2750,8 +2751,8 @@
           </orderedlist>
 
           <para>
-            You should now be able to connect as <literal>root</literal>
-            using the new password.
+            You should now be able to connect to MySQL as
+            <literal>root</literal> using the new password.
           </para>
 
         </section>

@@ -2774,16 +2775,33 @@
 
           <para>
             In a Unix environment, the procedure for resetting the MySQL
-            <literal>root</literal> password is as follows:
+            <literal>root</literal> password follows. When you use these
+            instructions, you should start the server so that it runs
+            using the same Unix login account that you normally run the
+            server as. For example, if you run the server using the
+            <literal>mysql</literal> login account, you should log in as
+            <literal>mysql</literal> before using the instructions. The
+            following instructions assume that you run the server from
+            the <literal>mysql</literal> login account and that you have
+            logged in as that user. (Alternatively, you can log in as
+            <literal>root</literal> and start <command>mysqld</command>
+            with the <option>--user=mysql</option> option. If you start
+            the server as <literal>root</literal> without using
+            <option>--user</option>, the server may create
+            <literal>root</literal>-owned files in the data directory,
+            such as log files, that will cause permission-related
+            problems for future server startups. If that happens, you
+            must either change the ownership of the files to
+            <literal>mysql</literal> or remove them.)
           </para>
 
           <orderedlist>
 
             <listitem>
               <para>
-                Log on to your system as either the Unix
-                <literal>root</literal> user or as the same user that
-                the <command>mysqld</command> server runs as.
+                Log on to your system as the Unix
+                <literal>mysql</literal> user that the the
+                <command>mysqld</command> server runs as.
               </para>
             </listitem>
 

@@ -2823,15 +2841,29 @@
 
             <listitem>
               <para>
-                Create a text file and place the following command
-                within it on a single line:
+                Create a text file and place the following statements in
+                it. Replace the password with the password that you want
+                to use.
               </para>
 
 <programlisting>
-SET PASSWORD FOR 'root'@'localhost' = PASSWORD('MyNewPassword');
+UPDATE mysql.user SET Password=PASSWORD('MyNewPass') WHERE User='root';
+FLUSH PRIVILEGES;
 </programlisting>
 
               <para>
+                The <literal>UPDATE</literal> and
+                <literal>FLUSH</literal> statements each must be written
+                on a single line. The <literal>UPDATE</literal>
+                statement resets the password for all existing
+                <literal>root</literal> accounts, and the
+                <literal>FLUSH</literal> statement tells the server to
+                reload the grant tables into memory.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
                 Save the file with any name. For this example, the file
                 will be <filename>/home/me/mysql-init</filename>. The
                 file contains the password, so it should not be saved

@@ -2850,8 +2882,9 @@
 </programlisting>
 
               <para>
-                The contents of the init-file are executed at server
-                startup, changing the root password.
+                The server executes the contents of the file named by
+                the <option>--init-file</option> option at startup,
+                changing each <literal>root</literal> account password.
               </para>
             </listitem>
 

@@ -2862,17 +2895,16 @@
               </para>
             </listitem>
 
-            <listitem>
-              <para>
-                You should be able to connect using the new password.
-              </para>
-            </listitem>
-
           </orderedlist>
 
           <para>
+            You should now be able to connect to MySQL as
+            <literal>root</literal> using the new password.
+          </para>
+
+          <para>
             Alternatively, on any platform, you can set the new password
-            using the <command>mysql</command> client(but this approach
+            using the <command>mysql</command> client (but this approach
             is less secure):
           </para>
 

@@ -2881,9 +2913,7 @@
             <listitem>
               <para>
                 Stop <command>mysqld</command> and restart it with the
-                <option>--skip-grant-tables --user=root</option> options
-                (Windows users omit the <option>--user=root</option>
-                portion).
+                <option>--skip-grant-tables</option> option.
               </para>
             </listitem>
 

@@ -2894,34 +2924,29 @@
               </para>
 
 <programlisting>
-shell&gt; <userinput>mysql -u root</userinput>
+shell&gt; <userinput>mysql</userinput>
 </programlisting>
             </listitem>
 
             <listitem>
               <para>
                 Issue the following statements in the
-                <command>mysql</command> client:
+                <command>mysql</command> client. Replace the password
+                with the password that you want to use.
               </para>
 
 <programlisting>
-mysql&gt; <userinput>UPDATE mysql.user SET Password=PASSWORD('<replaceable>newpwd</replaceable>')</userinput>
+mysql&gt; <userinput>UPDATE mysql.user SET Password=PASSWORD('MyNewPass')</userinput>
     -&gt;                   <userinput>WHERE User='root';</userinput>
 mysql&gt; <userinput>FLUSH PRIVILEGES;</userinput>
 </programlisting>
-
-              <para>
-                Replace <quote><replaceable>newpwd</replaceable></quote>
-                with the actual <literal>root</literal> password that
-                you want to use.
-              </para>
             </listitem>
 
           </orderedlist>
 
           <para>
-            You should now be able to connect as <literal>root</literal>
-            using the new password.
+            You should now be able to connect to MySQL as
+            <literal>root</literal> using the new password.
           </para>
 
         </section>


Modified: trunk/refman-6.0/errors-problems.xml
===================================================================
--- trunk/refman-6.0/errors-problems.xml	2008-05-19 19:11:01 UTC (rev 10772)
+++ trunk/refman-6.0/errors-problems.xml	2008-05-19 19:11:08 UTC (rev 10773)
Changed blocks: 9, Lines Added: 60, Lines Deleted: 35; 7580 bytes

@@ -2655,7 +2655,9 @@
                 <literal>FLUSH</literal> statement tells the server to
                 reload the grant tables into memory.
               </para>
+            </listitem>
 
+            <listitem>
               <para>
                 Save the file with any name. For this example, the file
                 will be <filename>C:\mysql-init.txt</filename>.

@@ -2690,9 +2692,8 @@
 
               <para>
                 The server executes the contents of the file named by
-                the <option>--init-file</option> option at server
-                startup, changing each <literal>root</literal> account
-                password.
+                the <option>--init-file</option> option at startup,
+                changing each <literal>root</literal> account password.
               </para>
 
               <para>

@@ -2749,8 +2750,8 @@
           </orderedlist>
 
           <para>
-            You should now be able to connect as <literal>root</literal>
-            using the new password.
+            You should now be able to connect to MySQL as
+            <literal>root</literal> using the new password.
           </para>
 
         </section>

@@ -2773,16 +2774,33 @@
 
           <para>
             In a Unix environment, the procedure for resetting the MySQL
-            <literal>root</literal> password is as follows:
+            <literal>root</literal> password follows. When you use these
+            instructions, you should start the server so that it runs
+            using the same Unix login account that you normally run the
+            server as. For example, if you run the server using the
+            <literal>mysql</literal> login account, you should log in as
+            <literal>mysql</literal> before using the instructions. The
+            following instructions assume that you run the server from
+            the <literal>mysql</literal> login account and that you have
+            logged in as that user. (Alternatively, you can log in as
+            <literal>root</literal> and start <command>mysqld</command>
+            with the <option>--user=mysql</option> option. If you start
+            the server as <literal>root</literal> without using
+            <option>--user</option>, the server may create
+            <literal>root</literal>-owned files in the data directory,
+            such as log files, that will cause permission-related
+            problems for future server startups. If that happens, you
+            must either change the ownership of the files to
+            <literal>mysql</literal> or remove them.)
           </para>
 
           <orderedlist>
 
             <listitem>
               <para>
-                Log on to your system as either the Unix
-                <literal>root</literal> user or as the same user that
-                the <command>mysqld</command> server runs as.
+                Log on to your system as the Unix
+                <literal>mysql</literal> user that the the
+                <command>mysqld</command> server runs as.
               </para>
             </listitem>
 

@@ -2822,15 +2840,29 @@
 
             <listitem>
               <para>
-                Create a text file and place the following command
-                within it on a single line:
+                Create a text file and place the following statements in
+                it. Replace the password with the password that you want
+                to use.
               </para>
 
 <programlisting>
-SET PASSWORD FOR 'root'@'localhost' = PASSWORD('MyNewPassword');
+UPDATE mysql.user SET Password=PASSWORD('MyNewPass') WHERE User='root';
+FLUSH PRIVILEGES;
 </programlisting>
 
               <para>
+                The <literal>UPDATE</literal> and
+                <literal>FLUSH</literal> statements each must be written
+                on a single line. The <literal>UPDATE</literal>
+                statement resets the password for all existing
+                <literal>root</literal> accounts, and the
+                <literal>FLUSH</literal> statement tells the server to
+                reload the grant tables into memory.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
                 Save the file with any name. For this example, the file
                 will be <filename>/home/me/mysql-init</filename>. The
                 file contains the password, so it should not be saved

@@ -2849,8 +2881,9 @@
 </programlisting>
 
               <para>
-                The contents of the init-file are executed at server
-                startup, changing the root password.
+                The server executes the contents of the file named by
+                the <option>--init-file</option> option at startup,
+                changing each <literal>root</literal> account password.
               </para>
             </listitem>
 

@@ -2861,17 +2894,16 @@
               </para>
             </listitem>
 
-            <listitem>
-              <para>
-                You should be able to connect using the new password.
-              </para>
-            </listitem>
-
           </orderedlist>
 
           <para>
+            You should now be able to connect to MySQL as
+            <literal>root</literal> using the new password.
+          </para>
+
+          <para>
             Alternatively, on any platform, you can set the new password
-            using the <command>mysql</command> client(but this approach
+            using the <command>mysql</command> client (but this approach
             is less secure):
           </para>
 

@@ -2880,9 +2912,7 @@
             <listitem>
               <para>
                 Stop <command>mysqld</command> and restart it with the
-                <option>--skip-grant-tables --user=root</option> options
-                (Windows users omit the <option>--user=root</option>
-                portion).
+                <option>--skip-grant-tables</option> option.
               </para>
             </listitem>
 

@@ -2893,34 +2923,29 @@
               </para>
 
 <programlisting>
-shell&gt; <userinput>mysql -u root</userinput>
+shell&gt; <userinput>mysql</userinput>
 </programlisting>
             </listitem>
 
             <listitem>
               <para>
                 Issue the following statements in the
-                <command>mysql</command> client:
+                <command>mysql</command> client. Replace the password
+                with the password that you want to use.
               </para>
 
 <programlisting>
-mysql&gt; <userinput>UPDATE mysql.user SET Password=PASSWORD('<replaceable>newpwd</replaceable>')</userinput>
+mysql&gt; <userinput>UPDATE mysql.user SET Password=PASSWORD('MyNewPass')</userinput>
     -&gt;                   <userinput>WHERE User='root';</userinput>
 mysql&gt; <userinput>FLUSH PRIVILEGES;</userinput>
 </programlisting>
-
-              <para>
-                Replace <quote><replaceable>newpwd</replaceable></quote>
-                with the actual <literal>root</literal> password that
-                you want to use.
-              </para>
             </listitem>
 
           </orderedlist>
 
           <para>
-            You should now be able to connect as <literal>root</literal>
-            using the new password.
+            You should now be able to connect to MySQL as
+            <literal>root</literal> using the new password.
           </para>
 
         </section>


Thread
svn commit - mysqldoc@docsrva: r10773 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-6.0paul19 May