List:Internals« Previous MessageNext Message »
From:stefan Date:August 25 2005 12:08pm
Subject:bk commit - mysqldoc@docsrva tree (stefan:1.3391)
View as plain text  
Below is the list of changes that have just been committed into a local
mysqldoc repository of stefan. When stefan does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.3391 05/08/25 14:08:15 stefan@stripped +9 -0
  titles.ent, manual.xml, error-handling.xml:
    Sync with refman
  manual.xml:
    Move Error Handling chapter to appendices
  error-handling.xml:
    Chapter => Appendix

  refman-common/titles.ent
    1.20 05/08/25 14:07:57 stefan@stripped +1 -1
    Sync with refman

  refman-5.1/manual.xml
    1.9 05/08/25 14:07:55 stefan@stripped +2 -4
    Sync with refman

  refman-5.1/error-handling.xml
    1.5 05/08/25 14:07:54 stefan@stripped +3 -3
    Sync with refman

  refman-5.0/manual.xml
    1.8 05/08/25 14:07:53 stefan@stripped +2 -4
    Sync with refman

  refman-5.0/error-handling.xml
    1.4 05/08/25 14:07:51 stefan@stripped +3 -3
    Sync with refman

  refman-4.1/manual.xml
    1.18 05/08/25 14:07:50 stefan@stripped +2 -4
    Sync with refman

  refman-4.1/error-handling.xml
    1.5 05/08/25 14:07:49 stefan@stripped +3 -3
    Sync with refman

  refman/manual.xml
    1.11 05/08/25 14:07:32 stefan@stripped +2 -4
    Move Error Handling chapter to appendices

  refman/error-handling.xml
    1.6 05/08/25 14:07:18 stefan@stripped +3 -3
    Chapter => Appendix

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	stefan
# Host:	apollon.site
# Root:	/home/stefan/bk/mysqldoc

--- 1.4/refman-5.1/error-handling.xml	2005-08-18 14:00:15 +02:00
+++ 1.5/refman-5.1/error-handling.xml	2005-08-25 14:07:54 +02:00
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+<!DOCTYPE appendix 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="error-handling">
+<appendix id="error-handling">
 
   <title id="title-error-handling">&title-error-handling;</title>
 
@@ -114,4 +114,4 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="errmsgs-client.xml"/>
 
-</chapter>
+</appendix>

--- 1.8/refman-5.1/manual.xml	2005-08-24 19:48:43 +02:00
+++ 1.9/refman-5.1/manual.xml	2005-08-25 14:07:55 +02:00
@@ -49,8 +49,6 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ndbcluster.xml"/>
 
-  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="maxdb.xml"/>-->
-
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="spatial-extensions-in-mysql.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="stored-procedures.xml"/>
@@ -67,11 +65,11 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mysql-connectors.xml"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="error-handling.xml"/>
-
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="extending-mysql.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="problems.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="error-handling.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="refman-common/credits.xml"/>
 

--- 1.4/refman-4.1/error-handling.xml	2005-08-15 03:22:03 +02:00
+++ 1.5/refman-4.1/error-handling.xml	2005-08-25 14:07:49 +02:00
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+<!DOCTYPE appendix 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">
@@ -7,7 +7,7 @@
     <!ENTITY % title.entities         SYSTEM "refman-common/titles.ent">
     %title.entities;
 ]>
-<chapter id='error-handling'>
+<appendix id='error-handling'>
 
   <title id='title-error-handling'>&title-error-handling;</title>
 
@@ -103,4 +103,4 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="errmsgs-client.xml"/>
 
-</chapter>
+</appendix>

--- 1.17/refman-4.1/manual.xml	2005-08-24 19:48:37 +02:00
+++ 1.18/refman-4.1/manual.xml	2005-08-25 14:07:50 +02:00
@@ -47,19 +47,17 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ndbcluster.xml"/>
 
-  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="maxdb.xml"/>-->
-
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="spatial-extensions-in-mysql.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mysql-apis.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mysql-connectors.xml"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="error-handling.xml"/>
-
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="extending-mysql.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="problems.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="error-handling.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="refman-common/credits.xml"/>
 

--- 1.5/refman/error-handling.xml	2005-08-15 03:22:04 +02:00
+++ 1.6/refman/error-handling.xml	2005-08-25 14:07:18 +02:00
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+<!DOCTYPE appendix 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">
@@ -7,7 +7,7 @@
     <!ENTITY % title.entities         SYSTEM "refman-common/titles.ent">
     %title.entities;
 ]>
-<chapter id='error-handling'>
+<appendix id='error-handling'>
 
   <title id='title-error-handling'>&title-error-handling;</title>
 
@@ -103,4 +103,4 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="errmsgs-client.xml"/>
 
-</chapter>
+</appendix>

--- 1.10/refman/manual.xml	2005-08-24 19:48:13 +02:00
+++ 1.11/refman/manual.xml	2005-08-25 14:07:32 +02:00
@@ -47,8 +47,6 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ndbcluster.xml"/>
 
-  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="maxdb.xml"/>-->
-
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="spatial-extensions-in-mysql.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="stored-procedures.xml"/>
@@ -65,11 +63,11 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mysql-connectors.xml"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="error-handling.xml"/>
-
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="extending-mysql.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="problems.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="error-handling.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="refman-common/credits.xml"/>
 

--- 1.3/refman-5.0/error-handling.xml	2005-08-16 04:15:28 +02:00
+++ 1.4/refman-5.0/error-handling.xml	2005-08-25 14:07:51 +02:00
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+<!DOCTYPE appendix 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">
@@ -7,7 +7,7 @@
     <!ENTITY % title.entities         SYSTEM "refman-common/titles.ent">
     %title.entities;
 ]>
-<chapter id='error-handling'>
+<appendix id='error-handling'>
 
   <title id='title-error-handling'>&title-error-handling;</title>
 
@@ -115,4 +115,4 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="errmsgs-client.xml"/>
 
-</chapter>
+</appendix>

--- 1.7/refman-5.0/manual.xml	2005-08-24 19:48:39 +02:00
+++ 1.8/refman-5.0/manual.xml	2005-08-25 14:07:53 +02:00
@@ -49,8 +49,6 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ndbcluster.xml"/>
 
-  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="maxdb.xml"/>-->
-
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="spatial-extensions-in-mysql.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="stored-procedures.xml"/>
@@ -67,11 +65,11 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mysql-connectors.xml"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="error-handling.xml"/>
-
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="extending-mysql.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="problems.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="error-handling.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="refman-common/credits.xml"/>
 

--- 1.19/refman-common/titles.ent	2005-08-24 19:48:44 +02:00
+++ 1.20/refman-common/titles.ent	2005-08-25 14:07:57 +02:00
@@ -296,7 +296,7 @@
 <!ENTITY title-environment-variables "Environment Variables">
 <!ENTITY title-error-access-denied "<literal>Access denied</literal>">
 <!ENTITY title-error-creating-innodb "Dealing with <literal>InnoDB</literal> Initialization Problems">
-<!ENTITY title-error-handling "Error Handling in MySQL">
+<!ENTITY title-error-handling "Error Codes and Messages">
 <!ENTITY title-error-log "The Error Log">
 <!ENTITY title-errors-in-3-23 "Issues in MySQL 3.23 Fixed in a Later MySQL Version">
 <!ENTITY title-errors-in-4-0 "Issues in 4.0 Fixed in a Later MySQL Version">
Thread
bk commit - mysqldoc@docsrva tree (stefan:1.3391)stefan25 Aug