Merge remote-tracking branch 'origin' into xoauth

[nmh] / man / nmh.man

diff --git a/man/nmh.man b/man/nmh.man
index ce0379686e002461394d24480199a5549d70637f..cf1433050039a3693e15c849dcf2a21d77e9753f 100644 (file)
--- a/man/nmh.man
+++ b/man/nmh.man
@@ -1,4 +1,4 @@
-.TH NMH %manext7% "February 21, 2014" "%nmhversion%"
+.TH NMH %manext7% "April 21, 2014" "%nmhversion%"

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


@@ -122,16 +122,28 @@ its
 .B attach
 and related responses, as described in its man page.
 .PP
 .B attach
 and related responses, as described in its man page.
 .PP

+.B nmh
+command arguments are usually called
+.IR switches .
+Some switches have a corresponding \*(lq\-no\*(rq switch, which
+negates all previous occurrences of that switch on the command line.
+This allows a user to conveniently override, on the command line, a
+switch in their profile.  Switches may be abbreviated as long as there
+is no ambiguity with another switch of the same command.  To avoid
+ambiguity with any switches that may be added in the future, it is
+recommended that full switch names be used in durable code such as
+shell scripts, functions, and aliases.
+.PP

 All the
 .B nmh
 All the
 .B nmh

-commands may be run with the single argument
+commands may be run with the single switch

 .BR \-help ,
 .BR \-help ,

-which causes them to print a list of the arguments they may be invoked
+which causes them to print a list of the switches they may be invoked

 with and then exit.
 .PP
 All the
 .B nmh
 with and then exit.
 .PP
 All the
 .B nmh

-commands may be run with the single argument
+commands may be run with the single switch

 .BR \-version ,
 which causes them to print the version number of the
 .B nmh
 .BR \-version ,
 which causes them to print the version number of the
 .B nmh


@@ -430,15 +442,15 @@ Convenience Wrappers
 .PD 0
 .IR mhmail (1)
 send or read mail
 .PD 0
 .IR mhmail (1)
 send or read mail

-.TP
-.IR msh (1)
-nmh shell

 .PD
 .ne 4
 .SS
 Utilities
 .TP \n(ttu
 .PD 0
 .PD
 .ne 4
 .SS
 Utilities
 .TP \n(ttu
 .PD 0

+.IR mhfixmsg (1)
+rewrite MIME messages with various transformations
+.TP

 .IR mhparam (1)
 print nmh profile components
 .TP
 .IR mhparam (1)
 print nmh profile components
 .TP


@@ -462,9 +474,6 @@ Indirectly Invoked Commands
 .IR ap (8)
 parse addresses RFC 822\-style
 .TP
 .IR ap (8)
 parse addresses RFC 822\-style
 .TP

-.IR conflict (8)
-search for alias/password conflicts
-.TP

 .IR dp (8)
 parse dates RFC 822\-style
 .TP
 .IR dp (8)
 parse dates RFC 822\-style
 .TP


@@ -521,12 +530,12 @@ contains
 .B nmh
 commands
 .TP
 .B nmh
 commands
 .TP

-%etcdir%
+%nmhetcdir%

 contains
 .B nmh
 format files
 .TP
 contains
 .B nmh
 format files
 .TP

-%libdir%
+%nmhlibexecdir%

 contains
 .B nmh
 library commands
 contains
 .B nmh
 library commands


@@ -537,7 +546,8 @@ The user's nmh profile
 .SH "SEE ALSO"
 .IR install-mh (1),
 .IR mh-profile (5),
 .SH "SEE ALSO"
 .IR install-mh (1),
 .IR mh-profile (5),

-.IR mh-chart (7)
+.IR mh-chart (7),
+.IR mh-mime (7)

 .ne 4
 .SH BUGS
 If problems are encountered with an
 .ne 4
 .SH BUGS
 If problems are encountered with an