@ifnottex, not @ifinfo

3 files changed, 12 insertions, 6 deletions

diff --git a/man/ChangeLog b/man/ChangeLog
index b8133c09fe8..30247e10435 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,9 @@
+2004-05-16  Karl Berry  <karl@gnu.org>
+
+        * emacs.texi (ack.texi) [@ifnottex]: Change condition; with @ifinfo,
+        makeinfo --html fails.
+        * help.texi (Help Summary) [@ifnottex]: Likewise.
+
 2004-05-13  Nick Roberts  <nickrob@gnu.org>
 
         * building.texi (GDB Graphical Interface): Update and describe
diff --git a/man/emacs.texi b/man/emacs.texi
index 3162cd1e167..b5f40a6d9e6 100644
--- a/man/emacs.texi
+++ b/man/emacs.texi
@@ -12,7 +12,7 @@ This is the @value{EDITION} edition of the @cite{GNU Emacs Manual},
 updated for Emacs version @value{EMACSVER}.
 
 Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998,
-1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -1500,9 +1500,9 @@ edit files while running shell commands.
 @include msdog.texi
 @include gnu.texi
 @include glossary.texi
-@ifinfo
+@ifnottex
 @include ack.texi
-@end ifinfo
+@end ifnottex
 
 @c The Option Index is produced only in the on-line version,
 @c because the index entries related to command-line options
diff --git a/man/help.texi b/man/help.texi
index 56fb9f542d4..050e600759b 100644
--- a/man/help.texi
+++ b/man/help.texi
@@ -1,5 +1,5 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 1985, 86, 87, 93, 94, 95, 97, 2000, 2001
+@c Copyright (C) 1985, 86, 87, 93, 94, 95, 97, 2000, 2001, 2004
 @c   Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Help, Mark, M-x, Top
@@ -103,10 +103,10 @@ command.
 @iftex
 @node Help Summary
 @end iftex
-@ifinfo
+@ifnottex
 @node Help Summary
 @section Help Summary
-@end ifinfo
+@end ifnottex
 
   Here is a summary of the Emacs interactive help commands.
 @xref{Help Files}, for other help commands that just display a