List:Commits« Previous MessageNext Message »
From:paul Date:January 12 2006 6:18pm
Subject:svn commit - mysqldoc@docsrva: r777 - in trunk: . refman-4.1
View as plain text  
Author: paul
Date: 2006-01-12 19:18:44 +0100 (Thu, 12 Jan 2006)
New Revision: 777

Log:
 r6112@frost:  paul | 2006-01-12 11:20:23 -0600
 Move InnoDB chapter into storage engines chapter in 4.1 manual
 (as in 5.0/5.1 manuals).


Modified:
   trunk/
   trunk/refman-4.1/innodb.xml
   trunk/refman-4.1/manual.xml
   trunk/refman-4.1/storage-engines.xml


Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6111
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2101
   + b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6112
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2101

Modified: trunk/refman-4.1/innodb.xml
===================================================================
--- trunk/refman-4.1/innodb.xml	2006-01-12 18:18:31 UTC (rev 776)
+++ trunk/refman-4.1/innodb.xml	2006-01-12 18:18:44 UTC (rev 777)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
 "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
 [
   <!ENTITY % fixedchars.entities  SYSTEM "../refman-common/fixedchars.ent">
@@ -9,7 +9,7 @@
   <!ENTITY % versions.entities    SYSTEM "versions.ent">
   %versions.entities;
 ]>
-<chapter id="innodb">
+<section id="innodb">
 
   <title>&title-innodb;</title>
 
@@ -7337,4 +7337,4 @@
 
   </section>
 
-</chapter>
+</section>

Modified: trunk/refman-4.1/manual.xml
===================================================================
--- trunk/refman-4.1/manual.xml	2006-01-12 18:18:31 UTC (rev 776)
+++ trunk/refman-4.1/manual.xml	2006-01-12 18:18:44 UTC (rev 777)
@@ -64,8 +64,6 @@
 
   <xi:include href="storage-engines.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
-  <xi:include href="innodb.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-
   <xi:include href="ndbcluster.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
   <xi:include href="spatial-extensions.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>

Modified: trunk/refman-4.1/storage-engines.xml
===================================================================
--- trunk/refman-4.1/storage-engines.xml	2006-01-12 18:18:31 UTC (rev 776)
+++ trunk/refman-4.1/storage-engines.xml	2006-01-12 18:18:44 UTC (rev 777)
@@ -234,8 +234,7 @@
 
   <para>
     This chapter describes each of the MySQL storage engines except for
-    <literal>InnoDB</literal> and <literal>NDB Cluster</literal>, which
-    are covered in <xref linkend="innodb"/>, and
+    <literal>NDB Cluster</literal>, which is covered in
     <xref linkend="ndbcluster"/>.
   </para>
 
@@ -1564,6 +1563,7 @@
     </section>
 
   </section>
+  <xi:include href="innodb.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
   <section id="merge-storage-engine">
 

Thread
svn commit - mysqldoc@docsrva: r777 - in trunk: . refman-4.1paul12 Jan