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 7f255ea522da47ece7b8be3507f48791cc916f6e..585814bf73827f48a7f38bd920cd6bb315d48a4a 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 d30819a1e48e36e4d6ad1ccc94ddd9bbb004a2f1..aac135470d334b50d7e3effa72926f7e25f040a5 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 7f255ea522da47ece7b8be3507f48791cc916f6e..585814bf73827f48a7f38bd920cd6bb315d48a4a 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 7f8a5672cedffac314d49ff96592ea5e11b93743..8533744d9ca40a227367710d55db8d6e581605ba 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 82b4ebc7403f79a90607e9ea8ad105ee8dfb8ade..a24462fec95f886ce3d6ec84dbe897a747ef2ece 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 795eab2c8a519e74214d74605a31c7325ff9b0ba..995dbf52e84f6eaeecb97a99441fc7c5aef5d111 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 13fe808258eb87c500065615008cfd3de9d7c61e..872ffc087760fcc4a59cab7eef18e90d314e120c 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 91664113119809f5f989959fc33cc4b988980ec4..2520c8e367bfb11cf42d3cccbd1bf9b5bc779403 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 210a3e00fb792ec7fe430803cb92d72db2069c3b..ff09c06b677bc8ed245f910abdf5fa3c7ce285bc 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 7b46eaa8e4d003ea306295b67f49c21bfc825381..59bcd19bc5868a4304e99fe053251ebc97e39119 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 80021df7aa500fa4e4fb8d69fbf0cc830959da31..7f5d73d127141247433493f7380f855d022fbbe8 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 2f2964026bd0ce143fd92e93e8f8272a892c543f..34d983cb78d4319ef8f5cc83935b794325bf32a2 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 9a78e0212d9aae6dd4a09c38899e936f10aafe97..280782e47af25b041c07f89a993b267a9b84b43c 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 ba2edcbc367bea4077896b35215815c06a3279d9..33c237e59cac6fac256bb2730d39f33b4d3e4e90 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 50dd103a6c6cd6eec2e687d28b865bc8e898e049..139f6f6de722948e1967a5c5e29bdadf223a5c2d 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 6c58c14e34aefdcce012fcdbcb9c51f4bfb00b3f..14c3ae776c2a22765e7ac3eceee64347378f43fd 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 3f52d6c10e5f97330f064fa62cbdb2a1b586fb92..accb38e8ae6bb97b834e3422dc7cedf58be2df9f 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 c5bec46aed605bfe38210fea7f9018b0f4882527..a1a134ac0ba660758e6905917c1e0a3fb058e362 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 1dece2623af74bd9dd5b0462011fde44700af62e..8e783744baca2a871f1af7b9a0fdd2cf8e8eb63f 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 ded61947260973d8b15792e1ab1abe666dfa13a3..2cd7c8fbc05bb6e4b95b2a29e2ca173b599e3c60 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 037246ddeb68c60c4919832b3d8f627011a19f41..ebe8b7647155de8d584cd277971020dc704458f3 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 fde41074157040779d34782526c0c8da197c9104..ac9225b14886bf346f0768bada930c3be8f5cb20 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 76b68a4e1ca7840a6f447ea6014dcbb97571a636..262e84db13196030d382bb5edfdb9171dbf57a58 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 },