Factor trim format function out

[mmh] / man / whatnow.man1

diff --git a/man/whatnow.man1 b/man/whatnow.man1
index 36844a0..d0fea84 100644 (file)
--- a/man/whatnow.man1
+++ b/man/whatnow.man1
@@ -10,11 +10,10 @@ whatnow \- prompting front-end for sending messages
 .B whatnow
 .RB [ \-editor
 .IR editor ]
 .B whatnow
 .RB [ \-editor
 .IR editor ]

-.RB [ \-noedit ]

 .RB [ \-prompt
 .IR string ]
 .RI [ file ]
 .RB [ \-prompt
 .IR string ]
 .RI [ file ]

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

 .RB [ \-help ]
 .ad
 .SH DESCRIPTION
 .RB [ \-help ]
 .ad
 .SH DESCRIPTION

@@ -22,7 +21,7 @@ whatnow \- prompting front-end for sending messages
 is the default program that queries the user about
 the disposition of a composed draft.  It is normally automatically
 invoked by one of the
 is the default program that queries the user about
 the disposition of a composed draft.  It is normally automatically
 invoked by one of the

-.B nmh
+.B mmh

 commands
 .BR comp ,
 .BR dist ,
 commands
 .BR comp ,
 .BR dist ,

@@ -31,11 +30,12 @@ or
 .B repl
 after the initial edit.
 .PP
 .B repl
 after the initial edit.
 .PP

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

 .B whatnow
 .B whatnow

-repetitively prompts the user with \*(lqWhat now?\*(rq
+repetitively prompts the user with `What now?'

 and awaits a response.  The valid responses are:
 .PP
 .RS 5
 and awaits a response.  The valid responses are:
 .PP
 .RS 5

@@ -43,36 +43,32 @@ and awaits a response.  The valid responses are:
 .B edit
 re\-edit using the same editor that was used on the
 preceding round unless a profile entry
 .B edit
 re\-edit using the same editor that was used on the
 preceding round unless a profile entry

-\*(lq<lasteditor>\-next: <editor>\*(rq names an alternate editor
+`<lasteditor>\-next: <editor>' names an alternate editor

 .TP \w'refilezzzzfolderz'u
 .B edit <editor>
 invoke <editor> for further editing
 .TP \w'refilezzzzfolderz'u
 .TP \w'refilezzzzfolderz'u
 .B edit <editor>
 invoke <editor> for further editing
 .TP \w'refilezzzzfolderz'u

-.B refile +folder
-refile the draft into the given folder
+.B list
+list the draft on the terminal

 .TP \w'refilezzzzfolderz'u
 .B display
 .TP \w'refilezzzzfolderz'u
 .B display

-list the message being distributed/replied\-to
-on the terminal
+list the message being distributed/replied\-to on the terminal

 .TP \w'refilezzzzfolderz'u
 .TP \w'refilezzzzfolderz'u

-.B list
-list the draft on the terminal
+.B whom
+list the recipients of the message

 .TP \w'refilezzzzfolderz'u
 .B send
 send the message
 .TP \w'refilezzzzfolderz'u
 .TP \w'refilezzzzfolderz'u
 .B send
 send the message
 .TP \w'refilezzzzfolderz'u

-.B send \-watch
-send the message and monitor the delivery process
+.B refile +folder
+refile the draft into the given folder

 .TP \w'refilezzzzfolderz'u
 .TP \w'refilezzzzfolderz'u

-.B push
-send the message in the background
+.B delete
+delete the draft and exit

 .TP \w'refilezzzzfolderz'u
 .B quit
 preserve the draft and exit
 .TP \w'refilezzzzfolderz'u
 .TP \w'refilezzzzfolderz'u
 .B quit
 preserve the draft and exit
 .TP \w'refilezzzzfolderz'u

-.B delete
-delete the draft and exit
-.TP \w'refilezzzzfolderz'u

 .B cd directory
 use the directory when interpreting attachment file names
 .TP \w'refilezzzzfolderz'u
 .B cd directory
 use the directory when interpreting attachment file names
 .TP \w'refilezzzzfolderz'u

@@ -88,8 +84,8 @@ add the named files to the draft as MIME attachments
 .B alist
 list the MIME attachments
 .TP \w'refilezzzzfolderz'u
 .B alist
 list the MIME attachments
 .TP \w'refilezzzzfolderz'u

-.B detach [-n] files-or-numbers
-remove MIME attachments, either by file name or by number with -n
+.B detach numbers
+remove MIME attachments by number

 .RE
 .PP
 When entering your response, you need only type enough characters
 .RE
 .PP
 When entering your response, you need only type enough characters

@@ -101,34 +97,30 @@ response, any valid switch to the editor is valid.
 .PP
 For the
 .B send
 .PP
 For the
 .B send

-and
-.B push
-responses, any valid switch to
+response, any valid switch to

 .BR send (1)
 .BR send (1)

-is valid (as
-.B push
-merely invokes
-.B send
-with the
-.B \-push
-option).
+is valid.

 .PP
 For the
 .B refile
 .PP
 For the
 .B refile

-response, any valid switch to the
-.I fileproc
+response, any valid switch to
+.B refile

 is valid.
 .PP
 See
 .BR mh\-profile (5)
 for further information about how editors
 are used by
 is valid.
 .PP
 See
 .BR mh\-profile (5)
 for further information about how editors
 are used by

-.BR nmh .
+.BR mmh .

 It also discusses how environment variables can be
 used to direct
 .BR whatnow 's
 actions in complex ways.
 .PP
 It also discusses how environment variables can be
 used to direct
 .BR whatnow 's
 actions in complex ways.
 .PP

+If the initial edit fails, no new draft is created, but any
+existing re-used draft is preserved.
+Failures of later edits are ignored and another prompt is printed.
+.PP

 The
 .B \-prompt
 .I string
 The
 .B \-prompt
 .I string

@@ -158,7 +150,6 @@ information.
 ^Editor:~^To override the default editor
 ^<lasteditor>\-next:~^To name an editor to be used after exit
 ^~^from <lasteditor>
 ^Editor:~^To override the default editor
 ^<lasteditor>\-next:~^To name an editor to be used after exit
 ^~^from <lasteditor>

-^fileproc:~^Program to refile the message

 ^listproc:~^Program to list the contents of a message
 .fi
 
 ^listproc:~^Program to list the contents of a message
 .fi
 

@@ -167,14 +158,8 @@ send(1)
 
 .SH DEFAULTS
 .nf
 
 .SH DEFAULTS
 .nf

-.RB ` \-prompt "' defaults to \*(lqWhat\ Now?\ \*(rq"
+.RB ` \-prompt "' defaults to `What\ Now?\ '"

 .fi
 
 .SH CONTEXT
 None
 .fi
 
 .SH CONTEXT
 None

-
-.SH BUGS
-If the initial edit fails,
-.B whatnow
-deletes your draft (by renaming
-it with a leading comma); failure of a later edit preserves the draft.