Fix spelling and encoding errors in manpages and an error message

[mmh] / etc / replcomps

diff --git a/etc/replcomps b/etc/replcomps
index 21282fc..87532ba 100644 (file)
--- a/etc/replcomps
+++ b/etc/replcomps
@@ -1,28 +1,26 @@
-%; $Id$
-%;
-%; replcomps: default form (components) file for `repl'
-%;
-%; Check for the following headers (in this order)
-%; to construct the return address
-%;
-%; Mail-Reply-To
-%; Reply-To
-%; From
-%; Sender
-%; Return-Path
-%;
-%; AND
-%;
-%; cc: To              (and)
-%;     cc              (and)
-%;     personal address
-%;
-%(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%>\
-%<{fcc}Fcc: %{fcc}\n%>\
-%<{subject}Subject: Re: %{subject}\n%>\
+%; $Header$
+%;
+%; 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.
+%;
+%(lit)%(formataddr{reply-to})\
+%(formataddr %<{from}%(void{from})%|%(void{apparently-from})%>)\
+%(formataddr{resent-to})\
+%(formataddr{prev-resent-to})\
+%(formataddr{x-to})\
+%(formataddr{apparently-to})\
+%(void(width))%(putaddr To: )
+%(lit)%(formataddr{to})\
+%(formataddr{cc})\
+%(formataddr{x-cc})\
+%(formataddr{resent-cc})\
+%(formataddr{prev-resent-cc})\
+%(formataddr(me))\
+%(void(width))%(putaddr Cc: )
+Fcc: +sent
+Subject: %<{subject}Re: %(void{subject})%(trim)%(decode)%>
 %;
 %; Make References: and In-reply-to: fields for threading.
 %; Use (void), (trim) and (putstr) to eat trailing whitespace.
@@ -33,6 +31,9 @@
 %(void{message-id})%(trim)%(putstr)\n%>\
 Comments: In-reply-to \
 %<{from}%(void{from})%?(void{apparently-from})%|%(void{sender})%>\
-%(trim)%(putstr)\n\
+%(trim)%(decode)\n\
    message dated "%<(nodate{date})%{date}%|%(tws{date})%>."
 --------
+[%4(year{date})-%02(mon{date})-%02(mday{date}) \
+%02(hour{date}):%02(min{date})] %(decode{from})
+>