lock_file.c: close(2) file descriptor on failure, avoiding leak.

[nmh] / man / mhshow.man

diff --git a/man/mhshow.man b/man/mhshow.man
index 94eaf9af0cc32554f918321f0b29f65117cc309f..b53b55e66eb5b2f6e4b1cfabc0135ef91995f922 100644 (file)
--- a/man/mhshow.man
+++ b/man/mhshow.man
@@ -23,6 +23,7 @@ mhshow \- display nmh MIME messages
 .RB [ \-prefer
 .IR content ]
 \&...
+.RB [ \-noprefer ]
 .RB [ \-concat " | " \-noconcat ]
 .RB [ \-textonly " | " \-notextonly ]
 .RB [ \-inlineonly " | " \-noinlineonly ]
@@ -72,7 +73,7 @@ or
 switches will override the default settings of
 .B \-textonly
 and
-.BR \-inlineonly.
+.BR \-inlineonly .
 .PP
 The
 .B \-header
@@ -108,7 +109,9 @@ will accept the source message on the standard input.  Note that the
 file, or input from standard input, should be a validly formatted message,
 just like any other
 .B nmh
-message.  It should NOT be in mail drop format (to convert a file in
+message.  It should
+.I not
+be in mail drop format (to convert a file in
 mail drop format to a folder of
 .B nmh
 messages, see
@@ -204,7 +207,7 @@ In the absence of
 will select the "best" displayable subpart from multipart/alternative
 content.  The
 .B \-prefer
-switch can be used (one or more times, in order of descending
+switch can be used (one or more times, in order of ascending
 preference) to let MH know which content types from a
 multipart/alternative MIME part are preferred by the user, in order to
 override the default selection for display.  For example, mail is
@@ -228,6 +231,16 @@ faithful" position.  Thus, when viewed by
 the ordering of multipart/alternative parts will appear to change when
 invoked with or without various
 .B \-prefer
+switches.  Since the last of multiple 
+.B \-prefer
+options "wins", a
+.B \-prefer
+on the command line will override any in a profile entry.
+.PP
+The
+.B \-noprefer
+switch will cancel any previous
+.B \-prefer
 switches.
 .SS "Unseen Sequence"
 If the profile entry \*(lqUnseen\-Sequence\*(rq is present and
@@ -424,9 +437,9 @@ If
 was built with
 .IR iconv (3),
 then all text/plain parts of the message(s) will be displayed using
-the character set of the current locale.  See the
+the character set of the current locale.  See
 .IR mhparam (1)
-man page for how to determine whether your
+for how to determine whether your
 .B nmh
 installation includes
 .IR iconv (3)
@@ -572,7 +585,7 @@ local filename
 The program should terminate with an exit status of zero if the
 retrieval is successful, and a non-zero exit status otherwise.
 .PP
-For the \*(lqurl\*(rq access\-type,
+For the \*(lqurl\*(rq access-type,
 .B mhshow
 will look for the \*(lqnmh-access-url\*(rq profile entry.  See
 .IR mhstore (1)
@@ -712,7 +725,7 @@ is checked.
 .fc ^ ~
 .nf
 .ta \w'%nmhetcdir%/ExtraBigFileName  'u
-^$HOME/\&.mh\(ruprofile~^The user profile
+^$HOME/.mh_profile~^The user profile
 ^$MHSHOW~^Additional profile entries
 ^%nmhetcdir%/mhn.defaults~^System default MIME profile entries
 ^%nmhetcdir%/mhl.headers~^The headers template