[Emacs-diffs] master 4010631: Revert part of the previous change

[Eli Zaretskii]

branch: master
commit 4010631fe915503e5376458d8a8b482d37360f87
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Revert part of the previous change
    
    * doc/misc/message.texi:
    * doc/misc/efaq.texi:
    * doc/emacs/sending.texi:
    * doc/emacs/rmail.texi: Revert the CC => Cc etc. conversions.
---
 doc/emacs/rmail.texi   | 12 ++++----
 doc/emacs/sending.texi | 30 ++++++++++----------
 doc/misc/efaq.texi     | 12 ++++----
 doc/misc/message.texi  | 76 +++++++++++++++++++++++++-------------------------
 4 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/doc/emacs/rmail.texi b/doc/emacs/rmail.texi
index 5bf96db..1366535 100644
--- a/doc/emacs/rmail.texi
+++ b/doc/emacs/rmail.texi
@@ -753,24 +753,24 @@ Try sending a bounced message a second time 
(@code{rmail-retry-failure}).
 to the message you are reading.  To do this, type @kbd{r}
 (@code{rmail-reply}).  This displays a mail composition buffer in
 another window, much like @kbd{C-x 4 m}, but preinitializes the
address@hidden, @samp{To}, @samp{Cc}, @samp{In-Reply-To} and
address@hidden, @samp{To}, @samp{CC}, @samp{In-Reply-To} and
 @samp{References} header fields based on the message you are replying
 to.  The @samp{To} field starts out as the address of the person who
-sent the message you received, and the @samp{Cc} field starts out with
+sent the message you received, and the @samp{CC} field starts out with
 all the other recipients of that message.
 
 @vindex mail-dont-reply-to-names
   You can exclude certain recipients from being included automatically
 in replies, using the variable @code{mail-dont-reply-to-names}.  Its
 value should be a regular expression; any recipients that match are
-excluded from the @samp{Cc} field.  They are also excluded from the
+excluded from the @samp{CC} field.  They are also excluded from the
 @samp{To} field, unless this would leave the field empty.  If this
 variable is @code{nil}, then the first time you compose a reply it is
 initialized to a default value that matches your own address.
 
   To reply only to the sender of the original message, enter
 the reply command with a numeric argument: @kbd{C-u r} or @kbd{1 r}.
-This omits the @samp{Cc} field completely for a particular reply.
+This omits the @samp{CC} field completely for a particular reply.
 
   Once the mail composition buffer has been initialized, editing and
 sending the mail goes as usual (@pxref{Sending Mail}).  You can edit
@@ -939,8 +939,8 @@ commas.
   @kbd{C-M-r @var{rcpts} @key{RET}} (@code{rmail-summary-by-recipients})
 makes a partial summary mentioning only the messages that have one or
 more recipients matching the regular expression @var{rcpts}.  This is matched
-against the @samp{To}, @samp{From}, and @samp{Cc} headers (supply a prefix
-argument to exclude the @samp{Cc} header).
+against the @samp{To}, @samp{From}, and @samp{CC} headers (supply a prefix
+argument to exclude the @samp{CC} header).
 
 @kindex C-M-t @r{(Rmail)}
 @findex rmail-summary-by-topic
diff --git a/doc/emacs/sending.texi b/doc/emacs/sending.texi
index 720f747..00b3c4d 100644
--- a/doc/emacs/sending.texi
+++ b/doc/emacs/sending.texi
@@ -70,7 +70,7 @@ or using some other method.  @xref{Mail Sending}, for details.
 
 @example
 To: subotai@@example.org
-Cc: mongol.soldier@@example.net, rms@@gnu.org
+CC: mongol.soldier@@example.net, rms@@gnu.org
 Subject: Re: What is best in life?
 From: conan@@example.org
 --text follows this line--
@@ -82,7 +82,7 @@ hear the lamentation of their women.
 At the top of the mail buffer is a set of @dfn{header fields}, which
 are used for specifying information about the email's recipient(s),
 subject, and so on.  The above buffer contains header fields for
address@hidden, @samp{Cc}, @samp{Subject}, and @samp{From}.  Some header
address@hidden, @samp{CC}, @samp{Subject}, and @samp{From}.  Some header
 fields are automatically pre-initialized in the mail buffer, when
 appropriate.
 
@@ -152,23 +152,23 @@ more than one address, use commas to separate them.
 @item Subject
 The subject of the message.
 
address@hidden Cc
address@hidden CC
 Additional mailing address(es) to send the message to.  This is like
 @samp{To}, except that these readers should not regard the message as
 directed at them.
 
address@hidden Bcc
address@hidden BCC
 Additional mailing address(es) to send the message to, which should
-not appear in the header of the message actually sent.  @samp{Bcc} stands
+not appear in the header of the message actually sent.  @samp{BCC} stands
 for @dfn{blind carbon copies}.
 
address@hidden Fcc
address@hidden FCC
 The name of a file, to which a copy of the sent message should be
 appended.  Emacs writes the message in mbox format, unless the file is
 in Babyl format (used by Rmail before Emacs 23), in which case Emacs
 writes in Babyl format.  If an Rmail buffer is visiting the file,
 Emacs updates it accordingly.  To specify more than one file, use
-several @samp{Fcc} fields, with one file name in each field.
+several @samp{FCC} fields, with one file name in each field.
 
 @item Reply-To
 An address to which replies should be sent, instead of @samp{From}.
@@ -198,7 +198,7 @@ this is normally filled in automatically for you.
 @end table
 
 @noindent
-The @samp{To}, @samp{Cc}, and @samp{Bcc} fields can appear any number
+The @samp{To}, @samp{CC}, and @samp{BCC} fields can appear any number
 of times, and each such header field can contain multiple addresses,
 separated by commas.  This way, you can specify any number of places
 to send the message.  These fields can also have continuation lines:
@@ -221,11 +221,11 @@ To: foo@@example.net, this@@example.net,
 buffer by setting the variable @code{mail-default-headers} to a
 string.  Then @kbd{C-x m} inserts this string into the message
 headers.  For example, here is how to add a @samp{Reply-To} and
address@hidden header to each message:
address@hidden header to each message:
 
 @smallexample
 (setq mail-default-headers
-      "Reply-To: foo@@example.com\nFcc: ~/Mail/sent")
+      "Reply-To: foo@@example.com\nFCC: ~/Mail/sent")
 @end smallexample
 
 @noindent
@@ -293,7 +293,7 @@ alias definitions and include commands.
   Mail aliases expand as abbrevs---that is to say, as soon as you type
 a word-separator character after an alias (@pxref{Abbrevs}).  This
 expansion takes place only within the @samp{To}, @samp{From},
address@hidden, @samp{Bcc}, and @samp{Reply-To} header fields (plus their
address@hidden, @samp{BCC}, and @samp{Reply-To} header fields (plus their
 @samp{Resent-} variants); it does not take place in other header
 fields, such as @samp{Subject}.
 
@@ -418,16 +418,16 @@ Move to the @samp{To} header (@code{message-goto-to}).
 @item C-c C-f C-s
 Move to the @samp{Subject} header (@code{message-goto-subject}).
 @item C-c C-f C-c
-Move to the @samp{Cc} header (@code{message-goto-cc}).
+Move to the @samp{CC} header (@code{message-goto-cc}).
 @item C-c C-f C-b
-Move to the @samp{Bcc} header (@code{message-goto-bcc}).
+Move to the @samp{BCC} header (@code{message-goto-bcc}).
 @item C-c C-f C-r
 Move to the @samp{Reply-To} header (@code{message-goto-reply-to}).
 @item C-c C-f C-f
 Move to the @samp{Mail-Followup-To} header field
 (@code{message-goto-followup-to}).
 @item C-c C-f C-w
-Add a new @samp{Fcc} header field, with file-name completion
+Add a new @samp{FCC} header field, with file-name completion
 (@code{message-goto-fcc}).
 @item C-c C-b
 Move to the start of the message body (@code{message-goto-body}).
@@ -463,7 +463,7 @@ the body.
 @findex message-tab
 @kindex TAB @r{(Message mode)}
   While editing a header field that contains addresses, such as
address@hidden:}, @samp{Cc:} and @samp{Bcc:}, you can complete an address by
address@hidden:}, @samp{CC:} and @samp{BCC:}, you can complete an address by
 typing @key{TAB} (@code{message-tab}).  This attempts to insert the
 full name corresponding to the address based on a couple of methods,
 including EUDC, a library that recognizes a number of directory server
diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi
index 0649ed5..862d283 100644
--- a/doc/misc/efaq.texi
+++ b/doc/misc/efaq.texi
@@ -4463,11 +4463,11 @@ appropriate regexp.
 @cindex Automatic filing of outgoing mail
 @cindex Mail, saving outgoing automatically
 
-You can either mail yourself a copy by including a @samp{Bcc} header in the
+You can either mail yourself a copy by including a @samp{BCC} header in the
 mail message, or store a copy of the message directly to a file by
-including an @samp{Fcc} header.
+including an @samp{FCC} header.
 
-If you use standard mail, you can automatically create a @samp{Bcc} to
+If you use standard mail, you can automatically create a @samp{BCC} to
 yourself by putting
 
 @lisp
@@ -4475,7 +4475,7 @@ yourself by putting
 @end lisp
 
 @noindent
-in your @file{.emacs} file.  You can automatically include an @samp{Fcc}
+in your @file{.emacs} file.  You can automatically include an @samp{FCC}
 field by putting something like the following in your @file{.emacs}
 file:
 
@@ -4485,7 +4485,7 @@ file:
 
 The output file will be in Unix mail format.
 
-If you use @code{mh-e}, add an @samp{Fcc} or @samp{Bcc} field to your
+If you use @code{mh-e}, add an @samp{FCC} or @samp{BCC} field to your
 components file.
 
 It does not work to put @samp{set record filename} in the @file{.mailrc}
@@ -4563,7 +4563,7 @@ these systems, you should configure @code{movemail} to 
use @code{flock}.
 @c isaacson@@seas.upenn.edu
 Ron Isaacson says: When you hit
 @kbd{r} to reply in Rmail, by default it Ccs all of the original
-recipients (everyone on the original @samp{To} and @samp{Cc}
+recipients (everyone on the original @samp{To} and @samp{CC}
 lists). With a prefix argument (i.e., typing @kbd{C-u} before @kbd{r}),
 it replies only to the sender.  However, going through the whole
 @kbd{C-u} business every time you want to reply is a pain.  This is the
diff --git a/doc/misc/message.texi b/doc/misc/message.texi
index 3d342f5..61eca75 100644
--- a/doc/misc/message.texi
+++ b/doc/misc/message.texi
@@ -162,7 +162,7 @@ header should be.  If it does not, it should just return 
@code{nil}, and
 the normal methods for determining the To header will be used.
 
 Each list element should be a cons, where the @sc{car} should be the
-name of a header (e.g., @code{Cc}) and the @sc{cdr} should be the header
+name of a header (e.g., @code{CC}) and the @sc{cdr} should be the header
 value (e.g., @samp{larsi@@ifi.uio.no}).  All these headers will be
 inserted into the head of the outgoing mail.
 
@@ -174,7 +174,7 @@ inserted into the head of the outgoing mail.
 The @code{message-wide-reply} pops up a message buffer that's a wide
 reply to the message in the current buffer.  A @dfn{wide reply} is a
 reply that goes out to all people listed in the @code{To}, @code{From}
-(or @code{Reply-To}) and @code{Cc} headers.
+(or @code{Reply-To}) and @code{CC} headers.
 
 @vindex message-wide-reply-to-function
 Message uses the normal methods to determine where wide replies are to go,
@@ -185,7 +185,7 @@ but you can change the behavior to suit your needs by 
fiddling with the
 @vindex message-dont-reply-to-names
 Addresses that match the @code{message-dont-reply-to-names} regular
 expression (or list of regular expressions or a predicate function)
-will be removed from the @code{Cc} header.  A value of @code{nil} means
+will be removed from the @code{CC} header.  A value of @code{nil} means
 to exclude only your email address.
 
 @vindex message-prune-recipient-rules
@@ -199,7 +199,7 @@ to match addresses to be pruned.
 It's complicated to explain, but it's easy to use.
 
 For instance, if you get an email from @samp{foo@@example.org}, but
address@hidden@@zot.example.org} is also in the @code{Cc} list, then your
address@hidden@@zot.example.org} is also in the @code{CC} list, then your
 wide reply will go out to both these addresses, since they are unique.
 
 To avoid this, do something like the following:
@@ -487,10 +487,10 @@ MFT field.  If there is one, it is left alone.  (Except 
if it's empty;
 in that case, the field is removed and is not replaced with an
 automatically generated one.  This lets you disable MFT generation on a
 per-message basis.)  If there is none, then the list of recipient
-addresses (in the To: and Cc: headers) is checked to see if one of them
+addresses (in the To: and CC: headers) is checked to see if one of them
 is a list address you are subscribed to.  If none of them is a list
 address, then no MFT is generated; otherwise, a MFT is added to the
-other headers and set to the value of all addresses in To: and Cc:
+other headers and set to the value of all addresses in To: and CC:
 
 @kindex C-c C-f C-a
 @findex message-generate-unsubscribed-mail-followup-to
@@ -516,7 +516,7 @@ header, Gnus' action will depend on the value of the 
variable
 
 @table @code
 @item use
- Always honor MFTs.  The To: and Cc: headers in your followup will be
+ Always honor MFTs.  The To: and CC: headers in your followup will be
  derived from the MFT header of the original post.  This is the default.
 
 @item nil
@@ -593,17 +593,17 @@ in the key binding is for Originator.)
 @item C-c C-f C-b
 @kindex C-c C-f C-b
 @findex message-goto-bcc
-Go to the @code{Bcc} header (@code{message-goto-bcc}).
+Go to the @code{BCC} header (@code{message-goto-bcc}).
 
 @item C-c C-f C-w
 @kindex C-c C-f C-w
 @findex message-goto-fcc
-Go to the @code{Fcc} header (@code{message-goto-fcc}).
+Go to the @code{FCC} header (@code{message-goto-fcc}).
 
 @item C-c C-f C-c
 @kindex C-c C-f C-c
 @findex message-goto-cc
-Go to the @code{Cc} header (@code{message-goto-cc}).
+Go to the @code{CC} header (@code{message-goto-cc}).
 
 @item C-c C-f C-s
 @kindex C-c C-f C-s
@@ -662,7 +662,7 @@ fetches the contents of the @samp{To:} header in the 
current mail
 buffer, and appends the current @code{user-mail-address}.
 
 If the optional argument @code{include-cc} is address@hidden, the
-addresses in the @samp{Cc:} header are also put into the
+addresses in the @samp{CC:} header are also put into the
 @samp{Mail-Followup-To:} header.
 
 @end table
@@ -696,7 +696,7 @@ or @code{Newsgroups} header of the article you're replying 
to
 @kindex C-c C-l
 @findex message-to-list-only
 Send a message to the list only.  Remove all addresses but the list
-address from @code{To:} and @code{Cc:} headers.
+address from @code{To:} and @code{CC:} headers.
 
 @item C-c M-n
 @kindex C-c M-n
@@ -746,13 +746,13 @@ by the @code{message-cross-post-note-function} variable.
 @item C-c C-f t
 @kindex C-c C-f t
 @findex message-reduce-to-to-cc
-Replace contents of @samp{To} header with contents of @samp{Cc}
-header (or the @samp{Bcc} header, if there is no @samp{Cc} header).
+Replace contents of @samp{To} header with contents of @samp{CC}
+header (or the @samp{BCC} header, if there is no @samp{CC} header).
 
 @item C-c C-f w
 @kindex C-c C-f w
 @findex message-insert-wide-reply
-Insert @samp{To} and @samp{Cc} headers as if you were doing a wide
+Insert @samp{To} and @samp{CC} headers as if you were doing a wide
 reply even if the message was not made for a wide reply first.
 
 @item C-c C-f a
@@ -902,7 +902,7 @@ found in RFC 3490.
 Message is a @acronym{IDNA}-compliant posting agent.  The user
 generally doesn't have to do anything to make the @acronym{IDNA}
 happen---Message will encode address@hidden domain names in @code{From},
address@hidden, and @code{Cc} headers automatically.
address@hidden, and @code{CC} headers automatically.
 
 Until @acronym{IDNA} becomes more well known, Message queries you
 whether @acronym{IDNA} encoding of the domain name really should
@@ -1011,7 +1011,7 @@ and/or encrypted messages as explained in the following.
 * Passphrase caching::          How to cache passphrases
 * PGP Compatibility::           Compatibility with older implementations
 * Encrypt-to-self::             Reading your own encrypted messages
-* Bcc Warning::                 Do not use encryption with Bcc headers
+* BCC Warning::                 Do not use encryption with BCC headers
 @end menu
 
 @node Signing and encryption
@@ -1300,7 +1300,7 @@ information about the problem.)
 @subsection Encrypt-to-self
 
 By default, messages are encrypted to all recipients (@code{To},
address@hidden, @code{Bcc} headers).  Thus, you will not be able to decrypt
address@hidden, @code{BCC} headers).  Thus, you will not be able to decrypt
 your own messages.  To make sure that messages are also encrypted to
 your own key(s), several alternative solutions exist:
 @enumerate
@@ -1318,17 +1318,17 @@ OpenPGP) or @code{mml-secure-smime-encrypt-to-self} (for
 @acronym{S/MIME} with EasyPG).
 @end enumerate
 
address@hidden Bcc Warning
address@hidden Bcc Warning
address@hidden BCC Warning
address@hidden BCC Warning
 
-The @code{Bcc} header is meant to hide recipients of messages.
+The @code{BCC} header is meant to hide recipients of messages.
 However, when encrypted messages are used, the e-mail addresses of all
address@hidden are given away to all recipients without
address@hidden are given away to all recipients without
 warning, which is a bug.
 @vindex mml-secure-safe-bcc-list
-But now Message got to warn if @code{Bcc} recipients are found in an
+But now Message got to warn if @code{BCC} recipients are found in an
 encrypted message when you are just about to send it.  If you are sure
-those @code{Bcc} addresses are safe to expose, set the
+those @code{BCC} addresses are safe to expose, set the
 @code{mml-secure-safe-bcc-list} variable, that is a list of e-mail
 addresses.  See
 @uref{https://debbugs.gnu.org/cgi/bugreport.cgi?bug=18718}.
@@ -1468,16 +1468,16 @@ alias ding "ding@@ifi.uio.no (ding mailing list)"
 @end example
 
 After adding lines like this to your @file{~/.mailrc} file, you should
-be able to just write @samp{lmi} in the @code{To} or @code{Cc} (and so
+be able to just write @samp{lmi} in the @code{To} or @code{CC} (and so
 on) headers and press @kbd{SPC} to expand the alias.
 
 No expansion will be performed upon sending of the message---all
 expansions have to be done explicitly.
 
 If you're using @code{ecomplete}, all addresses from @code{To} and
address@hidden headers will automatically be put into the
address@hidden headers will automatically be put into the
 @file{~/.ecompleterc} file.  When you enter text in the @code{To} and
address@hidden headers, @code{ecomplete} will check out the values stored
address@hidden headers, @code{ecomplete} will check out the values stored
 there and ``electrically'' say what completions are possible.  To
 choose one of these completions, use the @kbd{M-n} command to move
 down to the list.  Use @address@hidden or @kbd{M-n} and
@@ -1681,7 +1681,7 @@ trailing old subject.  In this case,
 @item message-alternative-emails
 @vindex message-alternative-emails
 Regexp or predicate function matching alternative email addresses.
-The first address in the To, Cc or From headers of the original
+The first address in the To, CC or From headers of the original
 article matching this variable is used as the From field of outgoing
 messages, replacing the default From value.
 
@@ -1701,7 +1701,7 @@ off @code{message-setup-hook}.
 @item message-allow-no-recipients
 @vindex message-allow-no-recipients
 Specifies what to do when there are no recipients other than
address@hidden or @code{Fcc}.  If it is @code{always}, the posting is
address@hidden or @code{FCC}.  If it is @code{always}, the posting is
 allowed.  If it is @code{never}, the posting is not allowed.  If it is
 @code{ask} (the default), you are prompted.
 
@@ -1713,7 +1713,7 @@ hidden when composing a message.
 
 @lisp
 (setq message-hidden-headers
-      '(not "From" "Subject" "To" "Cc" "Newsgroups"))
+      '(not "From" "Subject" "To" "CC" "Newsgroups"))
 @end lisp
 
 Headers are hidden using narrowing, you can use @kbd{M-x widen} to
@@ -1722,9 +1722,9 @@ expose them in the buffer.
 @item message-header-synonyms
 @vindex message-header-synonyms
 A list of lists of header synonyms.  E.g., if this list contains a
-member list with elements @code{Cc} and @code{To}, then
+member list with elements @code{CC} and @code{To}, then
 @code{message-carefully-insert-headers} will not insert a @code{To}
-header when the message is already @code{Cc}ed to the recipient.
+header when the message is already @code{CC}ed to the recipient.
 
 @end table
 
@@ -1742,7 +1742,7 @@ header when the message is already @code{Cc}ed to the 
recipient.
 @item message-ignored-mail-headers
 @vindex message-ignored-mail-headers
 Regexp of headers to be removed before mailing.  The default address@hidden
address@hidden:\\|^Resent-Fcc:\\|^Xref:\\|^X-Draft-From:\\|@*
address@hidden:\\|^Resent-FCC:\\|^Xref:\\|^X-Draft-From:\\|@*
 ^X-Gnus-Agent-Meta-Information:}.
 
 @item message-default-mail-headers
@@ -2091,7 +2091,7 @@ for which the check is disabled by default if
 @item message-ignored-news-headers
 @vindex message-ignored-news-headers
 Regexp of headers to be removed before posting.  The default address@hidden
address@hidden:\\|^Xref:\\|^[BGF]cc:\\|^Resent-Fcc:\\|@*
address@hidden:\\|^Xref:\\|^[BGF]cc:\\|^Resent-FCC:\\|@*
 ^X-Draft-From:\\|^X-Gnus-Agent-Meta-Information:}.
 
 @item message-default-news-headers
@@ -2471,7 +2471,7 @@ an article\\nthat has been posted to %s as well.\\n\\n"}.
 
 @item message-fcc-externalize-attachments
 @vindex message-fcc-externalize-attachments
-If @code{nil}, attach files as normal parts in Fcc copies; if it is
+If @code{nil}, attach files as normal parts in FCC copies; if it is
 address@hidden, attach local files as external parts.
 
 @item message-interactive
@@ -2626,13 +2626,13 @@ consulted, in turn:
 A @dfn{wide reply} is a mail response that includes @emph{all} entities
 mentioned in the message you are responding to.  All mailboxes from the
 following headers will be concatenated to form the outgoing
address@hidden/@code{Cc} headers:
address@hidden/@code{CC} headers:
 
 @table @code
 @item From
 (unless there's a @code{Reply-To}, in which case that is used instead).
 
address@hidden Cc
address@hidden CC
 
 @item To
 @end table
@@ -2656,7 +2656,7 @@ sent:
 @end table
 
 If a @code{Mail-Copies-To} header is present, it will be used as the
-basis of the new @code{Cc} header, except if this header is
+basis of the new @code{CC} header, except if this header is
 @samp{never}.
 
 @end table