-.TH MHSTORE %manext1% "September 15, 2012" "%nmhversion%"
+.TH MHSTORE %manext1% "March 21, 2013" "%nmhversion%"
.\"
.\" %nmhwarning%
.\"
.RI [ msgs ]
.RB [ \-file
.IR file ]
+.RB [ \-outfile
+.IR outfile ]
.RB [ \-part
.IR number ]
\&...
.PP
.B mhstore
manipulates multi-media messages as specified in
-RFC\-2045 to RFC\-2049.
+RFC 2045 to RFC 2049.
.PP
By default,
.B mhstore
to particular
subparts (of a multipart content) and/or particular content types.
.PP
-The option
+The
.B \-file
.I file
-directs
+switch directs
.B mhstore
to use the specified
file as the source message, rather than a message from a folder.
.PP
A content specification consists of a content type and a subtype.
The initial list of \*(lqstandard\*(rq content types and subtypes
-can be found in RFC\-2046.
+can be found in RFC 2046.
.PP
A list of commonly used contents is briefly reproduced here:
.PP
the current working directory is used.
.PP
If the
+.B \-outfile
+switch is given, its argument is used for the filename to store all
+of the content, with \*(lq-\*(rq indicating standard output. If the
.B \-auto
switch is given, then
.B mhstore
-will check if
-the message contains information indicating the filename that should
-be used to store the content. This information should be specified
-as the attribute \*(lqname=filename\*(rq in the \*(lqContent-Type\*(rq header
-for the content you are storing. For security reasons, this filename
-will be ignored if it begins with the character '/', '.', '|', or '!',
-or if it contains the character '%'. For the sake of security,
-this switch is not the default, and it is recommended that you do
-NOT put the
+will check if the message contains information indicating the filename
+that should be used to store the content. This information should be
+specified as the \*(lqfilename\*(rq attribute in the
+\*(lqContent-Disposition\*(rq header or as the \*(lqname\*(rq
+attribute in the \*(lqContent-Type\*(rq header for the content you are
+storing. For security reasons, this filename will be ignored if it
+begins with the character '/', '.', '|', or '!', or if it contains the
+character '%'. For the sake of security, this switch is not the
+default, and it is recommended that you do NOT put the
.B \-auto
switch in your
.I \&.mh\(ruprofile
.B nmh
installation.
.SH FILES
+.B mhstore
+looks for additional profile files in multiple locations: absolute
+pathnames are accessed directly, tilde expansion is done on usernames,
+and files are searched for in the user's
+.I Mail
+directory as specified in their profile. If not found there, the directory
+.RI \*(lq %etcdir% \*(rq
+is checked.
+.PP
.fc ^ ~
.nf
.ta \w'%etcdir%/ExtraBigFileName 'u