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.

diff --git a/doc/hx509.texi b/doc/hx509.texi
index b44cbeae4c99b4cae68e3fa0b3e3397bd72c9b92..d050c2118b1b209b201ba7105cf064d20e25ae78 100644 (file)
--- 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 891e27552f6aa373fa0247573446b3d3850922a1..7d83725d95812f75aa72df659f15460151a66a33 100644 (file)
--- 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