Merge from gnus--devo--0

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1494

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 14fa1bc91c27fa95ac86bec9c160c7bc0155d44c..34debb9ffd9249efcbb4c2e216f644e66695d103 100644 (file)
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
+2008-12-08  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * message.texi (Insertion Variables): Don't advertise sc-cite-original.
+
 2008-12-02  Carsten Dominik  <carsten.dominik@gmail.com>
 
        * org.texi (Using the mapping API): Fix bug in mapping example.

diff --git a/doc/misc/message.texi b/doc/misc/message.texi
index f29f835f94426b02fbcf8d2e4859bb293b1e2659..ca040c3d209b998bff4a1af03f2c0fe728cfeb54 100644 (file)
--- a/doc/misc/message.texi
+++ b/doc/misc/message.texi
@@ -1952,15 +1952,12 @@ Number of spaces to indent yanked messages.
 @item message-cite-function
 @vindex message-cite-function
 @findex message-cite-original
-@findex sc-cite-original
 @findex message-cite-original-without-signature
-@cindex Supercite
 Function for citing an original message.  The default is
 @code{message-cite-original}, which simply inserts the original message
 and prepends @samp{> } to each line.
 @code{message-cite-original-without-signature} does the same, but elides
-the signature.  You can also set it to @code{sc-cite-original} to use
-Supercite.
+the signature.
 
 @item message-indent-citation-function
 @vindex message-indent-citation-function