===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mandoc.1,v
retrieving revision 1.9
retrieving revision 1.10
diff -c -r1.9 -r1.10
*** src/usr.bin/mandoc/mandoc.1	2009/07/18 20:50:37	1.9
--- src/usr.bin/mandoc/mandoc.1	2009/08/09 17:20:17	1.10
***************
*** 1,4 ****
! .\"	$Id: mandoc.1,v 1.9 2009/07/18 20:50:37 schwarze Exp $
  .\"
  .\" Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
  .\"
--- 1,4 ----
! .\"	$Id: mandoc.1,v 1.10 2009/08/09 17:20:17 schwarze Exp $
  .\"
  .\" Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
  .\"
***************
*** 14,20 ****
  .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  .\"
! .Dd $Mdocdate: July 18 2009 $
  .Dt MANDOC 1
  .Os
  .\" SECTION
--- 14,20 ----
  .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  .\"
! .Dd $Mdocdate: August 9 2009 $
  .Dt MANDOC 1
  .Os
  .\" SECTION
***************
*** 34,46 ****
  .Sh DESCRIPTION
  The
  .Nm
! utility formats 
  .Ux
  manual pages for display.  The arguments are as follows:
  .Bl -tag -width Ds
  .\" ITEM
  .It Fl f Ns Ar option...
! Override default compiler behaviour.  See 
  .Sx Compiler Options
  for details.
  .\" ITEM
--- 34,46 ----
  .Sh DESCRIPTION
  The
  .Nm
! utility formats
  .Ux
  manual pages for display.  The arguments are as follows:
  .Bl -tag -width Ds
  .\" ITEM
  .It Fl f Ns Ar option...
! Override default compiler behaviour.  See
  .Sx Compiler Options
  for details.
  .\" ITEM
***************
*** 63,71 ****
  Configure warning messages.  Use
  .Fl W Ns Ar all
  to print warnings,
! .Fl W Ns Ar error 
  for warnings to be considered errors and cause utility
! termination.  Multiple 
  .Fl W
  arguments may be comma-separated, such as
  .Fl W Ns Ar error,all .
--- 63,71 ----
  Configure warning messages.  Use
  .Fl W Ns Ar all
  to print warnings,
! .Fl W Ns Ar error
  for warnings to be considered errors and cause utility
! termination.  Multiple
  .Fl W
  arguments may be comma-separated, such as
  .Fl W Ns Ar error,all .
***************
*** 79,87 ****
  .El
  .\" PARAGRAPH
  .Pp
! By default, 
! .Nm 
! reads 
  .Xr mdoc 7
  or
  .Xr man 7
--- 79,87 ----
  .El
  .\" PARAGRAPH
  .Pp
! By default,
! .Nm
! reads
  .Xr mdoc 7
  or
  .Xr man 7
***************
*** 101,124 ****
  .Nm
  according to the following rules:  opening punctuation
  .Po
! .Sq \&( , 
! .Sq \&[ , 
  and
  .Sq \&{
! .Pc 
  is not followed by a space; closing punctuation
  .Po
! .Sq \&. , 
! .Sq \&, , 
! .Sq \&; , 
! .Sq \&: , 
! .Sq \&? , 
! .Sq \&! , 
! .Sq \&) , 
! .Sq \&] 
  and
  .Sq \&}
! .Pc 
  is not preceded by whitespace.
  .Pp
  If the input is
--- 101,124 ----
  .Nm
  according to the following rules:  opening punctuation
  .Po
! .Sq \&( ,
! .Sq \&[ ,
  and
  .Sq \&{
! .Pc
  is not followed by a space; closing punctuation
  .Po
! .Sq \&. ,
! .Sq \&, ,
! .Sq \&; ,
! .Sq \&: ,
! .Sq \&? ,
! .Sq \&! ,
! .Sq \&) ,
! .Sq \&]
  and
  .Sq \&}
! .Pc
  is not preceded by whitespace.
  .Pp
  If the input is
***************
*** 128,137 ****
  White-space, in non-literal (normal) mode, is stripped from input and
  replaced on output by a single space.  Thus, if you wish to preserve
  multiple spaces, they must be space-escaped
! .Sq \e\ 
! or used in a literal display mode, e.g., 
! .Sq \&.Bd \-literal 
! in 
  .Xr mdoc 7 .
  .\" SUB-SECTION
  .Ss Input Formats
--- 128,137 ----
  White-space, in non-literal (normal) mode, is stripped from input and
  replaced on output by a single space.  Thus, if you wish to preserve
  multiple spaces, they must be space-escaped
! .Sq \e\
! or used in a literal display mode, e.g.,
! .Sq \&.Bd \-literal
! in
  .Xr mdoc 7 .
  .\" SUB-SECTION
  .Ss Input Formats
***************
*** 149,174 ****
  .Xr mdoc 7
  format is
  .Em strongly
! recommended; 
  .Xr man 7
  should only be used for legacy manuals.
  .Pp
  A third option,
  .Fl m Ns Ar andoc ,
  which is also the default, determines encoding on-the-fly: if the first
! non-comment macro is 
  .Sq \&.Dd
  or
  .Sq \&.Dt ,
! the 
  .Xr mdoc 7
  parser is used; otherwise, the
  .Xr man 7
  parser is used.
  .Pp
  If multiple
! files are specified with 
! .Fl m Ns Ar andoc , 
  each has its file-type determined this way.  If multiple files are
  specified and
  .Fl m Ns Ar doc
--- 149,174 ----
  .Xr mdoc 7
  format is
  .Em strongly
! recommended;
  .Xr man 7
  should only be used for legacy manuals.
  .Pp
  A third option,
  .Fl m Ns Ar andoc ,
  which is also the default, determines encoding on-the-fly: if the first
! non-comment macro is
  .Sq \&.Dd
  or
  .Sq \&.Dt ,
! the
  .Xr mdoc 7
  parser is used; otherwise, the
  .Xr man 7
  parser is used.
  .Pp
  If multiple
! files are specified with
! .Fl m Ns Ar andoc ,
  each has its file-type determined this way.  If multiple files are
  specified and
  .Fl m Ns Ar doc
***************
*** 222,232 ****
  .It Fl f Ns Ar no-ign-chars
  Do not ignore disallowed characters.
  .It Fl f Ns Ar strict
! Implies 
  .Fl f Ns Ar no-ign-escape ,
! .Fl f Ns Ar no-ign-macro 
  and
! .Fl f Ns Ar no-ign-chars . 
  .El
  .\" PARAGRAPH
  .Pp
--- 222,232 ----
  .It Fl f Ns Ar no-ign-chars
  Do not ignore disallowed characters.
  .It Fl f Ns Ar strict
! Implies
  .Fl f Ns Ar no-ign-escape ,
! .Fl f Ns Ar no-ign-macro
  and
! .Fl f Ns Ar no-ign-chars .
  .El
  .\" PARAGRAPH
  .Pp
***************
*** 247,265 ****
  .D1 % mandoc mandoc.1 mdoc.3 mdoc.7 | less
  .\" SECTION
  .Sh COMPATIBILITY
! This section summarises 
  .Nm
! compatibility with 
  .Xr groff 1 .
  .Pp
  .Bl -bullet -compact
! .It 
  A list or display following
  .Sq \&.Ss
  does not assert a prior vertical break, just as it doesn't with
  .Sq \&.Sh .
  .It
! The \-literal and \-unfilled 
  .Sq \&.Bd
  displays types are synonyms, as are \-filled and \-ragged.
  .It
--- 247,265 ----
  .D1 % mandoc mandoc.1 mdoc.3 mdoc.7 | less
  .\" SECTION
  .Sh COMPATIBILITY
! This section summarises
  .Nm
! compatibility with
  .Xr groff 1 .
  .Pp
  .Bl -bullet -compact
! .It
  A list or display following
  .Sq \&.Ss
  does not assert a prior vertical break, just as it doesn't with
  .Sq \&.Sh .
  .It
! The \-literal and \-unfilled
  .Sq \&.Bd
  displays types are synonyms, as are \-filled and \-ragged.
  .It
***************
*** 278,282 ****
  .Sh AUTHORS
  The
  .Nm
! utility was written by 
  .An Kristaps Dzonsons Aq kristaps@kth.se .
--- 278,282 ----
  .Sh AUTHORS
  The
  .Nm
! utility was written by
  .An Kristaps Dzonsons Aq kristaps@kth.se .