svn commit - mysqldoc@docsrva: r8458 - trunk/quick-guides

[mcbrown]

Author: mcbrown
Date: 2007-11-01 11:34:35 +0100 (Thu, 01 Nov 2007)
New Revision: 8458

Log:
Adding reservedwords data
Updating the main file and doing some renaming



Added:
   trunk/quick-guides/reservedwords-core.xml
Removed:
   trunk/quick-guides/mysqld-vs-optvar-core.xml
Renamed/Moved:
   trunk/quick-guides/mysqld-optvar-core.xml (from rev 8457,
trunk/quick-guides/mysqld-vs-optvar-core.xml)
Modified:
   trunk/quick-guides/Makefile
   trunk/quick-guides/mysqld-vs.xml


Modified: trunk/quick-guides/Makefile
===================================================================
--- trunk/quick-guides/mysqld-optvar-core.xml	                        (rev 0)
+++ trunk/quick-guides/mysqld-optvar-core.xml	2007-11-01 10:34:35 UTC (rev 8458)
Changed blocks: 2, Lines Added: 119, Lines Deleted: 2; 4239 bytes

@@ -18,7 +18,7 @@
 IDMAP_VER = 5.1
 
 IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_VER)/$(IDMAP_LANG)
-IDMAP_REFS = .
+IDMAP_REFS = . $(REPO_ROOT)/refman-5.0 $(REPO_ROOT)/refman-5.1 $(REPO_ROOT)/refman-6.0 
 IDMAP_SRCS = $(call base_xml_files)
 
 # Import standard variables

Copied: trunk/quick-guides/mysqld-optvar-core.xml (from rev 8457,
trunk/quick-guides/mysqld-vs-optvar-core.xml)
===================================================================
--- trunk/quick-guides/mysqld-optvar-core.xml	                        (rev 0)
+++ trunk/quick-guides/mysqld-optvar-core.xml	2007-11-01 10:34:35 UTC (rev 8458)

@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter 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;
+]>
+<chapter id="optvar-version-summmary">
+
+  <title>MySQL <literal>mysqld</literal> Options/Variables
Reference</title>
+
+  <para>
+    The table below shows all the options and variables available across
+    all versions of the <literal>mysqld</literal> server. The columns
+    are as follows:
+  </para>
+
+  <itemizedlist>
+
+    <listitem>
+      <para>
+        <emphasis role="bold">Name</emphasis> &mdash; the name of the
+        option or variable.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para>
+        <emphasis role="bold">In.</emphasis> &mdash; the version in
+        which the option or variable was introduced in
+        <literal>mysqld</literal>
+      </para>
+    </listitem>
+
+    <listitem>
+      <para>
+        <emphasis role="bold">Dep.</emphasis> &mdash; the version of
+        <literal>mysqld</literal> in which the option or variable was
+        deprecated.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para>
+        <emphasis role="bold">Cmd</emphasis> &mdash; indicates whether
+        the option/variable is valid on the command line.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para>
+        <emphasis role="bold">File</emphasis> &mdash; indicates whether
+        the option is valid within a configuration file.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para>
+        <emphasis role="bold">Srvr</emphasis> &mdash; indicates whether
+        the variable is a server system variable.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para>
+        <emphasis role="bold">Stat.</emphasis> &mdash; indicates whether
+        the variable is a status variable.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para>
+        <emphasis role="bold">Scp.</emphasis> &mdash; indicates the
+        scope of the variable (session-specific, global, or both).
+      </para>
+    </listitem>
+
+    <listitem>
+      <para>
+        <emphasis role="bold">Dyn.</emphasis> &mdash; indicates whether
+        the variable is dynamically settable while the server is
+        running.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para>
+        <emphasis role="bold">4.1</emphasis> &mdash; indicates if the
+        option/variable is available in the MySQL 4.1 series. If more
+        information is available in the main reference manual, the
+        indication will be a link to the correct part of the manual.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para>
+        <emphasis role="bold">5.0</emphasis> &mdash; indicates if the
+        option/variable is available in the MySQL 5.0 series. If more
+        information is available in the main reference manual, the
+        indication will be a link to the correct part of the manual.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para>
+        <emphasis role="bold">5.1</emphasis> &mdash; indicates if the
+        option/variable is available in the MySQL 5.1 series. If more
+        information is available in the main reference manual, the
+        indication will be a link to the correct part of the manual.
+      </para>
+    </listitem>
+
+  </itemizedlist>
+
+  <para condition="dynamic:optvar:versionsummary" role="all:mysqld:all"/>
+
+</chapter>


Modified: trunk/quick-guides/mysqld-vs.xml
===================================================================
--- trunk/quick-guides/mysqld-vs.xml	2007-11-01 10:02:44 UTC (rev 8457)
+++ trunk/quick-guides/mysqld-vs.xml	2007-11-01 10:34:35 UTC (rev 8458)
Changed blocks: 2, Lines Added: 5, Lines Deleted: 5; 1015 bytes

@@ -14,10 +14,7 @@
     <abstract>
 
       <para>
-        This document provides a single table showing the options and
-        variables available in all versions of
-        <literal>mysqld</literal>, including their introduction version
-        and version availability.
+        This document provides a single resource for summary information about MySQL
server, including specific infrmation on changes between different versions. 
       </para>
 
       <para>

@@ -39,7 +36,10 @@
 
   </bookinfo>
 
-  <xi:include href="dynxml-local-mysqld-vs-optvar.xml"
+  <xi:include href="dynxml-local-mysqld-optvar.xml"
       xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
+<xi:include href="dynxml-local-reservedwords.xml"
+      xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
 </book>


Added: trunk/quick-guides/reservedwords-core.xml
===================================================================
--- trunk/quick-guides/reservedwords-core.xml	                        (rev 0)
+++ trunk/quick-guides/reservedwords-core.xml	2007-11-01 10:34:35 UTC (rev 8458)
Changed blocks: 1, Lines Added: 43, Lines Deleted: 0; 1358 bytes

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter 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;
+]>
+<chapter id="reservedwords">
+
+  <title>Reserved Words</title>
+
+  <section id="reservedwords-5-0">
+
+  <title>Reserved Words in MySQL 5.0</title>
+
+  <para condition="dynamic:reservedwords:detailed" role="5.0"/>
+
+  </section>
+
+  <section id="reservedwords-5-1">
+
+  <title>Reserved Words in MySQL 5.1</title>
+
+  <para condition="dynamic:reservedwords:detailed" role="5.1"/>
+
+  <para condition="dynamic:reservedwords:singleversion" role="5.1.22"/>
+  <para condition="dynamic:reservedwords:singleversion" role="6.0"/>
+
+  <para condition="dynamic:reservedwords:newwords" role="5.1:5.0"/>
+
+  </section>
+
+  <section id="reservedwords-6-0">
+
+  <title>Reserved Words in MySQL 6.0</title>
+
+  <para condition="dynamic:reservedwords:detailed" role="6.0"/>
+
+  <para condition="dynamic:reservedwords:newwords" role="6.0:5.1"/>
+
+  </section>
+
+</chapter>