From a1d7f1f3e3cc6717f32a517053015585c47177ba Mon Sep 17 00:00:00 2001
From: Daniel Schepler <dschepler@gmail.com>
Date: Thu, 8 Aug 2013 17:12:49 -0600
Subject: [PATCH 1/2] fix for texinfo 5.1

Signed-off-by: Ken Dreyer <ktdreyer@ktdreyer.com>
---
 doc/hx509.texi | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/doc/hx509.texi b/doc/hx509.texi
index c927357f7..b44cbeae4 100644
--- a/doc/hx509.texi
+++ b/doc/hx509.texi
@@ -34,9 +34,20 @@
 @subtitle 2008
 @author Love Hörnquist Åstrand
 
+@iftex
 @def@copynext{@vskip 20pt plus 1fil}
 @def@copyrightstart{}
 @def@copyrightend{}
+@end iftex
+@ifinfo
+@macro copynext
+@end macro
+@macro copyrightstart
+@end macro
+@macro copyrightend
+@end macro
+@end ifinfo
+
 @page
 @copyrightstart
 Copyright (c) 1994-2008 Kungliga Tekniska Högskolan
@@ -183,6 +194,13 @@ This manual is for version @value{VERSION} of hx509.
 * CMS signing and encryption::
 * Certificate matching::
 * Software PKCS 11 module::
+* Creating a CA certificate::
+* Issuing certificates::
+* Issuing CRLs::
+* Application requirements::
+* CMS background::
+* Matching syntax::
+* How to use the PKCS11 module::
 
 @detailmenu
  --- The Detailed Node Listing ---

From 115f88a3e7901541a67964d41bbd2a1866cfc521 Mon Sep 17 00:00:00 2001
From: Ken Dreyer <ktdreyer@ktdreyer.com>
Date: Thu, 8 Aug 2013 18:21:15 -0600
Subject: [PATCH 2/2] more texinfo 5.1 hacks

For hx509.texi, we need the copyright macros for both html and info.
Just remove the "ifhtml" conditionals.

For whatis.texi, texinfo 5.1 inserts the sub{} macro inline with no
newlines, so there are errors about @html not being at the end of a
line, etc.
---
 doc/hx509.texi  | 2 --
 doc/whatis.texi | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/hx509.texi b/doc/hx509.texi
index b44cbeae4..d050c2118 100644
--- a/doc/hx509.texi
+++ b/doc/hx509.texi
@@ -39,14 +39,12 @@
 @def@copyrightstart{}
 @def@copyrightend{}
 @end iftex
-@ifinfo
 @macro copynext
 @end macro
 @macro copyrightstart
 @end macro
 @macro copyrightend
 @end macro
-@end ifinfo
 
 @page
 @copyrightstart
diff --git a/doc/whatis.texi b/doc/whatis.texi
index 891e27552..7d83725d9 100644
--- a/doc/whatis.texi
+++ b/doc/whatis.texi
@@ -43,9 +43,11 @@ services can authenticate each other.
 
 @ifhtml
 @macro sub{arg}
+
 @html
 <sub>\arg\</sub>
 @end html
+
 @end macro
 @end ifhtml