Author: paul
Date: 2010-12-15 19:08:07 +0100 (Wed, 15 Dec 2010)
New Revision: 24464
Log:
r37219@dhcp-215: paul | 2010-12-15 12:06:28 -0500
5.5 is GA now
Modified:
trunk/refman-4.1/installing.xml
trunk/refman-5.0/installing-cs.xml
trunk/refman-5.1/installing-general.xml
trunk/refman-5.5/installing-general.xml
trunk/refman-5.5/versions.ent
trunk/refman-5.6/installing-general.xml
trunk/refman-6.0/installing-general.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:45456
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:37214
+ 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:45456
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:37219
Modified: trunk/refman-4.1/installing.xml
===================================================================
--- trunk/refman-4.1/installing.xml 2010-12-15 18:07:36 UTC (rev 24463)
+++ trunk/refman-4.1/installing.xml 2010-12-15 18:08:07 UTC (rev 24464)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 6; 1080 bytes
@@ -451,17 +451,16 @@
<listitem>
<para>
- MySQL 5.5 and 5.6 are the current development release
- series.
+ MySQL 5.6 is the current development release series.
</para>
</listitem>
<listitem>
<para>
- MySQL 5.1 is the current General Availability (Production)
- release series. New releases are issued for bugfixes only;
- no new features are being added that could effect
- stability.
+ MySQL 5.5 and MySQL 5.1 are the current General
+ Availability (Production) release series. New releases are
+ issued for bugfixes only; no new features are being added
+ that could affect stability.
</para>
</listitem>
Modified: trunk/refman-5.0/installing-cs.xml
===================================================================
--- trunk/refman-5.0/installing-cs.xml 2010-12-15 18:07:36 UTC (rev 24463)
+++ trunk/refman-5.0/installing-cs.xml 2010-12-15 18:08:07 UTC (rev 24464)
Changed blocks: 2, Lines Added: 12, Lines Deleted: 12; 2072 bytes
@@ -101,13 +101,13 @@
<para>
After installing MySQL, read
- <xref linkend="postinstallation"/>, which contains
- important information about making sure the MySQL server is
- working properly. It also describes how to secure the
- initial MySQL user accounts, <emphasis>which have no
- passwords</emphasis> until you assign passwords. The
- information in this section applies whether you install
- MySQL using a binary or source distribution.
+ <xref linkend="postinstallation"/>, which contains important
+ information about making sure the MySQL server is working
+ properly. It also describes how to secure the initial MySQL
+ user accounts, <emphasis>which have no passwords</emphasis>
+ until you assign passwords. The information in this section
+ applies whether you install MySQL using a binary or source
+ distribution.
</para>
</formalpara>
@@ -459,16 +459,16 @@
<listitem>
<para>
- MySQL 5.5 and 5.6 are the current development release
- series.
+ MySQL 5.6 is the current development release series.
</para>
</listitem>
<listitem>
<para>
- MySQL 5.1 is the current General Availability (Production)
- release series. New releases are issued for bugfixes only;
- no new features are being added that could affect stability.
+ MySQL 5.5 and MySQL 5.1 are the current General Availability
+ (Production) release series. New releases are issued for
+ bugfixes only; no new features are being added that could
+ affect stability.
</para>
</listitem>
Modified: trunk/refman-5.1/installing-general.xml
===================================================================
--- trunk/refman-5.1/installing-general.xml 2010-12-15 18:07:36 UTC (rev 24463)
+++ trunk/refman-5.1/installing-general.xml 2010-12-15 18:08:07 UTC (rev 24464)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 5; 1054 bytes
@@ -273,16 +273,16 @@
<listitem>
<para>
- MySQL 5.5 and 5.6 are the current development release
- series.
+ MySQL 5.6 is the current development release series.
</para>
</listitem>
<listitem>
<para>
- MySQL 5.1 is the current General Availability (Production)
- release series. New releases are issued for bugfixes only;
- no new features are being added that could affect stability.
+ MySQL 5.5 and MySQL 5.1 are the current General Availability
+ (Production) release series. New releases are issued for
+ bugfixes only; no new features are being added that could
+ affect stability.
</para>
</listitem>
Modified: trunk/refman-5.5/installing-general.xml
===================================================================
--- trunk/refman-5.5/installing-general.xml 2010-12-15 18:07:36 UTC (rev 24463)
+++ trunk/refman-5.5/installing-general.xml 2010-12-15 18:08:07 UTC (rev 24464)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 5; 1054 bytes
@@ -272,16 +272,16 @@
<listitem>
<para>
- MySQL 5.5 and 5.6 are the current development release
- series.
+ MySQL 5.6 is the current development release series.
</para>
</listitem>
<listitem>
<para>
- MySQL 5.1 is the current General Availability (Production)
- release series. New releases are issued for bugfixes only;
- no new features are being added that could affect stability.
+ MySQL 5.5 and MySQL 5.1 are the current General Availability
+ (Production) release series. New releases are issued for
+ bugfixes only; no new features are being added that could
+ affect stability.
</para>
</listitem>
Modified: trunk/refman-5.5/versions.ent
===================================================================
--- trunk/refman-5.5/versions.ent 2010-12-15 18:07:36 UTC (rev 24463)
+++ trunk/refman-5.5/versions.ent 2010-12-15 18:08:07 UTC (rev 24464)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 740 bytes
@@ -10,4 +10,4 @@
<!ENTITY previous-series "5.1"><!-- Previous MySQL release series -->
<!ENTITY next-series "5.6"><!-- Next MySQL release series -->
<!ENTITY current-version "5.5.9"><!-- Current MySQL version - update with new releases -->
-<!ENTITY current-maturity "rc"><!-- Current maturity level: alpha, beta, release candidate, general availability -->
+<!ENTITY current-maturity "general availability"><!-- Current maturity level: alpha, beta, release candidate, general availability -->
Modified: trunk/refman-5.6/installing-general.xml
===================================================================
--- trunk/refman-5.6/installing-general.xml 2010-12-15 18:07:36 UTC (rev 24463)
+++ trunk/refman-5.6/installing-general.xml 2010-12-15 18:08:07 UTC (rev 24464)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 5; 1054 bytes
@@ -272,16 +272,16 @@
<listitem>
<para>
- MySQL 5.5 and 5.6 are the current development release
- series.
+ MySQL 5.6 is the current development release series.
</para>
</listitem>
<listitem>
<para>
- MySQL 5.1 is the current General Availability (Production)
- release series. New releases are issued for bugfixes only;
- no new features are being added that could affect stability.
+ MySQL 5.5 and MySQL 5.1 are the current General Availability
+ (Production) release series. New releases are issued for
+ bugfixes only; no new features are being added that could
+ affect stability.
</para>
</listitem>
Modified: trunk/refman-6.0/installing-general.xml
===================================================================
--- trunk/refman-6.0/installing-general.xml 2010-12-15 18:07:36 UTC (rev 24463)
+++ trunk/refman-6.0/installing-general.xml 2010-12-15 18:08:07 UTC (rev 24464)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 5; 1054 bytes
@@ -378,16 +378,16 @@
<listitem>
<para>
- MySQL 5.5 and 5.6 are the current development release
- series.
+ MySQL 5.6 is the current development release series.
</para>
</listitem>
<listitem>
<para>
- MySQL 5.1 is the current General Availability (Production)
- release series. New releases are issued for bugfixes only;
- no new features are being added that could affect stability.
+ MySQL 5.5 and MySQL 5.1 are the current General Availability
+ (Production) release series. New releases are issued for
+ bugfixes only; no new features are being added that could
+ affect stability.
</para>
</listitem>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r24464 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-5.5 refman-5.6 refman-6.0 | paul.dubois | 15 Dec |
