After some constructive criticism from pjanzen@ and some e-mail tag:

   - only use the .Dv NULL form when referring explicitly to a function
     argument or return value
   - otherwise, use these forms:
        o non-null
        o null-terminated (hyphenated form for predicate adjective)
        o else, null terminated, or null terminate, whichever the case
        o null pointer, null byte, null string, etc.
   - may use NUL to refer to an ASCII NUL, but it doesn't need a .Tn macro

In general, capitalizing the word "null" everywhere is unnecessary and makes
the man pages harder to read. The above is consistent with popular programming
texts (i.e., K&R, Stevens).

29 files changed, 107 insertions, 171 deletions

diff --git a/lib/libc/gen/basename.3 b/lib/libc/gen/basename.3
index c712fed6613..53e01067660 100644
--- a/lib/libc/gen/basename.3
+++ b/lib/libc/gen/basename.3
@@ -24,7 +24,7 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: basename.3,v 1.10 1999/05/29 16:08:54 aaron Exp $
+.\" $OpenBSD: basename.3,v 1.11 1999/06/04 01:30:10 aaron Exp $
 .\"
 .Dd August 17, 1997
 .Dt BASENAME 3
@@ -52,9 +52,7 @@ characters, a pointer to the string
 .Qq \&/
 is returned.  If
 .Ar path
-is a
-.Dv NULL
-pointer or the empty string, a pointer to the string
+is a null pointer or the empty string, a pointer to the string
 .Qq \&.
 is returned.
 .Sh RETURN VALUES
@@ -65,9 +63,7 @@ returns a pointer to the last component of
 .Pp
 If
 .Fn basename
-fails, a
-.Dv NULL
-pointer is returned and the global variable
+fails, a null pointer is returned and the global variable
 .Va errno
 is set to indicate the error.
 .Sh ERRORS
diff --git a/lib/libc/gen/confstr.3 b/lib/libc/gen/confstr.3
index e3e1453dfe3..5da41b75910 100644
--- a/lib/libc/gen/confstr.3
+++ b/lib/libc/gen/confstr.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: confstr.3,v 1.8 1999/05/29 22:38:33 aaron Exp $
+.\"	$OpenBSD: confstr.3,v 1.9 1999/06/04 01:30:10 aaron Exp $
 .\"
 .\" Copyright (c) 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -66,15 +66,13 @@ If
 .Fa len
 is non-zero,
 .Fa buf
-is a
-.Pf non- Dv NULL
-pointer, and
+is a non-null pointer, and
 .Fa name
 has a value; up to
 .Fa len
 \- 1 bytes of the value are copied into the buffer 
 .Fa buf .
-The copied value is always NUL-terminated.
+The copied value is always null terminated.
 .Pp
 The available values are as follows:
 .Pp
diff --git a/lib/libc/gen/ctermid.3 b/lib/libc/gen/ctermid.3
index 022a835c601..bed5d7a92de 100644
--- a/lib/libc/gen/ctermid.3
+++ b/lib/libc/gen/ctermid.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ctermid.3,v 1.3 1999/05/29 16:08:54 aaron Exp $
+.\"	$OpenBSD: ctermid.3,v 1.4 1999/06/04 01:30:10 aaron Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -49,9 +49,7 @@ the current controlling terminal of the calling process.
 .Pp
 If
 .Ar buf
-is the
-.Dv NULL
-pointer, a pointer to a static area is returned.
+is a null pointer, a pointer to a static area is returned.
 Otherwise, the pathname is copied into the memory referenced by
 .Ar buf .
 The argument
@@ -66,12 +64,8 @@ bytes long.
 The current implementation simply generates
 .Qq /dev/tty .
 .Sh RETURN VALUES
-Upon successful completion, a
-.Pf non- Dv NULL
-pointer is returned.
-Otherwise, a
-.Dv NULL
-pointer is returned and the global variable
+Upon successful completion, a non-null pointer is returned.
+Otherwise, a null pointer is returned and the global variable
 .Va errno
 is set to indicate the error.
 .Sh ERRORS
diff --git a/lib/libc/gen/directory.3 b/lib/libc/gen/directory.3
index cd0f9a6352a..95d85109f03 100644
--- a/lib/libc/gen/directory.3
+++ b/lib/libc/gen/directory.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: directory.3,v 1.8 1999/06/03 10:03:19 aaron Exp $
+.\"	$OpenBSD: directory.3,v 1.9 1999/06/04 01:30:10 aaron Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -71,9 +71,7 @@ with it
 and
 returns a pointer to be used to identify the
 directory stream
-in subsequent operations.  The pointer
-.Dv NULL
-is returned if
+in subsequent operations.  A null pointer is returned if
 .Fa filename
 cannot be accessed, or if
 .Xr malloc 3
diff --git a/lib/libc/gen/dirname.3 b/lib/libc/gen/dirname.3
index 0ad1174d499..05d57025dff 100644
--- a/lib/libc/gen/dirname.3
+++ b/lib/libc/gen/dirname.3
@@ -24,7 +24,7 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: dirname.3,v 1.6 1999/05/29 16:08:54 aaron Exp $
+.\" $OpenBSD: dirname.3,v 1.7 1999/06/04 01:30:10 aaron Exp $
 .\"
 .Dd August 17, 1997
 .Dt DIRNAME 3
@@ -49,9 +49,7 @@ Any trailing
 characters are not counted as part of the directory
 name.  If
 .Ar path
-is a
-.Dv NULL
-pointer, the empty string, or contains no
+is a null pointer, the empty string, or contains no
 .Sq \&/
 characters,
 .Fn dirname
@@ -66,9 +64,7 @@ returns a pointer to the parent directory of
 .Pp
 If
 .Fn dirname
-fails, a
-.Dv NULL
-pointer is returned and the global variable
+fails, a null pointer is returned and the global variable
 .Va errno
 is set to indicate the error.
 .Sh ERRORS
diff --git a/lib/libc/gen/exec.3 b/lib/libc/gen/exec.3
index f23d193f656..734da4d14af 100644
--- a/lib/libc/gen/exec.3
+++ b/lib/libc/gen/exec.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: exec.3,v 1.8 1999/06/03 10:03:19 aaron Exp $
+.\"	$OpenBSD: exec.3,v 1.9 1999/06/04 01:30:10 aaron Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -84,49 +84,42 @@ functions can be thought of as
 \&...,
 .Fa argn .
 Together they describe a list of one or more pointers to
-NUL-terminated
+null-terminated
 strings that represent the argument list available to the executed program.
 The first argument, by convention, should point to the file name associated
 with the file being executed.
 The list of arguments
 .Em must
-be terminated by a
-.Dv NULL
-pointer.
+be terminated by a null pointer.
 .Pp
 The
 .Fn exect ,
 .Fn execv ,
 and
 .Fn execvp
-functions provide an array of pointers to NUL-terminated
-strings that
+functions provide an array of pointers to
+null-terminated strings that
 represent the argument list available to the new program.
 The first argument, by convention, should point to the file name associated
 with the file begin executed.
 The array of pointers
 .Em must
-be terminated by a
-.Dv NULL
-pointer.
+be terminated by a null pointer itself.
 .Pp
 The
 .Fn execle
 and
 .Fn exect
 functions also specify the environment of the executed process by following
-the
-.Dv NULL
+the null
 pointer that terminates the list of arguments in the parameter list
 or the pointer to the
 .Va argv
 array with an additional parameter.
-This additional parameter is an array of pointers to NUL-terminated
+This additional parameter is an array of pointers to null-terminated
 strings and
 .Em must
-be terminated by a
-.Dv NULL
-pointer itself.
+be terminated by a null pointer itself.
 The other functions take the environment for the new process image from the
 external variable
 .Va environ
diff --git a/lib/libc/gen/fts.3 b/lib/libc/gen/fts.3
index edfc8d17a4a..cb36282fc94 100644
--- a/lib/libc/gen/fts.3
+++ b/lib/libc/gen/fts.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fts.3,v 1.10 1999/06/03 10:03:20 aaron Exp $
+.\"	$OpenBSD: fts.3,v 1.11 1999/06/04 01:30:10 aaron Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -291,8 +291,7 @@ Upon return from the
 .Fn fts_children
 function, the
 .Fa fts_link
-field points to the next structure in the
-.Dv NULL Ns -terminated
+field points to the next structure in the null-terminated
 linked list of directory members.
 Otherwise, the contents of the
 .Fa fts_link
@@ -324,7 +323,7 @@ Therefore, the
 .Fa fts_path
 and
 .Fa fts_accpath
-fields are guaranteed to be NUL-terminated
+fields are guaranteed to be null terminated
 .Em only
 for the file most recently returned by
 .Fn fts_read .
@@ -341,15 +340,13 @@ Any such modifications should be undone before further calls to
 are attempted.
 The
 .Fa fts_name
-field is always NUL-terminated.
+field is always null terminated.
 .Ss FTS_OPEN
 The
 .Fn fts_open
 function takes a pointer to an array of character pointers naming one
 or more paths which make up a logical file hierarchy to be traversed.
-The array must be terminated by a
-.Dv NULL
-pointer.
+The array must be terminated by a null pointer.
 .Pp
 There are
 a number of options, at least one of which (either
@@ -560,8 +557,7 @@ The
 .Fn fts_children
 function returns a pointer to an
 .Em FTSENT
-structure describing the first entry in a
-.Dv NULL Ns -terminatedu
+structure describing the first entry in a null-terminated
 linked list of
 the files in the directory represented by the
 .Em FTSENT
diff --git a/lib/libc/gen/getbsize.3 b/lib/libc/gen/getbsize.3
index 330b908fb2f..998f129a419 100644
--- a/lib/libc/gen/getbsize.3
+++ b/lib/libc/gen/getbsize.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getbsize.3,v 1.5 1999/05/29 22:38:34 aaron Exp $
+.\"	$OpenBSD: getbsize.3,v 1.6 1999/06/04 01:30:10 aaron Exp $
 .\"
 .\" Copyright (c) 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -52,15 +52,14 @@ for details on its use and format.
 .Pp
 The
 .Fn getbsize
-function returns a pointer to a NUL-terminated
+function returns a pointer to a null-terminated
 string describing
 the block size, something like
 .Qq 1K-blocks .
 The memory referenced by
 .Fa headerlenp
 is filled in with the length of the string (not including the
-terminating
-.Dv NULL ) .
+terminating null byte).
 The memory referenced by
 .Fa blocksizep
 is filled in with the block size, in bytes.
diff --git a/lib/libc/gen/getcap.3 b/lib/libc/gen/getcap.3
index cfe5e33ba3c..76de0a76a6f 100644
--- a/lib/libc/gen/getcap.3
+++ b/lib/libc/gen/getcap.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getcap.3,v 1.12 1999/06/03 10:03:20 aaron Exp $
+.\"	$OpenBSD: getcap.3,v 1.13 1999/06/04 01:30:10 aaron Exp $
 .\"
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -77,8 +77,7 @@ The
 function
 extracts the capability record
 .Fa name
-from the database specified by the
-.Dv NULL Ns -terminated
+from the database specified by the null-terminated
 file array
 .Fa db_array
 and returns a pointer to a
@@ -176,7 +175,7 @@ found.  The end of the capability value is signaled by a
 .Sq \&:
 or
 .Tn ASCII
-.Dv NUL
+NUL
 (see below for capability database syntax).
 .Pp
 .Fn cgetnum
@@ -196,16 +195,15 @@ retrieves the value of the string capability
 .Fa cap
 from the capability record pointed to by
 .Fa buf .
-A pointer to a decoded, NUL-terminated,
+A pointer to a decoded, null-terminated,
 .Xr malloc Ns \&'d
 copy of the string is returned in the
 .Ft char *
 pointed to by
 .Fa str .
-The number of characters in the decoded string not including the trailing
-.Dv NUL
-is returned on success, \-1 if the requested string capability couldn't
-be found, \-2 if a system error was encountered (storage allocation
+The number of characters in the decoded string (not including the trailing
+NUL) is returned on success, \-1 if the requested string capability couldn't
+be found, or \-2 if a system error was encountered (storage allocation
 failure).
 .Pp
 .Fn cgetustr
@@ -218,8 +216,7 @@ character of the capability string literally.
 and
 .Fn cgetnext
 comprise a function group that provides for sequential
-access of the
-.Dv NULL Ns -terminated
+access of the null-terminated
 array of file names,
 .Fa db_array .
 .Fn cgetfirst 
@@ -455,15 +452,12 @@ A
 may be followed by up to three octal digits directly specifies
 the numeric code for a character.  The use of
 .Tn ASCII
-.Dv NUL Ns s ,
-while easily
+NULs, while easily
 encoded, causes all sorts of problems and must be used with care since
-.Dv NUL Ns s
-are typically used to denote the end of strings; many applications
+NULs are typically used to denote the end of strings; many applications
 use
 .Sq \e\|200
-to represent a
-.Dv NUL .
+to represent a NUL.
 .Sh EXAMPLES
 .Bd -unfilled -offset indent
 example\||\|an example of binding multiple values to names:\e
diff --git a/lib/libc/gen/getcwd.3 b/lib/libc/gen/getcwd.3
index 0f0003ddfca..e3f292d61e9 100644
--- a/lib/libc/gen/getcwd.3
+++ b/lib/libc/gen/getcwd.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getcwd.3,v 1.5 1999/05/29 19:11:10 aaron Exp $
+.\"	$OpenBSD: getcwd.3,v 1.6 1999/06/04 01:30:10 aaron Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -92,9 +92,7 @@ and use the
 function to return.
 .Sh RETURN VALUES
 Upon successful completion, a pointer to the pathname is returned.
-Otherwise a
-.Dv NULL
-pointer is returned and the global variable
+Otherwise a null pointer is returned and the global variable
 .Va errno
 is set to indicate the error.
 In addition,
@@ -136,9 +134,7 @@ The
 function
 conforms to
 .St -ansiC .
-The ability to specify a
-.Dv NULL
-pointer and have
+The ability to specify a null pointer and have
 .Fn getcwd
 allocate memory as necessary is an extension.
 .Sh HISTORY
diff --git a/lib/libc/gen/getdomainname.3 b/lib/libc/gen/getdomainname.3
index 3764633ac25..923e84800e4 100644
--- a/lib/libc/gen/getdomainname.3
+++ b/lib/libc/gen/getdomainname.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getdomainname.3,v 1.13 1999/06/03 10:03:20 aaron Exp $
+.\"	$OpenBSD: getdomainname.3,v 1.14 1999/06/04 01:30:10 aaron Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -56,7 +56,7 @@ The parameter
 specifies the size of the 
 .Fa name
 array.  If insufficient space is provided, the returned name is truncated.
-The returned name is always NUL-terminated.
+The returned name is always null terminated.
 .Pp
 .Fn setdomainname
 sets the domain name of the host machine to be
diff --git a/lib/libc/gen/getfsent.3 b/lib/libc/gen/getfsent.3
index 39b0d228ee2..dd4fb08d633 100644
--- a/lib/libc/gen/getfsent.3
+++ b/lib/libc/gen/getfsent.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getfsent.3,v 1.4 1999/05/29 19:11:11 aaron Exp $
+.\"	$OpenBSD: getfsent.3,v 1.5 1999/06/04 01:30:10 aaron Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -107,10 +107,7 @@ The
 .Fn getfsspec ,
 and
 .Fn getfsfile
-functions
-return a
-.Dv NULL
-pointer on
+functions return a null pointer on
 .Dv EOF
 or error.
 The
diff --git a/lib/libc/gen/getgrent.3 b/lib/libc/gen/getgrent.3
index a0de73fcfba..007a9ff3a3d 100644
--- a/lib/libc/gen/getgrent.3
+++ b/lib/libc/gen/getgrent.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getgrent.3,v 1.3 1999/05/29 19:11:11 aaron Exp $
+.\"	$OpenBSD: getgrent.3,v 1.4 1999/06/04 01:30:11 aaron Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -123,9 +123,7 @@ The functions
 and
 .Fn getgrgid
 return a pointer to the group entry if successful; if end-of-file
-is reached or an error occurs a
-.Dv NULL
-pointer is returned.
+is reached or an error occurs a null pointer is returned.
 The
 .Fn setgroupent
 function returns the value 1 if successful, otherwise 0.
diff --git a/lib/libc/gen/gethostname.3 b/lib/libc/gen/gethostname.3
index 176d7a69fad..499e818b4f8 100644
--- a/lib/libc/gen/gethostname.3
+++ b/lib/libc/gen/gethostname.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: gethostname.3,v 1.13 1999/06/03 10:03:21 aaron Exp $
+.\"	$OpenBSD: gethostname.3,v 1.14 1999/06/04 01:30:11 aaron Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -55,7 +55,7 @@ The parameter
 specifies the size of the 
 .Fa name
 array.  If insufficient space is provided, the returned name is truncated.
-The returned name is always NUL-terminated.
+The returned name is always null terminated.
 .Pp
 .Fn sethostname
 sets the name of the host machine to be
diff --git a/lib/libc/gen/getpass.3 b/lib/libc/gen/getpass.3
index 941ec9e5c67..70e84f592fe 100644
--- a/lib/libc/gen/getpass.3
+++ b/lib/libc/gen/getpass.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getpass.3,v 1.5 1999/05/29 22:38:35 aaron Exp $
+.\"	$OpenBSD: getpass.3,v 1.6 1999/06/04 01:30:11 aaron Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -67,7 +67,7 @@ avoid leaving the cleartext password visible in the process's address
 space.
 .Sh RETURN VALUES
 .Fn getpass
-returns a pointer to the NUL-terminated password.
+returns a pointer to the null-terminated password.
 .Sh FILES
 .Bl -tag -width /dev/tty -compact
 .It Pa /dev/tty
diff --git a/lib/libc/gen/getpwent.3 b/lib/libc/gen/getpwent.3
index c0de291a2ae..d74b047cc22 100644
--- a/lib/libc/gen/getpwent.3
+++ b/lib/libc/gen/getpwent.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getpwent.3,v 1.6 1999/05/29 19:11:11 aaron Exp $
+.\"	$OpenBSD: getpwent.3,v 1.7 1999/06/04 01:30:11 aaron Exp $
 .\"
 .\" Copyright (c) 1988, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -136,9 +136,7 @@ The functions
 and
 .Fn getpwuid
 return a valid pointer to a passwd structure on success
-or a
-.Dv NULL
-pointer if end-of-file is reached or an error occurs.
+or a null pointer if end-of-file is reached or an error occurs.
 The
 .Fn setpassent
 function returns 0 on failure or 1 on success.
diff --git a/lib/libc/gen/getttyent.3 b/lib/libc/gen/getttyent.3
index 7f8bcd7da74..4d82c5026d0 100644
--- a/lib/libc/gen/getttyent.3
+++ b/lib/libc/gen/getttyent.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getttyent.3,v 1.6 1999/05/29 19:11:11 aaron Exp $
+.\"	$OpenBSD: getttyent.3,v 1.7 1999/06/04 01:30:11 aaron Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -123,9 +123,7 @@ or whitespace removed.
 .El
 .Pp
 If any of the fields pointing to character strings are unspecified,
-they are returned as
-.Dv NULL
-pointers.
+they are returned as null pointers.
 The field
 .Fa ty_status
 will be zero if no flag values are specified.
@@ -156,9 +154,7 @@ The routines
 .Fn getttyent
 and
 .Fn getttynam
-return a
-.Dv NULL
-pointer on
+return a null pointer on
 .Dv EOF
 or error.
 The
diff --git a/lib/libc/gen/getusershell.3 b/lib/libc/gen/getusershell.3
index 2159e7bea3f..78708e7886d 100644
--- a/lib/libc/gen/getusershell.3
+++ b/lib/libc/gen/getusershell.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getusershell.3,v 1.5 1999/05/29 19:11:11 aaron Exp $
+.\"	$OpenBSD: getusershell.3,v 1.6 1999/06/04 01:30:11 aaron Exp $
 .\"
 .\" Copyright (c) 1985, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -80,9 +80,7 @@ closes it.
 .Sh DIAGNOSTICS
 The routine
 .Fn getusershell
-returns a
-.Dv NULL
-pointer on
+returns a null pointer
 .Dv EOF .
 .Sh SEE ALSO
 .Xr shells 5
diff --git a/lib/libc/gen/glob.3 b/lib/libc/gen/glob.3
index 5afc633398c..3f48eb2922a 100644
--- a/lib/libc/gen/glob.3
+++ b/lib/libc/gen/glob.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: glob.3,v 1.9 1999/05/29 22:38:35 aaron Exp $
+.\"	$OpenBSD: glob.3,v 1.10 1999/06/04 01:30:11 aaron Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -141,8 +141,7 @@ field.
 If this flag is set,
 .Fa gl_offs
 is used to specify how many
-.Dv NULL
-pointers to prepend to the beginning
+null pointers to prepend to the beginning
 of the
 .Fa gl_pathv
 field.
@@ -150,13 +149,10 @@ In other words,
 .Fa gl_pathv
 will point to
 .Fa gl_offs
-.Dv NULL
-pointers,
+null pointers,
 followed by
 .Fa gl_pathc
-pathname pointers, followed by a
-.Dv NULL
-pointer.
+pathname pointers, followed by a null pointer.
 .It Dv GLOB_ERR
 Causes
 .Fn glob
@@ -269,8 +265,7 @@ to user name home directories.
 If, during the search, a directory is encountered that cannot be opened
 or read and
 .Fa errfunc
-is
-.Pf non- Dv NULL , 
+is non-null,
 .Fn glob
 calls
 .Fa (*errfunc)(path, errno) .
@@ -359,7 +354,7 @@ or
 .Ql [ ,
 cleared if not.
 .It Fa gl_pathv
-Contains a pointer to a NUL-terminated
+Contains a pointer to a null-terminated
 list of matched pathnames.
 However, if
 .Fa gl_pathc
diff --git a/lib/libc/gen/popen.3 b/lib/libc/gen/popen.3
index 1e553f5f480..f5000c955eb 100644
--- a/lib/libc/gen/popen.3
+++ b/lib/libc/gen/popen.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: popen.3,v 1.6 1999/06/03 10:03:22 aaron Exp $
+.\"	$OpenBSD: popen.3,v 1.7 1999/06/04 01:30:11 aaron Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -60,7 +60,7 @@ the resulting stream is correspondingly read-only or write-only.
 .Pp
 The
 .Fa command
-argument is a pointer to a NUL-terminated
+argument is a pointer to a null-terminated
 string containing a shell command line.
 This command is passed to
 .Pa /bin/sh
@@ -69,7 +69,7 @@ using the
 flag; interpretation, if any, is performed by the shell.
 The
 .Fa mode
-argument is a pointer to a NUL-terminated
+argument is a pointer to a null-terminated
 string which must be either
 .Qq r
 for reading
diff --git a/lib/libc/gen/psignal.3 b/lib/libc/gen/psignal.3
index b6b16ccde9f..fbf8e8b04e5 100644
--- a/lib/libc/gen/psignal.3
+++ b/lib/libc/gen/psignal.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: psignal.3,v 1.5 1999/05/29 21:24:18 aaron Exp $
+.\"	$OpenBSD: psignal.3,v 1.6 1999/06/04 01:30:11 aaron Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -55,8 +55,8 @@ and writes it to the standard error.
 .Pp
 If the argument
 .Fa s
-is
-.Pf non- Dv NULL
+is not
+.Dv NULL
 it is written to the standard error file descriptor
 prior to the message string,
 immediately followed by a colon and a space.
diff --git a/lib/libc/gen/pwcache.3 b/lib/libc/gen/pwcache.3
index 5ae01b7ae96..e350587e558 100644
--- a/lib/libc/gen/pwcache.3
+++ b/lib/libc/gen/pwcache.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pwcache.3,v 1.5 1999/05/20 14:50:35 aaron Exp $
+.\"	$OpenBSD: pwcache.3,v 1.6 1999/06/04 01:30:11 aaron Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -59,9 +59,7 @@ to a string representation of the
 .Fa uid ,
 unless the argument
 .Fa nouser
-is non-zero, in which case a
-.Dv NULL
-pointer is returned.
+is non-zero, in which case a null pointer is returned.
 .Pp
 The
 .Fn group_from_gid
@@ -78,9 +76,7 @@ to a string representation of the
 .Fa gid ,
 unless the argument
 .Fa nogroup
-is non-zero, in which case a
-.Dv NULL
-pointer is returned.
+is non-zero, in which case a null pointer is returned.
 .Sh SEE ALSO
 .Xr getgrgid 3 ,
 .Xr getpwuid 3
diff --git a/lib/libc/gen/sysctl.3 b/lib/libc/gen/sysctl.3
index c3bae681cea..2cadc4f15cb 100644
--- a/lib/libc/gen/sysctl.3
+++ b/lib/libc/gen/sysctl.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sysctl.3,v 1.17 1999/06/03 10:03:23 aaron Exp $
+.\"	$OpenBSD: sysctl.3,v 1.18 1999/06/04 01:30:11 aaron Exp $
 .\"
 .\" Copyright (c) 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -711,8 +711,7 @@ The
 array is less than two or greater than
 .Dv CTL_MAXNAME .
 .It Bq Er EINVAL
-A
-.Pf non- Dv NULL
+A non-null
 .Fa newp
 pointer is given and its specified length in
 .Fa newlen
diff --git a/lib/libc/gen/time.3 b/lib/libc/gen/time.3
index d15ca8281d3..e196d2b4869 100644
--- a/lib/libc/gen/time.3
+++ b/lib/libc/gen/time.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: time.3,v 1.5 1999/05/29 22:38:35 aaron Exp $
+.\"	$OpenBSD: time.3,v 1.6 1999/06/04 01:30:11 aaron Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -57,9 +57,7 @@ pointer
 .Fa tloc .
 If
 .Fa tloc
-is a
-.Dv NULL
-pointer, no value is stored.
+is a null pointer, no value is stored.
 .Pp
 Upon successful completion,
 .Fn time
diff --git a/lib/libc/gen/ttyname.3 b/lib/libc/gen/ttyname.3
index b2e804b6aa4..706ec728153 100644
--- a/lib/libc/gen/ttyname.3
+++ b/lib/libc/gen/ttyname.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ttyname.3,v 1.7 1999/05/29 22:38:36 aaron Exp $
+.\"	$OpenBSD: ttyname.3,v 1.8 1999/06/04 01:30:11 aaron Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -84,7 +84,7 @@ a file descriptor for which
 is true.
 The
 .Fn ttyname_r
-function stores the NUL-terminated
+function stores the null-terminated
 pathname of the terminal associated with 
 the file descriptor
 .Fa fd
@@ -107,13 +107,11 @@ The
 .Fn ttyname
 and
 .Fn ttyname_r
-functions return the NUL-terminated
+functions return the null-terminated
 name if the device is found and
 .Fn isatty
 is true; otherwise 
-a
-.Dv NULL
-pointer is returned and
+a null pointer is returned and
 .Dv errno
 is set to indicate the error.
 .Pp
@@ -149,7 +147,7 @@ argument does not refer to a terminal device.
 The value of 
 .Fa namesize
 is smaller than the length of the string to be returned including the
-terminating nul character.
+terminating NUL character.
 .El
 .Sh FILES
 .Bl -tag -width /etc/ttys -compact
diff --git a/lib/libc/gen/uname.3 b/lib/libc/gen/uname.3
index 0b6377fae3c..c32be4a21b3 100644
--- a/lib/libc/gen/uname.3
+++ b/lib/libc/gen/uname.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: uname.3,v 1.6 1999/06/03 10:03:24 aaron Exp $
+.\"	$OpenBSD: uname.3,v 1.7 1999/06/04 01:30:11 aaron Exp $
 .\"
 .\" Copyright (c) 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -44,7 +44,7 @@
 .Sh DESCRIPTION
 The
 .Fn uname
-function stores NUL-terminated strings of information identifying
+function stores null-terminated strings of information identifying
 the current system into the structure referenced by
 .Fa name .
 .Pp
diff --git a/lib/libc/gen/utime.3 b/lib/libc/gen/utime.3
index 8d05f44a105..52365bded62 100644
--- a/lib/libc/gen/utime.3
+++ b/lib/libc/gen/utime.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: utime.3,v 1.8 1999/06/03 10:03:24 aaron Exp $
+.\"	$OpenBSD: utime.3,v 1.9 1999/06/04 01:30:12 aaron Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -62,8 +62,7 @@ write the file.
 .Pp
 If 
 .Fa timep
-is 
-.Pf non- Dv NULL ,
+is non-null
 .Fa time 
 is assumed to be a pointer to a
 .Em utimbuf
diff --git a/lib/libc/gen/valloc.3 b/lib/libc/gen/valloc.3
index 963cd29859f..7e2ce6e4425 100644
--- a/lib/libc/gen/valloc.3
+++ b/lib/libc/gen/valloc.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: valloc.3,v 1.6 1999/05/29 22:38:37 aaron Exp $
+.\"	$OpenBSD: valloc.3,v 1.7 1999/06/04 01:30:12 aaron Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -64,8 +64,7 @@ The
 .Fn valloc
 function returns
 a pointer to the allocated space if successful; otherwise a
-.Dv NULL
-pointer is returned
+null pointer is returned.
 .Sh HISTORY
 The
 .Fn valloc
diff --git a/lib/libc/gen/vis.3 b/lib/libc/gen/vis.3
index 663355c95d3..aa2de9df014 100644
--- a/lib/libc/gen/vis.3
+++ b/lib/libc/gen/vis.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: vis.3,v 1.6 1999/05/29 22:38:37 aaron Exp $
+.\"	$OpenBSD: vis.3,v 1.7 1999/06/04 01:30:12 aaron Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -58,14 +58,16 @@ a string which represents the character
 If
 .Fa c
 needs no encoding, it is copied in unaltered.  The string is
-NUL-terminated and a pointer to the end of the string is
+null terminated and a pointer to the end of the string is
 returned.  The maximum length of any encoding is four
 characters (not including the trailing NUL);
 thus, when
 encoding a set of characters into a buffer, the size of the buffer should
 be four times the number of characters encoded, plus one for the trailing
 NUL.
-The flag parameter is used for altering the default range of
+The
+.Fa flag
+parameter is used for altering the default range of
 characters considered for encoding and for altering the visual
 representation.
 The additional character,
@@ -95,8 +97,8 @@ function encodes exactly
 characters from
 .Fa src
 (this
-is useful for encoding a block of data that may contain NUls).
-Both forms NUL-terminate
+is useful for encoding a block of data that may contain NULs).
+Both forms null terminate
 .Fa dst .
 The size of
 .Fa dst
@@ -105,8 +107,9 @@ of characters encoded from
 .Fa src
 (plus one for the NUL).
 Both
-forms return the number of characters in dst (not including
-the trailing NUL.
+forms return the number of characters in
+.Fa dst
+(not including the trailing NUL).
 .Pp
 The encoding is a unique, invertible representation composed entirely of
 graphic characters; it can be decoded back into the original form using 
@@ -220,7 +223,9 @@ The following sequences are used to represent the indicated characters:
 .Li \e0 Tn  - NUL No (000)
 .Ed
 .Pp
-When using this format, the nextc parameter is looked at to determine
+When using this format, the
+.Fa nextc
+parameter is looked at to determine
 if a NUL character can be encoded as
 .Ql \e0
 instead of