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

diff --git a/man/mhshow.man1 b/man/mhshow.man1
index 1d5d99d..a3330c0 100644
--- a/man/mhshow.man1
+++ b/man/mhshow.man1
@@ -19,7 +19,6 @@ mhshow \- display MIME messages
 .IR content ]
 \&...
 .RB [ \-serialonly " | " \-noserialonly ]
-.RB [ \-pause " | " \-nopause ]
 .RB [ \-form
 .IR formfile ]
 .RB [ \-rcache
@@ -140,10 +139,8 @@ Content-MD5 header field), then
 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 +227,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 +241,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 +255,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
@@ -401,9 +392,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,11 +455,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
@@ -574,13 +560,12 @@ 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"
@@ -592,7 +577,6 @@ mhbuild(1), mhl(1), mhlist(1), mhstore(1), sendfiles(1)
 .RB ` msgs "' defaults to cur"
 .RB ` \-nocheck '
 .RB ` \-form mhl.headers '
-.RB ` \-pause '
 .RB ` \-rcache ask '
 .RB ` \-realsize '
 .RB ` \-noserialonly '