List:Commits« Previous MessageNext Message »
From:paul.dubois Date:January 11 2011 3:14pm
Subject:svn commit - mysqldoc@docsrva: r24770 - in trunk: . refman-5.0 refman-5.1 refman-5.5 refman-5.6 refman-6.0
View as plain text  
Author: paul
Date: 2011-01-11 16:14:02 +0100 (Tue, 11 Jan 2011)
New Revision: 24770

Log:
 r43950@dhcp-213:  paul | 2011-01-11 09:13:18 -0500
 Do not mention irrlevant-for-Windows program; confuses the issue


Modified:
   trunk/refman-5.0/installing-windows.xml
   trunk/refman-5.1/installing-windows.xml
   trunk/refman-5.5/installing-windows.xml
   trunk/refman-5.6/installing-windows.xml
   trunk/refman-6.0/installing-windows.xml

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:46087
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:66486
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
ebeeeee4-b232-4669-a521-231442eced53:/mysqldoc-local/mysqldoc/trunk:43871
   + 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:46087
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:66486
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
ebeeeee4-b232-4669-a521-231442eced53:/mysqldoc-local/mysqldoc/trunk:43950


Modified: trunk/refman-5.0/installing-windows.xml
===================================================================
--- trunk/refman-5.0/installing-windows.xml	2011-01-11 15:13:45 UTC (rev 24769)
+++ trunk/refman-5.0/installing-windows.xml	2011-01-11 15:14:02 UTC (rev 24770)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 6; 1290 bytes

@@ -2882,12 +2882,11 @@
       On Windows, you need not create the data directory and the grant
       tables. MySQL Windows distributions include the grant tables with
       a set of preinitialized accounts in the <literal>mysql</literal>
-      database under the data directory. It is unnecessary to run the
-      <command>mysql_install_db</command> script that is used on Unix.
-      Regarding passwords, if you installed MySQL using the Windows
-      Installation Wizard, you may have already assigned passwords to
-      the accounts. (See <xref linkend="windows-install-wizard"/>.)
-      Otherwise, use the password-assignment procedure given in
+      database under the data directory. Regarding passwords, if you
+      installed MySQL using the Windows Installation Wizard, you may
+      have already assigned passwords to the accounts. (See
+      <xref linkend="windows-install-wizard"/>.) Otherwise, use the
+      password-assignment procedure given in
       <xref linkend="default-privileges"/>.
     </para>
 


Modified: trunk/refman-5.1/installing-windows.xml
===================================================================
--- trunk/refman-5.1/installing-windows.xml	2011-01-11 15:13:45 UTC (rev 24769)
+++ trunk/refman-5.1/installing-windows.xml	2011-01-11 15:14:02 UTC (rev 24770)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 6; 1290 bytes

@@ -3958,12 +3958,11 @@
       On Windows, you need not create the data directory and the grant
       tables. MySQL Windows distributions include the grant tables with
       a set of preinitialized accounts in the <literal>mysql</literal>
-      database under the data directory. It is unnecessary to run the
-      <command>mysql_install_db</command> script that is used on Unix.
-      Regarding passwords, if you installed MySQL using the Windows
-      Installation Wizard, you may have already assigned passwords to
-      the accounts. (See <xref linkend="windows-install-wizard"/>.)
-      Otherwise, use the password-assignment procedure given in
+      database under the data directory. Regarding passwords, if you
+      installed MySQL using the Windows Installation Wizard, you may
+      have already assigned passwords to the accounts. (See
+      <xref linkend="windows-install-wizard"/>.) Otherwise, use the
+      password-assignment procedure given in
       <xref linkend="default-privileges"/>.
     </para>
 


Modified: trunk/refman-5.5/installing-windows.xml
===================================================================
--- trunk/refman-5.5/installing-windows.xml	2011-01-11 15:13:45 UTC (rev 24769)
+++ trunk/refman-5.5/installing-windows.xml	2011-01-11 15:14:02 UTC (rev 24770)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 6; 1290 bytes

@@ -3619,12 +3619,11 @@
       On Windows, you need not create the data directory and the grant
       tables. MySQL Windows distributions include the grant tables with
       a set of preinitialized accounts in the <literal>mysql</literal>
-      database under the data directory. It is unnecessary to run the
-      <command>mysql_install_db</command> script that is used on Unix.
-      Regarding passwords, if you installed MySQL using the Windows
-      Installation Wizard, you may have already assigned passwords to
-      the accounts. (See <xref linkend="windows-install-wizard"/>.)
-      Otherwise, use the password-assignment procedure given in
+      database under the data directory. Regarding passwords, if you
+      installed MySQL using the Windows Installation Wizard, you may
+      have already assigned passwords to the accounts. (See
+      <xref linkend="windows-install-wizard"/>.) Otherwise, use the
+      password-assignment procedure given in
       <xref linkend="default-privileges"/>.
     </para>
 


Modified: trunk/refman-5.6/installing-windows.xml
===================================================================
--- trunk/refman-5.6/installing-windows.xml	2011-01-11 15:13:45 UTC (rev 24769)
+++ trunk/refman-5.6/installing-windows.xml	2011-01-11 15:14:02 UTC (rev 24770)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 6; 1290 bytes

@@ -3608,12 +3608,11 @@
       On Windows, you need not create the data directory and the grant
       tables. MySQL Windows distributions include the grant tables with
       a set of preinitialized accounts in the <literal>mysql</literal>
-      database under the data directory. It is unnecessary to run the
-      <command>mysql_install_db</command> script that is used on Unix.
-      Regarding passwords, if you installed MySQL using the Windows
-      Installation Wizard, you may have already assigned passwords to
-      the accounts. (See <xref linkend="windows-install-wizard"/>.)
-      Otherwise, use the password-assignment procedure given in
+      database under the data directory. Regarding passwords, if you
+      installed MySQL using the Windows Installation Wizard, you may
+      have already assigned passwords to the accounts. (See
+      <xref linkend="windows-install-wizard"/>.) Otherwise, use the
+      password-assignment procedure given in
       <xref linkend="default-privileges"/>.
     </para>
 


Modified: trunk/refman-6.0/installing-windows.xml
===================================================================
--- trunk/refman-6.0/installing-windows.xml	2011-01-11 15:13:45 UTC (rev 24769)
+++ trunk/refman-6.0/installing-windows.xml	2011-01-11 15:14:02 UTC (rev 24770)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 6; 1290 bytes

@@ -2890,12 +2890,11 @@
       On Windows, you need not create the data directory and the grant
       tables. MySQL Windows distributions include the grant tables with
       a set of preinitialized accounts in the <literal>mysql</literal>
-      database under the data directory. It is unnecessary to run the
-      <command>mysql_install_db</command> script that is used on Unix.
-      Regarding passwords, if you installed MySQL using the Windows
-      Installation Wizard, you may have already assigned passwords to
-      the accounts. (See <xref linkend="windows-install-wizard"/>.)
-      Otherwise, use the password-assignment procedure given in
+      database under the data directory. Regarding passwords, if you
+      installed MySQL using the Windows Installation Wizard, you may
+      have already assigned passwords to the accounts. (See
+      <xref linkend="windows-install-wizard"/>.) Otherwise, use the
+      password-assignment procedure given in
       <xref linkend="default-privileges"/>.
     </para>
 


Thread
svn commit - mysqldoc@docsrva: r24770 - in trunk: . refman-5.0 refman-5.1 refman-5.5 refman-5.6 refman-6.0paul.dubois11 Jan