new.c: Order two return statements to match comment.

[nmh] / man / whatnow.man

diff --git a/man/whatnow.man b/man/whatnow.man
index 8ffc1c7979c59b5e7130760e144d33123c9414a8..5d6f0709f8fa169c56e983e215496e0da1883bb4 100644 (file)
--- a/man/whatnow.man
+++ b/man/whatnow.man
@@ -1,13 +1,15 @@
-.\"
+.TH WHATNOW %manext1% 2014-01-23 "%nmhversion%"
+.

 .\" %nmhwarning%
 .\" %nmhwarning%

-.\"
-.TH WHATNOW %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
+.

 .SH NAME
 .SH NAME

-whatnow \- prompting front-end for sending messages
+whatnow \- prompting front-end for writing nmh messages

 .SH SYNOPSIS
 .HP 5
 .na
 .B whatnow
 .SH SYNOPSIS
 .HP 5
 .na
 .B whatnow

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

 .RB [ \-draftfolder
 .IR +folder ]
 .RB [ \-draftmessage
 .RB [ \-draftfolder
 .IR +folder ]
 .RB [ \-draftmessage


@@ -19,14 +21,9 @@ whatnow \- prompting front-end for sending messages
 .RB [ \-prompt
 .IR string ]
 .RI [ file ]
 .RB [ \-prompt
 .IR string ]
 .RI [ file ]

-.RB [ \-version ]
-.RB [ \-help ]
-.RB [ \-attach
-.IR header-field-name ]
-.RB [ \-noattach ]

 .ad
 .SH DESCRIPTION
 .ad
 .SH DESCRIPTION

-.B Whatnow
+.B whatnow

 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


@@ -49,14 +46,16 @@ and awaits a response.  The valid responses are:
 .RS 5
 .TP \w'refilezzzzfolderz'u
 .B edit
 .RS 5
 .TP \w'refilezzzzfolderz'u
 .B edit

-re\-edit using the same editor that was used on the
+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
 .TP \w'refilezzzzfolderz'u
 preceding round unless a profile entry
 \*(lq<lasteditor>\-next: <editor>\*(rq names an alternate editor
 .TP \w'refilezzzzfolderz'u

-.B edit <editor>
-invoke <editor> for further editing
+\fBedit\fP \fIeditor\fP
+invoke
+.I editor
+for further editing

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

-.B refile +folder
+\fBrefile\fP \fI+folder\fP

 refile the draft into the given folder
 .TP \w'refilezzzzfolderz'u
 .B mime
 refile the draft into the given folder
 .TP \w'refilezzzzfolderz'u
 .B mime


@@ -68,7 +67,7 @@ command
 by default)
 .TP \w'refilezzzzfolderz'u
 .B display
 by default)
 .TP \w'refilezzzzfolderz'u
 .B display

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

 on the terminal
 .TP \w'refilezzzzfolderz'u
 .B list
 on the terminal
 .TP \w'refilezzzzfolderz'u
 .B list


@@ -99,22 +98,27 @@ delete the draft and exit
 .B delete
 delete 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
+\fBcd\fP \fIdirectory\fP
+use
+.I directory
+when interpreting attachment file names

 .TP \w'refilezzzzfolderz'u
 .B pwd
 print the working directory for attachment files
 .TP \w'refilezzzzfolderz'u
 .TP \w'refilezzzzfolderz'u
 .B pwd
 print the working directory for attachment files
 .TP \w'refilezzzzfolderz'u

-.B ls [ls-options]
+\fBls\fP [\fIls-options\fP\^]

 list files in the attachment working directory using the ls command
 .TP \w'refilezzzzfolderz'u
 list files in the attachment working directory using the ls command
 .TP \w'refilezzzzfolderz'u

-.B attach files
-add the named files to the draft as MIME attachments
+\fBattach [-v]\fP \fIfiles\fP
+add the named files to the message as MIME attachments; -v displays
+the mhbuild directive that
+.IR send (1)
+will use

 .TP \w'refilezzzzfolderz'u
 .B alist [-ln]
 list the MIME attachments, either short, long [-l] or numbered [-n]
 .TP \w'refilezzzzfolderz'u
 .TP \w'refilezzzzfolderz'u
 .B alist [-ln]
 list the MIME attachments, either short, long [-l] or numbered [-n]
 .TP \w'refilezzzzfolderz'u

-.B detach [-n] files-or-numbers
+\fBdetach [-n]\fP \fIfiles-or-numbers\fP

 remove MIME attachments, either by file name or by number with -n
 .RE
 .PP
 remove MIME attachments, either by file name or by number with -n
 .RE
 .PP


@@ -130,7 +134,7 @@ For the
 and
 .B push
 responses, any valid switch to
 and
 .B push
 responses, any valid switch to

-.BR send (1)
+.IR send (1)

 is valid (as
 .B push
 merely invokes
 is valid (as
 .B push
 merely invokes


@@ -142,7 +146,7 @@ option).
 For the
 .B whom
 response, any valid switch to
 For the
 .B whom
 response, any valid switch to

-.BR whom (1)
+.IR whom (1)

 is valid.
 .PP
 For the
 is valid.
 .PP
 For the


@@ -158,7 +162,7 @@ and
 responses, any valid argument to
 the
 .I lproc
 responses, any valid argument to
 the
 .I lproc

-is valid.  If any non\-switch arguments are present, then
+is valid.  If any non-switch arguments are present, then

 the pathname of the draft will be excluded from the argument list given
 to the
 .I lproc
 the pathname of the draft will be excluded from the argument list given
 to the
 .I lproc


@@ -167,7 +171,7 @@ to the
 message).
 .PP
 See
 message).
 .PP
 See

-.BR mh\-profile (5)
+.IR mh\-profile (5)

 for further information about how editors
 are used by
 .BR nmh .
 for further information about how editors
 are used by
 .BR nmh .


@@ -192,60 +196,53 @@ switches invoke
 the
 .B nmh
 draft folder facility.  This is an advanced (and highly
 the
 .B nmh
 draft folder facility.  This is an advanced (and highly

-useful) feature.  Consult the
-.BR mh-draft (5)
-man page for more
+useful) feature.  Consult
+.IR mh-draft (5)
+for more

 information.
 information.

-
+.PP
+If your
+.B nmh
+was configured with readline enabled, you'll be able to use filename
+completion and other readline features at the prompt.  These are
+particularly useful with the
+.BR cd ,
+.BR ls ,
+.BR attach ,
+and
+.B detach
+commands for managing MIME attachments.

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

-.ta \w'%etcdir%/ExtraBigFileName  'u
-^$HOME/\&.mh\(ruprofile~^The user profile
-^<mh\-dir>/draft~^The draft file
+.ta \w'%nmhetcdir%/ExtraBigFileName  'u
+^$HOME/.mh_profile~^The user profile
+^<mh-dir>/draft~^The draft file

 .fi
 .fi

-

 .SH "PROFILE COMPONENTS"
 .fc ^ ~
 .nf
 .ta 2.4i
 .ta \w'ExtraBigProfileName  'u
 ^Path:~^To determine the user's nmh directory
 .SH "PROFILE COMPONENTS"
 .fc ^ ~
 .nf
 .ta 2.4i
 .ta \w'ExtraBigProfileName  'u
 ^Path:~^To determine the user's nmh directory

-^Draft\-Folder:~^To find the default draft\-folder
+^Draft\-Folder:~^To find the default draft-folder

 ^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>

-^automimeproc:~^If value is 1, and the draft is a MIME
-^~^composition file, then automatically call
-^~^buildmimeproc prior to sending.

 ^buildmimeproc:~^Program to translate MIME composition files
 ^fileproc:~^Program to refile the message
 ^lproc:~^Program to list the contents of a message
 ^sendproc:~^Program to use to send the message
 ^whomproc:~^Program to determine who a message would go to
 .fi
 ^buildmimeproc:~^Program to translate MIME composition files
 ^fileproc:~^Program to refile the message
 ^lproc:~^Program to list the contents of a message
 ^sendproc:~^Program to use to send the message
 ^whomproc:~^Program to determine who a message would go to
 .fi

-

 .SH "SEE ALSO"
 .SH "SEE ALSO"

-send(1), whom(1)
-
+.IR send (1),
+.IR whom (1)

 .SH DEFAULTS
 .nf
 .RB ` \-prompt "' defaults to \*(lqWhat\ Now?\ \*(rq"
 .SH DEFAULTS
 .nf
 .RB ` \-prompt "' defaults to \*(lqWhat\ Now?\ \*(rq"

-.RB ` \-attach "' defaults to \*(lqNmh-Attachment\*(rq"

 .fi
 .fi

-
-.SH CONTEXT
-None
-

 .SH BUGS
 .SH BUGS

-The argument to the
-.B \-prompt
-switch must be interpreted as a single
-token by the shell that invokes
-.BR whatnow .
-Therefore, one must
-usually place the argument to this switch inside quotes.
-.PP

 If the initial edit fails,
 .B whatnow
 deletes your draft (by renaming
 If the initial edit fails,
 .B whatnow
 deletes your draft (by renaming


@@ -272,7 +269,7 @@ then
 .BR forw ,
 and
 .B repl
 .BR forw ,
 and
 .B repl

-use a built\-in
+use a built-in

 .BR whatnow ,
 and do not actually run the
 .B whatnow
 .BR whatnow ,
 and do not actually run the
 .B whatnow


@@ -288,7 +285,7 @@ is
 .BR send ,
 then
 .B whatnow
 .BR send ,
 then
 .B whatnow

-uses a built\-in
+uses a built-in

 .BR send ,
 it does not actually run the
 .B send
 .BR send ,
 it does not actually run the
 .B send