Author: mcbrown
Date: 2007-07-26 14:38:13 +0200 (Thu, 26 Jul 2007)
New Revision: 7220
Log:
Merging CS/ES installers.
Removing the last vestiges of anything resembling a specific Enterprise only installer
Modified:
trunk/refman-5.0/Makefile.depends
trunk/refman-5.0/installing-cs.xml
trunk/refman-5.0/installing-es.xml
trunk/refman-5.0/renamed-nodes.txt
Modified: trunk/refman-5.0/Makefile.depends
===================================================================
--- trunk/refman-5.0/Makefile.depends 2007-07-26 09:06:17 UTC (rev 7219)
+++ trunk/refman-5.0/Makefile.depends 2007-07-26 12:38:13 UTC (rev 7220)
Changed blocks: 7, Lines Added: 30, Lines Deleted: 45; 4274 bytes
@@ -568,8 +568,37 @@
../common/phrases.ent \
../refman-common/urls.ent \
all-entities.ent \
+ config-wizard.xml \
+ images/mysql-cfg-fig1.png \
+ images/mysql-cfg-fig10.png \
+ images/mysql-cfg-fig2.png \
+ images/mysql-cfg-fig3.png \
+ images/mysql-cfg-fig4.png \
+ images/mysql-cfg-fig5.png \
+ images/mysql-cfg-fig6.png \
+ images/mysql-cfg-fig7.png \
+ images/mysql-cfg-fig8.png \
+ images/mysql-cfg-fig9.png \
+ images/mysql-es-win32-fig1.png \
+ images/mysql-es-win32-fig2.png \
+ images/mysql-es-win32-fig3.png \
+ images/mysql-es-win32-fig4.png \
versions.ent
-installing_cs_IMAGES =
+installing_cs_IMAGES = \
+ images/mysql-cfg-fig1.png \
+ images/mysql-cfg-fig10.png \
+ images/mysql-cfg-fig2.png \
+ images/mysql-cfg-fig3.png \
+ images/mysql-cfg-fig4.png \
+ images/mysql-cfg-fig5.png \
+ images/mysql-cfg-fig6.png \
+ images/mysql-cfg-fig7.png \
+ images/mysql-cfg-fig8.png \
+ images/mysql-cfg-fig9.png \
+ images/mysql-es-win32-fig1.png \
+ images/mysql-es-win32-fig2.png \
+ images/mysql-es-win32-fig3.png \
+ images/mysql-es-win32-fig4.png
installing_cs_SOURCES = installing-cs.xml $(installing_cs_INCLUDES)
installing_cs_IDMAPS = \
../refman-common/metadata/bug-reports.idmap \
@@ -577,7 +606,6 @@
metadata/apis-c.idmap \
metadata/charset.idmap \
metadata/client-utility-programs.idmap \
- metadata/config-wizard.idmap \
metadata/connectors.idmap \
metadata/data-types.idmap \
metadata/dba-core.idmap \
@@ -613,47 +641,12 @@
../common/phrases.ent \
../refman-common/urls.ent \
all-entities.ent \
- config-wizard.xml \
- images/mysql-cfg-fig1.png \
- images/mysql-cfg-fig10.png \
- images/mysql-cfg-fig2.png \
- images/mysql-cfg-fig3.png \
- images/mysql-cfg-fig4.png \
- images/mysql-cfg-fig5.png \
- images/mysql-cfg-fig6.png \
- images/mysql-cfg-fig7.png \
- images/mysql-cfg-fig8.png \
- images/mysql-cfg-fig9.png \
- images/mysql-es-win32-fig1.png \
- images/mysql-es-win32-fig2.png \
- images/mysql-es-win32-fig3.png \
- images/mysql-es-win32-fig4.png \
- images/mysql-es-win32-fig5.png \
- images/mysql-es-win32-fig6.png \
images/mysql-esi-win32-uninst.png \
versions.ent
installing_es_IMAGES = \
- images/mysql-cfg-fig1.png \
- images/mysql-cfg-fig10.png \
- images/mysql-cfg-fig2.png \
- images/mysql-cfg-fig3.png \
- images/mysql-cfg-fig4.png \
- images/mysql-cfg-fig5.png \
- images/mysql-cfg-fig6.png \
- images/mysql-cfg-fig7.png \
- images/mysql-cfg-fig8.png \
- images/mysql-cfg-fig9.png \
- images/mysql-es-win32-fig1.png \
- images/mysql-es-win32-fig2.png \
- images/mysql-es-win32-fig3.png \
- images/mysql-es-win32-fig4.png \
- images/mysql-es-win32-fig5.png \
- images/mysql-es-win32-fig6.png \
images/mysql-esi-win32-uninst.png
installing_es_SOURCES = installing-es.xml $(installing_es_INCLUDES)
installing_es_IDMAPS = \
- ../refman-common/metadata/bug-reports.idmap \
- metadata/dba-core.idmap \
metadata/installing-cs.idmap \
metadata/news.idmap \
metadata/releasenotes-es.idmap
@@ -705,8 +698,6 @@
images/mysql-es-win32-fig2.png \
images/mysql-es-win32-fig3.png \
images/mysql-es-win32-fig4.png \
- images/mysql-es-win32-fig5.png \
- images/mysql-es-win32-fig6.png \
images/mysql-esi-win32-uninst.png \
installing-cs.xml \
installing-es.xml \
@@ -727,8 +718,6 @@
images/mysql-es-win32-fig2.png \
images/mysql-es-win32-fig3.png \
images/mysql-es-win32-fig4.png \
- images/mysql-es-win32-fig5.png \
- images/mysql-es-win32-fig6.png \
images/mysql-esi-win32-uninst.png
installing_SOURCES = installing.xml $(installing_INCLUDES)
installing_IDMAPS = \
@@ -978,8 +967,6 @@
images/mysql-es-win32-fig2.png \
images/mysql-es-win32-fig3.png \
images/mysql-es-win32-fig4.png \
- images/mysql-es-win32-fig5.png \
- images/mysql-es-win32-fig6.png \
images/mysql-esi-win32-uninst.png \
images/ndb-size-pl-1.png \
images/replicas-groups-1-1.png \
@@ -1095,8 +1082,6 @@
images/mysql-es-win32-fig2.png \
images/mysql-es-win32-fig3.png \
images/mysql-es-win32-fig4.png \
- images/mysql-es-win32-fig5.png \
- images/mysql-es-win32-fig6.png \
images/mysql-esi-win32-uninst.png \
images/ndb-size-pl-1.png \
images/replicas-groups-1-1.png \
Modified: trunk/refman-5.0/installing-cs.xml
===================================================================
--- trunk/refman-5.0/installing-cs.xml 2007-07-26 09:06:17 UTC (rev 7219)
+++ trunk/refman-5.0/installing-cs.xml 2007-07-26 12:38:13 UTC (rev 7220)
Changed blocks: 10, Lines Added: 48, Lines Deleted: 30; 4747 bytes
@@ -2757,7 +2757,7 @@
<section id="mysql-install-wizard-starting" role="cs">
<title>Downloading and Starting the MySQL Installation Wizard</title>
- &cs-only;
+
<para>
The MySQL installation packages can be downloaded from
<ulink url="&base-url-downloads;"/>. If the package you
@@ -2774,16 +2774,23 @@
start the installation process.
</para>
- <remark>
- END STARTING
- </remark>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/mysql-es-win32-fig1.png"
+ format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase lang="en">MySQL Installer Main Screen
+ (Windows)</phrase>
+ </textobject>
+ </mediaobject>
</section>
<section id="mysql-install-wizard-install-type" role="cs">
<title>Choosing an Install Type</title>
- &cs-only;
+
<para>
There are three installation types available:
<emphasis role="bold">Typical</emphasis>,
@@ -2791,6 +2798,17 @@
<emphasis role="bold">Custom</emphasis>.
</para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/mysql-es-win32-fig2.png"
+ format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase lang="en">MySQL Installer Setup type
+ (Windows)</phrase>
+ </textobject>
+ </mediaobject>
+
<para>
The <emphasis role="bold">Typical</emphasis> installation type
installs the MySQL server, the <command>mysql</command>
@@ -2828,10 +2846,6 @@
<xref linkend="mysql-install-wizard-custom-install"/>.
</para>
- <remark>
- END INSTALLATION TYPES
- </remark>
-
</section>
<section id="mysql-install-wizard-custom-install" role="cs">
@@ -2845,6 +2859,17 @@
installation type.
</para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/mysql-es-win32-fig3.png"
+ format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase lang="en">MySQL Installer Custom Installation
+ (Windows)</phrase>
+ </textobject>
+ </mediaobject>
+
<para>
A tree view on the left side of the custom install dialog
lists all available components. Components that are not
@@ -2866,10 +2891,6 @@
to the confirmation dialog.
</para>
- <remark>
- END CUSTOM INSTALLATION
- </remark>
-
</section>
<section id="mysql-install-wizard-confirmation-dialog" role="cs">
@@ -2883,6 +2904,17 @@
displayed for you to review.
</para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/mysql-es-win32-fig4.png"
+ format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase lang="en">MySQL Installer Installation Summary
+ (Windows)</phrase>
+ </textobject>
+ </mediaobject>
+
<para>
To install MySQL if you are satisfied with your settings,
click the <guibutton>Install</guibutton> button. To change
@@ -2905,10 +2937,6 @@
service, and configure security settings.
</para>
- <remark>
- END CONFIRMATION DIALOG
- </remark>
-
</section>
<section id="mysql-install-wizard-changes" role="cs">
@@ -3091,19 +3119,8 @@
</section>
- <section id="windows-config-wizard">
+ <xi:include href="config-wizard.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <title>MySQL Windows Configuration Wizard</title>
-
- <para>
- For instructions on using the MySQL Configuration Wizard for
- Wizard to configure your MySQL server, see
- <xref
- linkend="mysql-config-wizard"/>.
- </para>
-
- </section>
-
<section id="windows-install-archive" role="cs">
<title>Installing MySQL from a Noinstall Zip Archive</title>
@@ -5640,7 +5657,8 @@
(<filename>mysql-<replaceable>5.0.42</replaceable>-i5os-power-32bit.savf</filename>)
or 64-bit
(<filename>mysql-<replaceable>5.0.42</replaceable>-i5os-power-64bit.savf</filename>)
- from <ulink url="http://dev.mysql.com/downloads">MySQL Downloads</ulink>.
+ from <ulink url="http://dev.mysql.com/downloads">MySQL
+ Downloads</ulink>.
</para>
</listitem>
Modified: trunk/refman-5.0/installing-es.xml
===================================================================
--- trunk/refman-5.0/installing-es.xml 2007-07-26 09:06:17 UTC (rev 7219)
+++ trunk/refman-5.0/installing-es.xml 2007-07-26 12:38:13 UTC (rev 7220)
Changed blocks: 3, Lines Added: 8, Lines Deleted: 185; 7501 bytes
@@ -23,7 +23,6 @@
<section id="installing-es-overview">
<title>Overview of MySQL Enterprise Installation</title>
-&es-only;
<para>
To obtain MySQL Enterprise, visit
@@ -38,9 +37,8 @@
distribution plus the latest available service pack or hot-fix.
You only need to install the latest service pack or hot-fix
– this will include all updates since the previous main
- distribution release. For platforms that do not have a MySQL
- Enterprise Server installer, use the Community Server instructions
- (see <xref linkend="installing-cs"/>).
+ distribution release. For all platforms use the Community Server
+ instructions (see <xref linkend="installing-cs"/>).
</para>
</section>
@@ -121,189 +119,14 @@
<section id="installing-es-installer">
<title>Installing the Enterprise MySQL Server</title>
- &es-only;
-
- <para>
- Installers for MySQL Enterprise are available for the Windows and
- Mac OS X. For other platforms, you will need to use the TAR, Zip
- or native package format (RPM, Solaris PKG) pafiles to perform the
- installation.
+
+ <para>
+ For Windows and Mac OS X platforms you will need to use the MySQL
+ installer. For all other other platforms, you will need to use the
+ TAR, Zip or native package format (RPM, Solaris PKG) pafiles to
+ perform the installation.
</para>
- <section id="installing-es-installer-windows">
-
- <title>Using the Enterprise MySQL Installer for Windows</title>
-&es-only;
-
- <remark role="todo">
- [MC] Add notes on Service Pack/Hot fix installation here,
- forward link to SP/HF
- </remark>
-
- <para>
- The Enterprise MySQL Server installer installs the MySQL server
- and the MySQL Server Configuration Wizard, and enables you to
- run the configuration wizard to set up and configure your server
- before use.
- </para>
-
- <para>
- To start the installation process:
- </para>
-
- <orderedlist>
-
- <listitem>
- <para>
- Download the
- <filename>mysql-enterprise<replaceable>VERSION</replaceable>-win32.zip</filename>
- file and extract the <filename>Setup.exe</filename> file.
- You should double-click on this file to start the
- installation process.
- </para>
- </listitem>
-
- <listitem>
- <para>
- The opening screen provides an overview of what the
- installer will achieve. Click <guibutton>Next</guibutton> to
- continue.
- </para>
-
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/mysql-es-win32-fig1.png"
- format="PNG"/>
- </imageobject>
- <textobject>
- <phrase lang="en">MySQL Enterprise Installer Main Screen
- (Windows)</phrase>
- </textobject>
- </mediaobject>
- </listitem>
-
- <listitem>
- <para>
- Choose your installation type. The
- <emphasis
- role="bold">Typical</emphasis> installation
- installs the main server and associated components, but does
- not include the developer libraries. The
- <emphasis role="bold">Complete</emphasis> installation
- installs everything. The
- <emphasis role="bold">Custom</emphasis> installation enables
- you to select which components are installed. Choose your
- installation and click <guibutton>Next</guibutton> to
- continue.
- </para>
-
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/mysql-es-win32-fig2.png"
- format="PNG"/>
- </imageobject>
- <textobject>
- <phrase lang="en">MySQL Enterprise Installer Setup type
- (Windows)</phrase>
- </textobject>
- </mediaobject>
- </listitem>
-
- <listitem>
- <para>
- If you have selected the custom installation, you need to
- choose which components are installed. Click
- <guibutton>Next</guibutton> to continute.
- </para>
-
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/mysql-es-win32-fig3.png"
- format="PNG"/>
- </imageobject>
- <textobject>
- <phrase lang="en">MySQL Enterprise Installer Custom
- Installation (Windows)</phrase>
- </textobject>
- </mediaobject>
- </listitem>
-
- <listitem>
- <para>
- The installation choices you have made will be summarized
- for you. If you have made a mistake, you can click
- <guibutton>Back</guibutton> to choose an alternate
- installation type. If you are ready to continue, choose
- <guibutton>Install</guibutton>.
- </para>
-
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/mysql-es-win32-fig4.png"
- format="PNG"/>
- </imageobject>
- <textobject>
- <phrase lang="en">MySQL Enterprise Installer Installation
- Summary (Windows)</phrase>
- </textobject>
- </mediaobject>
- </listitem>
-
- <listitem>
- <para>
- You can optionally set up your a connection to your
- MySQL.com account by entering your login details, or you can
- create a new account, or you can skip the MySQL.com signup.
- </para>
-
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/mysql-es-win32-fig5.png"
- format="PNG"/>
- </imageobject>
- <textobject>
- <phrase lang="en">MySQL Enterprise Installer MySQL.com
- Registration (Windows)</phrase>
- </textobject>
- </mediaobject>
- </listitem>
-
- <listitem>
- <para>
- The installation should proceed, installing the components
- you have selected. Once the installation has completed, you
- will get the opportunity to start the MySQL Instance
- Configuration Wizard. Untick the box if you do not want to
- run the wizard at this time. Click
- <guibutton>Finish</guibutton> to complete the installation.
- If you have opted to run the wizard, then it will be started
- once the installer has completed.
- </para>
-
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/mysql-es-win32-fig6.png"
- format="PNG"/>
- </imageobject>
- <textobject>
- <phrase lang="en">MySQL Enterprise Installer Completed
- (Windows)</phrase>
- </textobject>
- </mediaobject>
- </listitem>
-
- </orderedlist>
-
- <para>
- If you selected to run the MySQL Configuration Wizard, see
- <xref
- linkend="mysql-config-wizard"/>.
- </para>
-
- </section>
-
- <xi:include href="config-wizard.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-
</section>
<section id="installing-es-upgrade">
Modified: trunk/refman-5.0/renamed-nodes.txt
===================================================================
--- trunk/refman-5.0/renamed-nodes.txt 2007-07-26 09:06:17 UTC (rev 7219)
+++ trunk/refman-5.0/renamed-nodes.txt 2007-07-26 12:38:13 UTC (rev 7220)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 0; 946 bytes
@@ -213,6 +213,7 @@
innodb-news-4-1-9 ../../4.1/en/innodb-news-4-1-9
innodb-start innodb-parameters
installing-es-default-config installing-es
+installing-es-installer-windows windows-install-wizard
installing-myodbc myodbc-installation
instance-manager-command-line-options instance-manager-command-options
introduction-to-odbc myodbc-general-information
@@ -644,6 +645,7 @@
where-to-get-myodbc myodbc-installation-obtaining
win95-start windows-start-command-line
windows-binary-installation windows-installation
+windows-config-wizard mysql-config-wizard
windows-prepare-environment windows-create-option-file
windows-running windows-testing
windows-system-requirements windows-installation
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r7220 - trunk/refman-5.0 | mcbrown | 26 Jul |
