Fill mode changes don't break next-line scope in all cases,

[mandoc.git] / man.1

diff --git a/man.1 b/man.1
index 65db3861d4e975eadda4517d8984208999ed49bb..c9ddfa7d1863b3097cb1e1e0f159483ba64c64ad 100644 (file)
--- a/man.1
+++ b/man.1
@@ -1,9 +1,9 @@
-.\"    $Id: man.1,v 1.9 2014/12/18 21:11:46 schwarze Exp $
+.\"    $Id: man.1,v 1.15 2015/07/17 22:38:29 schwarze Exp $

 .\"
 .\" Copyright (c) 1989, 1990, 1993
 .\"    The Regents of the University of California.  All rights reserved.
 .\" Copyright (c) 2003, 2007, 2008, 2014 Jason McIntyre <jmc@openbsd.org>
 .\"
 .\" Copyright (c) 1989, 1990, 1993
 .\"    The Regents of the University of California.  All rights reserved.
 .\" Copyright (c) 2003, 2007, 2008, 2014 Jason McIntyre <jmc@openbsd.org>

-.\" Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
+.\" Copyright (c) 2010, 2011, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>

 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions


@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)man.1      8.2 (Berkeley) 1/2/94
 .\"
 .\"
 .\"     @(#)man.1      8.2 (Berkeley) 1/2/94
 .\"

-.Dd $Mdocdate: December 18 2014 $
+.Dd $Mdocdate: July 17 2015 $

 .Dt MAN 1
 .Os
 .Sh NAME
 .Dt MAN 1
 .Os
 .Sh NAME


@@ -39,7 +39,7 @@
 .Nd display manual pages
 .Sh SYNOPSIS
 .Nm man
 .Nd display manual pages
 .Sh SYNOPSIS
 .Nm man

-.Op Fl acfhklVw
+.Op Fl acfhklw

 .Op Fl C Ar file
 .Op Fl I Cm os Ns = Ns Ar name
 .Op Fl K Ar encoding
 .Op Fl C Ar file
 .Op Fl I Cm os Ns = Ns Ar name
 .Op Fl K Ar encoding


@@ -106,6 +106,9 @@ Override the default operating system
 for the
 .Xr mdoc 7
 .Ic \&Os
 for the
 .Xr mdoc 7
 .Ic \&Os

+and for the
+.Xr man 7
+.Ic \&TH

 macro.
 .It Fl h
 Display only the SYNOPSIS lines of the requested manual pages.
 macro.
 .It Fl h
 Display only the SYNOPSIS lines of the requested manual pages.


@@ -288,8 +291,6 @@ and
 are described in the
 .Xr mandoc 1
 manual.
 are described in the
 .Xr mandoc 1
 manual.

-.It Fl V
-Print version and exit.

 .It Fl W Ar level
 Specify the minimum message
 .Ar level
 .It Fl W Ar level
 Specify the minimum message
 .Ar level


@@ -300,12 +301,13 @@ can be
 .Cm warning ,
 .Cm error ,
 or
 .Cm warning ,
 .Cm error ,
 or

-.Cm fatal .
-The default is
-.Cm fatal ;
+.Cm unsupp ;

 .Cm all
 is an alias for
 .Cm warning .
 .Cm all
 is an alias for
 .Cm warning .

+By default,
+.Nm
+is silent.

 See the
 .Xr mandoc 1
 manual for details.
 See the
 .Xr mandoc 1
 manual for details.


@@ -358,6 +360,13 @@ Any non-empty value of the environment variable
 .Ev MANPAGER
 will be used instead of the standard pagination program,
 .Xr more 1 .
 .Ev MANPAGER
 will be used instead of the standard pagination program,
 .Xr more 1 .

+If
+.Xr less 1
+is used, the interactive
+.Ic :t
+command can be used to go to the definitions of various terms, for
+example command line options, command modifiers, internal commands,
+and environment variables.

 .It Ev MANPATH
 The standard search path used by
 .Nm
 .It Ev MANPATH
 The standard search path used by
 .Nm


@@ -379,7 +388,8 @@ Specifies the pagination program to use when
 .Ev MANPAGER
 is not defined.
 If neither PAGER nor MANPAGER is defined,
 .Ev MANPAGER
 is not defined.
 If neither PAGER nor MANPAGER is defined,

-.Pa /usr/bin/more Fl s
+.Xr more 1
+.Fl s

 will be used.
 .El
 .Sh FILES
 will be used.
 .El
 .Sh FILES


@@ -412,7 +422,7 @@ utility is compliant with the
 specification.
 .Pp
 The flags
 specification.
 .Pp
 The flags

-.Op Fl aCcfhIKlMmOSsTVWw ,
+.Op Fl aCcfhIKlMmOSsTWw ,

 as well as the environment variables
 .Ev MACHINE ,
 .Ev MANPAGER ,
 as well as the environment variables
 .Ev MACHINE ,
 .Ev MANPAGER ,