Merge jcole@work.mysql.com:/home/bk/mysql-4.0

into sarvik.tfr.cafe.ee:/usr/home/jcole/bk/mysql-4.0

2 files changed, 25 insertions, 0 deletions

diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 2dd5daa4999..17c327e8210 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -36,3 +36,4 @@ tonu@hundin.mysql.fi
 tonu@volk.internalnet
 tonu@x153.internalnet
 tonu@x3.internalnet
+jcole@sarvik.tfr.cafe.ee
diff --git a/Docs/Support/docbook-fixup.pl b/Docs/Support/docbook-fixup.pl
index 885953db0a0..eb3c3018baf 100755
--- a/Docs/Support/docbook-fixup.pl
+++ b/Docs/Support/docbook-fixup.pl
@@ -29,6 +29,14 @@ print STDERR "Adding PARA inside ENTRY...\n";
 $data =~ s{<entry>(.+?)</entry>}
           {<entry><para>$1</para></entry>}gs;
 
+print STDERR "Removing mailto: from email addresses...\n";
+$data =~ s{mailto:}
+          {}gs;
+
+print STDERR "Fixing spacing problem with titles...\n";
+$data =~ s{</(\w+)>(\w{2,})}
+          {</$1> $2}gs;
+
 @apx = ("Users", "MySQL Testimonials", "News",
         "GPL-license", "LGPL-license");
 
@@ -36,6 +44,22 @@ foreach $apx (@apx) {
   print STDERR "Removing appendix $apx...\n";
   $data =~ s{<appendix id=\"$apx\">(.+?)</appendix>}
             {}gs;
+
+  print STDERR " ... Building list of removed nodes ...\n";
+  foreach(split "\n", $&) {
+    push @nodes, $2 if(/<(\w+) id=\"(.+?)\">/)
+  };
+};
+
+print STDERR "Fixing references to removed nodes...\n";
+foreach $node (@nodes) {
+  $web = $node;
+  $web =~ s/[ ]/_/;
+  $web = "http://www.mysql.com/doc/" .
+         (join "/", (split //, $web)[0..1])."/$web.html";
+  print STDERR "$node -> $web\n";
+  $data =~ s{<(\w+) linkend=\"$node\">}
+            {$web}gs;
 };
 
 print STDOUT $data;