Author: paul
Date: 2009-01-09 19:55:06 +0100 (Fri, 09 Jan 2009)
New Revision: 13075
Log:
r37147@frost: paul | 2009-01-09 12:55:41 -0500
Fix validation problem, version inconsistencies
Modified:
trunk/refman-5.0/installing-core.xml
trunk/refman-5.1/installing-core.xml
trunk/refman-6.0/installing-core.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:40875
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:37136
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:35335
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:40875
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:37147
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:35335
Modified: trunk/refman-5.0/installing-core.xml
===================================================================
--- trunk/refman-5.0/installing-core.xml 2009-01-09 18:40:01 UTC (rev 13074)
+++ trunk/refman-5.0/installing-core.xml 2009-01-09 18:55:06 UTC (rev 13075)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 3; 993 bytes
@@ -1210,9 +1210,9 @@
<note>
<para>
If you are installing on Windows Vista it is best to open a
- port for MySQL to use before beginning the installation. To
- do this, first ensure that you are logged in as an
- administrator, then go to the <literal>Control
+ network port for MySQL to use before beginning the
+ installation. To do this, first ensure that you are logged
+ in as an Administrator, then go to the <literal>Control
Panel</literal> and double-click the <literal>Windows
Firewall</literal> icon. Choose the <literal>Allow a program
through Windows Firewall</literal> option and click the
Modified: trunk/refman-5.1/installing-core.xml
===================================================================
--- trunk/refman-5.1/installing-core.xml 2009-01-09 18:40:01 UTC (rev 13074)
+++ trunk/refman-5.1/installing-core.xml 2009-01-09 18:55:06 UTC (rev 13075)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 633 bytes
@@ -2683,8 +2683,8 @@
<listitem>
<para>
- A 32-bit Windows operating system, including Windows 2000,
- Windows XP, Windows Vista, Windows Server 2003, and Windows
+ A 32-bit Windows operating system such as Windows 2000,
+ Windows XP, Windows Vista, Windows Server 2003, or Windows
Server 2008.
</para>
Modified: trunk/refman-6.0/installing-core.xml
===================================================================
--- trunk/refman-6.0/installing-core.xml 2009-01-09 18:40:01 UTC (rev 13074)
+++ trunk/refman-6.0/installing-core.xml 2009-01-09 18:55:06 UTC (rev 13075)
Changed blocks: 3, Lines Added: 6, Lines Deleted: 8; 1908 bytes
@@ -2699,8 +2699,8 @@
encounter problems with certain operations such as editing the
<literal>PATH</literal> environment variable or accessing the
<command>Service Control Manager</command>. Once installed,
- MySQL does not need to be executed using a user with Admin
- istrator privileges.
+ MySQL does not need to be executed using a user with
+ Administrator privileges.
</para>
</listitem>
@@ -2939,8 +2939,6 @@
<title>Using the MySQL Installation Wizard</title>
- <title>Introduction to the Installation Wizard</title>
-
<para>
MySQL Installation Wizard is an installer for the MySQL server
that uses the latest installer technologies for Microsoft
@@ -3009,10 +3007,10 @@
<note>
<para>
If you are installing on Windows Vista it is best to open a
- port before beginning the installation. To do this first
- ensure that you are logged in as an administrator, go to the
- <literal>Control Panel</literal>, and double click the
- <literal>Windows Firewall</literal> icon. Choose the
+ network port before beginning the installation. To do this,
+ first ensure that you are logged in as an Administrator, go
+ to the <literal>Control Panel</literal>, and double click
+ the <literal>Windows Firewall</literal> icon. Choose the
<literal>Allow a program through Windows Firewall</literal>
option and click the <guibutton>Add port</guibutton> button.
Enter <literal>MySQL</literal> into the
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r13075 - in trunk: . refman-5.0 refman-5.1 refman-6.0 | paul.dubois | 9 Jan |
