Author: paul
Date: 2006-10-25 16:10:58 +0200 (Wed, 25 Oct 2006)
New Revision: 3735
Log:
r11233@frost: paul | 2006-10-25 09:06:06 -0500
Rewrite general-installation-issues to account for the ES/CS split.
Modified:
trunk/refman-5.0/installing.xml
trunk/refman-5.1/installing.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:14819
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:11226
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:10957
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:14819
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:11233
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:10957
Modified: trunk/refman-5.0/installing.xml
===================================================================
--- trunk/refman-5.0/installing.xml 2006-10-25 14:03:37 UTC (rev 3734)
+++ trunk/refman-5.0/installing.xml 2006-10-25 14:10:58 UTC (rev 3735)
Changed blocks: 3, Lines Added: 40, Lines Deleted: 22; 4146 bytes
@@ -51,10 +51,10 @@
<listitem>
<para>
<emphasis role="bold">Determine whether MySQL runs, and whether
- it is supported on your platform.</emphasis> Please note that
+ it is supported on your platform.</emphasis> Please note that
not all platforms are equally suitable for running MySQL, and
that not all platforms on which MySQL is known to run are
- officially supported by MySQL AB. See
+ officially supported by MySQL AB. See
<xref linkend="which-os"/>, for details.
</para>
</listitem>
@@ -124,42 +124,60 @@
</orderedlist>
- <section id="general-installation-issues" role="cs">
+ <section id="general-installation-issues">
<title>General Installation Issues</title>
- &cs-only;
-
+
<para>
- Before installing MySQL, you should do the following:
+ The MySQL installation procedure depends on whether you will
+ install MySQL Enterprise Server or MySQL Community Server. The set
+ of applicable platforms depends on which distribution you will
+ install. For MySQL Enterprise Server, the officially supported
+ platforms are listed at
+ <ulink url="http://www.mysql.com/support/supportedplatforms.html"/>.
+ MySQL Community Server runs on the platforms listed at
+ <xref linkend="which-os"/>.
</para>
- <orderedlist>
+ <para>
+ For MySQL Enterprise Server, install the main distribution plus
+ any service packs or hotfixes that you wish to apply using the
+ Enterprise Installer. For platforms that do not yet have an
+ Enterprise Installer, use the Community Server instructions.
+ </para>
- <listitem>
- <para>
- Determine whether MySQL runs on your platform.
- </para>
- </listitem>
+ <para>
+ For MySQL Community Server, install the main distribution plus any
+ hotfixes and updates:
+ </para>
+ <itemizedlist>
+
<listitem>
<para>
- Choose a distribution to install.
+ Download a binary release, or download a source release and
+ build MySQL yourself from the source code.
</para>
</listitem>
<listitem>
<para>
- Download the distribution and verify its integrity.
+ Retrieve MySQL from the BitKeeper tree and build it from
+ source. The BitKeeper tree contains the latest developer code.
</para>
</listitem>
- </orderedlist>
+ </itemizedlist>
<para>
- This section contains the information necessary to carry out these
- steps. After doing so, you can use the instructions in later
- sections of the chapter to install the distribution that you
- choose.
+ The immediately following sections contain the information
+ necessary to choose, download, and verify your distribution. The
+ instructions in later sections of the chapter describe how to
+ install the distribution that you choose. For binary
+ distributions, see the instructions at
+ <xref linkend="quick-standard-installation"/>. To build MySQL from
+ source, use the instructions at
+ <xref linkend="installing-source"/>.
</para>
<section id="which-os" role="cs">
@@ -192,14 +210,14 @@
This section lists the operating systems on which MySQL is known
to run.
</para>
-
+
<para>
<emphasis role="bold">Important</emphasis>: MySQL AB does not
necessarily provide official support for all the platforms
listed in this section. For information about those platforms
- which MySQL AB officially supports, see
+ which MySQL AB officially supports, see
<ulink url="http://www.mysql.com/support/supportedplatforms.html">MySQL
- Server Supported Platforms</ulink> on the MySQL website.
+ Server Supported Platforms</ulink> on the MySQL website.
</para>
<para>
Modified: trunk/refman-5.1/installing.xml
===================================================================
--- trunk/refman-5.1/installing.xml 2006-10-25 14:03:37 UTC (rev 3734)
+++ trunk/refman-5.1/installing.xml 2006-10-25 14:10:58 UTC (rev 3735)
Changed blocks: 1, Lines Added: 33, Lines Deleted: 14; 2739 bytes
@@ -114,36 +114,55 @@
<title>General Installation Issues</title>
<para>
- Before installing MySQL, you should do the following:
+ The MySQL installation procedure depends on whether you will
+ install MySQL Enterprise Server or MySQL Community Server. The set
+ of applicable platforms depends on which distribution you will
+ install. For MySQL Enterprise Server, the officially supported
+ platforms are listed at
+ <ulink url="http://www.mysql.com/support/supportedplatforms.html"/>.
+ MySQL Community Server runs on the platforms listed at
+ <xref linkend="which-os"/>.
</para>
- <orderedlist>
+ <para>
+ For MySQL Enterprise Server, install the main distribution plus
+ any service packs or hotfixes that you wish to apply using the
+ Enterprise Installer. For platforms that do not yet have an
+ Enterprise Installer, use the Community Server instructions.
+ </para>
- <listitem>
- <para>
- Determine whether MySQL runs on your platform.
- </para>
- </listitem>
+ <para>
+ For MySQL Community Server, install the main distribution plus any
+ hotfixes and updates:
+ </para>
+ <itemizedlist>
+
<listitem>
<para>
- Choose a distribution to install.
+ Download a binary release, or download a source release and
+ build MySQL yourself from the source code.
</para>
</listitem>
<listitem>
<para>
- Download the distribution and verify its integrity.
+ Retrieve MySQL from the BitKeeper tree and build it from
+ source. The BitKeeper tree contains the latest developer code.
</para>
</listitem>
- </orderedlist>
+ </itemizedlist>
<para>
- This section contains the information necessary to carry out these
- steps. After doing so, you can use the instructions in later
- sections of the chapter to install the distribution that you
- choose.
+ The immediately following sections contain the information
+ necessary to choose, download, and verify your distribution. The
+ instructions in later sections of the chapter describe how to
+ install the distribution that you choose. For binary
+ distributions, see the instructions at
+ <xref linkend="quick-standard-installation"/>. To build MySQL from
+ source, use the instructions at
+ <xref linkend="installing-source"/>.
</para>
<section id="which-os">
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r3735 - in trunk: . refman-5.0 refman-5.1 | paul | 25 Oct |
