Merge from emacs-24; up to 2012-04-25T15:23:19Z!sdl.web@gmail.com

2 files changed, 6 insertions, 18 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index ccf8c4df40e..9f9717aab29 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-10  Chong Yidong  <cyd@gnu.org>
+
+        * sc.texi: Remove bogus @ifinfo commands which prevent makeinfo
+        compilation for html-mono.
+
 2012-06-08  Paul Eggert  <eggert@cs.ucla.edu>
 
         * texinfo.tex: Merge from gnulib.
diff --git a/doc/misc/sc.texi b/doc/misc/sc.texi
index 51d12fef806..6be385aeba9 100644
--- a/doc/misc/sc.texi
+++ b/doc/misc/sc.texi
@@ -95,13 +95,11 @@ of composing replies to both USENET network news and electronic mail.
 The preferred way to spell Supercite is with a capital @samp{S},
 lowercase @samp{upercite}.
 
-@ifinfo
 @menu
 * Usage Overview::
 * What Supercite Does Not Do::
 * What Supercite Does::
 @end menu
-@end ifinfo
 
 @cindex MUA
 @cindex NUA
@@ -242,12 +240,10 @@ citations after multiple replies:
 And that's what I think too.
 @end example
 
-@ifinfo
 @menu
 * Citation Elements::
 * Recognizing Citations::
 @end menu
-@end ifinfo
 
 Note that multiple inclusions of the original messages result in a
 nesting of the @samp{@code{>}} characters.  This can sometimes be quite
@@ -506,12 +502,10 @@ name, email address, the original article's subject, etc.  In fact any
 information contained in the info alist can be inserted into a reference
 header.
 
-@ifinfo
 @menu
 * The Built-in Header Rewrite Functions::
 * Electric References::
 @end menu
-@end ifinfo
 
 @cindex header rewrite functions
 @vindex sc-rewrite-header-list
@@ -791,7 +785,6 @@ Buffer Initialization}.@refill
 
 @node  Replying and Yanking
 @chapter Replying and Yanking
-@ifinfo
 
 This chapter explains what happens when you reply and yank an original
 message from an MUA.
@@ -800,7 +793,7 @@ message from an MUA.
 * Reply Buffer Initialization::
 * Filling Cited Text::
 @end menu
-@end ifinfo
+
 @node  Reply Buffer Initialization
 @section Reply Buffer Initialization
 @findex sc-cite-original
@@ -1053,13 +1046,11 @@ element in the attribution alist is a key-value pair containing such
 information as the author's first name, middle names, and last name, the
 author's initials, and the author's email terminus.
 
-@ifinfo
 @menu
 * Attribution Preferences::
 * Anonymous Attributions::
 * Author Names::
 @end menu
-@end ifinfo
 
 @node  Attribution Preferences
 @section Attribution Preferences
@@ -1331,12 +1322,10 @@ can be transformed in an @emph{awk}-like manner.  Regi is used
 throughout Supercite, from mail header information extraction, to header
 nuking, to citing text.
 
-@ifinfo
 @menu
 * Using Regi::
 * Frames You Can Customize::
 @end menu
-@end ifinfo
 
 While the details of Regi are discussed below (@pxref{Using Regi}), only
 those who wish to customize certain aspects of Supercite need concern
@@ -1534,7 +1523,6 @@ but unfortunately the best general solution so far.  In the rest of this
 chapter, we'll assume you've installed Supercite's keymap on the default
 prefix.@refill
 
-@ifinfo
 @menu
 * Citing Commands::
 * Insertion Commands::
@@ -1542,7 +1530,6 @@ prefix.@refill
 * Mail Field Commands::
 * Miscellaneous Commands::
 @end menu
-@end ifinfo
 
 @node   Citing Commands
 @section Commands to Manually Cite, Recite, and Uncite
@@ -1909,9 +1896,7 @@ Supercite was written by Barry Warsaw.
 
 @node  Command Index
 @unnumbered Command Index
-@ifinfo
 
-@end ifinfo
 Since all supercite commands are prepended with the string
 ``@code{sc-}'', each appears under its @code{sc-}@var{command} name and
 its @var{command} name.
@@ -1926,9 +1911,7 @@ its @var{command} name.
 
 @node Variable Index
 @unnumbered Variable Index
-@ifinfo
 
-@end ifinfo
 Since all supercite variables are prepended with the string
 ``@code{sc-}'', each appears under its @code{sc-}@var{variable} name and
 its @var{variable} name.