X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=man%2Fforw.man;h=e5c25c9000de702a48061305efb797c7418c3dd5;hp=6d490534e75872843127880b6486f047635478e8;hb=337338b404931f06f0db2119c9e145e8ca5a9860;hpb=3d7993e40a34f52e2b6394c2f64ef0111ab886f7

diff --git a/man/forw.man b/man/forw.man
index 6d49053..e5c25c9 100644
--- a/man/forw.man
+++ b/man/forw.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH FORW %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
@@ -11,7 +10,7 @@ forw \- forward messages
 .B forw
 .RI [ +folder ]
 .RI [ msgs ]
-.RB [ \-annotate " | " \-noannotate ] 
+.RB [ \-annotate " | " \-noannotate ]
 .RB [ \-form
 .IR formfile ]
 .RB [ \-format " | " \-noformat ]
@@ -19,11 +18,6 @@ forw \- forward messages
 .IR filterfile ]
 .RB [ \-inplace " | " \-noinplace ]
 .RB [ \-mime " | " \-nomime ]
-.RB [ \-draftfolder
-.IR +folder ]
-.RB [ \-draftmessage
-.IR msg ]
-.RB [ \-nodraftfolder ]
 .RB [ \-editor
 .IR editor ]
 .RB [ \-noedit ]
@@ -47,7 +41,7 @@ forw \- forward messages
 .IR number ]
 .RB [ \-volume
 .IR number ]
-[other\ switches\ for\ 
+[other\ switches\ for\
 .BR forw ]
 .RB [ \-version ]
 .RB [ \-help ]
@@ -79,27 +73,18 @@ alternate forms file with the switch
 .B \-form
 .IR formfile .
 .PP
-If the draft already exists,
-.B forw
-will ask you as to the disposition
-of the draft.  A reply of
-.B quit
-will abort
-.BR forw ,
-leaving the draft intact;
-.B replace
-will replace the existing draft with a blank skeleton; and
-.B list
-will display the draft.
-.PP
 If the
 .B \-annotate
 switch is given, each message being forwarded will
 be annotated with the lines:
-
-     Forwarded:\ date
-     Forwarded:\ addrs
-
+.PP
+.RS 5
+.nf
+Forwarded:\ date
+Forwarded:\ addrs
+.fi
+.RE
+.PP
 where each address list contains as many lines as required.  This
 annotation will be done only if the message is sent directly from
 .BR forw .
@@ -225,16 +210,7 @@ What now? mime
 .PP
 prior to sending the draft.
 .PP
-The
-.B \-draftfolder
-.I +folder
-and
-.B \-draftmessage
-.I msg
-switches invoke the
-.B nmh
-draft folder facility.  This is an advanced (and highly
-useful) feature.  Consult the
+Consult the
 .BR mh-draft (5)
 man page for more information.
 .PP
@@ -278,14 +254,14 @@ it is documented here only for completeness.
 The
 .B \-file
 .I msgfile
-switch specifies the message to be forwarded as an 
+switch specifies the message to be forwarded as an
 exact filename rather than as an
 .B nmh
-folder and message number. It is 
+folder and message number. It is
 intended to be used by the
 .B msh
 interface to
-.BR nmh . 
+.BR nmh .
 This switch implies
 .BR \-noannotate .
 The forwarded message is simply
@@ -295,8 +271,8 @@ the
 .BR \-mime ,
 and
 .B \-digest
-switches is bypassed, and the usual leading and trailing
-'Forwarded Message' delimiters are not added.
+switches is bypassed, and the usual leading and
+trailing 'Forwarded Message' delimiters are not added.
 The same caveats apply to this option as to the
 .B \-build
 switch.
@@ -332,7 +308,7 @@ User's Manual for more information on making digests.
 .SH FILES
 .fc ^ ~
 .nf
-.ta \w'/usr/local/nmh/etc/ExtraBigFileName  'u
+.ta \w'%etcdir%/ExtraBigFileName  'u
 ^%etcdir%/forwcomps~^The standard message skeleton
 ^or <mh\-dir>/forwcomps~^Rather than the standard skeleton
 ^%etcdir%/digestcomps~^The message skeleton if `\-digest' is given
@@ -340,7 +316,7 @@ User's Manual for more information on making digests.
 ^%etcdir%/mhl.forward~^The standard message filter
 ^or <mh\-dir>/mhl.forward~^Rather than the standard filter
 ^$HOME/\&.mh\(ruprofile~^The user profile
-^<mh\-dir>/draft~^The draft file
+^<mh\-dir>/drafts~^The draft folder
 .fi
 
 .SH "PROFILE COMPONENTS"
@@ -350,7 +326,7 @@ User's Manual for more information on making digests.
 .ta \w'ExtraBigProfileName  'u
 ^Path:~^To determine the user's nmh directory
 ^Current\-Folder:~^To find the default current folder
-^Draft\-Folder:~^To find the default draft\-folder
+^Draft\-Folder:~^To set the default draft\-folder
 ^Editor:~^To override the default editor
 ^Msg\-Protect:~^To set mode when creating a new message (draft)
 ^fileproc:~^Program to refile the message
@@ -368,7 +344,6 @@ mhbuild(1), comp(1), repl(1), send(1), whatnow(1), mh\-format(5),
 .RB ` +folder "' defaults to the current folder"
 .RB ` msgs "' defaults to cur"
 .RB ` \-noannotate '
-.RB ` \-nodraftfolder '
 .RB ` \-noformat '
 .RB ` \-inplace '
 .RB ` \-dashstuffing '