X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;ds=sidebyside;f=man%2Fmhshow.man1;h=e3fbdb76fad0b49da645f1463cf42de316e4cd95;hb=d1fefd9f614e4dc3cda16da6c69133c1b2005269;hp=1d5d99d738431b67c39382910980497cd872f7bb;hpb=5aaedc4256d58afe2481d667afdcb5162a914ba9;p=mmh

diff --git a/man/mhshow.man1 b/man/mhshow.man1
index 1d5d99d..e3fbdb7 100644
--- a/man/mhshow.man1
+++ b/man/mhshow.man1
@@ -18,15 +18,8 @@ mhshow \- display MIME messages
 .RB [ \-type
 .IR content ]
 \&...
-.RB [ \-serialonly " | " \-noserialonly ]
-.RB [ \-pause " | " \-nopause ]
 .RB [ \-form
 .IR formfile ]
-.RB [ \-rcache
-.IR policy ]
-.RB [ \-wcache
-.IR policy ]
-.RB [ \-check " | " \-nocheck ]
 .RB [ \-version ]
 .RB [ \-help ]
 .ad
@@ -128,22 +121,9 @@ non\-empty, then
 .B mhshow
 will remove each of the messages shown
 from each sequence named by the profile entry.
-.SS "Checking the Contents"
-The
-.B \-check
-switch tells
-.B mhshow
-to check each content for an
-integrity checksum.  If a content has such a checksum (specified as a
-Content-MD5 header field), then
-.B mhshow
-will attempt to verify the
-integrity of the content.
 .SS "Showing the Contents"
-The headers of each message are displayed with the
-.I mhlproc
-(usually
-.BR mhl ),
+The headers of each message are displayed with
+.B mhl
 using the standard format file
 .IR mhl.headers .
 You may specify an alternate format file with the
@@ -230,7 +210,7 @@ The display string may contain the following escapes:
 %f	Insert filename containing content
 %F	%e, %f, and stdin is terminal not content
 %l	display listing prior to displaying content
-%p	%l, and ask for confirmation
+%p	synonym to %l
 %s	Insert content subtype
 %d	Insert content description
 %%	Insert the character %
@@ -244,12 +224,6 @@ 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.
 .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
@@ -264,12 +238,12 @@ redirected from the terminal to the content.
 .PP
 If a display string is not found,
 .B mhshow
-has several default values:
+has the following default values:
 .PP
 .RS 5
 .nf
-mhshow-show-text/plain: %pmoreproc '%F'
-mhshow-show-message/rfc822: %pshow -file '%F'
+mhshow-show-text/plain: %l<defaultpager> '%F'
+mhshow-show-message/rfc822: %lshow \-file '%F'
 .fi
 .RE
 .PP
@@ -307,16 +281,14 @@ the shell of any funny characters that might be present in the filename.
 .PP
 Finally,
 .B mhshow
-will process each message serially\0--\0it won't start
+will process each message serially \- it 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
+cause confusion, particularly on uni-window displays,
 .B mhshow
-to never display parts in parallel.
+will never display parts in parallel.
 .SS "Showing Alternate Character Sets"
 Because a content of type text might be in a non-ASCII character
 set, when
@@ -401,9 +373,9 @@ determining whether a character is \*(lqnormal\*(rq, \*(lqcontrol\*(lq,
 or \*(lqbinary\*(rq.  The second line tells
 .B less
 not to warn you
-if it encounters a file that has non-ASCII characters.  Then, simply
+if it encounters a file that has non-ASCII characters.  Then,
 set the
-.I moreproc
+.I Pager
 profile entry to
 .BR less ,
 and it will get
@@ -464,63 +436,6 @@ local filename
 .PP
 The program should terminate with an exit status of zero if the
 retrieval is successful, and a non-zero exit status otherwise.
-.PP
-If this entry is not provided, then
-.B mhshow
-will use a simple
-built-in FTP client to perform the retrieval.
-.SS "The Content Cache"
-When
-.B mhshow
-encounters an external content containing a
-\*(lqContent-ID:\*(rq field, and if the content allows caching, then
-depending on the caching behavior of
-.BR mhshow ,
-the content might be read from or written to a cache.
-.PP
-The caching behavior of
-.B mhshow
-is controlled with the
-.B \-rcache
-and
-.B \-wcache
-switches, which define the policy for reading from,
-and writing to, the cache, respectively.  One of four policies may be
-specified: \*(lqpublic\*(rq, indicating that
-.B mhshow
-should make use
-of a publically-accessible content cache; \*(lqprivate\*(rq, indicating
-that
-.B mhshow
-should make use of the user's private content cache;
-\*(lqnever\*(rq, indicating that
-.B mhshow
-should never make use of
-caching; and, \*(lqask\*(rq, indicating that
-.B mhshow
-should ask the user.
-.PP
-There are two directories where contents may be cached: the profile entry
-\*(lqnmh-cache\*(rq names a directory containing world-readable contents, and,
-the profile entry \*(lqnmh-private-cache\*(rq names a directory containing
-private contents.  The former should be an absolute (rooted) directory
-name.
-.PP
-For example,
-.PP
-.RS 5
-nmh-cache: /tmp
-.RE
-.PP
-might be used if you didn't care that the cache got wiped after each
-reboot of the system.  The private cache is interpreted relative to the user's
-mail storage, if not rooted, e.g.,
-.PP
-.RS 5
-nmh-private-cache: .cache
-.RE
-.PP
-(which is the default value).
 .SS "User Environment"
 Because the display environment in which
 .B mhshow
@@ -574,13 +489,10 @@ installation.
 ^Path:~^To determine the user's mail storage
 ^Current\-Folder:~^To find the default current folder
 ^Unseen\-Sequence:~^To name sequences denoting unseen messages
-^mhlproc:~^Default program to display message headers
 ^nmh-access-ftp:~^Program to retrieve contents via FTP
-^nmh-cache~^Public directory to store cached external contents
-^nmh-private-cache~^Personal directory to store cached external contents
 ^mhshow-charset-<charset>~^Template for environment to render character sets
 ^mhshow-show-<type>*~^Template for displaying contents
-^moreproc:~^Default program to display text/plain content
+^Pager:~^Default program to display text/plain content
 .fi
 
 .SH "SEE ALSO"
@@ -590,14 +502,8 @@ mhbuild(1), mhl(1), mhlist(1), mhstore(1), sendfiles(1)
 .nf
 .RB ` +folder "' defaults to the current folder"
 .RB ` msgs "' defaults to cur"
-.RB ` \-nocheck '
-.RB ` \-form mhl.headers '
-.RB ` \-pause '
-.RB ` \-rcache ask '
-.RB ` \-realsize '
-.RB ` \-noserialonly '
+.RB ` \-form \ mhl.headers'
 .RB ` \-noverbose '
-.RB ` \-wcache ask '
 .fi
 
 .SH CONTEXT