===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/deroff/deroff.1,v
retrieving revision 1.5
retrieving revision 1.6
diff -c -r1.5 -r1.6
*** src/usr.bin/deroff/deroff.1	2003/06/10 09:12:10	1.5
--- src/usr.bin/deroff/deroff.1	2005/07/05 15:02:20	1.6
***************
*** 1,4 ****
! .\" $OpenBSD: deroff.1,v 1.5 2003/06/10 09:12:10 jmc Exp $
  .\"
  .\" Copyright (c) 1990, 1993
  .\"	The Regents of the University of California.  All rights reserved.
--- 1,4 ----
! .\" $OpenBSD: deroff.1,v 1.6 2005/07/05 15:02:20 jmc Exp $
  .\"
  .\" Copyright (c) 1990, 1993
  .\"	The Regents of the University of California.  All rights reserved.
***************
*** 72,78 ****
  .Op Fl ikpw
  .Oo
  .Fl m
! .Ar m | s | e | a | l
  .Oc
  .Op Ar
  .Sh DESCRIPTION
--- 72,78 ----
  .Op Fl ikpw
  .Oo
  .Fl m
! .Ar a | e | l | m | s
  .Oc
  .Op Ar
  .Sh DESCRIPTION
***************
*** 83,95 ****
  .Xr troff 1
  command lines, backslash constructions, macro definitions,
  .Xr eqn 1
! constructs (between `.EQ' and `.EN' lines or between delimiters),
  .Xr pic 1
  pictures,
  and table descriptions and writes the remainder to the standard output.
  .Nm
! follows chains of included files (`.so' and `.nx' commands);
! if a file has already been included, a `.so' is ignored and a `.nx'
  terminates execution.
  If no input file is given,
  .Nm
--- 83,108 ----
  .Xr troff 1
  command lines, backslash constructions, macro definitions,
  .Xr eqn 1
! constructs (between
! .Dq .EQ
! and
! .Dq .EN
! lines or between delimiters),
  .Xr pic 1
  pictures,
  and table descriptions and writes the remainder to the standard output.
  .Nm
! follows chains of included files
! .Po
! .Dq .so
! and
! .Dq .nx
! commands
! .Pc ;
! if a file has already been included, a
! .Dq .so
! is ignored and a
! .Dq .nx
  terminates execution.
  If no input file is given,
  .Nm
***************
*** 98,104 ****
  The options are as follows:
  .Bl -tag -width Ds
  .It Fl i
! Ignore `.so' and `.nx' commands.
  .It Fl k
  Keep blocks of text intact.
  This is the default behavior unless the
--- 111,121 ----
  The options are as follows:
  .Bl -tag -width Ds
  .It Fl i
! Ignore
! .Dq .so
! and
! .Dq .nx
! commands.
  .It Fl k
  Keep blocks of text intact.
  This is the default behavior unless the
***************
*** 109,115 ****
  The
  .Fl m
  option takes the following arguments:
! .Bl -tag -width Ds
  .It a
  recognize
  .Xr man 7
--- 126,133 ----
  The
  .Fl m
  option takes the following arguments:
! .Pp
! .Bl -tag -width Ds -offset indent -compact
  .It a
  recognize
  .Xr man 7
***************
*** 118,137 ****
  recognize
  .Xr me 7
  macros.
- .It m
- recognize
- .Xr me 7
- macros.
- .It s
- recognize
- .Xr me 7
- macros.
  .It l
  recognize
  .Xr mm 7
  macros and delete
  .Xr mm 7
  lists.
  .El
  .It Fl p
  Preserve paragraph macros.
--- 136,155 ----
  recognize
  .Xr me 7
  macros.
  .It l
  recognize
  .Xr mm 7
  macros and delete
  .Xr mm 7
  lists.
+ .It m
+ recognize
+ .Xr mm 7
+ macros.
+ .It s
+ recognize
+ .Xr ms 7
+ macros.
  .El
  .It Fl p
  Preserve paragraph macros.