===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/m4/m4.1,v
retrieving revision 1.48
retrieving revision 1.49
diff -c -r1.48 -r1.49
*** src/usr.bin/m4/m4.1	2006/12/12 21:16:18	1.48
--- src/usr.bin/m4/m4.1	2007/05/30 04:41:34	1.49
***************
*** 1,4 ****
! .\"	@(#) $OpenBSD: m4.1,v 1.48 2006/12/12 21:16:18 jmc Exp $
  .\"
  .\" Copyright (c) 1989, 1993
  .\"	The Regents of the University of California.  All rights reserved.
--- 1,4 ----
! .\"	@(#) $OpenBSD: m4.1,v 1.49 2007/05/30 04:41:34 jmc Exp $
  .\"
  .\" Copyright (c) 1989, 1993
  .\"	The Regents of the University of California.  All rights reserved.
***************
*** 419,436 ****
  Returns the current file's name.
  .El
  .Sh STANDARDS
  .Nm
! is expected to be
  .St -p1003.1-2004
! compliant,
! along with a few extensions taken from
! .Nm gnu-m4 .
  .Pp
! Flags
! .Fl I ,
! .Fl d ,
! .Fl t
! are non-standard.
  .Pp
  The output format of tracing and of
  .Ic dumpdef
--- 419,447 ----
  Returns the current file's name.
  .El
  .Sh STANDARDS
+ The
  .Nm
! utility is compliant with the
  .St -p1003.1-2004
! specification.
  .Pp
! The flags
! .Op Fl dgIot
! and the macros
! .Ic builtin ,
! .Ic esyscmd ,
! .Ic expr ,
! .Ic format ,
! .Ic indir ,
! .Ic paste ,
! .Ic patsubst ,
! .Ic regexp ,
! .Ic spaste ,
! .Ic unix ,
! .Ic __line__ ,
! and
! .Ic __file__
! are extensions to that specification.
  .Pp
  The output format of tracing and of
  .Ic dumpdef
***************
*** 454,473 ****
  .Ic define
  replaces the top-most definition only.
  Other implementations may erase all definitions on the stack instead.
- .Pp
- For portability, one should not use the macros
- .Ic builtin ,
- .Ic esyscmd ,
- .Ic expr ,
- .Ic format ,
- .Ic indir ,
- .Ic paste ,
- .Ic patsubst ,
- .Ic regexp ,
- .Ic spaste ,
- .Ic unix ,
- .Ic __line__ ,
- .Ic __file__ .
  .Pp
  All built-ins do expand without arguments in many other
  .Nm m4 .
--- 465,470 ----