Renamed -version switch to -Version to remove the conflict with -verbose.

[mmh] / man / comp.man1

diff --git a/man/comp.man1 b/man/comp.man1
index d722bfd..da522b9 100644 (file)
--- a/man/comp.man1
+++ b/man/comp.man1
@@ -13,24 +13,21 @@ comp \- compose a message
 .RB [ \-form
 .IR formfile ]
 .RB [ \-use " | " \-nouse ]
 .RB [ \-form
 .IR formfile ]
 .RB [ \-use " | " \-nouse ]

-.RB [ \-file
-.IR file ]

 .RB [ \-editor
 .IR editor ]
 .RB [ \-editor
 .IR editor ]

-.RB [ \-noedit ]

 .RB [ \-whatnowproc
 .IR program ]
 .RB [ \-whatnowproc
 .IR program ]

-.RB [ \-nowhatnowproc ]
-.RB [ \-version ]
+.RB [ \-Version ]

 .RB [ \-help ]
 .ad
 .SH DESCRIPTION
 .B Comp
 is used to create a new message to be mailed.  It copies a
 message form to the draft being composed and then invokes an editor on
 .RB [ \-help ]
 .ad
 .SH DESCRIPTION
 .B Comp
 is used to create a new message to be mailed.  It copies a
 message form to the draft being composed and then invokes an editor on

-the draft (unless
-.B \-noedit
-is given, in which case the initial edit is suppressed).
+the draft (unless the
+.B \-editor
+switch with an empty string argument is given,
+in which case the initial edit is suppressed).

 .PP
 The default message form contains the following elements:
 .PP
 .PP
 The default message form contains the following elements:
 .PP

@@ -51,7 +48,7 @@ forms file with the switch
 You may also start
 .B comp
 using the contents of an existing message
 You may also start
 .B comp
 using the contents of an existing message

-as the form.  If you supply either a
+as the form.  If you supply a

 .I +folder
 or
 .I msg
 .I +folder
 or
 .I msg

@@ -85,11 +82,15 @@ is terminated without sending the draft, the draft can
 be edited again via
 .RB \*(lq comp
 .BR \-use \*(rq.
 be edited again via
 .RB \*(lq comp
 .BR \-use \*(rq.

-.PP
-The
-.B \-file
-.I file
-switch says to use the named file as the message draft.
+If
+.B \-use
+is given,
+.I msg
+is located within the draft folder.
+A
+.I +folder
+argument is not allowed together with
+.BR \-use .

 .PP
 If the draft already exists,
 .B comp
 .PP
 If the draft already exists,
 .B comp

@@ -130,15 +131,7 @@ will invoke the
 program.  See
 .BR whatnow (1)
 for a discussion of
 program.  See
 .BR whatnow (1)
 for a discussion of

-available options.  The invocation of this program can be inhibited
-by using the
-.B \-nowhatnowproc
-switch.  (In truth of fact, it is
-the
-.I whatnow
-program which starts the initial edit.  Hence,
-.B \-nowhatnowproc
-will prevent any edit from occurring.)
+available options.

 
 .SH FILES
 .fc ^ ~
 
 .SH FILES
 .fc ^ ~

@@ -159,7 +152,6 @@ will prevent any edit from occurring.)
 ^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)
 ^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

 ^whatnowproc:~^Program to ask the \*(lqWhat now?\*(rq questions
 .fi
 
 ^whatnowproc:~^Program to ask the \*(lqWhat now?\*(rq questions
 .fi
 

@@ -175,6 +167,3 @@ dist(1), forw(1), repl(1), send(1), whatnow(1), mh-profile(5)
 
 .SH CONTEXT
 None
 
 .SH CONTEXT
 None

-
-.SH BUGS
-None