overrides.texi: Remove.

sieve.texi, sasl.texi, pgg.texi, message.texi, gnus.texi:
emacs-mime.texi, auth.texi, Makefile.in: Revert last changes.

10 files changed, 7 insertions, 60 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 4dca9eedb2a..08799f17f18 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,10 @@
+2011-02-05  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * overrides.texi: Remove.
+
+        * sieve.texi, sasl.texi, pgg.texi, message.texi, gnus.texi:
+        * emacs-mime.texi, auth.texi, Makefile.in: Revert last changes.
+
 2011-02-05  Michael Albinus  <michael.albinus@gmx.de>
 
         * tramp.texi (Frequently Asked Questions): Mention problems with
diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index c657551862b..f1dbf3bcc08 100644
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -209,12 +209,6 @@ mkinfodir = @cd ${srcdir}; test -d ${infodir} || mkdir ${infodir} || test -d ${i
 
 info: $(INFO_TARGETS)
 
-webhack: clean
-        echo '@set WEBHACKDEVEL' > overrides.texi
-
-nowebhack: clean
-        echo '@clear WEBHACKDEVEL' > overrides.texi
-
 dvi: $(DVI_TARGETS)
 
 pdf: $(PDF_TARGETS)
diff --git a/doc/misc/auth.texi b/doc/misc/auth.texi
index a89018dd00e..f19d6e28ddb 100644
--- a/doc/misc/auth.texi
+++ b/doc/misc/auth.texi
@@ -1,7 +1,4 @@
 \input texinfo                  @c -*-texinfo-*-
-
-@include overrides.texi
-
 @setfilename ../../info/auth
 @settitle Emacs auth-source Library @value{VERSION}
 
@@ -38,12 +35,7 @@ license to the document, as described in section 6 of the license.
 @end direntry
 
 @titlepage
-@ifset WEBHACKDEVEL
-@title Emacs auth-source Library (DEVELOPMENT VERSION)
-@end ifset
-@ifclear WEBHACKDEVEL
 @title Emacs auth-source Library
-@end ifclear
 @author by Ted Zlatanov
 @page
 @vskip 0pt plus 1filll
diff --git a/doc/misc/emacs-mime.texi b/doc/misc/emacs-mime.texi
index 0acb3187157..62a43aa11bc 100644
--- a/doc/misc/emacs-mime.texi
+++ b/doc/misc/emacs-mime.texi
@@ -1,7 +1,5 @@
 \input texinfo
 
-@include overrides.texi
-
 @setfilename ../../info/emacs-mime
 @settitle Emacs MIME Manual
 @synindex fn cp
@@ -40,12 +38,7 @@ developing GNU and promoting software freedom.''
 @setchapternewpage odd
 
 @titlepage
-@ifset WEBHACKDEVEL
-@title Emacs MIME Manual (DEVELOPMENT VERSION)
-@end ifset
-@ifclear WEBHACKDEVEL
 @title Emacs MIME Manual
-@end ifclear
 
 @author by Lars Magne Ingebrigtsen
 @page
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 83a689fcbc0..936f140af00 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -1,7 +1,5 @@
 \input texinfo
 
-@include overrides.texi
-
 @setfilename ../../info/gnus
 @settitle Gnus Manual
 @syncodeindex fn cp
@@ -331,12 +329,7 @@ developing GNU and promoting software freedom.''
 
 
 @titlepage
-@ifset WEBHACKDEVEL
-@title Gnus Manual (DEVELOPMENT VERSION)
-@end ifset
-@ifclear WEBHACKDEVEL
 @title Gnus Manual
-@end ifclear
 
 @author by Lars Magne Ingebrigtsen
 @page
diff --git a/doc/misc/message.texi b/doc/misc/message.texi
index 7a7315d0fa5..34bd14f2a82 100644
--- a/doc/misc/message.texi
+++ b/doc/misc/message.texi
@@ -1,7 +1,5 @@
 \input texinfo                  @c -*-texinfo-*-
 
-@include overrides.texi
-
 @setfilename ../../info/message
 @settitle Message Manual
 @synindex fn cp
@@ -36,12 +34,7 @@ developing GNU and promoting software freedom.''
 @end iftex
 
 @titlepage
-@ifset WEBHACKDEVEL
-@title Message Manual (DEVELOPMENT VERSION)
-@end ifset
-@ifclear WEBHACKDEVEL
 @title Message Manual
-@end ifclear
 
 @author by Lars Magne Ingebrigtsen
 @page
diff --git a/doc/misc/overrides.texi b/doc/misc/overrides.texi
deleted file mode 100644
index 369462b775d..00000000000
--- a/doc/misc/overrides.texi
+++ /dev/null
@@ -1 +0,0 @@
-@clear WEBHACKDEVEL
diff --git a/doc/misc/pgg.texi b/doc/misc/pgg.texi
index 3ca26af7b0d..9bdb1eaa216 100644
--- a/doc/misc/pgg.texi
+++ b/doc/misc/pgg.texi
@@ -1,7 +1,4 @@
 \input texinfo                  @c -*-texinfo-*-
-
-@include overrides.texi
-
 @setfilename ../../info/pgg
 @settitle PGG @value{VERSION}
 
@@ -33,12 +30,7 @@ developing GNU and promoting software freedom.''
 @end direntry
 
 @titlepage
-@ifset WEBHACKDEVEL
-@title PGG (DEVELOPMENT VERSION)
-@end ifset
-@ifclear WEBHACKDEVEL
 @title PGG
-@end ifclear
 
 @author by Daiki Ueno
 @page
diff --git a/doc/misc/sasl.texi b/doc/misc/sasl.texi
index d87b5acaf44..99c4c98e439 100644
--- a/doc/misc/sasl.texi
+++ b/doc/misc/sasl.texi
@@ -1,7 +1,4 @@
 \input texinfo                  @c -*-texinfo-*-
-
-@include overrides.texi
-
 @setfilename ../../info/sasl
 
 @set VERSION 0.2
@@ -40,12 +37,7 @@ license to the document, as described in section 6 of the license.
 
 
 @titlepage
-@ifset WEBHACKDEVEL
-@title Emacs SASL Library @value{VERSION} (DEVELOPMENT VERSION)
-@end ifset
-@ifclear WEBHACKDEVEL
 @title Emacs SASL Library @value{VERSION}
-@end ifclear
 
 @author by Daiki Ueno
 @page
diff --git a/doc/misc/sieve.texi b/doc/misc/sieve.texi
index 52677b57fbe..5c069f619ff 100644
--- a/doc/misc/sieve.texi
+++ b/doc/misc/sieve.texi
@@ -1,7 +1,4 @@
 \input texinfo                  @c -*-texinfo-*-
-
-@include overrides.texi
-
 @setfilename ../../info/sieve
 @settitle Emacs Sieve Manual
 @synindex fn cp
@@ -37,12 +34,7 @@ developing GNU and promoting software freedom.''
 @setchapternewpage odd
 
 @titlepage
-@ifset WEBHACKDEVEL
-@title Emacs Sieve Manual (DEVELOPMENT VERSION)
-@end ifset
-@ifclear WEBHACKDEVEL
 @title Emacs Sieve Manual
-@end ifclear
 
 @author by Simon Josefsson
 @page