Explicitly mention that PATH_MAX includes the NUL in the ENAMETOOLONG

description.

30 files changed, 210 insertions, 182 deletions

diff --git a/lib/libc/sys/access.2 b/lib/libc/sys/access.2
index ba655d046c5..38b7ef39683 100644
--- a/lib/libc/sys/access.2
+++ b/lib/libc/sys/access.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: access.2,v 1.24 2014/12/14 07:42:50 schwarze Exp $
+.\"	$OpenBSD: access.2,v 1.25 2015/01/19 15:54:11 millert Exp $
 .\"	$NetBSD: access.2,v 1.7 1995/02/27 12:31:44 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)access.2	8.2 (Berkeley) 4/1/94
 .\"
-.Dd $Mdocdate: December 14 2014 $
+.Dd $Mdocdate: January 19 2015 $
 .Dt ACCESS 2
 .Os
 .Sh NAME
@@ -135,10 +135,11 @@ Access to the file is denied if:
 A component of the path prefix is not a directory.
 .It Bq Er ENAMETOOLONG
 A component of a pathname exceeded
-.Dv {NAME_MAX}
-characters, or an entire path name exceeded
-.Dv {PATH_MAX}
-characters.
+.Dv NAME_MAX
+characters, or an entire pathname (including the terminating NUL)
+exceeded
+.Dv PATH_MAX
+bytes.
 .It Bq Er ENOENT
 The named file does not exist.
 .It Bq Er ELOOP
diff --git a/lib/libc/sys/acct.2 b/lib/libc/sys/acct.2
index 0ca5b754229..3b98446b48e 100644
--- a/lib/libc/sys/acct.2
+++ b/lib/libc/sys/acct.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: acct.2,v 1.16 2014/12/10 19:19:00 schwarze Exp $
+.\"	$OpenBSD: acct.2,v 1.17 2015/01/19 15:54:11 millert Exp $
 .\"	$NetBSD: acct.2,v 1.6 1995/02/27 12:31:47 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)acct.2	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: December 10 2014 $
+.Dd $Mdocdate: January 19 2015 $
 .Dt ACCT 2
 .Os
 .Sh NAME
@@ -88,10 +88,11 @@ The caller is not the superuser.
 A component of the path prefix is not a directory.
 .It Bq Er ENAMETOOLONG
 A component of a pathname exceeded
-.Dv {NAME_MAX}
-characters, or an entire path name exceeded
-.Dv {PATH_MAX}
-characters.
+.Dv NAME_MAX
+characters, or an entire pathname (including the terminating NUL)
+exceeded
+.Dv PATH_MAX
+bytes.
 .It Bq Er ENOENT
 The named file does not exist.
 .It Bq Er EACCES
diff --git a/lib/libc/sys/bind.2 b/lib/libc/sys/bind.2
index d7df8eccb60..f70856da6ca 100644
--- a/lib/libc/sys/bind.2
+++ b/lib/libc/sys/bind.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: bind.2,v 1.19 2014/12/10 07:18:44 guenther Exp $
+.\"	$OpenBSD: bind.2,v 1.20 2015/01/19 15:54:11 millert Exp $
 .\"	$NetBSD: bind.2,v 1.8 1995/10/12 15:40:46 jtc Exp $
 .\"
 .\" Copyright (c) 1983, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)bind.2	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: December 10 2014 $
+.Dd $Mdocdate: January 19 2015 $
 .Dt BIND 2
 .Os
 .Sh NAME
@@ -106,10 +106,11 @@ The following errors are specific to binding names in the
 A component of the path prefix is not a directory.
 .It Bq Er ENAMETOOLONG
 A component of a pathname exceeded
-.Dv {NAME_MAX}
-characters, or an entire path name exceeded
-.Dv {PATH_MAX}
-characters.
+.Dv NAME_MAX
+characters, or an entire pathname (including the terminating NUL)
+exceeded
+.Dv PATH_MAX
+bytes.
 .It Bq Er ENOENT
 A prefix component of the path name does not exist.
 .It Bq Er ELOOP
diff --git a/lib/libc/sys/chdir.2 b/lib/libc/sys/chdir.2
index e07f7d87db8..0afd904c0ca 100644
--- a/lib/libc/sys/chdir.2
+++ b/lib/libc/sys/chdir.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: chdir.2,v 1.12 2014/12/10 19:19:00 schwarze Exp $
+.\"	$OpenBSD: chdir.2,v 1.13 2015/01/19 15:54:11 millert Exp $
 .\"	$NetBSD: chdir.2,v 1.7 1995/02/27 12:32:00 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)chdir.2	8.2 (Berkeley) 12/11/93
 .\"
-.Dd $Mdocdate: December 10 2014 $
+.Dd $Mdocdate: January 19 2015 $
 .Dt CHDIR 2
 .Os
 .Sh NAME
@@ -76,10 +76,11 @@ one or more of the following are true:
 A component of the path prefix is not a directory.
 .It Bq Er ENAMETOOLONG
 A component of a pathname exceeded
-.Dv {NAME_MAX}
-characters, or an entire path name exceeded
-.Dv {PATH_MAX}
-characters.
+.Dv NAME_MAX
+characters, or an entire pathname (including the terminating NUL)
+exceeded
+.Dv PATH_MAX
+bytes.
 .It Bq Er ENOENT
 The named directory does not exist.
 .It Bq Er ELOOP
diff --git a/lib/libc/sys/chflags.2 b/lib/libc/sys/chflags.2
index 749537c80fe..d6b3008986a 100644
--- a/lib/libc/sys/chflags.2
+++ b/lib/libc/sys/chflags.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: chflags.2,v 1.26 2014/12/16 00:06:49 schwarze Exp $
+.\"	$OpenBSD: chflags.2,v 1.27 2015/01/19 15:54:11 millert Exp $
 .\"	$NetBSD: chflags.2,v 1.6 1995/02/27 12:32:03 cgd Exp $
 .\"
 .\" Copyright (c) 1989, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	@(#)chflags.2	8.1 (Berkeley) 6/9/93
 .\"
-.Dd $Mdocdate: December 16 2014 $
+.Dd $Mdocdate: January 19 2015 $
 .Dt CHFLAGS 2
 .Os
 .Sh NAME
@@ -145,10 +145,11 @@ will fail if:
 A component of the path prefix is not a directory.
 .It Bq Er ENAMETOOLONG
 A component of a pathname exceeded
-.Dv {NAME_MAX}
-characters, or an entire path name exceeded
-.Dv {PATH_MAX}
-characters.
+.Dv NAME_MAX
+characters, or an entire pathname (including the terminating NUL)
+exceeded
+.Dv PATH_MAX
+bytes.
 .It Bq Er ENOENT
 The named file does not exist.
 .It Bq Er EACCES
diff --git a/lib/libc/sys/chmod.2 b/lib/libc/sys/chmod.2
index c450f98cf57..44eced06f4e 100644
--- a/lib/libc/sys/chmod.2
+++ b/lib/libc/sys/chmod.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: chmod.2,v 1.26 2014/12/10 19:19:00 schwarze Exp $
+.\"	$OpenBSD: chmod.2,v 1.27 2015/01/19 15:54:11 millert Exp $
 .\"	$NetBSD: chmod.2,v 1.7 1995/02/27 12:32:06 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)chmod.2	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: December 10 2014 $
+.Dd $Mdocdate: January 19 2015 $
 .Dt CHMOD 2
 .Os
 .Sh NAME
@@ -164,10 +164,11 @@ functions will fail and the file mode will be unchanged if:
 A component of the path prefix is not a directory.
 .It Bq Er ENAMETOOLONG
 A component of a pathname exceeded
-.Dv {NAME_MAX}
-characters, or an entire path name exceeded
-.Dv {PATH_MAX}
-characters.
+.Dv NAME_MAX
+characters, or an entire pathname (including the terminating NUL)
+exceeded
+.Dv PATH_MAX
+bytes.
 .It Bq Er ENOENT
 The named file does not exist.
 .It Bq Er EACCES
diff --git a/lib/libc/sys/chown.2 b/lib/libc/sys/chown.2
index 7eec007d8e8..e683cbcf0bb 100644
--- a/lib/libc/sys/chown.2
+++ b/lib/libc/sys/chown.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: chown.2,v 1.24 2014/12/10 19:19:00 schwarze Exp $
+.\"	$OpenBSD: chown.2,v 1.25 2015/01/19 15:54:11 millert Exp $
 .\"	$NetBSD: chown.2,v 1.10 1995/10/12 15:40:47 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993, 1994
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)chown.2	8.4 (Berkeley) 4/19/94
 .\"
-.Dd $Mdocdate: December 10 2014 $
+.Dd $Mdocdate: January 19 2015 $
 .Dt CHOWN 2
 .Os
 .Sh NAME
@@ -148,10 +148,11 @@ will fail and the file or link will be unchanged if:
 A component of the path prefix is not a directory.
 .It Bq Er ENAMETOOLONG
 A component of a pathname exceeded
-.Dv {NAME_MAX}
-characters, or an entire path name exceeded
-.Dv {PATH_MAX}
-characters.
+.Dv NAME_MAX
+characters, or an entire pathname (including the terminating NUL)
+exceeded
+.Dv PATH_MAX
+bytes.
 .It Bq Er ENOENT
 The named file does not exist.
 .It Bq Er EACCES
diff --git a/lib/libc/sys/chroot.2 b/lib/libc/sys/chroot.2
index d7e31f67dfd..d1d02922df1 100644
--- a/lib/libc/sys/chroot.2
+++ b/lib/libc/sys/chroot.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: chroot.2,v 1.20 2014/12/16 00:06:49 schwarze Exp $
+.\"	$OpenBSD: chroot.2,v 1.21 2015/01/19 15:54:11 millert Exp $
 .\"	$NetBSD: chroot.2,v 1.7 1995/02/27 12:32:12 cgd Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)chroot.2	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: December 16 2014 $
+.Dd $Mdocdate: January 19 2015 $
 .Dt CHROOT 2
 .Os
 .Sh NAME
@@ -88,10 +88,11 @@ will fail and the root directory will be unchanged if:
 A component of the path name is not a directory.
 .It Bq Er ENAMETOOLONG
 A component of a pathname exceeded
-.Dv {NAME_MAX}
-characters, or an entire path name exceeded
-.Dv {PATH_MAX}
-characters.
+.Dv NAME_MAX
+characters, or an entire pathname (including the terminating NUL)
+exceeded
+.Dv PATH_MAX
+bytes.
 .It Bq Er ENOENT
 The named directory does not exist.
 .It Bq Er EACCES
diff --git a/lib/libc/sys/connect.2 b/lib/libc/sys/connect.2
index 8bb8f693ee0..b3d9970960d 100644
--- a/lib/libc/sys/connect.2
+++ b/lib/libc/sys/connect.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: connect.2,v 1.24 2013/07/17 05:42:11 schwarze Exp $
+.\"	$OpenBSD: connect.2,v 1.25 2015/01/19 15:54:11 millert Exp $
 .\"	$NetBSD: connect.2,v 1.8 1995/10/12 15:40:48 jtc Exp $
 .\"
 .\" Copyright (c) 1983, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)connect.2	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: July 17 2013 $
+.Dd $Mdocdate: January 19 2015 $
 .Dt CONNECT 2
 .Os
 .Sh NAME
@@ -142,10 +142,11 @@ IPC domain.
 A component of the path prefix is not a directory.
 .It Bq Er ENAMETOOLONG
 A component of a pathname exceeded
-.Dv {NAME_MAX}
-characters, or an entire path name exceeded
-.Dv {PATH_MAX}
-characters.
+.Dv NAME_MAX
+characters, or an entire pathname (including the terminating NUL)
+exceeded
+.Dv PATH_MAX
+bytes.
 .It Bq Er ENOENT
 The named socket does not exist.
 .It Bq Er EACCES
diff --git a/lib/libc/sys/execve.2 b/lib/libc/sys/execve.2
index 4e8e215ad7c..0d61267c87c 100644
--- a/lib/libc/sys/execve.2
+++ b/lib/libc/sys/execve.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: execve.2,v 1.41 2014/05/30 04:38:43 guenther Exp $
+.\"	$OpenBSD: execve.2,v 1.42 2015/01/19 15:54:11 millert Exp $
 .\"	$NetBSD: execve.2,v 1.9 1995/02/27 12:32:25 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)execve.2	8.3 (Berkeley) 1/24/94
 .\"
-.Dd $Mdocdate: May 30 2014 $
+.Dd $Mdocdate: January 19 2015 $
 .Dt EXECVE 2
 .Os
 .Sh NAME
@@ -249,10 +249,11 @@ will fail and return to the calling process if:
 A component of the path prefix is not a directory.
 .It Bq Er ENAMETOOLONG
 A component of a pathname exceeded
-.Dv {NAME_MAX}
-characters, or an entire path name exceeded
-.Dv {PATH_MAX}
-characters.
+.Dv NAME_MAX
+characters, or an entire pathname (including the terminating NUL)
+exceeded
+.Dv PATH_MAX
+bytes.
 .It Bq Er ENOENT
 The new process file does not exist.
 .It Bq Er ELOOP
diff --git a/lib/libc/sys/getfh.2 b/lib/libc/sys/getfh.2
index fb2ddfd75e1..68051d0d882 100644
--- a/lib/libc/sys/getfh.2
+++ b/lib/libc/sys/getfh.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getfh.2,v 1.17 2014/12/16 00:06:49 schwarze Exp $
+.\"	$OpenBSD: getfh.2,v 1.18 2015/01/19 15:54:11 millert Exp $
 .\"	$NetBSD: getfh.2,v 1.7 1995/10/12 15:40:53 jtc Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	@(#)getfh.2	8.1 (Berkeley) 6/9/93
 .\"
-.Dd $Mdocdate: December 16 2014 $
+.Dd $Mdocdate: January 19 2015 $
 .Dt GETFH 2
 .Os
 .Sh NAME
@@ -59,15 +59,12 @@ A component of the path prefix of
 .Fa path
 is not a directory.
 .It Bq Er ENAMETOOLONG
-The length of a component of
-.Fa path
-exceeds
-.Dv {NAME_MAX}
-characters, or the length of
-.Fa path
-exceeds
-.Dv {PATH_MAX}
-characters.
+A component of a pathname exceeded
+.Dv NAME_MAX
+characters, or an entire pathname (including the terminating NUL)
+exceeded
+.Dv PATH_MAX
+bytes.
 .It Bq Er ENOENT
 The file referred to by
 .Fa path
diff --git a/lib/libc/sys/ktrace.2 b/lib/libc/sys/ktrace.2
index f932969087c..895b623a25b 100644
--- a/lib/libc/sys/ktrace.2
+++ b/lib/libc/sys/ktrace.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ktrace.2,v 1.26 2014/12/14 07:42:50 schwarze Exp $
+.\"	$OpenBSD: ktrace.2,v 1.27 2015/01/19 15:54:11 millert Exp $
 .\"	$NetBSD: ktrace.2,v 1.2 1995/02/27 12:33:58 cgd Exp $
 .\"
 .\" Copyright (c) 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)ktrace.2	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: December 14 2014 $
+.Dd $Mdocdate: January 19 2015 $
 .Dt KTRACE 2
 .Os
 .Sh NAME
@@ -172,8 +172,12 @@ A component of the path prefix is not a directory.
 .It Bq Er EINVAL
 No trace points were selected.
 .It Bq Er ENAMETOOLONG
-A component of a pathname exceeded 255 characters,
-or an entire path name exceeded 1023 characters.
+A component of a pathname exceeded
+.Dv NAME_MAX
+characters, or an entire pathname (including the terminating NUL)
+exceeded
+.Dv PATH_MAX
+bytes.
 .It Bq Er ENOENT
 The named tracefile does not exist.
 .It Bq Er EACCES
diff --git a/lib/libc/sys/link.2 b/lib/libc/sys/link.2
index 128a3dbb9fd..4aa204ec28d 100644
--- a/lib/libc/sys/link.2
+++ b/lib/libc/sys/link.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: link.2,v 1.27 2014/12/10 19:19:00 schwarze Exp $
+.\"	$OpenBSD: link.2,v 1.28 2015/01/19 15:54:11 millert Exp $
 .\"	$NetBSD: link.2,v 1.7 1995/02/27 12:34:01 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)link.2	8.3 (Berkeley) 1/12/94
 .\"
-.Dd $Mdocdate: December 10 2014 $
+.Dd $Mdocdate: January 19 2015 $
 .Dt LINK 2
 .Os
 .Sh NAME
@@ -138,10 +138,11 @@ will fail and no link will be created if:
 A component of either path prefix is not a directory.
 .It Bq Er ENAMETOOLONG
 A component of a pathname exceeded
-.Dv {NAME_MAX}
-characters, or an entire path name exceeded
-.Dv {PATH_MAX}
-characters.
+.Dv NAME_MAX
+characters, or an entire pathname (including the terminating NUL)
+exceeded
+.Dv PATH_MAX
+bytes.
 .It Bq Er ENOENT
 A component of either path prefix does not exist.
 .It Bq Er EOPNOTSUPP
diff --git a/lib/libc/sys/mkdir.2 b/lib/libc/sys/mkdir.2
index 2a6dd7ce924..687a2b312b6 100644
--- a/lib/libc/sys/mkdir.2
+++ b/lib/libc/sys/mkdir.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mkdir.2,v 1.15 2014/12/10 19:19:00 schwarze Exp $
+.\"	$OpenBSD: mkdir.2,v 1.16 2015/01/19 15:54:11 millert Exp $
 .\"	$NetBSD: mkdir.2,v 1.8 1995/02/27 12:34:22 cgd Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)mkdir.2	8.2 (Berkeley) 12/11/93
 .\"
-.Dd $Mdocdate: December 10 2014 $
+.Dd $Mdocdate: January 19 2015 $
 .Dt MKDIR 2
 .Os
 .Sh NAME
@@ -93,10 +93,11 @@ will fail and no directory will be created if:
 A component of the path prefix is not a directory.
 .It Bq Er ENAMETOOLONG
 A component of a pathname exceeded
-.Dv {NAME_MAX}
-characters, or an entire path name exceeded
-.Dv {PATH_MAX}
-characters.
+.Dv NAME_MAX
+characters, or an entire pathname (including the terminating NUL)
+exceeded
+.Dv PATH_MAX
+bytes.
 .It Bq Er ENOENT
 A component of the path prefix does not exist.
 .It Bq Er EACCES
diff --git a/lib/libc/sys/mkfifo.2 b/lib/libc/sys/mkfifo.2
index cf1b4628117..88027ccf8cb 100644
--- a/lib/libc/sys/mkfifo.2
+++ b/lib/libc/sys/mkfifo.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mkfifo.2,v 1.13 2014/12/16 00:06:49 schwarze Exp $
+.\"	$OpenBSD: mkfifo.2,v 1.14 2015/01/19 15:54:11 millert Exp $
 .\"	$NetBSD: mkfifo.2,v 1.8 1995/02/27 12:34:27 cgd Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	@(#)mkfifo.2	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: December 16 2014 $
+.Dd $Mdocdate: January 19 2015 $
 .Dt MKFIFO 2
 .Os
 .Sh NAME
@@ -97,10 +97,11 @@ The kernel has not been configured to support FIFOs.
 A component of the path prefix is not a directory.
 .It Bq Er ENAMETOOLONG
 A component of a pathname exceeded
-.Dv {NAME_MAX}
-characters, or an entire path name exceeded
-.Dv {PATH_MAX}
-characters.
+.Dv NAME_MAX
+characters, or an entire pathname (including the terminating NUL)
+exceeded
+.Dv PATH_MAX
+bytes.
 .It Bq Er ENOENT
 A component of the path prefix does not exist.
 .It Bq Er EACCES
diff --git a/lib/libc/sys/mknod.2 b/lib/libc/sys/mknod.2
index b6501674e7e..d69315f63a2 100644
--- a/lib/libc/sys/mknod.2
+++ b/lib/libc/sys/mknod.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mknod.2,v 1.19 2014/10/26 05:45:43 guenther Exp $
+.\"	$OpenBSD: mknod.2,v 1.20 2015/01/19 15:54:11 millert Exp $
 .\"	$NetBSD: mknod.2,v 1.6 1995/02/27 12:34:33 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)mknod.2	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: October 26 2014 $
+.Dd $Mdocdate: January 19 2015 $
 .Dt MKNOD 2
 .Os
 .Sh NAME
@@ -120,10 +120,11 @@ is an invalid value for that file type.
 A component of the path prefix is not a directory.
 .It Bq Er ENAMETOOLONG
 A component of a pathname exceeded
-.Dv {NAME_MAX}
-characters, or an entire path name exceeded
-.Dv {PATH_MAX}
-characters.
+.Dv NAME_MAX
+characters, or an entire pathname (including the terminating NUL)
+exceeded
+.Dv PATH_MAX
+bytes.
 .It Bq Er ENOENT
 A component of the path prefix does not exist.
 .It Bq Er EACCES
diff --git a/lib/libc/sys/open.2 b/lib/libc/sys/open.2
index 742d28d2956..e92cd70c2c0 100644
--- a/lib/libc/sys/open.2
+++ b/lib/libc/sys/open.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: open.2,v 1.48 2014/11/25 15:02:13 schwarze Exp $
+.\"	$OpenBSD: open.2,v 1.49 2015/01/19 15:54:11 millert Exp $
 .\"	$NetBSD: open.2,v 1.8 1995/02/27 12:35:14 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)open.2	8.2 (Berkeley) 11/16/93
 .\"
-.Dd $Mdocdate: November 25 2014 $
+.Dd $Mdocdate: January 19 2015 $
 .Dt OPEN 2
 .Os
 .Sh NAME
@@ -244,10 +244,11 @@ is specified and
 does not name a directory.
 .It Bq Er ENAMETOOLONG
 A component of a pathname exceeded
-.Dv {NAME_MAX}
-characters, or an entire path name exceeded
-.Dv {PATH_MAX}
-characters.
+.Dv NAME_MAX
+characters, or an entire pathname (including the terminating NUL)
+exceeded
+.Dv PATH_MAX
+bytes.
 .It Bq Er ENOENT
 .Dv O_CREAT
 is not set and the named file does not exist.
diff --git a/lib/libc/sys/pathconf.2 b/lib/libc/sys/pathconf.2
index dd9c72ce7f0..ad345d7211f 100644
--- a/lib/libc/sys/pathconf.2
+++ b/lib/libc/sys/pathconf.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pathconf.2,v 1.21 2014/01/21 03:15:45 schwarze Exp $
+.\"	$OpenBSD: pathconf.2,v 1.22 2015/01/19 15:54:11 millert Exp $
 .\"	$NetBSD: pathconf.2,v 1.2 1995/02/27 12:35:22 cgd Exp $
 .\"
 .\" Copyright (c) 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	@(#)pathconf.2	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: January 21 2014 $
+.Dd $Mdocdate: January 19 2015 $
 .Dt PATHCONF 2
 .Os
 .Sh NAME
@@ -172,12 +172,13 @@ will fail if:
 A component of the path prefix is not a directory.
 .It Bq Er ENAMETOOLONG
 A component of a pathname exceeded
-.Brq Dv NAME_MAX
+.Dv NAME_MAX
 characters (but see
 .Dv _PC_NO_TRUNC
-above), or an entire path name exceeded
-.Brq Dv PATH_MAX
-characters.
+above), or an entire pathname (including the terminating NUL)
+exceeded
+.Dv PATH_MAX
+bytes.
 .It Bq Er ENOENT
 The named file does not exist.
 .It Bq Er EACCES
diff --git a/lib/libc/sys/quotactl.2 b/lib/libc/sys/quotactl.2
index a3393eb17e1..89ec2eb435d 100644
--- a/lib/libc/sys/quotactl.2
+++ b/lib/libc/sys/quotactl.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: quotactl.2,v 1.14 2014/12/16 00:06:49 schwarze Exp $
+.\"	$OpenBSD: quotactl.2,v 1.15 2015/01/19 15:54:11 millert Exp $
 .\"	$NetBSD: quotactl.2,v 1.8 1995/02/27 12:35:43 cgd Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1991, 1993
@@ -33,7 +33,7 @@
 .\"
 .\"	@(#)quotactl.2	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: December 16 2014 $
+.Dd $Mdocdate: January 19 2015 $
 .Dt QUOTACTL 2
 .Os
 .Sh NAME
@@ -165,10 +165,11 @@ Search permission is denied for a component of a path prefix.
 A component of a path prefix was not a directory.
 .It Bq Er ENAMETOOLONG
 A component of a pathname exceeded
-.Dv {NAME_MAX}
-characters, or an entire path name exceeded
-.Dv {PATH_MAX}
-characters.
+.Dv NAME_MAX
+characters, or an entire pathname (including the terminating NUL)
+exceeded
+.Dv PATH_MAX
+bytes.
 .It Bq Er ENOENT
 A filename does not exist.
 .It Bq Er ELOOP
diff --git a/lib/libc/sys/readlink.2 b/lib/libc/sys/readlink.2
index 9f12e977472..376b9a71064 100644
--- a/lib/libc/sys/readlink.2
+++ b/lib/libc/sys/readlink.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: readlink.2,v 1.17 2014/09/01 05:09:52 doug Exp $
+.\"	$OpenBSD: readlink.2,v 1.18 2015/01/19 15:54:11 millert Exp $
 .\"	$NetBSD: readlink.2,v 1.7 1995/02/27 12:35:54 cgd Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)readlink.2	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: September 1 2014 $
+.Dd $Mdocdate: January 19 2015 $
 .Dt READLINK 2
 .Os
 .Sh NAME
@@ -98,10 +98,11 @@ will fail if:
 A component of the path prefix is not a directory.
 .It Bq Er ENAMETOOLONG
 A component of a pathname exceeded
-.Dv {NAME_MAX}
-characters, or an entire path name exceeded
-.Dv {PATH_MAX}
-characters.
+.Dv NAME_MAX
+characters, or an entire pathname (including the terminating NUL)
+exceeded
+.Dv PATH_MAX
+bytes.
 .It Bq Er ENOENT
 The named file does not exist.
 .It Bq Er EACCES
diff --git a/lib/libc/sys/rename.2 b/lib/libc/sys/rename.2
index a589430736a..a7dabaa3b25 100644
--- a/lib/libc/sys/rename.2
+++ b/lib/libc/sys/rename.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rename.2,v 1.20 2014/12/10 19:19:00 schwarze Exp $
+.\"	$OpenBSD: rename.2,v 1.21 2015/01/19 15:54:11 millert Exp $
 .\"	$NetBSD: rename.2,v 1.7 1995/02/27 12:36:15 cgd Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)rename.2	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: December 10 2014 $
+.Dd $Mdocdate: January 19 2015 $
 .Dt RENAME 2
 .Os
 .Sh NAME
@@ -118,10 +118,11 @@ affected if:
 .Bl -tag -width Er
 .It Bq Er ENAMETOOLONG
 A component of a pathname exceeded
-.Dv {NAME_MAX}
-characters, or an entire path name exceeded
-.Dv {PATH_MAX}
-characters.
+.Dv NAME_MAX
+characters, or an entire pathname (including the terminating NUL)
+exceeded
+.Dv PATH_MAX
+bytes.
 .It Bq Er ENOENT
 A component of the
 .Fa from
diff --git a/lib/libc/sys/revoke.2 b/lib/libc/sys/revoke.2
index 6f98990e6c4..9c380a74b93 100644
--- a/lib/libc/sys/revoke.2
+++ b/lib/libc/sys/revoke.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: revoke.2,v 1.10 2014/12/10 19:19:00 schwarze Exp $
+.\"	$OpenBSD: revoke.2,v 1.11 2015/01/19 15:54:11 millert Exp $
 .\"	$NetBSD: revoke.2,v 1.3 1995/10/12 15:41:11 jtc Exp $
 .\"
 .\" Copyright (c) 1993
@@ -33,7 +33,7 @@
 .\"
 .\"     @(#)revoke.2	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: December 10 2014 $
+.Dd $Mdocdate: January 19 2015 $
 .Dt REVOKE 2
 .Os
 .Sh NAME
@@ -74,8 +74,12 @@ Access to the named file is revoked unless one of the following:
 .It Bq Er ENOTDIR
 A component of the path prefix is not a directory.
 .It Bq Er ENAMETOOLONG
-A component of a pathname exceeded 255 characters,
-or an entire path name exceeded 1024 characters.
+A component of a pathname exceeded
+.Dv NAME_MAX
+characters, or an entire pathname (including the terminating NUL)
+exceeded
+.Dv PATH_MAX
+bytes.
 .It Bq Er ENOENT
 The named file or a component of the path name does not exist.
 .It Bq Er EACCES
diff --git a/lib/libc/sys/rmdir.2 b/lib/libc/sys/rmdir.2
index cbfbfc51f41..02f9947be48 100644
--- a/lib/libc/sys/rmdir.2
+++ b/lib/libc/sys/rmdir.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rmdir.2,v 1.12 2014/09/09 07:36:42 guenther Exp $
+.\"	$OpenBSD: rmdir.2,v 1.13 2015/01/19 15:54:11 millert Exp $
 .\"	$NetBSD: rmdir.2,v 1.7 1995/02/27 12:36:30 cgd Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)rmdir.2	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: September 9 2014 $
+.Dd $Mdocdate: January 19 2015 $
 .Dt RMDIR 2
 .Os
 .Sh NAME
@@ -69,10 +69,11 @@ The named file is removed unless:
 A component of the path is not a directory.
 .It Bq Er ENAMETOOLONG
 A component of a pathname exceeded
-.Dv {NAME_MAX}
-characters, or an entire path name exceeded
-.Dv {PATH_MAX}
-characters.
+.Dv NAME_MAX
+characters, or an entire pathname (including the terminating NUL)
+exceeded
+.Dv PATH_MAX
+bytes.
 .It Bq Er ENOENT
 The named directory does not exist.
 .It Bq Er ELOOP
diff --git a/lib/libc/sys/stat.2 b/lib/libc/sys/stat.2
index 7fa0f68d525..70fb506051a 100644
--- a/lib/libc/sys/stat.2
+++ b/lib/libc/sys/stat.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: stat.2,v 1.43 2014/12/10 19:19:00 schwarze Exp $
+.\"	$OpenBSD: stat.2,v 1.44 2015/01/19 15:54:11 millert Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"     @(#)stat.2	8.3 (Berkeley) 4/19/94
 .\"
-.Dd $Mdocdate: December 10 2014 $
+.Dd $Mdocdate: January 19 2015 $
 .Dt STAT 2
 .Os
 .Sh NAME
@@ -296,9 +296,10 @@ A component of the path prefix is not a directory.
 .It Bq Er ENAMETOOLONG
 A component of a pathname exceeded
 .Dv NAME_MAX
-characters, or an entire path name exceeded
+characters, or an entire pathname (including the terminating NUL)
+exceeded
 .Dv PATH_MAX
-characters.
+bytes.
 .It Bq Er ENOENT
 A component of
 .Em name
diff --git a/lib/libc/sys/statfs.2 b/lib/libc/sys/statfs.2
index c1e576ff7c6..de9d6d593f6 100644
--- a/lib/libc/sys/statfs.2
+++ b/lib/libc/sys/statfs.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: statfs.2,v 1.24 2014/12/16 00:06:49 schwarze Exp $
+.\"	$OpenBSD: statfs.2,v 1.25 2015/01/19 15:54:12 millert Exp $
 .\"	$NetBSD: statfs.2,v 1.10 1995/06/29 11:40:48 cgd Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	@(#)statfs.2	8.3 (Berkeley) 2/11/94
 .\"
-.Dd $Mdocdate: December 16 2014 $
+.Dd $Mdocdate: January 19 2015 $
 .Dt STATFS 2
 .Os
 .Sh NAME
@@ -109,15 +109,12 @@ A component of the path prefix of
 .Fa path
 is not a directory.
 .It Bq Er ENAMETOOLONG
-The length of a component of
-.Fa path
-exceeds
-.Dv {NAME_MAX}
-characters, or the length of
-.Fa path
-exceeds
-.Dv {PATH_MAX}
-characters.
+A component of a pathname exceeded
+.Dv NAME_MAX
+characters, or an entire pathname (including the terminating NUL)
+exceeded
+.Dv PATH_MAX
+bytes.
 .It Bq Er ENOENT
 The file referred to by
 .Fa path
diff --git a/lib/libc/sys/swapctl.2 b/lib/libc/sys/swapctl.2
index d2b90608d89..463c8f7ba41 100644
--- a/lib/libc/sys/swapctl.2
+++ b/lib/libc/sys/swapctl.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: swapctl.2,v 1.20 2014/12/13 10:27:50 schwarze Exp $
+.\"	$OpenBSD: swapctl.2,v 1.21 2015/01/19 15:54:12 millert Exp $
 .\"	$NetBSD: swapctl.2,v 1.10 1998/08/29 17:11:09 mrg Exp $
 .\"
 .\" Copyright (c) 1997 Matthew R. Green
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: December 13 2014 $
+.Dd $Mdocdate: January 19 2015 $
 .Dt SWAPCTL 2
 .Os
 .Sh NAME
@@ -175,9 +175,10 @@ A component of the path prefix is not a directory.
 .It Bq Er ENAMETOOLONG
 A component of a pathname exceeded
 .Dv NAME_MAX
-characters, or an entire path name exceeded
+characters, or an entire pathname (including the terminating NUL)
+exceeded
 .Dv PATH_MAX
-characters.
+bytes.
 .It Bq Er ENOENT
 The named device does not exist.
 For the
diff --git a/lib/libc/sys/symlink.2 b/lib/libc/sys/symlink.2
index 8b5d60eeabb..21c182b5df3 100644
--- a/lib/libc/sys/symlink.2
+++ b/lib/libc/sys/symlink.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: symlink.2,v 1.18 2014/12/10 19:19:00 schwarze Exp $
+.\"	$OpenBSD: symlink.2,v 1.19 2015/01/19 15:54:12 millert Exp $
 .\"	$NetBSD: symlink.2,v 1.7 1995/02/27 12:38:34 cgd Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)symlink.2	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: December 10 2014 $
+.Dd $Mdocdate: January 19 2015 $
 .Dt SYMLINK 2
 .Os
 .Sh NAME
@@ -95,10 +95,11 @@ A component of the
 prefix is not a directory.
 .It Bq Er ENAMETOOLONG
 A component of a pathname exceeded
-.Dv {NAME_MAX}
-characters, or an entire path name exceeded
-.Dv {PATH_MAX}
-characters.
+.Dv NAME_MAX
+characters, or an entire pathname (including the terminating NUL)
+exceeded
+.Dv PATH_MAX
+bytes.
 .It Bq Er ENOENT
 The named file does not exist.
 .It Bq Er EACCES
diff --git a/lib/libc/sys/truncate.2 b/lib/libc/sys/truncate.2
index 11b375beb84..8cca00e3119 100644
--- a/lib/libc/sys/truncate.2
+++ b/lib/libc/sys/truncate.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: truncate.2,v 1.16 2014/12/10 19:19:00 schwarze Exp $
+.\"	$OpenBSD: truncate.2,v 1.17 2015/01/19 15:54:12 millert Exp $
 .\"	$NetBSD: truncate.2,v 1.7 1995/02/27 12:39:00 cgd Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)truncate.2	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: December 10 2014 $
+.Dd $Mdocdate: January 19 2015 $
 .Dt TRUNCATE 2
 .Os
 .Sh NAME
@@ -82,10 +82,11 @@ may return the following errors:
 A component of the path prefix is not a directory.
 .It Bq Er ENAMETOOLONG
 A component of a pathname exceeded
-.Dv {NAME_MAX}
-characters, or an entire path name exceeded
-.Dv {PATH_MAX}
-characters.
+.Dv NAME_MAX
+characters, or an entire pathname (including the terminating NUL)
+exceeded
+.Dv PATH_MAX
+bytes.
 .It Bq Er ENOENT
 The named file does not exist.
 .It Bq Er EACCES
diff --git a/lib/libc/sys/unlink.2 b/lib/libc/sys/unlink.2
index ec02a7b6241..5a1b7120609 100644
--- a/lib/libc/sys/unlink.2
+++ b/lib/libc/sys/unlink.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: unlink.2,v 1.25 2014/09/09 07:36:42 guenther Exp $
+.\"	$OpenBSD: unlink.2,v 1.26 2015/01/19 15:54:12 millert Exp $
 .\"	$NetBSD: unlink.2,v 1.7 1995/02/27 12:39:13 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)unlink.2	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: September 9 2014 $
+.Dd $Mdocdate: January 19 2015 $
 .Dt UNLINK 2
 .Os
 .Sh NAME
@@ -117,10 +117,11 @@ functions will fail if:
 A component of the path prefix is not a directory.
 .It Bq Er ENAMETOOLONG
 A component of a pathname exceeded
-.Dv {NAME_MAX}
-characters, or an entire path name exceeded
-.Dv {PATH_MAX}
-characters.
+.Dv NAME_MAX
+characters, or an entire pathname (including the terminating NUL)
+exceeded
+.Dv PATH_MAX
+bytes.
 .It Bq Er ENOENT
 The named file does not exist.
 .It Bq Er EACCES
diff --git a/lib/libc/sys/utimes.2 b/lib/libc/sys/utimes.2
index 61ded7b53d6..cdb7ea82b9d 100644
--- a/lib/libc/sys/utimes.2
+++ b/lib/libc/sys/utimes.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: utimes.2,v 1.22 2014/12/10 19:19:00 schwarze Exp $
+.\"	$OpenBSD: utimes.2,v 1.23 2015/01/19 15:54:12 millert Exp $
 .\"	$NetBSD: utimes.2,v 1.9 1996/04/23 10:34:16 mycroft Exp $
 .\"
 .\" Copyright (c) 1990, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)utimes.2	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: December 10 2014 $
+.Dd $Mdocdate: January 19 2015 $
 .Dt UTIMES 2
 .Os
 .Sh NAME
@@ -164,10 +164,11 @@ An I/O error occurred while reading or writing the affected inode.
 Too many symbolic links were encountered in translating the pathname.
 .It Bq Er ENAMETOOLONG
 A component of a pathname exceeded
-.Dv {NAME_MAX}
-characters, or an entire path name exceeded
-.Dv {PATH_MAX}
-characters.
+.Dv NAME_MAX
+characters, or an entire pathname (including the terminating NUL)
+exceeded
+.Dv PATH_MAX
+bytes.
 .It Bq Er ENOENT
 The named file does not exist.
 .It Bq Er ENOTDIR