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

[nmh] / man / mhstore.man

diff --git a/man/mhstore.man b/man/mhstore.man
index 1a7cb9690732a1c779a831f16293c112e1804a47..ac66b86bd61cb1840dac570fcab53d2de03dd788 100644 (file)
--- a/man/mhstore.man
+++ b/man/mhstore.man
@@ -25,6 +25,7 @@ mhstore \- store contents of nmh MIME messages into files
 .RB [ \-prefer
 .IR content ]
 \&...
 .RB [ \-prefer
 .IR content ]
 \&...

+.RB [ \-noprefer ]

 .RB [ \-auto " | " \-noauto ]
 .RB [ \-clobber
 .IR always " | " auto " | " suffix " | " ask " | " never ]
 .RB [ \-auto " | " \-noauto ]
 .RB [ \-clobber
 .IR always " | " auto " | " suffix " | " ask " | " never ]


@@ -68,7 +69,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
 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
 mail drop format to a folder of
 .B nmh
 messages, see


@@ -156,12 +159,22 @@ but is also implemented in
 and
 .B mhstore
 to make common part-numbering possible across all three programs.
 and
 .B mhstore
 to make common part-numbering possible across all three programs.

+The last of multiple
+.B \-prefer
+switches will have the highest priority.  This allows the command line
+switches to override profile entries.

 See
 .IR mhlist (1)
 and
 .IR mhshow (1)
 for more information on
 See
 .IR mhlist (1)
 and
 .IR mhshow (1)
 for more information on

-.BR \-prefer.
+.BR \-prefer .
+.PP
+The
+.B \-noprefer
+switch will cancel any previous
+.B \-prefer
+switches.

 .SS "Checking the Contents"
 The
 .B \-check
 .SS "Checking the Contents"
 The
 .B \-check


@@ -474,7 +487,7 @@ nmh-access-url: curl -L
 to determine the program to use to perform the HTTP retrieval.  This program
 is invoked with one argument: the URL of the content to retrieve.  The program
 should write the content to standard out, and should terminate with a status
 to determine the program to use to perform the HTTP retrieval.  This program
 is invoked with one argument: the URL of the content to retrieve.  The program
 should write the content to standard out, and should terminate with a status

-of zero if the retrieval is successful and a non\-zero exit status otherwise.
+of zero if the retrieval is successful and a non-zero exit status otherwise.

 .SS "The Content Cache"
 When
 .B mhstore
 .SS "The Content Cache"
 When
 .B mhstore


@@ -579,7 +592,7 @@ is checked.
 .fc ^ ~
 .nf
 .ta \w'%nmhetcdir%/ExtraBigFileName  'u
 .fc ^ ~
 .nf
 .ta \w'%nmhetcdir%/ExtraBigFileName  'u

-^$HOME/.mh\(ruprofile~^The user profile
+^$HOME/.mh_profile~^The user profile

 ^$MHSTORE~^Additional profile entries
 ^%nmhetcdir%/mhn.defaults~^System default MIME profile entries
 .fi
 ^$MHSTORE~^Additional profile entries
 ^%nmhetcdir%/mhn.defaults~^System default MIME profile entries
 .fi