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

[nmh] / man / mh-profile.man

diff --git a/man/mh-profile.man b/man/mh-profile.man
index 774df3080890971a8c08e617ac2fb0befd4e98cc..3b9bdcb4c40f056936032d68496c7ef33ca3472e 100644 (file)
--- a/man/mh-profile.man
+++ b/man/mh-profile.man
@@ -1,24 +1,24 @@
-.TH MH-PROFILE %manext5% "October 19, 2016" "%nmhversion%"
-.\"
+.TH MH-PROFILE %manext5% 2016-10-19 "%nmhversion%"
+.

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

-.\"
+.

 .SH NAME
 .SH NAME

-mh-profile \- user profile customization for nmh message handler
+mh-profile \- user customization for nmh message handler

 .SH DESCRIPTION
 Each user of
 .B nmh
 is expected to have a file named
 .I \&.mh\-profile
 .SH DESCRIPTION
 Each user of
 .B nmh
 is expected to have a file named
 .I \&.mh\-profile

-in his or her home directory.  This file contains
-a set of user parameters used by some or all of the
+in their home directory.  This file contains
+a set of user parameters used by the

 .B nmh
 family of programs.  Each entry in the file is of the format
 .PP
 .RS 5
 .B nmh
 family of programs.  Each entry in the file is of the format
 .PP
 .RS 5

-.IR profile\-component ": " value
+.IR profile-component ": " value

 .RE
 .PP
 .RE
 .PP

-If the text of profile entry is long, you may extend it across several
+If the text of a profile entry is long, you may extend it across several

 real lines by indenting the continuation lines with leading spaces or tabs.
 Comments may be introduced by a line starting with `#:':
 .PP
 real lines by indenting the continuation lines with leading spaces or tabs.
 Comments may be introduced by a line starting with `#:':
 .PP


@@ -28,10 +28,9 @@ This is a comment.
 .RE
 .PP
 Blank lines are not permitted in
 .RE
 .PP
 Blank lines are not permitted in

-.IR \&.mh\-profile.
-The shell quoting conventions are not available in the
-.IR \&.mh\-profile ;
-each token is separated by whitespace.
+.IR \&.mh\-profile .
+Shell quoting conventions are not available; each token is separated
+by whitespace.

 .SS "Standard Profile Entries"
 The possible profile components are exemplified below.  The only mandatory
 entry is `Path:'.  The others are optional; some have default values if
 .SS "Standard Profile Entries"
 The possible profile components are exemplified below.  The only mandatory
 entry is `Path:'.  The others are optional; some have default values if


@@ -41,7 +40,7 @@ indicates whether the information is kept in the user's
 profile or
 .B nmh
 context, and indicates what the default value is.  Note that a profile
 profile or
 .B nmh
 context, and indicates what the default value is.  Note that a profile

-component can only appear once.  Multiple appearances with trigger a
+component can only appear once.  Multiple appearances will trigger a

 warning that all appearances after the first are ignored.
 .PP
 Some MH programs, including
 warning that all appearances after the first are ignored.
 .PP
 Some MH programs, including


@@ -50,8 +49,8 @@ Some MH programs, including
 and
 .BR mhstore ,
 have specific profile components that are described in their respective
 and
 .BR mhstore ,
 have specific profile components that are described in their respective

-man pages.  Each component name begins with the name of the program and
-is followed by a dash.
+man pages.  Each component name specific to these programs begins with
+the name of the program and is followed by a dash.

 .PP
 .BR Path :
 Mail
 .PP
 .BR Path :
 Mail


@@ -82,12 +81,12 @@ context
 .RS 5
 Declares the location of the
 .B nmh
 .RS 5
 Declares the location of the
 .B nmh

-context file.  This is overridden by the environment variable
+context file.  This can be overridden by the environment variable

 MHCONTEXT.
 See the
 .B HISTORY
 section below.
 MHCONTEXT.
 See the
 .B HISTORY
 section below.

-(profile, default: <nmh\-dir>/context)
+(profile, default: <nmh-dir>/context)

 .RE
 .PP
 .BR Current\-Folder :
 .RE
 .PP
 .BR Current\-Folder :


@@ -100,7 +99,7 @@ Keeps track of the current open folder.
 .BR Inbox :
 inbox
 .RS 5
 .BR Inbox :
 inbox
 .RS 5

-Defines the name of your default inbox.
+Defines the name of the default inbox.

 (profile, default: inbox)
 .RE
 .PP
 (profile, default: inbox)
 .RE
 .PP


@@ -112,10 +111,10 @@ Names the sequence or sequences which should be defined as the `msgs' or
 .B nmh
 command.  If not present or empty,
 no such sequences are defined.  Otherwise, for each name given, the
 .B nmh
 command.  If not present or empty,
 no such sequences are defined.  Otherwise, for each name given, the

-sequence is first zero'd and then each message is added to the sequence.
-Read the
+sequence is first zeroed and then each message is added to the sequence.
+Read

 .IR mh\-sequence (5)
 .IR mh\-sequence (5)

-man page for the details about this sequence.  (profile, no default)
+for the details about this sequence.  (profile, no default)

 .RE
 .PP
 .BR Sequence\-Negation :
 .RE
 .PP
 .BR Sequence\-Negation :


@@ -123,9 +122,9 @@ not
 .RS 5
 Defines the string which, when prefixed to a sequence name, negates
 that sequence.  Hence, \*(lqnotseen\*(rq means all those messages that
 .RS 5
 Defines the string which, when prefixed to a sequence name, negates
 that sequence.  Hence, \*(lqnotseen\*(rq means all those messages that

-are not a member of the sequence \*(lqseen\*(rq.  Read the
+are not a member of the sequence \*(lqseen\*(rq.  Read

 .IR mh\-sequence (5)
 .IR mh\-sequence (5)

-man page for the details.  (profile, no default)
+for the details.  (profile, no default)

 .RE
 .PP
 .BR Unseen\-Sequence :
 .RE
 .PP
 .BR Unseen\-Sequence :


@@ -141,9 +140,9 @@ and
 will add or remove messages from these
 sequences when they are incorporated or read.  If not present or
 empty, no such sequences are defined.  Otherwise, each message is
 will add or remove messages from these
 sequences when they are incorporated or read.  If not present or
 empty, no such sequences are defined.  Otherwise, each message is

-added to, or removed from, each sequence name given.  Read the
+added to, or removed from, each sequence name given.  Read

 .IR mh\-sequence (5)
 .IR mh\-sequence (5)

-man page for the details about this sequence.
+for the details about this sequence.

 (profile, no default)
 .RE
 .PP
 (profile, no default)
 .RE
 .PP


@@ -159,10 +158,10 @@ entry blank.  (profile, default: \&.mh\-sequences)
 172\0178\-181\0212
 .RS 5
 Keeps track of the private sequence called \*(lqseq\*(rq in the specified
 172\0178\-181\0212
 .RS 5
 Keeps track of the private sequence called \*(lqseq\*(rq in the specified

-folder.  Private sequences are generally used for read\-only folders.
-See the
+folder.  Private sequences are generally used for read-only folders.
+See

 .IR mh\-sequence (5)
 .IR mh\-sequence (5)

-man page for details about private sequences.
+for details about private sequences.

 (context, no default)
 .RE
 .PP
 (context, no default)
 .RE
 .PP


@@ -175,9 +174,8 @@ Defines the editor to be used by the commands
 .BR forw ,
 and
 .BR repl .
 .BR forw ,
 and
 .BR repl .

-If not set in profile the value will be taken from the VISUAL and
-EDITOR environment variables.
-(profile, default: vi)
+If not set, the value will be taken from the VISUAL and EDITOR environment
+variables.  (profile, default: vi)

 .RE
 .PP
 .BR Msg\-Protect :
 .RE
 .PP
 .BR Msg\-Protect :


@@ -206,7 +204,7 @@ fcntl
 .RS 5
 The locking algorithm used to lock changes to any
 .B nmh
 .RS 5
 The locking algorithm used to lock changes to any
 .B nmh

-data files, such as sequences or the context.  The locking algorithm is
+data files, such as sequences or context.  The locking algorithm is

 any one of the following entries:
 .PP
 .RS 5
 any one of the following entries:
 .PP
 .RS 5


@@ -215,9 +213,8 @@ any one of the following entries:
 .fi
 .RE
 .PP
 .fi
 .RE
 .PP

-Available locking algorithms can vary depending on what is supported by
-the operating system.  Note: currently transactional locking is only
-supported on public sequences; see
+Available locking algorithms can vary depending on the operating system.
+Note: currently, transactional locking is only supported on public sequences; see

 .IR mh\-sequence (5)
 for more information.
 (profile, default: fcntl)
 .IR mh\-sequence (5)
 for more information.
 (profile, default: fcntl)


@@ -242,17 +239,16 @@ repl: \-editor /bin/ed
 .I nexteditor
 .RS 5
 Names \*(lqnexteditor\*(rq to be the default editor after using
 .I nexteditor
 .RS 5
 Names \*(lqnexteditor\*(rq to be the default editor after using

-\*(lqlasteditor\*(rq.  This takes effect at \*(lqWhat now?\*(rq prompt
+\*(lqlasteditor\*(rq.  This takes effect at the \*(lqWhat now?\*(rq prompt

 in
 .BR comp ,
 .BR dist ,
 .BR forw ,
 and
 .BR repl .
 in
 .BR comp ,
 .BR dist ,
 .BR forw ,
 and
 .BR repl .

-After editing
-the draft with \*(lqlasteditor\*(rq, the default editor is set to be
-\*(lqnexteditor\*(rq.  If the user types \*(lqedit\*(rq without any
-arguments to \*(lqWhat now?\*(rq, then \*(lqnexteditor\*(rq is used.
+After editing the draft with \*(lqlasteditor\*(rq, the default editor is
+set to be \*(lqnexteditor\*(rq.  If the user types \*(lqedit\*(rq without
+any arguments to \*(lqWhat now?\*(rq, then \*(lqnexteditor\*(rq is used.

 (profile, no default)
 .RE
 .PP
 (profile, no default)
 .RE
 .PP


@@ -268,16 +264,18 @@ command.
 .BR Local\-Mailbox :
 Your Username <user@some.host>
 .RS 5
 .BR Local\-Mailbox :
 Your Username <user@some.host>
 .RS 5

-Tells the various MH tools what your local mailbox is.  If set, will be used
-by the default component files by tools like
+Tells the MH programs what your local mailbox is.  If set, it will be used
+by the default component files by programs like

 .B comp
 and
 .B repl
 .B comp
 and
 .B repl

-to construct your default \*(lqFrom\*(rq header.  The text used here will
-be copied exactly to your From: header, so it should already be RFC 822
-compliant.  If this is set, the
+to construct your default \*(lqFrom:\*(rq header.  The text used here will
+be copied exactly to your \*(lqFrom:\*(rq header, so it should already be RFC
+822 compliant.  If this is set, the

 .B Signature
 .B Signature

-profile entry is NOT used, so it should include a signature as well.  (profile,
+profile entry is
+.I not
+used, so it should include a signature as well.  (profile,

 default: userid@local.hostname)
 .RE
 .PP
 default: userid@local.hostname)
 .RE
 .PP


@@ -288,27 +286,24 @@ Tells
 .B repl
 and
 .B scan
 .B repl
 and
 .B scan

-which addresses are really yours.
-In this way,
+which additional addresses are yours.  In this way,

 .B repl
 .B repl

-knows which addresses should be included in the
-reply, and
-scan
-knows if the message really originated from you.
-Addresses must be separated by a comma, and the hostnames listed should
-be the \*(lqofficial\*(rq hostnames for the mailboxes you indicate, as
-local nicknames for hosts are not replaced with their official site names.
-For each address, if a host is not given, then that address on any host is
-considered to be you.  In addition, an asterisk (`*') may appear at either
-or both ends of the mailbox and host to indicate wild-card matching.
-(profile, default: your user-id)
+knows which addresses should be included in the reply, and
+.B scan
+knows if a message originated from you.  Addresses must be separated by a comma,
+and the hostnames listed should be the \*(lqofficial\*(rq hostnames for the
+mailboxes you indicate, as local nicknames for hosts are not replaced with
+their official site names.  For each address, if a host is not given, then
+that address on any host is considered to be you.  In addition, an asterisk
+(`*') may appear at either or both ends of the mailbox and host to indicate
+wild-card matching.  (profile, default: your user-id)

 .RE
 .PP
 .BR Aliasfile :
 aliases
 .RE
 .PP
 .BR Aliasfile :
 aliases

-.I other-alias
+.I other-aliases

 .RS 5
 .RS 5

-Indicates aliases files for
+Indicates alias files for

 .BR ali ,
 .BR whom ,
 and
 .BR ali ,
 .BR whom ,
 and


@@ -329,9 +324,9 @@ Indicates a default draft folder for
 .BR refile ,
 and
 .BR repl .
 .BR refile ,
 and
 .BR repl .

-Read the
+Read

 .IR mh\-draft (5)
 .IR mh\-draft (5)

-man page for details.  (profile, no default)
+for details.  (profile, no default)

 .RE
 .PP
 .BI digest\-issue\- list :
 .RE
 .PP
 .BI digest\-issue\- list :


@@ -360,8 +355,7 @@ the last volume sent for the digest
 Tells
 .B inc
 your mail drop, if different from the default.  This is
 Tells
 .B inc
 your mail drop, if different from the default.  This is

-superseded by the environment variable
-MAILDROP.
+superseded by the environment variable MAILDROP.

 (profile, default: %mailspool%/$USER)
 .RE
 .PP
 (profile, default: %mailspool%/$USER)
 .RE
 .PP


@@ -369,18 +363,15 @@ MAILDROP.
 RAND MH System (agent: Marshall Rose)
 .RS 5
 Tells front-end programs such as
 RAND MH System (agent: Marshall Rose)
 .RS 5
 Tells front-end programs such as

-.BR comp,
-.BR forw,
+.BR comp ,
+.BR forw ,

 and
 .B repl
 and
 .B repl

-your mail signature.  This is superseded by the
-environment variable
-SIGNATURE .
-If
-SIGNATURE
-is not set and this profile entry is not present, the \*(lqgcos\*(rq field of
-the \fI/etc/passwd\fP file will be used.
-Your signature will be added to the address
+your mail signature.  (This is not to be confused with a .signature
+that might be appended to mails.) This is superseded by the environment
+variable SIGNATURE.  If SIGNATURE is not set and this profile entry is
+not present, the \*(lqgcos\*(rq field of the \fI/etc/passwd\fP file
+will be used.  Your signature will be added to the address

 .B send
 puts in the \*(lqFrom:\*(rq header; do not include an address in the
 signature text.  The \*(lqLocal\-Mailbox\*(rq profile component
 .B send
 puts in the \*(lqFrom:\*(rq header; do not include an address in the
 signature text.  The \*(lqLocal\-Mailbox\*(rq profile component


@@ -388,7 +379,7 @@ supersedes all of this.  (profile, no default)
 .RE
 .PP
 .BR credentials :
 .RE
 .PP
 .BR credentials :

-\&legacy
+legacy

 .RS 5
 Indicates how the username and password credentials will be retrieved
 for access to external servers, such as those that provide SMTP or POP
 .RS 5
 Indicates how the username and password credentials will be retrieved
 for access to external servers, such as those that provide SMTP or POP


@@ -404,12 +395,12 @@ username is the first of:
 1)
 .B \-user
 switch to
 1)
 .B \-user
 switch to

-.BR send ,
-.BR post ,
-.BR whom ,

 .BR inc ,
 .BR inc ,

+.BR msgchk ,
+.BR post ,
+.BR send ,

 or
 or

-.B msgchk
+.B whom

 program
 .TP
 2)
 program
 .TP
 2)


@@ -464,12 +455,12 @@ can be any valid filename, either absolute or relative to Path or
 $HOME.  The
 .I netrc
 file contains authentication information, for each server,
 $HOME.  The
 .I netrc
 file contains authentication information, for each server,

-using a line of the following form.  Replace the words
+using a line of the following form.  (Replace

 .IR myserver ,
 .IR mylogin ,
 and
 .I mypassword
 .IR myserver ,
 .IR mylogin ,
 and
 .I mypassword

-with your own account information:
+with your own account information.)

 .PP
 .RS 5
 .B machine
 .PP
 .RS 5
 .B machine


@@ -519,17 +510,15 @@ version.  The version reference is of the form:
 Version: %nmhversion%
 .fi
 .RE
 Version: %nmhversion%
 .fi
 .RE

-.PP
-.RE

 .SS "Process Profile Entries"
 The following profile elements are used whenever an
 .B nmh
 .SS "Process Profile Entries"
 The following profile elements are used whenever an
 .B nmh

-program invokes some other program such as
+program invokes some other program, such as

 .BR more .
 The
 .I \&.mh\-profile
 .BR more .
 The
 .I \&.mh\-profile

-can be used to select alternate programs if the
-user wishes.  The default values are given in the examples.
+can be used to select alternate programs if the user wishes.
+The default values are given in the examples.

 .PP
 If the profile element contains spaces, the element is split at spaces
 into tokens and each token is given as a separate argument to the
 .PP
 If the profile element contains spaces, the element is split at spaces
 into tokens and each token is given as a separate argument to the


@@ -537,7 +526,6 @@ into tokens and each token is given as a separate argument to the
 system call.  If the element contains shell metacharacters then the entire
 element is executed using
 .BR /bin/sh .
 system call.  If the element contains shell metacharacters then the entire
 element is executed using
 .BR /bin/sh .

-.RE

 .PP
 .BR buildmimeproc :
 %bindir%/mhbuild
 .PP
 .BR buildmimeproc :
 %bindir%/mhbuild


@@ -704,7 +692,7 @@ to delete a message from a folder.
 .BR sendproc :
 %bindir%/send
 .RS 5
 .BR sendproc :
 %bindir%/send
 .RS 5

-This is the program to use by
+This is the program used by

 .B whatnow
 to actually send the message
 .RE
 .B whatnow
 to actually send the message
 .RE


@@ -730,8 +718,8 @@ to filter and display text (non-MIME) messages.
 .RS 5
 This is the program invoked by
 .BR comp ,
 .RS 5
 This is the program invoked by
 .BR comp ,

-.BR forw ,

 .BR dist ,
 .BR dist ,

+.BR forw ,

 and
 .B repl
 to query about the disposition of a composed draft message.
 and
 .B repl
 to query about the disposition of a composed draft message.


@@ -745,10 +733,9 @@ This is the program used by
 to determine to whom a message would be sent.
 .RE
 .SS "Profile Lookup"
 to determine to whom a message would be sent.
 .RE
 .SS "Profile Lookup"

-After consulting .mh_profile,
-some programs read an optional profile specified by a
-program-specific environment variable,
-and then the system-wide profile %nmhetcdir%/mhn.defaults.
+After consulting .mh_profile, some programs read an optional profile
+specified by a program-specific environment variable, and then the
+system-wide profile %nmhetcdir%/mhn.defaults.

 These programs are
 .BR mhbuild ,
 .BR mhshow ,
 These programs are
 .BR mhbuild ,
 .BR mhshow ,


@@ -757,27 +744,25 @@ and
 .BR mhn .
 .B mhfixmsg
 is similar, but has no optional profile.
 .BR mhn .
 .B mhfixmsg
 is similar, but has no optional profile.

-.sp
-The first occurrence of a component is used,
-e.g.\& .mh_profile's trumps $MHSHOW's.
-A component with no value still stops further occurrences being used,
-but is considered absent.
+.PP
+The first occurrence of a component is used, e.g.\& .mh_profile's
+trumps $MHSHOW's.  A component with no value still stops further
+occurrences being used, but is considered absent.

 .PP
 The
 .I \&.mh\-profile
 contains only static information, which
 .B nmh
 programs will
 .PP
 The
 .I \&.mh\-profile
 contains only static information, which
 .B nmh
 programs will

-.B NOT
+.I not

 update.  Changes in context are made to the
 .I context
 file kept in the users
 .B nmh
 update.  Changes in context are made to the
 .I context
 file kept in the users
 .B nmh

-directory.
-This includes, but is not limited to: the \*(lqCurrent\-Folder\*(rq entry
-and all private sequence information.  Public sequence information is
-kept in each folder in the file determined by the \*(lqmh\-sequences\*(rq
-profile entry (default is
+directory.  This includes, but is not limited to: the
+\*(lqCurrent\-Folder\*(rq entry and all private sequence information.
+Public sequence information is kept in each folder in the file
+determined by the \*(lqmh\-sequences\*(rq profile entry (default is

 .IR \&.mh\-sequences ).
 .PP
 The
 .IR \&.mh\-sequences ).
 .PP
 The


@@ -803,17 +788,13 @@ that has to get passed via environment variables to make the
 .B nmh
 user, isn't it?  The reason for all this is that the
 .B nmh
 .B nmh
 user, isn't it?  The reason for all this is that the
 .B nmh

-user
-can select
-any
-program as the
+user can select any program as the

 .IR whatnowproc ,
 .IR whatnowproc ,

-including
-one of the standard shells.  As a result, it's not possible to pass
-information via an argument list.  The convention is that environment
-variables whose names are all upper-case are user-settable; those
-whose names are lower-case only are used internally by nmh and should
-not generally be set by the user.
+including one of the standard shells.  As a result, it's not possible
+to pass information via an argument list.  The convention is that
+environment variables whose names are all upper-case are user-settable;
+those whose names are lower-case only are used internally by nmh and
+should not generally be set by the user.

 .TP
 LC_ALL, LC_CTYPE, and LANG
 These variables are used to set the locale, see locale(1).
 .TP
 LC_ALL, LC_CTYPE, and LANG
 These variables are used to set the locale, see locale(1).


@@ -822,15 +803,15 @@ The \*(lqlocale\*(rq profile entry supersedes these.
 MAILDROP
 This variable tells
 .B inc
 MAILDROP
 This variable tells
 .B inc

-the default mail drop.
-This supersedes the \*(lqMailDrop\*(rq profile entry.
+the default mail drop.  This supersedes the \*(lqMailDrop\*(rq
+profile entry.

 .TP
 MAILHOST
 This variable tells
 .B inc
 .TP
 MAILHOST
 This variable tells
 .B inc

-the POP host to query for mail to incorporate.  See the
+the POP host to query for mail to incorporate.  See

 .IR inc (1)
 .IR inc (1)

-man page for more information.
+for more information.

 .TP
 MH
 With this environment variable, you can specify a profile
 .TP
 MH
 With this environment variable, you can specify a profile


@@ -838,31 +819,27 @@ other than
 .I \&.mh\-profile
 to be read by the
 .B nmh
 .I \&.mh\-profile
 to be read by the
 .B nmh

-programs
-that you invoke.  If the value of
-MH
-is not absolute, (i.e., does
-not begin with a \*(lq/\*(rq), it will be presumed to start from the current
-working directory.  This is one of the very few exceptions in
+programs that you invoke.  If the value of MH is not absolute,
+(i.e., does not begin with a \*(lq/\*(rq), it will be presumed
+to start from the current working directory.  This is one of the
+very few exceptions in

 .B nmh
 where non-absolute pathnames are not considered relative to the user's
 .B nmh
 directory.
 .TP
 MHBUILD
 .B nmh
 where non-absolute pathnames are not considered relative to the user's
 .B nmh
 directory.
 .TP
 MHBUILD

-With this environment variable, you can specify an
-additional user profile (file) to be read by
+With this environment variable, you can specify an additional user profile
+(file) to be read by

 .BR mhbuild ,
 in addition to the mhn.defaults profile.
 .TP
 MHCONTEXT
 .BR mhbuild ,
 in addition to the mhn.defaults profile.
 .TP
 MHCONTEXT

-With this environment variable, you can specify a
-context other than the normal context file (as specified in
-the
+With this environment variable, you can specify a context other than the
+normal context file (as specified in the

 .B nmh
 .B nmh

-profile).  As always, unless the value of
-MHCONTEXT
-is absolute, it will be presumed to start from your
+profile).  As usual, unless the value of MHCONTEXT is absolute, it will
+be presumed to start from your

 .B nmh
 directory.
 .TP
 .B nmh
 directory.
 .TP


@@ -874,8 +851,8 @@ will emit debugging information.
 MHMTSCONF
 If this variable is set to a non-null value, it specifies the
 name of the mail transport configuration file to use by
 MHMTSCONF
 If this variable is set to a non-null value, it specifies the
 name of the mail transport configuration file to use by

-.BR post ,

 .BR inc ,
 .BR inc ,

+.BR post ,

 and other programs that interact with the mail transport system,
 instead of the default.  See
 .IR mh-tailor (5).
 and other programs that interact with the mail transport system,
 instead of the default.  See
 .IR mh-tailor (5).


@@ -887,53 +864,42 @@ default.  See
 .IR mh-tailor (5).
 .TP
 MHN
 .IR mh-tailor (5).
 .TP
 MHN

-With this environment variable, you can specify an
-additional user profile (file) to be read by
+With this environment variable, you can specify an additional user
+profile (file) to be read by

 .BR mhn ,
 in addition to the mhn.defaults profile.
 .B mhn
 .BR mhn ,
 in addition to the mhn.defaults profile.
 .B mhn

-is deprecated, so support for this variable will
-be removed from a future nmh release.
+is deprecated, so support for this variable will be removed from a
+future nmh release.

 .TP
 MHSHOW
 .TP
 MHSHOW

-With this environment variable, you can specify an
-additional user profile (file) to be read by
+With this environment variable, you can specify an additional user
+profile (file) to be read by

 .BR mhshow ,
 in addition to the mhn.defaults profile.
 .TP
 MHSTORE
 .BR mhshow ,
 in addition to the mhn.defaults profile.
 .TP
 MHSTORE

-With this environment variable, you can specify an
-additional user profile (file) to be read by
+With this environment variable, you can specify an additional user
+profile (file) to be read by

 .BR mhstore ,
 in addition to the mhn.defaults profile.
 .TP
 .BR mhstore ,
 in addition to the mhn.defaults profile.
 .TP

-MHPDEBUG
-If this variable is set to a non-null value,
-.B pick
-will emit a representation of the search pattern.
-MHPDEBUG
-is deprecated, so support for this variable will
-be removed from a future nmh release.  Instead,
-.B pick
-now supports a
-.B \-debug
-switch.
-.TP

 MHTMPDIR, TMPDIR
 These variables are searched, in order, for the directory in which to
 create some temporary files.
 MHTMPDIR, TMPDIR
 These variables are searched, in order, for the directory in which to
 create some temporary files.

+MHTMPDIR is deprecated and will be removed in a future release of nmh.

 .TP
 MHWDEBUG
 If this variable is set to a non-null value,
 .B nmh
 commands that use the
 .B Alternate\-Mailboxes
 .TP
 MHWDEBUG
 If this variable is set to a non-null value,
 .B nmh
 commands that use the
 .B Alternate\-Mailboxes

-profile entry will display debugging information
-about the values in that entry.
+profile entry will display debugging information about the values in
+that entry.

 .TP
 PAGER
 .TP
 PAGER

-If set to a non-null value, this supersedes the value of
-the default built-in pager command.
+If set to a non-null value, this supersedes the value of the default
+built-in pager command.

 .TP
 SIGNATURE
 This variable tells
 .TP
 SIGNATURE
 This variable tells


@@ -951,33 +917,27 @@ your user name and
 your default mail drop:  see the \*(lqMailDrop\*(rq profile entry.
 .TP
 USERNAME_EXTENSION
 your default mail drop:  see the \*(lqMailDrop\*(rq profile entry.
 .TP
 USERNAME_EXTENSION

-This variable is for use with username_extension masquerading.  See the
-.IR mh-tailor (5)
-man page.
+This variable is for use with username_extension masquerading.  See
+.IR mh-tailor (5).

 .TP
 editalt
 .TP
 editalt

-This is the alternate message.
-This is set by
+This is the alternate message.  This is set by

 .B dist
 and
 .B repl
 .B dist
 and
 .B repl

-during edit sessions so you can
-peruse the message being distributed or replied to.  The message is also
-available, when the
+during edit sessions so you can peruse the message being distributed or
+replied to.  The message is also available, when the

 .B \-atfile
 .B \-atfile

-switch is used,
-through a link called \*(lq@\*(rq in the current directory if
-your current working directory and the folder the message lives in are
-on the same UNIX filesystem, and if your current working directory is
+switch is used, through a link called \*(lq@\*(rq in the current directory
+if your current working directory and the folder the message lives in are
+on the same Unix filesystem, and if your current working directory is

 writable.
 .TP
 mhaltmsg
 .B dist
 and
 .B repl
 writable.
 .TP
 mhaltmsg
 .B dist
 and
 .B repl

-set
-mhaltmsg
-to tell the
+set mhaltmsg to tell the

 .I whatnowproc
 about an alternate message associated with the
 draft (the message being distributed or replied to).
 .I whatnowproc
 about an alternate message associated with the
 draft (the message being distributed or replied to).


@@ -992,15 +952,12 @@ if annotations are to occur.
 .TP
 mhdist
 .B dist
 .TP
 mhdist
 .B dist

-sets
-mhdist
-to tell the
+sets mhdist to tell the

 .I whatnowproc
 that message re-distribution is occurring.
 .TP
 mhdraft
 .I whatnowproc
 that message re-distribution is occurring.
 .TP
 mhdraft

-This is the path to the working draft.
-It is set by
+This is the path to the working draft.  It is set by

 .BR comp ,
 .BR dist ,
 .BR forw ,
 .BR comp ,
 .BR dist ,
 .BR forw ,


@@ -1008,8 +965,7 @@ and
 .B repl
 to tell the
 .I whatnowproc
 .B repl
 to tell the
 .I whatnowproc

-which file to ask \*(lqWhat now?\*(rq
-questions about.
+which file to ask \*(lqWhat now?\*(rq questions about.

 .TP
 mheditor
 This is set by
 .TP
 mheditor
 This is set by


@@ -1020,8 +976,7 @@ and
 .B dist
 to tell the
 .I whatnowproc
 .B dist
 to tell the
 .I whatnowproc

-the user's choice of
-editor (unless overridden by
+the user's choice of editor (unless overridden by

 .BR \-noedit ).
 .TP
 mhfolder
 .BR \-noedit ).
 .TP
 mhfolder


@@ -1030,15 +985,13 @@ It is set by
 .B dist
 and
 .B repl
 .B dist
 and
 .B repl

-during edit sessions so you
-can peruse other messages in the current folder besides the one being
-distributed or replied to.  The environment variable
-mhfolder
-is also set by
-.BR show ,
+during edit sessions so you can peruse other messages in the current
+folder besides the one being distributed or replied to.
+The environment variable mhfolder is also set by
+.BR next ,

 .BR prev ,
 and
 .BR prev ,
 and

-.B next
+.B show

 for use by
 .BR mhl .
 .TP
 for use by
 .BR mhl .
 .TP


@@ -1064,13 +1017,13 @@ This may be set by
 .SH FILES
 .PD 0
 .TP 20
 .SH FILES
 .PD 0
 .TP 20

-$HOME/\&.mh\-profile
+$HOME/.mh\-profile

 The user's profile.
 .TP
 The user's profile.
 .TP

-<mh\-dir>/context
+<mh-dir>/context

 The user's context
 .TP
 The user's context
 .TP

-<folder>/\&.mh\-sequences
+<folder>/.mh\-sequences

 Public sequences for <folder>.
 .PD
 .SH "SEE ALSO"
 Public sequences for <folder>.
 .PD
 .SH "SEE ALSO"


@@ -1082,31 +1035,28 @@ Public sequences for <folder>.
 .SH BUGS
 There is some question as to what kind of arguments should be placed
 in the profile as options.  In order to provide a clear answer, recall
 .SH BUGS
 There is some question as to what kind of arguments should be placed
 in the profile as options.  In order to provide a clear answer, recall

-command line semantics of all
+the command line semantics of all

 .B nmh
 programs: conflicting switches
 (e.g.
 .B \-header
 and
 .BR \-noheader )
 .B nmh
 programs: conflicting switches
 (e.g.
 .B \-header
 and
 .BR \-noheader )

-may occur more than one time on the
-command line, with the last switch taking effect.  Other arguments, such
-as message sequences, filenames and folders, are always remembered on
-the invocation line and are not superseded by following arguments of
-the same type.  Hence, it is safe to place only switches (and their
-arguments) in the profile.
+may occur more than one time on the command line, with the last switch
+taking effect.  Other arguments, such as message sequences, filenames
+and folders, are always remembered on the invocation line and are not
+superseded by following arguments of the same type.
+Hence, it is safe to place only switches (and their arguments) in the profile.

 .PP
 If one finds that an
 .B nmh
 .PP
 If one finds that an
 .B nmh

-program is being invoked again and again
-with the same arguments, and those arguments aren't switches, then there
-are a few possible solutions to this problem.  The first is to create a
-(soft) link in your
+program is being invoked again and again with the same arguments, and those
+arguments aren't switches, then there are a few possible solutions to this
+problem.  The first is to create a (soft) link in your

 .I $HOME/bin
 directory to the
 .B nmh
 .I $HOME/bin
 directory to the
 .B nmh

-program
-of your choice.  By giving this link a different name, you can create
+program of your choice.  By giving this link a different name, you can create

 a new entry in your profile and use an alternate set of defaults for
 the
 .B nmh
 a new entry in your profile and use an alternate set of defaults for
 the
 .B nmh