From ba9a53ab87c76b75d1832541383b6cf6f6620207 Mon Sep 17 00:00:00 2001
From: unknown <jcole@tetra.spaceapes.com>
Date: Wed, 3 Oct 2001 19:12:04 -0500
Subject: [PATCH 1/2] oopsie, broke the build

---
 Docs/manual.texi | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Docs/manual.texi b/Docs/manual.texi
index d2d9d275be5..3646e0bca3a 100644
--- a/Docs/manual.texi
+++ b/Docs/manual.texi
@@ -41889,9 +41889,9 @@ You need to use the following functions when you want to create a
 threaded client. @xref{Threaded clients}.
 
 @menu
-* my_init::                       @code{my_init()}
-* mysql_thread_init::             @code{mysql_thread_init()}
-* mysql_thread_end::              @code{mysql_thread_end()}
+* my_init::                     @code{my_init()}
+* mysql_thread_init::           @code{mysql_thread_init()}
+* mysql_thread_end::            @code{mysql_thread_end()}
 @end menu
 
 @node my_init, mysql_thread_init, C Thread functions, C Thread functions
@@ -41963,7 +41963,7 @@ a stand-alone server without modifying any code.
 * mysql_server_end::            @code{mysql_server_end()}
 @end menu
 
-@node mysql_server_init, mysql_server_end, C Embedded Server functions, C Embedded Server functions
+@node mysql_server_init, mysql_server_end, C Embedded Server func, C Embedded Server func
 @subsubsection @code{mysql_server_init()}
 
 @findex @code{mysql_server_init()}
@@ -42024,7 +42024,7 @@ int main(void) @{
 
 0 if ok, 1 if an error occurred.
 
-@node mysql_server_end,  , mysql_server_init, C Embedded Server functions
+@node mysql_server_end,  , mysql_server_init, C Embedded Server func
 @subsubsection @code{mysql_server_end()}
 
 @findex @code{mysql_server_end()}

From fc03b5b20e65749347797708ba024f78e4da30b0 Mon Sep 17 00:00:00 2001
From: unknown <jcole@tetra.spaceapes.com>
Date: Sun, 14 Oct 2001 19:29:23 -0500
Subject: [PATCH 2/2] Added docbook-fixup.pl to fix up XML DocBook format.

Docs/Makefile.am:
  Added docbook-fixup.pl.
Docs/manual.texi:
  Fixed small bug.  Removed old commented out part.
---
 Docs/Makefile.am              |  3 +++
 Docs/Support/docbook-fixup.pl | 41 +++++++++++++++++++++++++++++++++++
 Docs/manual.texi              |  9 +-------
 3 files changed, 45 insertions(+), 8 deletions(-)
 create mode 100755 Docs/Support/docbook-fixup.pl

diff --git a/Docs/Makefile.am b/Docs/Makefile.am
index 17def904875..12338e0ed0c 100644
--- a/Docs/Makefile.am
+++ b/Docs/Makefile.am
@@ -96,6 +96,9 @@ nusphere.pdf: manual.texi
 # Target to produce DocBook XML
 mysql.xml: manual.texi include.texi
 	$(MAKEINFO) --force --no-ifinfo --docbook manual.texi
+	mv mysql.xml mysql-tmp.xml
+	Support/docbook-fixup.pl <mysql-tmp.xml >mysql.xml
+	rm -f mysql-tmp.xml
 
 # The texi2dvi gives a lot of harmless errors. Just ignore them unless
 # you want to help with the typesetting part.
diff --git a/Docs/Support/docbook-fixup.pl b/Docs/Support/docbook-fixup.pl
new file mode 100755
index 00000000000..81f1466fb06
--- /dev/null
+++ b/Docs/Support/docbook-fixup.pl
@@ -0,0 +1,41 @@
+#!/usr/bin/perl
+
+sub fix {
+  $str = shift;
+  $str =~ tr/_/-/;
+  return $str;
+};
+
+$data = join "", <STDIN>;
+
+print STDERR "Changing @@ to @...\n";
+$data =~ s/@@/@/gs;
+
+print STDERR "Changing '_' to '-' in references...\n";
+$data =~ s{id=\"(.+?)\"}
+          {"id=\"".&fix($1)."\""}gsex;
+$data =~ s{linkend=\"(.+?)\"}
+          {"linkend=\"".&fix($1)."\""}gsex;
+
+print STDERR "Changing ULINK to SYSTEMITEM...\n";
+$data =~ s{<ulink url=\"(.+?)\"></ulink>}
+          {<systemitem role=\"url\">$1</systemitem>}gs;
+
+print STDERR "Removing INFORMALFIGURE...\n";
+$data =~ s{<informalfigure>(.+?)</informalfigure>}
+          {}gs;
+
+print STDERR "Adding PARA inside ENTRY...\n";
+$data =~ s{<entry>(.+?)</entry>}
+          {<entry><para>$1</para></entry>}gs;
+
+@apx = ("Users", "MySQL-customer-usage", "Credits", "News",
+        "Porting", "GPL-license", "LGPL-license", "Placeholder");
+
+foreach $apx (@apx) {
+  print STDERR "Removing appendix $apx...\n";
+  $data =~ s{<appendix id=\"$apx\">(.+?)</appendix>}
+            {}gs;
+};
+
+print STDOUT $data;
diff --git a/Docs/manual.texi b/Docs/manual.texi
index fb7fe288082..e795aedabec 100644
--- a/Docs/manual.texi
+++ b/Docs/manual.texi
@@ -95,11 +95,6 @@ END-INFO-DIR-ENTRY
 
 @node Top, Introduction, (dir), (dir)
 
-@c @ifhtml
-@c <IMG SRC="Images/mysql-logo.gif">
-@c <!--Image doesn't exist. Can't find suitable replacement. (Matt) -->
-@c @end ifhtml
-
 @ifinfo
 This is a manual for MySQL. This version is about the
 @value{mysql_version} version of MySQL.  You can find a manual
@@ -135,9 +130,7 @@ distribution for that version.
 @end menu
 
 
-
-
-@node Introduction, Installing, Top, Top
+@node Introduction, Installing, Top, (dir)
 @chapter General Information About MySQL
 
 @cindex overview