| List: | Commits | « Previous MessageNext Message » | |
| From: | paul | Date: | May 20 2008 5:10pm |
| Subject: | svn commit - mysqldoc@docsrva: r10784 - in trunk: . it/refman-5.1 pt/refman-5.1 refman-4.1 refman-5.0 refman-5.1 refman-6.0 | ||
| View as plain text | |||
Author: paul Date: 2008-05-20 17:10:48 +0200 (Tue, 20 May 2008) New Revision: 10784 Log: r31526@frost: paul | 2008-05-20 10:08:15 -0500 Tweaks to password-resetting section Modified: trunk/it/refman-5.1/errors-problems-core.xml trunk/pt/refman-5.1/errors-problems-core.xml 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:31525 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:31526 b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218 bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:31325 Modified: trunk/it/refman-5.1/errors-problems-core.xml =================================================================== --- trunk/it/refman-5.1/errors-problems-core.xml 2008-05-20 15:10:24 UTC (rev 10783) +++ trunk/it/refman-5.1/errors-problems-core.xml 2008-05-20 15:10:48 UTC (rev 10784) Changed blocks: 6, Lines Added: 27, Lines Deleted: 27; 4778 bytes @@ -2602,8 +2602,8 @@ <title>Resetting the Root Password on Windows Systems</title> <para> - The procedure for resetting the password for any MySQL - <literal>root</literal> accounts on Windows is as follows: + Use the following procedure for resetting the password for + any MySQL <literal>root</literal> accounts on Windows: </para> <orderedlist> @@ -2660,8 +2660,8 @@ <listitem> <para> - Save the file with any name. For this example, the file - will be <filename>C:\mysql-init.txt</filename>. + Save the file. For this example, the file will be named + <filename>C:\mysql-init.txt</filename>. </para> </listitem> @@ -2677,13 +2677,6 @@ <listitem> <para> - We assume that you installed MySQL to - <filename>C:\mysql</filename>. If you installed MySQL to - another location, adjust the following commands - accordingly. - </para> - - <para> Start the MySQL server with the special <option>--init-file</option> option: </para> @@ -2693,6 +2686,12 @@ </programlisting> <para> + If you installed MySQL to a location other than + <filename>C:\mysql</filename>, adjust the command + accordingly. + </para> + + <para> 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. @@ -2775,23 +2774,24 @@ </formalpara> <para> - In a Unix environment, the procedure for resetting the - password for any MySQL <literal>root</literal> accounts on - Unix follows. The following instructions assume that you - will start the server so that it runs using the same Unix - login account that you normally use for running the server. - 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. - (Alternatively, you can log in as <literal>root</literal> - and start <command>mysqld</command> with the + Use the following procedure for resetting the password for + any MySQL <literal>root</literal> accounts on Unix. The + instructions assume that you will start the server so that + it runs using the Unix login account that you normally use + for running the server. 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. (Alternatively, you can log in as + <literal>root</literal>, but in this case you + <emphasis>must</emphasis> start 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 + <option>--user=mysql</option>, the server may create <literal>root</literal>-owned files in the data directory, such as log files, and these may cause permission-related problems for future server startups. If that happens, you - must either change the ownership of the files to + will need to either change the ownership of the files to <literal>mysql</literal> or remove them.) </para> @@ -2864,10 +2864,10 @@ <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 - where it can be read by other users. + Save the file. For this example, the file will be named + <filename>/home/me/mysql-init</filename>. The file + contains the password, so it should not be saved where + it can be read by other users. </para> </listitem> Modified: trunk/pt/refman-5.1/errors-problems-core.xml =================================================================== --- trunk/pt/refman-5.1/errors-problems-core.xml 2008-05-20 15:10:24 UTC (rev 10783) +++ trunk/pt/refman-5.1/errors-problems-core.xml 2008-05-20 15:10:48 UTC (rev 10784) Changed blocks: 6, Lines Added: 27, Lines Deleted: 27; 4778 bytes @@ -2602,8 +2602,8 @@ <title>Resetting the Root Password on Windows Systems</title> <para> - The procedure for resetting the password for any MySQL - <literal>root</literal> accounts on Windows is as follows: + Use the following procedure for resetting the password for + any MySQL <literal>root</literal> accounts on Windows: </para> <orderedlist> @@ -2660,8 +2660,8 @@ <listitem> <para> - Save the file with any name. For this example, the file - will be <filename>C:\mysql-init.txt</filename>. + Save the file. For this example, the file will be named + <filename>C:\mysql-init.txt</filename>. </para> </listitem> @@ -2677,13 +2677,6 @@ <listitem> <para> - We assume that you installed MySQL to - <filename>C:\mysql</filename>. If you installed MySQL to - another location, adjust the following commands - accordingly. - </para> - - <para> Start the MySQL server with the special <option>--init-file</option> option: </para> @@ -2693,6 +2686,12 @@ </programlisting> <para> + If you installed MySQL to a location other than + <filename>C:\mysql</filename>, adjust the command + accordingly. + </para> + + <para> 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. @@ -2775,23 +2774,24 @@ </formalpara> <para> - In a Unix environment, the procedure for resetting the - password for any MySQL <literal>root</literal> accounts on - Unix follows. The following instructions assume that you - will start the server so that it runs using the same Unix - login account that you normally use for running the server. - 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. - (Alternatively, you can log in as <literal>root</literal> - and start <command>mysqld</command> with the + Use the following procedure for resetting the password for + any MySQL <literal>root</literal> accounts on Unix. The + instructions assume that you will start the server so that + it runs using the Unix login account that you normally use + for running the server. 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. (Alternatively, you can log in as + <literal>root</literal>, but in this case you + <emphasis>must</emphasis> start 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 + <option>--user=mysql</option>, the server may create <literal>root</literal>-owned files in the data directory, such as log files, and these may cause permission-related problems for future server startups. If that happens, you - must either change the ownership of the files to + will need to either change the ownership of the files to <literal>mysql</literal> or remove them.) </para> @@ -2864,10 +2864,10 @@ <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 - where it can be read by other users. + Save the file. For this example, the file will be named + <filename>/home/me/mysql-init</filename>. The file + contains the password, so it should not be saved where + it can be read by other users. </para> </listitem> Modified: trunk/refman-4.1/errors-problems.xml =================================================================== --- trunk/refman-4.1/errors-problems.xml 2008-05-20 15:10:24 UTC (rev 10783) +++ trunk/refman-4.1/errors-problems.xml 2008-05-20 15:10:48 UTC (rev 10784) Changed blocks: 6, Lines Added: 27, Lines Deleted: 27; 4754 bytes @@ -2682,8 +2682,8 @@ <title>Resetting the Root Password on Windows Systems</title> <para> - The procedure for resetting the password for any MySQL - <literal>root</literal> accounts on Windows is as follows: + Use the following procedure for resetting the password for + any MySQL <literal>root</literal> accounts on Windows: </para> <orderedlist> @@ -2740,8 +2740,8 @@ <listitem> <para> - Save the file with any name. For this example, the file - will be <filename>C:\mysql-init.txt</filename>. + Save the file. For this example, the file will be named + <filename>C:\mysql-init.txt</filename>. </para> </listitem> @@ -2757,13 +2757,6 @@ <listitem> <para> - We assume that you installed MySQL to - <filename>C:\mysql</filename>. If you installed MySQL to - another location, adjust the following commands - accordingly. - </para> - - <para> Start the MySQL server with the special <option>--init-file</option> option: </para> @@ -2773,6 +2766,12 @@ </programlisting> <para> + If you installed MySQL to a location other than + <filename>C:\mysql</filename>, adjust the command + accordingly. + </para> + + <para> 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. @@ -2855,23 +2854,24 @@ </formalpara> <para> - In a Unix environment, the procedure for resetting the - password for any MySQL <literal>root</literal> accounts on - Unix follows. The following instructions assume that you - will start the server so that it runs using the same Unix - login account that you normally use for running the server. - 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. - (Alternatively, you can log in as <literal>root</literal> - and start <command>mysqld</command> with the + Use the following procedure for resetting the password for + any MySQL <literal>root</literal> accounts on Unix. The + instructions assume that you will start the server so that + it runs using the Unix login account that you normally use + for running the server. 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. (Alternatively, you can log in as + <literal>root</literal>, but in this case you + <emphasis>must</emphasis> start 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 + <option>--user=mysql</option>, the server may create <literal>root</literal>-owned files in the data directory, such as log files, and these may cause permission-related problems for future server startups. If that happens, you - must either change the ownership of the files to + will need to either change the ownership of the files to <literal>mysql</literal> or remove them.) </para> @@ -2944,10 +2944,10 @@ <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 - where it can be read by other users. + Save the file. For this example, the file will be named + <filename>/home/me/mysql-init</filename>. The file + contains the password, so it should not be saved where + it can be read by other users. </para> </listitem> Modified: trunk/refman-5.0/errors-problems.xml =================================================================== --- trunk/refman-5.0/errors-problems.xml 2008-05-20 15:10:24 UTC (rev 10783) +++ trunk/refman-5.0/errors-problems.xml 2008-05-20 15:10:48 UTC (rev 10784) Changed blocks: 6, Lines Added: 27, Lines Deleted: 27; 4754 bytes @@ -2599,8 +2599,8 @@ <title>Resetting the Root Password on Windows Systems</title> <para> - The procedure for resetting the password for any MySQL - <literal>root</literal> accounts on Windows is as follows: + Use the following procedure for resetting the password for + any MySQL <literal>root</literal> accounts on Windows: </para> <orderedlist> @@ -2657,8 +2657,8 @@ <listitem> <para> - Save the file with any name. For this example, the file - will be <filename>C:\mysql-init.txt</filename>. + Save the file. For this example, the file will be named + <filename>C:\mysql-init.txt</filename>. </para> </listitem> @@ -2674,13 +2674,6 @@ <listitem> <para> - We assume that you installed MySQL to - <filename>C:\mysql</filename>. If you installed MySQL to - another location, adjust the following commands - accordingly. - </para> - - <para> Start the MySQL server with the special <option>--init-file</option> option: </para> @@ -2690,6 +2683,12 @@ </programlisting> <para> + If you installed MySQL to a location other than + <filename>C:\mysql</filename>, adjust the command + accordingly. + </para> + + <para> 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. @@ -2772,23 +2771,24 @@ </formalpara> <para> - In a Unix environment, the procedure for resetting the - password for any MySQL <literal>root</literal> accounts on - Unix follows. The following instructions assume that you - will start the server so that it runs using the same Unix - login account that you normally use for running the server. - 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. - (Alternatively, you can log in as <literal>root</literal> - and start <command>mysqld</command> with the + Use the following procedure for resetting the password for + any MySQL <literal>root</literal> accounts on Unix. The + instructions assume that you will start the server so that + it runs using the Unix login account that you normally use + for running the server. 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. (Alternatively, you can log in as + <literal>root</literal>, but in this case you + <emphasis>must</emphasis> start 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 + <option>--user=mysql</option>, the server may create <literal>root</literal>-owned files in the data directory, such as log files, and these may cause permission-related problems for future server startups. If that happens, you - must either change the ownership of the files to + will need to either change the ownership of the files to <literal>mysql</literal> or remove them.) </para> @@ -2861,10 +2861,10 @@ <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 - where it can be read by other users. + Save the file. For this example, the file will be named + <filename>/home/me/mysql-init</filename>. The file + contains the password, so it should not be saved where + it can be read by other users. </para> </listitem> Modified: trunk/refman-5.1/errors-problems-core.xml =================================================================== --- trunk/refman-5.1/errors-problems-core.xml 2008-05-20 15:10:24 UTC (rev 10783) +++ trunk/refman-5.1/errors-problems-core.xml 2008-05-20 15:10:48 UTC (rev 10784) Changed blocks: 6, Lines Added: 27, Lines Deleted: 27; 4769 bytes @@ -2602,8 +2602,8 @@ <title>Resetting the Root Password on Windows Systems</title> <para> - The procedure for resetting the password for any MySQL - <literal>root</literal> accounts on Windows is as follows: + Use the following procedure for resetting the password for + any MySQL <literal>root</literal> accounts on Windows: </para> <orderedlist> @@ -2660,8 +2660,8 @@ <listitem> <para> - Save the file with any name. For this example, the file - will be <filename>C:\mysql-init.txt</filename>. + Save the file. For this example, the file will be named + <filename>C:\mysql-init.txt</filename>. </para> </listitem> @@ -2677,13 +2677,6 @@ <listitem> <para> - We assume that you installed MySQL to - <filename>C:\mysql</filename>. If you installed MySQL to - another location, adjust the following commands - accordingly. - </para> - - <para> Start the MySQL server with the special <option>--init-file</option> option: </para> @@ -2693,6 +2686,12 @@ </programlisting> <para> + If you installed MySQL to a location other than + <filename>C:\mysql</filename>, adjust the command + accordingly. + </para> + + <para> 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. @@ -2775,23 +2774,24 @@ </formalpara> <para> - In a Unix environment, the procedure for resetting the - password for any MySQL <literal>root</literal> accounts on - Unix follows. The following instructions assume that you - will start the server so that it runs using the same Unix - login account that you normally use for running the server. - 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. - (Alternatively, you can log in as <literal>root</literal> - and start <command>mysqld</command> with the + Use the following procedure for resetting the password for + any MySQL <literal>root</literal> accounts on Unix. The + instructions assume that you will start the server so that + it runs using the Unix login account that you normally use + for running the server. 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. (Alternatively, you can log in as + <literal>root</literal>, but in this case you + <emphasis>must</emphasis> start 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 + <option>--user=mysql</option>, the server may create <literal>root</literal>-owned files in the data directory, such as log files, and these may cause permission-related problems for future server startups. If that happens, you - must either change the ownership of the files to + will need to either change the ownership of the files to <literal>mysql</literal> or remove them.) </para> @@ -2864,10 +2864,10 @@ <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 - where it can be read by other users. + Save the file. For this example, the file will be named + <filename>/home/me/mysql-init</filename>. The file + contains the password, so it should not be saved where + it can be read by other users. </para> </listitem> Modified: trunk/refman-6.0/errors-problems.xml =================================================================== --- trunk/refman-6.0/errors-problems.xml 2008-05-20 15:10:24 UTC (rev 10783) +++ trunk/refman-6.0/errors-problems.xml 2008-05-20 15:10:48 UTC (rev 10784) Changed blocks: 6, Lines Added: 27, Lines Deleted: 27; 4754 bytes @@ -2601,8 +2601,8 @@ <title>Resetting the Root Password on Windows Systems</title> <para> - The procedure for resetting the password for any MySQL - <literal>root</literal> accounts on Windows is as follows: + Use the following procedure for resetting the password for + any MySQL <literal>root</literal> accounts on Windows: </para> <orderedlist> @@ -2659,8 +2659,8 @@ <listitem> <para> - Save the file with any name. For this example, the file - will be <filename>C:\mysql-init.txt</filename>. + Save the file. For this example, the file will be named + <filename>C:\mysql-init.txt</filename>. </para> </listitem> @@ -2676,13 +2676,6 @@ <listitem> <para> - We assume that you installed MySQL to - <filename>C:\mysql</filename>. If you installed MySQL to - another location, adjust the following commands - accordingly. - </para> - - <para> Start the MySQL server with the special <option>--init-file</option> option: </para> @@ -2692,6 +2685,12 @@ </programlisting> <para> + If you installed MySQL to a location other than + <filename>C:\mysql</filename>, adjust the command + accordingly. + </para> + + <para> 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. @@ -2774,23 +2773,24 @@ </formalpara> <para> - In a Unix environment, the procedure for resetting the - password for any MySQL <literal>root</literal> accounts on - Unix follows. The following instructions assume that you - will start the server so that it runs using the same Unix - login account that you normally use for running the server. - 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. - (Alternatively, you can log in as <literal>root</literal> - and start <command>mysqld</command> with the + Use the following procedure for resetting the password for + any MySQL <literal>root</literal> accounts on Unix. The + instructions assume that you will start the server so that + it runs using the Unix login account that you normally use + for running the server. 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. (Alternatively, you can log in as + <literal>root</literal>, but in this case you + <emphasis>must</emphasis> start 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 + <option>--user=mysql</option>, the server may create <literal>root</literal>-owned files in the data directory, such as log files, and these may cause permission-related problems for future server startups. If that happens, you - must either change the ownership of the files to + will need to either change the ownership of the files to <literal>mysql</literal> or remove them.) </para> @@ -2863,10 +2863,10 @@ <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 - where it can be read by other users. + Save the file. For this example, the file will be named + <filename>/home/me/mysql-init</filename>. The file + contains the password, so it should not be saved where + it can be read by other users. </para> </listitem>
| Thread | ||
|---|---|---|
| • svn commit - mysqldoc@docsrva: r10784 - in trunk: . it/refman-5.1 pt/refman-5.1 refman-4.1 refman-5.0 refman-5.1 refman-6.0 | paul | 20 May 2008 |
© 1995-2008 MySQL AB. All rights reserved.
Page generated in 0.609 sec. using MySQL 5.1.14-beta-log