From: Tinderbox User Date: Sat, 15 Aug 2015 02:55:15 +0000 (+0000) Subject: [master] fix the o umlaut for HTML and TXT too X-Git-Tag: v9.11.0a1~570 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=310f88d008f976a278121341f5b16666ff4db902;p=thirdparty%2Fbind9.git [master] fix the o umlaut for HTML and TXT too --- diff --git a/doc/arm/Makefile.in b/doc/arm/Makefile.in index 46a5c34b78f..501133e0db3 100644 --- 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 index 00000000000..06042b2952d --- /dev/null +++ b/doc/arm/html-fixup.pl @@ -0,0 +1,20 @@ +#!/usr/bin/perl -w +# +# Copyright (C) 2005, 2007, 2012, 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/쎶/ö/; + print; +} diff --git a/doc/arm/latex-fixup.pl b/doc/arm/latex-fixup.pl index b4e9feaa3ea..bad6e9f99b8 100644 --- 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/쎶/{\\"o}/; # omlaut o 쎶 or 쎶 + s/쎶/{\\"o}/; # umlaut o 쎶 or 쎶 # Write out whatever we have now. print; diff --git a/doc/arm/notes.html b/doc/arm/notes.html index 634fcf59987..bac75ddba98 100644 --- a/doc/arm/notes.html +++ b/doc/arm/notes.html @@ -21,7 +21,7 @@

-Release Notes for BIND Version 9.11.0pre-alpha

+Release Notes for BIND Version 9.11.0pre-alpha

Introduction

@@ -56,7 +56,7 @@ when parsing certain malformed DNSSEC keys.

- This flaw was discovered by Hanno B쎶eck of the Fuzzing + This flaw was discovered by Hanno Böck of the Fuzzing Project, and is disclosed in CVE-2015-5722. [RT #40212]

diff --git a/doc/arm/notes.pdf b/doc/arm/notes.pdf index e43f151bbee..f67d505cf32 100644 Binary files a/doc/arm/notes.pdf and b/doc/arm/notes.pdf differ diff --git a/doc/arm/notes.xml b/doc/arm/notes.xml index a490dc1b344..e53eadb26fb 100644 --- a/doc/arm/notes.xml +++ b/doc/arm/notes.xml @@ -51,7 +51,7 @@ when parsing certain malformed DNSSEC keys. - This flaw was discovered by Hanno B쎶eck of the Fuzzing + This flaw was discovered by Hanno B쎶ck of the Fuzzing Project, and is disclosed in CVE-2015-5722. [RT #40212]