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

[nmh] / man / show.man

diff --git a/man/show.man b/man/show.man
index fde9b433094a77741e72f78305776ea13e12cf76..4a0f5f4829caa0d8f0affa3a5a3056ad02d52a9d 100644 (file)
--- a/man/show.man
+++ b/man/show.man
@@ -1,31 +1,32 @@
-.TH SHOW %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
-.\"
+.TH SHOW %manext1% 2016-03-24 "%nmhversion%"
+.

 .\" %nmhwarning%
 .\" %nmhwarning%

-.\"
+.

 .SH NAME
 .SH NAME

-show \- show (display) messages
+show \- display nmh messages

 .SH SYNOPSIS
 .HP 5
 .na
 .B show
 .SH SYNOPSIS
 .HP 5
 .na
 .B show

+.RB [ \-help ]
+.RB [ \-version ]

 .RI [ +folder ]
 .RI [ msgs ]
 .RB [ \-draft ]
 .RI [ +folder ]
 .RI [ msgs ]
 .RB [ \-draft ]

-.RB [\-showproc
+.RB [ \-showproc

 .IR program ]
 .RB [ \-showmimeproc
 .IR program ]
 .RB [ \-header " | " \-noheader ]
 .RB [ \-checkmime " | " \-nocheckmime ]
 .IR program ]
 .RB [ \-showmimeproc
 .IR program ]
 .RB [ \-header " | " \-noheader ]
 .RB [ \-checkmime " | " \-nocheckmime ]

+.RB [ \-concat " | " \-noconcat ]

 [switches\ for
 .I showproc
 or
 .IR showmimeproc ]
 [switches\ for
 .I showproc
 or
 .IR showmimeproc ]

-.RB [ \-version ]
-.RB [ \-help ]

 .ad
 .SH DESCRIPTION
 .ad
 .SH DESCRIPTION

-.B Show
+.B show

 lists each of the specified messages to the standard output
 (typically, the terminal).
 .PP
 lists each of the specified messages to the standard output
 (typically, the terminal).
 .PP


@@ -43,7 +44,11 @@ manual page for the details about this
 command.  This default can be changed by defining the
 .I showproc
 profile component.  Any switches not recognized by
 command.  This default can be changed by defining the
 .I showproc
 profile component.  Any switches not recognized by

-.B show
+.BR show ,
+as well as
+.B \-header
+and
+.BR \-noheader ,

 are
 passed along to that program.  To override the default and the
 .I showproc
 are
 passed along to that program.  To override the default and the
 .I showproc


@@ -59,7 +64,7 @@ program to list the messages with no reformatting.  Normally, this
 program is specified as the
 .I showproc
 in the user's
 program is specified as the
 .I showproc
 in the user's

-.IR \&.mh\(ruprofile ,
+.IR \&.mh_profile ,

 rather than using a command line switch.
 .PP
 By default, non-text messages (MIME messages with multi-media
 rather than using a command line switch.
 .PP
 By default, non-text messages (MIME messages with multi-media


@@ -92,14 +97,15 @@ specify a transfer encoding (such as MIME quoted-printable or
 base64) or specify a character set that
 .B show
 doesn't believe
 base64) or specify a character set that
 .B show
 doesn't believe

-can be displayed natively.  The environment variable
-.B $MM_CHARSET
+can be displayed natively.  The appropriate
+.IR locale (1)
+environment variables

 should be set to the terminal's native character set to avoid
 gratuitous invocations of the
 .IR showmimeproc .
 should be set to the terminal's native character set to avoid
 gratuitous invocations of the
 .IR showmimeproc .

-See the
-.IR mh-profile (5)
-man page for details about this environment variable.
+See
+.IR locale (1)
+for details about these environment variables.

 .PP
 The option
 .B \-checkmime
 .PP
 The option
 .B \-checkmime


@@ -133,10 +139,16 @@ The
 .B \-header
 switch tells
 .B show
 .B \-header
 switch tells
 .B show

-to display a one\-line
+to display a one-line

 description of the message being shown.  This description includes
 the folder and the message number.
 .PP
 description of the message being shown.  This description includes
 the folder and the message number.
 .PP

+By default
+.B show
+will concatenate all content under one pager.  If you want each part to
+displayed separately, you can override the default behavior with
+.B \-noconcat.
+.PP

 If no `msgs' are specified, the current message is used.  Although
 it depends on the specific
 .I showproc
 If no `msgs' are specified, the current message is used.  Although
 it depends on the specific
 .I showproc


@@ -150,23 +162,23 @@ If a <RETURN> is entered, it will print the next line, whereas
 <SPACE> will print the next screenful.
 .PP
 If the standard output is not a terminal, no queries are made, and
 <SPACE> will print the next screenful.
 .PP
 If the standard output is not a terminal, no queries are made, and

-each file is listed with a one\-line header and two lines of
+each file is listed with a one-line header and two lines of

 separation.
 .PP
 .RB \*(lq "show \-draft" \*(rq
 separation.
 .PP
 .RB \*(lq "show \-draft" \*(rq

-will list the file <mh\-dir>/draft if it
+will list the file <mh-dir>/draft if it

 exists.
 .PP
 If the profile entry \*(lqUnseen\-Sequence\*(rq is present and
 exists.
 .PP
 If the profile entry \*(lqUnseen\-Sequence\*(rq is present and

-non\-empty, then
+non-empty, then

 .B show
 will remove each of the messages shown
 from each sequence named by the profile entry.
 .SH FILES
 .fc ^ ~
 .nf
 .B show
 will remove each of the messages shown
 from each sequence named by the profile entry.
 .SH FILES
 .fc ^ ~
 .nf

-.ta \w'%etcdir%/ExtraBigFileName  'u
-^$HOME/\&.mh\(ruprofile~^The user profile
+.ta \w'%nmhetcdir%/ExtraBigFileName  'u
+^$HOME/.mh_profile~^The user profile

 .fi
 .SH "PROFILE COMPONENTS"
 .fc ^ ~
 .fi
 .SH "PROFILE COMPONENTS"
 .fc ^ ~


@@ -191,6 +203,7 @@ from each sequence named by the profile entry.
 .RB ` msgs "' defaults to cur"
 .RB ` \-checkmime '
 .RB ` \-header '
 .RB ` msgs "' defaults to cur"
 .RB ` \-checkmime '
 .RB ` \-header '

+.RB ` \-concat '

 .fi
 .SH CONTEXT
 If a folder is given, it will become the current folder.  The last
 .fi
 .SH CONTEXT
 If a folder is given, it will become the current folder.  The last


@@ -208,7 +221,7 @@ be circumvented by referencing the \*(lqmessagename\*(rq field in the
 .B mhl
 format file.
 .PP
 .B mhl
 format file.
 .PP

-.B Show
+.B show

 updates the user's context before showing the message.
 Hence
 .B show
 updates the user's context before showing the message.
 Hence
 .B show


@@ -225,13 +238,13 @@ is
 (the default), then
 .B show
 uses
 (the default), then
 .B show
 uses

-a built\-in
+a built-in

 .BR mhl :
 it does not actually run the
 .B mhl
 program.
 Hence, if you define your own
 .BR mhl :
 it does not actually run the
 .B mhl
 program.
 Hence, if you define your own

-.B showproc ,
+.BR showproc ,

 don't call it
 .B mhl
 since
 don't call it
 .B mhl
 since


@@ -254,7 +267,7 @@ show | imprint &
 Due to a bug in
 .BR more ,
 show will go into a \*(lqtty input\*(rq state.
 Due to a bug in
 .BR more ,
 show will go into a \*(lqtty input\*(rq state.

-To avoid this problem, re\-direct
+To avoid this problem, re-direct

 .BR show 's
 diagnostic output as well.
 For users of
 .BR show 's
 diagnostic output as well.
 For users of