Renames: s/+outbox/+sent/ and s/cc:/Cc:/

IMO ``sent'' specifies more exactly what it contains. ``outbox'' would
mean to me that these messages are prepared for delivery, but are not
already sent.

diff --git a/etc/components b/etc/components
index 7f255ea..585814b 100644 (file)
--- a/etc/components
+++ b/etc/components
@@ -1,5 +1,5 @@
 To:
-cc:
-Fcc: +outbox
+Cc:
+Fcc: +sent
 Subject:
 --------

diff --git a/etc/distcomps b/etc/distcomps
index d30819a..aac1354 100644 (file)
--- a/etc/distcomps
+++ b/etc/distcomps
@@ -1,3 +1,3 @@
 Resent-To:
-Resent-cc:
-Resent-fcc:
+Resent-Cc:
+Resent-Fcc:

diff --git a/etc/forwcomps b/etc/forwcomps
index 7f255ea..585814b 100644 (file)
--- a/etc/forwcomps
+++ b/etc/forwcomps
@@ -1,5 +1,5 @@
 To:
-cc:
-Fcc: +outbox
+Cc:
+Fcc: +sent
 Subject:
 --------

diff --git a/etc/mhl.format b/etc/mhl.format
index 7f8a567..8533744 100644 (file)
--- a/etc/mhl.format
+++ b/etc/mhl.format
@@ -8,7 +8,7 @@ leftadjust,compwidth=9
 ignores=msgid,message-id,received,content-type,content-transfer-encoding,content-id
 Date:formatfield="%<(nodate{text})%{text}%|%(pretty{text})%>"
 To:
-cc:
+Cc:
 From:decode
 Subject:decode
 :

diff --git a/etc/mhl.forward b/etc/mhl.forward
index 82b4ebc..a24462f 100644 (file)
--- a/etc/mhl.forward
+++ b/etc/mhl.forward
@@ -7,7 +7,7 @@ leftadjust,compress,compwidth=9
 Date:formatfield="%<(nodate{text})%{text}%|%(tws{text})%>"
 From:
 To:
-cc:
+Cc:
 Subject:
 :
 body:nocomponent,overflowoffset=0,noleftadjust,nocompress

diff --git a/etc/mhl.headers b/etc/mhl.headers
index 795eab2..995dbf5 100644 (file)
--- a/etc/mhl.headers
+++ b/etc/mhl.headers
@@ -9,7 +9,7 @@ leftadjust,compwidth=9
 ignores=msgid,message-id,received,content-type,content-transfer-encoding,content-id
 Date:formatfield="%<(nodate{text})%{text}%|%(pretty{text})%>"
 To:
-cc:
+Cc:
 From:decode
 Subject:decode
 :

diff --git a/etc/rcvdistcomps.outbox b/etc/rcvdistcomps.outbox
index 13fe808..872ffc0 100644 (file)
--- a/etc/rcvdistcomps.outbox
+++ b/etc/rcvdistcomps.outbox
@@ -1,3 +1,3 @@
 %(lit)%(formataddr{addresses})\
 %<(nonnull)%(void(width))%(putaddr Resent-To: )\n%>\
-Resent-Fcc: outbox
+Resent-Fcc: sent

diff --git a/etc/replcomps b/etc/replcomps
index 9166411..2520c8e 100644 (file)
--- a/etc/replcomps
+++ b/etc/replcomps
@@ -1,9 +1,9 @@
 %; $Header$
 %;
-%; These next lines slurp in lots of addresses for To: and cc:.
+%; These next lines slurp in lots of addresses for To: and Cc:.
 %; Use with repl -query or else you may get flooded with addresses!
 %;
-%; If no To:/cc:/Fcc: text, we output empty fields for prompter to fill in.
+%; If no To:/Cc:/Fcc: text, we output empty fields for prompter to fill in.
 %;
 %(lit)%(formataddr{reply-to})\
 %(formataddr %<{from}%(void{from})%|%(void{apparently-from})%>)\
@@ -18,8 +18,8 @@
 %(formataddr{resent-cc})\
 %(formataddr{prev-resent-cc})\
 %(formataddr(me))\
-%(void(width))%(putaddr cc: )
-Fcc: %<{fcc}%{fcc}%|+outbox%>
+%(void(width))%(putaddr Cc: )
+Fcc: %<{fcc}%{fcc}%|+sent%>
 Subject: %<{subject}Re: %(void{subject})%(trim)%(putstr)%>
 %;
 %; Make References: and In-reply-to: fields for threading.

diff --git a/etc/replgroupcomps b/etc/replgroupcomps
index 210a3e0..ff09c06 100644 (file)
--- a/etc/replgroupcomps
+++ b/etc/replgroupcomps
@@ -16,8 +16,8 @@
 %;
 %; AND
 %;
-%; cc: To              (and)
-%;     cc              (and)
+%; Cc: To              (and)
+%;     Cc              (and)
 %;     personal address
 %;
 %(lit)%(formataddr{mail-followup-to})\
@@ -26,9 +26,9 @@
 %(lit)%(formataddr %<{mail-reply-to}%?{reply-to}%?{from}%?{sender}%?{return-path}%>)\
 %<(nonnull)%(void(width))%(putaddr To: )\n%>\
 %(lit)%(formataddr{to})%(formataddr{cc})%(formataddr(me))\
-%<(nonnull)%(void(width))%(putaddr cc: )\n%>%>\
+%<(nonnull)%(void(width))%(putaddr Cc: )\n%>%>\
 %;
-Fcc: %<{fcc}%{fcc}%|+outbox%>
+Fcc: %<{fcc}%{fcc}%|+sent%>
 Subject: %<{subject}Re: %(void{subject})%(trim)%(putstr)%>
 %;
 %; Make References: and In-reply-to: fields for threading.

diff --git a/man/dist.man1 b/man/dist.man1
index 7b46eaa..59bcd19 100644 (file)
--- a/man/dist.man1
+++ b/man/dist.man1
@@ -50,7 +50,7 @@ The form used will be prepended to the message being resent.
 .PP
 Only those addresses in
 .RI \*(lq Resent\-To: \*(rq,
-.RI \*(lq Resent\-cc: \*(rq,
+.RI \*(lq Resent\-Cc: \*(rq,
 and
 .RI \*(lq Resent\-Bcc: \*(rq
 will be sent.  Also, a

diff --git a/man/mh-format.man5 b/man/mh-format.man5
index 80021df..7f5d73d 100644 (file)
--- a/man/mh-format.man5
+++ b/man/mh-format.man5
@@ -514,7 +514,7 @@ the \*(lq\-cc\*(rq switch to \fIrepl\fR\^) are formatted.
 .RE
 .PP
 If the result is non-null, it is printed as above with a
-leading label of \*(lqcc:\*(rq.
+leading label of \*(lqCc:\*(rq.
 .PP
 .RS 5
 .nf

diff --git a/man/mh-mail.man5 b/man/mh-mail.man5
index 2f29640..34d983c 100644 (file)
--- a/man/mh-mail.man5
+++ b/man/mh-mail.man5
@@ -62,7 +62,7 @@ in their text portions.
 .PP
 The text for most formatted components (e.g., \*(lqDate:\*(rq and
 \*(lqMessage\-Id:\*(rq) is produced automatically.  The only ones entered
-by the user are address fields such as \*(lqTo:\*(rq, \*(lqcc:\*(rq,
+by the user are address fields such as \*(lqTo:\*(rq, \*(lqCc:\*(rq,
 etc.  Internet addresses are assigned mailbox names and host computer
 specifications.  The rough format is \*(lqlocal@domain\*(rq, such as
 \*(lqMH@UCI\*(rq, or \*(lqMH@UCI\-ICSA.ARPA\*(rq.  Multiple addresses
@@ -118,7 +118,7 @@ any addresses in this field will take precedence, and no other reply address
 will be added to the draft.  If this header is not available, then the
 return addresses will be constructed from the \*(lqMail-Reply\-To:\*(rq,
 or \*(lqReply\-To:\*(rq, or \*(lqFrom:\*(rq, along with adding the
-addresses from the headers \*(lqTo:\*(rq, \*(lqcc:\*(rq, as well as
+addresses from the headers \*(lqTo:\*(rq, \*(lqCc:\*(rq, as well as
 adding your personal address.
 .RE
 .PP
@@ -209,9 +209,9 @@ New recipients for a message resent by
 .BR dist .
 .RE
 .PP
-.BR Resent\-cc :
+.BR Resent\-Cc :
 .RS 5
-Still more recipients. See \*(lqcc:\*(rq and \*(lqResent\-To:\*(rq.
+Still more recipients. See \*(lqCc:\*(rq and \*(lqResent\-To:\*(rq.
 .RE
 .PP
 .BR Resent\-Bcc :

diff --git a/man/mhbuild.man1 b/man/mhbuild.man1
index 9a78e02..280782e 100644 (file)
--- a/man/mhbuild.man1
+++ b/man/mhbuild.man1
@@ -424,7 +424,7 @@ containing five parts:
 .RS 5
 .nf
 To: nobody@nowhere.org
-cc:
+Cc:
 Subject: Look and listen to me!
 --------
 The first part will be text/plain

diff --git a/man/mhmail.man1 b/man/mhmail.man1
index ba2edcb..33c237e 100644 (file)
--- a/man/mhmail.man1
+++ b/man/mhmail.man1
@@ -82,7 +82,7 @@ Normally, addresses appearing as arguments are put in the \*(lqTo:\*(rq
 field.  If the
 .B \-cc
 switch is used, all addresses following it are
-placed in the \*(lqcc:\*(rq field.
+placed in the \*(lqCc:\*(rq field.
 .PP
 By using
 .B \-from

diff --git a/man/pick.man1 b/man/pick.man1
index 50dd103..139f6f6 100644 (file)
--- a/man/pick.man1
+++ b/man/pick.man1
@@ -100,7 +100,7 @@ is a shorthand for specifying
 .RE
 .PP
 It is used to pick a component which is not one of \*(lqTo:\*(rq,
-\*(lqcc:\*(rq, \*(lqDate:\*(rq, \*(lqFrom:\*(rq, or \*(lqSubject:\*(rq.
+\*(lqCc:\*(rq, \*(lqDate:\*(rq, \*(lqFrom:\*(rq, or \*(lqSubject:\*(rq.
 An example is
 .RB \*(lq "pick\0\-\|\-reply\-to\0pooh" \*(rq.
 .PP

diff --git a/man/post.man8 b/man/post.man8
index 6c58c14..14c3ae7 100644 (file)
--- a/man/post.man8
+++ b/man/post.man8
@@ -47,7 +47,7 @@ which parses the various header fields, appends
 will not normally be called directly by the user.
 .PP
 .B Post
-searches the \*(lqTo:\*(rq, \*(lqcc:\*(rq, \*(lqBcc:\*(rq,
+searches the \*(lqTo:\*(rq, \*(lqCc:\*(rq, \*(lqBcc:\*(rq,
 \*(lqFcc:\*(rq, and \*(lqResent\-xxx:\*(rq header lines of the specified
 message for destination addresses, checks these addresses for validity,
 and formats them so as to conform to ARPAnet Internet Message Format

diff --git a/man/repl.man1 b/man/repl.man1
index 3f52d6c..accb38e 100644 (file)
--- a/man/repl.man1
+++ b/man/repl.man1
@@ -78,8 +78,8 @@ to construct the reply message draft as follows:
 .RS 5
 .nf
 To: <Mail\-Reply\-To> or <Reply\-To> or <From>
-cc: <To> and <cc> and <personal address>
-Fcc: {fcc switch} or +outbox
+Cc: <To> and <Cc> and <personal address>
+Fcc: {fcc switch} or +sent
 Subject: Re: <Subject>
 In\-Reply\-To: <Message\-Id>
 References: <Message\-Id>
@@ -94,7 +94,7 @@ where field names enclosed in angle brackets (<\ >) indicate the
 contents of the named field from the message to which the reply is
 being made.
 .PP
-By default, the \*(lqcc:\*(rq field is empty.  You may selectively add
+By default, the \*(lqCc:\*(rq field is empty.  You may selectively add
 addresses to this default with the
 .B \-cc
 .I type
@@ -102,7 +102,7 @@ switch.  This switch takes an
 argument (
 .IR all / to / cc / me )
 which specifies who gets added to the default
-\*(lqcc:\*(rq list of the reply.  You may give this switch multiple times (with
+\*(lqCc:\*(rq list of the reply.  You may give this switch multiple times (with
 different arguments) if you wish to add multiple types of addresses.
 .PP
 If the switch
@@ -135,7 +135,7 @@ or if the field <Mail\-Followup\-To> is not available:
 .RS 5
 .nf
 To: <Mail\-Reply\-To> or <Reply\-To> or <From>
-cc: <To> and <cc> and <personal address>
+Cc: <To> and <Cc> and <personal address>
 Subject: Re: <Subject>
 In\-Reply\-To: Message from <From> of <Date>.
 .ti +\w'In\-Reply\-To: 'u
@@ -144,7 +144,7 @@ In\-Reply\-To: Message from <From> of <Date>.
 .fi
 .RE
 .PP
-By default, the \*(lqcc:\*(rq contains all the addresses shown.  You may
+By default, the \*(lqCc:\*(rq contains all the addresses shown.  You may
 selectively remove addresses from this default with the
 .B \-nocc
 .I type
@@ -152,7 +152,7 @@ switch.
 This switch takes an argument (
 .IR all / to / cc / me )
 which specifies who gets removed
-from the default \*(lqcc:\*(rq list of the reply.  You may give this switch
+from the default \*(lqCc:\*(rq list of the reply.  You may give this switch
 multiple times (with different arguments) if you wish to remove multiple types
 of addresses.
 .PP
@@ -167,7 +167,7 @@ switch modifies the action of
 .I type
 switch by
 interactively asking you if each address that normally would be placed in
-the \*(lqTo:\*(rq and \*(lqcc:\*(rq list should actually be sent a copy.
+the \*(lqTo:\*(rq and \*(lqCc:\*(rq list should actually be sent a copy.
 This is useful for special\-purpose replies.  Note that the position of
 the
 .B \-cc
@@ -176,7 +176,7 @@ and
 switches, like all other switches which take a
 positive and negative form, is important.
 .PP
-Lines beginning with the fields \*(lqTo:\*(rq, \*(lqcc:\*(rq, and
+Lines beginning with the fields \*(lqTo:\*(rq, \*(lqCc:\*(rq, and
 \*(rqBcc:\*(rq will be standardized and have duplicate addresses removed.
 In addition, the
 .B \-width
@@ -335,7 +335,7 @@ switch to change this.
 .PP
 Although the default template specifies that a copy of the reply will be
 put in
-the folder 'outbox',
+the folder 'sent',
 if the
 .B \-fcc
 .I +folder

diff --git a/man/send.man1 b/man/send.man1
index c5bec46..a1a134a 100644 (file)
--- a/man/send.man1
+++ b/man/send.man1
@@ -38,7 +38,7 @@ send \- send a message
 .SH DESCRIPTION
 .B Send
 will cause each of the specified messages to be delivered
-to each of the destinations in the \*(lqTo:\*(rq, \*(lqcc:\*(rq,
+to each of the destinations in the \*(lqTo:\*(rq, \*(lqCc:\*(rq,
 \*(lqBcc:\*(rq, \*(lqDcc:\*(rq, and \*(lqFcc:\*(rq fields of the message.  If
 .B send
 is re\-distributing a message, as invoked from
@@ -250,7 +250,7 @@ existing \*(lqSender:\*(rq field is an error!)
 By using the
 .B \-format
 switch, each of the entries in the \*(lqTo:\*(rq
-and \*(lqcc:\*(rq fields will be replaced with \*(lqstandard\*(rq
+and \*(lqCc:\*(rq fields will be replaced with \*(lqstandard\*(rq
 format entries.  This standard format is designed to be usable by all
 of the message handlers on the various systems around the Internet.
 If

diff --git a/test/tests/mhbuild/test-forw b/test/tests/mhbuild/test-forw
index 1dece26..8e78374 100644 (file)
--- a/test/tests/mhbuild/test-forw
+++ b/test/tests/mhbuild/test-forw
@@ -18,8 +18,8 @@ check() {
 mkdraft() {
     cat > $draft <<EOF
 To:
-cc:
-Fcc: +outbox
+Cc:
+Fcc: +sent
 Subject:
 --------
 #forw [forwarded messages] +inbox 1 2
@@ -39,8 +39,8 @@ actual=$MH_TEST_DIR/$$.actual
 # check mhbuild
 cat > $expected <<EOF
 To:
-cc:
-Fcc: +outbox
+Cc:
+Fcc: +sent
 Subject:
 MIME-Version: 1.0
 Content-Type: multipart/digest; boundary="----- =_aaaaaaaaaa0"
@@ -77,8 +77,8 @@ check
 # check mhbuild -rfc934
 cat > $expected <<EOF
 To:
-cc:
-Fcc: +outbox
+Cc:
+Fcc: +sent
 Subject:
 MIME-Version: 1.0
 Content-Type: multipart/digest; boundary="----- =_aaaaaaaaaa0"

diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c
index ded6194..2cd7c8f 100644 (file)
--- a/uip/mhlsbr.c
+++ b/uip/mhlsbr.c
@@ -158,7 +158,7 @@ static struct pair pairs[] = {
        { "Resent-Sender", ADDRFMT },
        { "Resent-Reply-To", ADDRFMT },
        { "Resent-To", ADDRFMT },
-       { "Resent-cc", ADDRFMT },
+       { "Resent-Cc", ADDRFMT },
        { "Resent-Bcc", ADDRFMT },
        { "Face", FACEFMT },
        { NULL, 0 }

diff --git a/uip/mhmail.c b/uip/mhmail.c
index 037246d..ebe8b76 100644 (file)
--- a/uip/mhmail.c
+++ b/uip/mhmail.c
@@ -135,7 +135,7 @@ main(int argc, char **argv)
 
        fprintf(out, "%sTo: %s\n", resent ? "Resent-" : "", tolist);
        if (cclist)
-               fprintf(out, "%scc: %s\n", resent ? "Resent-" : "", cclist);
+               fprintf(out, "%sCc: %s\n", resent ? "Resent-" : "", cclist);
        if (subject)
                fprintf(out, "%sSubject: %s\n", resent ? "Resent-" : "", subject);
        if (from)

diff --git a/uip/slocal.c b/uip/slocal.c
index fde4107..ac9225b 100644 (file)
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -158,7 +158,7 @@ static struct pair hdrs[NVEC + 1] = {
        { "Resent-From",  NULL, P_ADR },
        { "Resent-Sender",   NULL, P_ADR },
        { "Resent-To",  NULL, P_ADR },
-       { "Resent-cc",  NULL, P_ADR },
+       { "Resent-Cc",  NULL, P_ADR },
        { NULL, NULL, 0 }
 };
 

diff --git a/uip/spost.c b/uip/spost.c
index 76b68a4..262e84d 100644 (file)
--- a/uip/spost.c
+++ b/uip/spost.c
@@ -123,7 +123,7 @@ static struct headers RHeaders[] = {
        { "Resent-Date", HNOP, MRDT },
        { "Resent-Subject", HSUB, 0 },
        { "Resent-To", HADR|HTRY, MVIS },
-       { "Resent-cc", HADR|HTRY, MVIS },
+       { "Resent-Cc", HADR|HTRY, MVIS },
        { "Resent-Bcc", HADR|HTRY|HBCC, MINV },
        { "Resent-Message-Id", HBAD, 0 },
        { "Resent-Fcc", HFCC, 0 },