Author: paul
Date: 2007-10-29 19:49:01 +0100 (Mon, 29 Oct 2007)
New Revision: 8392
Log:
r31925@polar: paul | 2007-10-29 13:47:30 -0500
Convert 5.2.6 news section to 6.0 (dynamic) changelog.
This does nothing with the earlier 5.2.x news sections, which remain in
their static form.
Added:
trunk/refman-5.2/news-6.0-core.xml
Modified:
trunk/dynamic-docs/changelog/mysqld-versions.xml
trunk/dynamic-docs/changelog/mysqld.xml
trunk/refman-5.2/Makefile.depends
trunk/refman-5.2/news-5.2.xml
trunk/refman-5.2/news.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:31921
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:26290
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:21581
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:31925
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:26290
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:21581
Modified: trunk/dynamic-docs/changelog/mysqld-versions.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld-versions.xml 2007-10-29 18:43:49 UTC (rev 8391)
+++ trunk/dynamic-docs/changelog/mysqld-versions.xml 2007-10-29 18:49:01 UTC (rev 8392)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 693 bytes
@@ -4,7 +4,7 @@
<mysqlproductname title="MySQL"/>
<versionentry ver="6.0.4" reldate="Not yet released"/>
- <versionentry ver="5.2.6" reldate="Not yet released"/>
+ <versionentry ver="6.0.3" reldate="Not yet released"/>
<versionentry ver="5.2.4" reldate="Not yet released"/>
<versionentry ver="5.2.4" reldate="Not yet released"/>
<versionentry ver="5.2.1" reldate="Not yet released"/>
Modified: trunk/dynamic-docs/changelog/mysqld.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld.xml 2007-10-29 18:43:49 UTC (rev 8391)
+++ trunk/dynamic-docs/changelog/mysqld.xml 2007-10-29 18:49:01 UTC (rev 8392)
Changed blocks: 1, Lines Added: 27, Lines Deleted: 0; 818 bytes
@@ -139071,4 +139071,31 @@
</logentry>
+ <logentry entrytype="feature">
+
+ <tags>
+ <manual type="collation"/>
+ </tags>
+
+ <bugs>
+ <fixes bugid="26474"/>
+ </bugs>
+
+ <versions>
+ <version ver="6.0.3"/>
+ </versions>
+
+ <message>
+
+ <para>
+ Sinhala collations <literal>utf8_sinhala_ci</literal> and
+ <literal>ucs2_sinhala_ci</literal> were added for the
+ <literal>utf8</literal> and <literal>ucs2</literal>
character
+ sets.
+ </para>
+
+ </message>
+
+ </logentry>
+
</changelog>
Modified: trunk/refman-5.2/Makefile.depends
===================================================================
--- trunk/refman-5.2/Makefile.depends 2007-10-29 18:43:49 UTC (rev 8391)
+++ trunk/refman-5.2/Makefile.depends 2007-10-29 18:49:01 UTC (rev 8392)
Changed blocks: 9, Lines Added: 43, Lines Deleted: 2; 4558 bytes
@@ -663,6 +663,28 @@
dynxml-local-functions-manprepped.xml: $(dynxml_local_functions_SOURCES)
$(dynxml_local_functions_IDMAPS)
dynxml-local-functions-remprepped.xml: $(dynxml_local_functions_SOURCES)
$(dynxml_local_functions_IDMAPS)
+dynxml_local_news_6_0_INCLUDES = \
+ ../common/fixedchars.ent \
+ ../common/phrases.ent \
+ ../dynamic-docs/changelog/mysqld-versions.xml \
+ ../dynamic-docs/changelog/mysqld.xml \
+ ../refman-common/urls.ent \
+ all-entities.ent \
+ news-6.0-core.xml \
+ versions.ent
+dynxml_local_news_6_0_IMAGES =
+dynxml_local_news_6_0_SOURCES = dynxml-local-news-6.0.xml
$(dynxml_local_news_6_0_INCLUDES)
+dynxml_local_news_6_0_IDMAPS = \
+ metadata/introduction.idmap
+dynxml-local-news-6.0.validpure: $(dynxml_local_news_6_0_SOURCES)
+dynxml-local-news-6.0.titles: $(dynxml_local_news_6_0_SOURCES)
+dynxml-local-news-6.0.useless: $(dynxml_local_news_6_0_SOURCES)
+dynxml-local-news-6.0.valid: $(dynxml_local_news_6_0_SOURCES)
$(dynxml_local_news_6_0_IDMAPS)
+dynxml-local-news-6.0.validwarn: $(dynxml_local_news_6_0_SOURCES)
$(dynxml_local_news_6_0_IDMAPS)
+dynxml-local-news-6.0-prepped.xml: $(dynxml_local_news_6_0_SOURCES)
$(dynxml_local_news_6_0_IDMAPS)
+dynxml-local-news-6.0-manprepped.xml: $(dynxml_local_news_6_0_SOURCES)
$(dynxml_local_news_6_0_IDMAPS)
+dynxml-local-news-6.0-remprepped.xml: $(dynxml_local_news_6_0_SOURCES)
$(dynxml_local_news_6_0_IDMAPS)
+
errmsgs_client_INCLUDES =
errmsgs_client_IMAGES =
errmsgs_client_SOURCES = errmsgs-client.xml $(errmsgs_client_INCLUDES)
@@ -926,7 +948,6 @@
metadata/errors-problems.idmap \
metadata/extending-mysql.idmap \
metadata/faqs.idmap \
- metadata/ha.idmap \
metadata/installing.idmap \
metadata/language-structure.idmap \
metadata/mysql-cluster-configuration.idmap \
@@ -1056,6 +1077,8 @@
../dynamic-docs/changelog/connector-odbc.xml \
../dynamic-docs/changelog/mysql-proxy-versions.xml \
../dynamic-docs/changelog/mysql-proxy.xml \
+ ../dynamic-docs/changelog/mysqld-versions.xml \
+ ../dynamic-docs/changelog/mysqld.xml \
../dynamic-docs/changelog/vstudioplugin-versions.xml \
../dynamic-docs/changelog/vstudioplugin.xml \
../dynamic-docs/command-optvars/mysqld.xml \
@@ -1168,6 +1191,7 @@
dynxml-common-news-vstudioplugin.xml \
dynxml-local-dba.xml \
dynxml-local-functions.xml \
+ dynxml-local-news-6.0.xml \
errmsgs-client.xml \
errmsgs-server.xml \
errors-problems.xml \
@@ -1209,6 +1233,7 @@
mysql-cluster-utilities.xml \
mysql-cluster.xml \
news-5.2.xml \
+ news-6.0-core.xml \
news.xml \
optimization.xml \
partitioning.xml \
@@ -1855,6 +1880,19 @@
news-5.2-manprepped.xml: $(news_5_2_SOURCES) $(news_5_2_IDMAPS)
news-5.2-remprepped.xml: $(news_5_2_SOURCES) $(news_5_2_IDMAPS)
+news_6_0_core_INCLUDES =
+news_6_0_core_IMAGES =
+news_6_0_core_SOURCES = news-6.0-core.xml $(news_6_0_core_INCLUDES)
+news_6_0_core_IDMAPS =
+news-6.0-core.validpure: $(news_6_0_core_SOURCES)
+news-6.0-core.titles: $(news_6_0_core_SOURCES)
+news-6.0-core.useless: $(news_6_0_core_SOURCES)
+news-6.0-core.valid: $(news_6_0_core_SOURCES) $(news_6_0_core_IDMAPS)
+news-6.0-core.validwarn: $(news_6_0_core_SOURCES) $(news_6_0_core_IDMAPS)
+news-6.0-core-prepped.xml: $(news_6_0_core_SOURCES) $(news_6_0_core_IDMAPS)
+news-6.0-core-manprepped.xml: $(news_6_0_core_SOURCES) $(news_6_0_core_IDMAPS)
+news-6.0-core-remprepped.xml: $(news_6_0_core_SOURCES) $(news_6_0_core_IDMAPS)
+
news_INCLUDES = \
../common/fixedchars.ent \
../common/phrases.ent \
@@ -1868,6 +1906,8 @@
../dynamic-docs/changelog/connector-odbc.xml \
../dynamic-docs/changelog/mysql-proxy-versions.xml \
../dynamic-docs/changelog/mysql-proxy.xml \
+ ../dynamic-docs/changelog/mysqld-versions.xml \
+ ../dynamic-docs/changelog/mysqld.xml \
../dynamic-docs/changelog/vstudioplugin-versions.xml \
../dynamic-docs/changelog/vstudioplugin.xml \
../refman-common/news-cj-core.xml \
@@ -1884,7 +1924,9 @@
dynxml-common-news-codbc.xml \
dynxml-common-news-mysql-proxy.xml \
dynxml-common-news-vstudioplugin.xml \
+ dynxml-local-news-6.0.xml \
news-5.2.xml \
+ news-6.0-core.xml \
versions.ent
news_IMAGES =
news_SOURCES = news.xml $(news_INCLUDES)
@@ -2578,7 +2620,6 @@
triggers_SOURCES = triggers.xml $(triggers_INCLUDES)
triggers_IDMAPS = \
metadata/faqs.idmap \
- metadata/installing.idmap \
metadata/restrictions.idmap \
metadata/sql-syntax.idmap \
metadata/stored-procedures.idmap \
Modified: trunk/refman-5.2/news-5.2.xml
===================================================================
--- trunk/refman-5.2/news-5.2.xml 2007-10-29 18:43:49 UTC (rev 8391)
+++ trunk/refman-5.2/news-5.2.xml 2007-10-29 18:49:01 UTC (rev 8392)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 62; 2375 bytes
@@ -30,68 +30,6 @@
<filename>refman-common</filename> directory.
</remark>
- <section id="news-5-2-6">
-
- <title>Changes in release 5.2.6 (Not yet released: Alpha)</title>
-
- <para role="release-level">
- This is a new Alpha development release, fixing recently
- discovered bugs.
- </para>
-
- <note>
- <para role="release-non-production">
- This Alpha release, as any other pre-production release, should
- not be installed on <emphasis>production</emphasis> level
- systems or systems with critical data. It is good practice to
- back up your data before installing any new version of software.
- Although MySQL has worked very hard to ensure a high level of
- quality, protect your data by making a backup as you would for
- any software beta release. Please refer to our bug database at
- <ulink url="http://bugs.mysql.com/"/> for more details about the
- individual bugs fixed in this version.
- </para>
- </note>
-
- <para>
- This section documents all changes and bug fixes that have been
- applied since the last official MySQL release. If you would like
- to receive more fine-grained and personalized <emphasis>update
- alerts</emphasis> about fixes that are relevant to the version and
- features you use, please consider subscribing to <emphasis>MySQL
- Network</emphasis> (a commercial MySQL offering). For more details
- please see <ulink url="&base-url-enterprise;advisors.html"/>.
- </para>
-
- <para>
- Functionality added or changed:
- </para>
-
- <itemizedlist>
-
- <listitem>
- <para>
- Sinhala collations <literal>utf8_sinhala_ci</literal> and
- <literal>ucs2_sinhala_ci</literal> were added for the
- <literal>utf8</literal> and <literal>ucs2</literal>
character
- sets. (Bug #26474)
- </para>
- </listitem>
-
- </itemizedlist>
-
-<!--
- <para>
- Bugs fixed:
- </para>
-
- <itemizedlist>
-
- </itemizedlist>
--->
-
- </section>
-
<section id="news-5-2-5">
<title>Changes in release 5.2.5 (Not yet released: Alpha)</title>
Added: trunk/refman-5.2/news-6.0-core.xml
===================================================================
--- trunk/refman-5.2/news-6.0-core.xml (rev 0)
+++ trunk/refman-5.2/news-6.0-core.xml 2007-10-29 18:49:01 UTC (rev 8392)
Changed blocks: 1, Lines Added: 50, Lines Deleted: 0; 1498 bytes
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+[
+ <!ENTITY % all.entities SYSTEM "all-entities.ent">
+ %all.entities;
+]>
+<!--
+
+WARNING:
+
+Do not add changelog entries to this file - use the changelog XML in
dynamic-docs/changelog.
+
+-->
+<section id="news-6-0-x">
+
+ <title>Changes in release 6.0.x (Development)</title>
+
+ <remark role="dynamic-dependency-list"/>
+
+ <indexterm>
+ <primary>changes</primary>
+ <secondary>MySQL 6.0</secondary>
+ </indexterm>
+
+ <para>
+ An overview of which features were added in MySQL 6.0 can be found
+ here: <xref linkend="mysql-nutshell"/>.
+ </para>
+
+ <para>
+ For a full list of changes, please refer to the changelog sections
+ for each individual 5.1.x release.
+ </para>
+
+ <remark>
+ To insert a new changelog subsection, use the
+ <filename>TEMPLATE.news.xml</filename> template in the
+ <filename>refman-common</filename> directory.
+ </remark>
+
+ <section id="news-6-0-3">
+
+ <title condition="dynamic:changelog:vertitle" role="6.0.3:mysqld:all"/>
+
+ <para condition="dynamic:changelog:entrylist" role="6.0.3:mysqld:all"/>
+
+ </section>
+
+</section>
Modified: trunk/refman-5.2/news.xml
===================================================================
--- trunk/refman-5.2/news.xml 2007-10-29 18:43:49 UTC (rev 8391)
+++ trunk/refman-5.2/news.xml 2007-10-29 18:49:01 UTC (rev 8392)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 0; 550 bytes
@@ -65,6 +65,8 @@
version instead.
</para>
+ <xi:include href="dynxml-local-news-6.0.xml"
xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
<xi:include href="news-5.2.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="dynxml-common-news-codbc.xml"
xmlns:xi="http://www.w3.org/2001/XInclude"/>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r8392 - in trunk: . dynamic-docs/changelog refman-5.2 | paul | 29 Oct |