Merge remote-tracking branch 'origin' into xoauth

[nmh] / man / nmh.man

diff --git a/man/nmh.man b/man/nmh.man
index b9dadd17e62c7aa27b9895370ea983e29831b48a..cf1433050039a3693e15c849dcf2a21d77e9753f 100644 (file)
--- a/man/nmh.man
+++ b/man/nmh.man
@@ -1,4 +1,4 @@
-.TH NMH %manext7% "March 13, 2014" "%nmhversion%"
+.TH NMH %manext7% "April 21, 2014" "%nmhversion%"
 .\"
 .\" %nmhwarning%
 .\"
@@ -442,15 +442,15 @@ Convenience Wrappers
 .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
+.IR mhfixmsg (1)
+rewrite MIME messages with various transformations
+.TP
 .IR mhparam (1)
 print nmh profile components
 .TP
@@ -474,9 +474,6 @@ Indirectly Invoked Commands
 .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
@@ -533,12 +530,12 @@ contains
 .B nmh
 commands
 .TP
-%etcdir%
+%nmhetcdir%
 contains
 .B nmh
 format files
 .TP
-%libdir%
+%nmhlibexecdir%
 contains
 .B nmh
 library commands