[v9_9] fix the o umlaut for HTML and TXT too

diff --git a/doc/arm/Makefile.in b/doc/arm/Makefile.in
index 46a5c34b78fa170667c463d51fe8cf7ae09decd6..501133e0db39128acc67630db9c7bc986fea5744 100644 (file)
--- a/doc/arm/Makefile.in
+++ b/doc/arm/Makefile.in
@@ -47,7 +47,8 @@ docclean manclean maintainer-clean distclean::
 
 notes.html: notes-wrapper.xml notes.xml releaseinfo.xml pkgversion.xml noteversion.xml
        expand notes-wrapper.xml | \
-       ${XSLTPROC} --stringparam generate.toc "" -o notes.html ../xsl/isc-notes-html.xsl -
+       ${XSLTPROC} --stringparam generate.toc "" ../xsl/isc-notes-html.xsl - |\
+       @PERL@ html-fixup.pl > notes.html
 
 notes.tex: notes-wrapper.xml notes.xml releaseinfo.xml pkgversion.xml noteversion.xml
        expand notes-wrapper.xml | \

diff --git a/doc/arm/html-fixup.pl b/doc/arm/html-fixup.pl
new file mode 100644 (file)
index 0000000..2763813
--- /dev/null
+++ b/doc/arm/html-fixup.pl
@@ -0,0 +1,20 @@
+#!/usr/bin/perl -w
+#
+# Copyright (C) 2015  Internet Systems Consortium, Inc. ("ISC")
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+
+while (<>) {
+    s/&#50102;/&ouml;/;
+    print;
+}

diff --git a/doc/arm/latex-fixup.pl b/doc/arm/latex-fixup.pl
index b4e9feaa3ea35a5e01db153c8e6b9eb3cff0a702..bad6e9f99b8f6ee324af97cdd68b09a1523a2771 100644 (file)
--- a/doc/arm/latex-fixup.pl
+++ b/doc/arm/latex-fixup.pl
@@ -44,7 +44,7 @@ while (<>) {
 
     # Add any further tweaking here.
     # https://en.wikibooks.org/wiki/LaTeX/Special_Characters
-    s/&#50102;/{\\"o}/;  # omlaut o &#xc3b6; or &#50102;
+    s/&#50102;/{\\"o}/;  # umlaut o &#xc3b6; or &#50102;
 
     # Write out whatever we have now.
     print;

diff --git a/doc/arm/notes.xml b/doc/arm/notes.xml
index ed65af36569b9ea37f37e2d7d9302b5d891321ca..9c680cfeb9d718444b9cf9b169a9d131ffa6b3c3 100644 (file)
--- a/doc/arm/notes.xml
+++ b/doc/arm/notes.xml
@@ -51,7 +51,7 @@
          when parsing certain malformed DNSSEC keys.
        </para>
        <para>
-         This flaw was discovered by Hanno B&#xc3b6;eck of the Fuzzing
+         This flaw was discovered by Hanno B&#xc3b6;ck of the Fuzzing
          Project, and is disclosed in CVE-2015-5722. [RT #40212]
        </para>
       </listitem>