X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/ed3214f1518b36c8b96a1a17be4af0a708ea25e3..d6e398f9c:/man/mhshow.man?ds=inline

diff --git a/man/mhshow.man b/man/mhshow.man
index d25e6ebc..b6fe8838 100644
--- a/man/mhshow.man
+++ b/man/mhshow.man
@@ -1,4 +1,4 @@
-.TH MHSHOW %manext1% "February 18, 2014" "%nmhversion%"
+.TH MHSHOW %manext1% "March 16, 2014" "%nmhversion%"
 .\"
 .\" %nmhwarning%
 .\"
@@ -18,8 +18,6 @@ mhshow \- display MIME messages
 .RB [ \-type
 .IR content ]
 \&...
-.RB [ \-serialonly " | " \-noserialonly ]
-.RB [ \-pause " | " \-nopause ]
 .RB [ \-form
 .IR formfile ]
 .RB [ \-rcache
@@ -224,53 +222,43 @@ The display string may contain the following escapes:
 .PP
 .RS 5
 .nf
-.ta \w'%F      'u
+.ta \w'%F        'u
 %a	   Insert parameters from Content-Type field
-%{charset} Insert the charset value from the Content-Type field
-%e	   exclusive execution
+%{parameter} Insert the parameter value from the Content-Type field
 %f	   Insert filename containing content
-%F	   %e, %f, and stdin is terminal not content
+%F	   %f, and stdin is terminal not content
 %l	   display listing prior to displaying content
-%p	   %l, and ask for confirmation
 %s	   Insert content subtype
 %d	   Insert content description
 %%	   Insert the character %
 .fi
 .RE
 .PP
-For those display strings containing the e- or F-escape,
-.B mhshow
+.B Mhshow
 will
-execute at most one of these at any given time.  Although the F-escape
-expands to be the filename containing the content, the e-escape has no
-expansion as far as the shell is concerned.
+execute at most one display string at any given time, and wait for the
+current display string to finish execution before executing the next
+display string.
 .PP
-When the p-escape prompts for confirmation, typing INTR (usually
-control-C) will tell
-.B mhshow
-not to display that content.
-The p-escape can be disabled by specifying the switch
-.BR \-nopause .
-Further, when
-.B mhshow
-is display a content, typing QUIT (usually
-control-\\) will tell
-.B mhshow
-to wrap things up immediately.
-.PP
-The {charset} escape is typically used in a command line argument that
-should only be present if it has a non-null value.  Shell parameter
-expansion can construct the argument only when it is non-null, e.g.,
+The {parameter} escape is typically used in a command line argument
+that should only be present if it has a non-null value.  Its value
+will be wrapped with single quotes if the escape is not so wrapped.
+Shell parameter expansion can construct the argument only when it is
+non-null, e.g.,
 .PP
 .RS 5
 .nf
-mhshow-show-text/html: charset="%{charset}";
+mhshow-show-text/html: charset=%{charset};
   w3m ${charset:+-I $charset} -T text/html %F
 .fi
 .RE
 .PP
 That example also shows the use of indentation to signify continuation:
-the two text lines combine to form a single entry.
+the two text lines combine to form a single entry.  Note that when
+dealing with text that has been converted internally by
+.IR iconv (3),
+the \*(lqcharset\*(rq parameter will reflect the target character set
+of the text, rather than the original character set in the message.
 .PP
 Note that if the content being displayed is multipart, but not one of
 the subtypes listed above, then the f- and F-escapes expand to multiple
@@ -283,8 +271,8 @@ behaves as if these profile entries were supplied and supported:
 .PP
 .RS 5
 .nf
-mhshow-show-text/plain: %pmoreproc %F
-mhshow-show-message/rfc822: %pshow -file %F
+mhshow-show-text/plain: %lmoreproc %F
+mhshow-show-message/rfc822: %lshow -file %F
 .fi
 .RE
 .PP
@@ -319,28 +307,27 @@ mhshow-show-application/PostScript: lpr -Pps
 .fi
 .RE
 .PP
-If an f- or F-escape is not quoted with single quotes, double quotes,
-or backticks, its expansion will be wrapped with single quotes.
+If an f- or F-escape is not quoted with single quotes, its expansion
+will be wrapped with single quotes.
 .PP
 Finally,
 .B mhshow
 will process each message serially\0--\0it won't start
 showing the next message until all the commands executed to display the
-current message have terminated.  In the case of a multipart content
-(of any subtype listed above), the content contains advice indicating if
-the parts should be displayed serially or in parallel.  Because this may
-cause confusion, particularly on uni-window displays, the
-.B \-serialonly
-switch can be given to tell
-.B mhshow
-to never display parts in parallel.
+current message have terminated.
 .SS "Showing Alternate Character Sets"
 If
 .B mhshow
 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.  To convert text parts other
+the character set of the current locale.  See the
+.BR mhparam (1)
+man page for how determine whether your
+.B nmh
+installation includes
+.IR iconv (3)
+support.  To convert text parts other
 than text/plain, or if
 .B mhshow
 was not built with
@@ -624,6 +611,7 @@ is checked.
 .IR mhbuild (1),
 .IR mhl (1),
 .IR mhlist (1),
+.IR mhparam (1),
 .IR mhstore (1),
 .IR sendfiles (1)
 .SH DEFAULTS
@@ -632,9 +620,7 @@ is checked.
 .RB ` msgs "' defaults to cur"
 .RB ` \-nocheck '
 .RB ` \-form\ mhl.headers '
-.RB ` \-pause '
 .RB ` \-rcache\ ask '
-.RB ` \-noserialonly '
 .RB ` \-wcache\ ask '
 .fi
 .SH CONTEXT