22 files changed, 33 insertions, 28 deletions
diff --git a/lib/libc/string/bstring.3 b/lib/libc/string/bstring.3
index c79eb94a3172..28ec676ec6f6 100644
--- a/lib/libc/string/bstring.3
+++ b/lib/libc/string/bstring.3
@@ -45,7 +45,7 @@
 .Nm memchr ,
 .Nm memcmp ,
 .Nm memcpy ,
-.Nm memmove,
+.Nm memmove ,
 .Nm memset
 .Nd byte string operations
 .Sh LIBRARY
@@ -97,7 +97,7 @@ The functions
 and
 .Fn memset
 conform to
-.St -ansiC .
+.St -isoC .
 .Sh HISTORY
 The functions
 .Fn bzero
diff --git a/lib/libc/string/memchr.3 b/lib/libc/string/memchr.3
index 2da1b839df56..fc56ee67698d 100644
--- a/lib/libc/string/memchr.3
+++ b/lib/libc/string/memchr.3
@@ -79,4 +79,4 @@ The
 .Fn memchr
 function
 conforms to
-.St -ansiC .
+.St -isoC .
diff --git a/lib/libc/string/memcmp.3 b/lib/libc/string/memcmp.3
index 1f38f3ac6705..1bf3c8f3e742 100644
--- a/lib/libc/string/memcmp.3
+++ b/lib/libc/string/memcmp.3
@@ -82,4 +82,4 @@ The
 .Fn memcmp
 function
 conforms to
-.St -ansiC .
+.St -isoC .
diff --git a/lib/libc/string/memcpy.3 b/lib/libc/string/memcpy.3
index 6b8ce3059afc..267b49679ce5 100644
--- a/lib/libc/string/memcpy.3
+++ b/lib/libc/string/memcpy.3
@@ -74,7 +74,7 @@ The
 .Fn memcpy
 function
 conforms to
-.St -ansiC .
+.St -isoC .
 .Sh BUGS
 In this implementation
 .Fn memcpy
diff --git a/lib/libc/string/memmove.3 b/lib/libc/string/memmove.3
index 71626f7890e4..8d14efc68412 100644
--- a/lib/libc/string/memmove.3
+++ b/lib/libc/string/memmove.3
@@ -75,4 +75,4 @@ The
 .Fn memmove
 function
 conforms to
-.St -ansiC .
+.St -isoC .
diff --git a/lib/libc/string/memset.3 b/lib/libc/string/memset.3
index 2a1253ed6f76..baeca31fc26d 100644
--- a/lib/libc/string/memset.3
+++ b/lib/libc/string/memset.3
@@ -70,4 +70,4 @@ The
 .Fn memset
 function
 conforms to
-.St -ansiC .
+.St -isoC .
diff --git a/lib/libc/string/strcat.3 b/lib/libc/string/strcat.3
index 77fd0d275d67..fed597941e68 100644
--- a/lib/libc/string/strcat.3
+++ b/lib/libc/string/strcat.3
@@ -74,7 +74,7 @@ appends not more than
 characters from
 .Fa append ,
 and then adds a terminating
-.Ql \e0.
+.Ql \e0 .
 .Sh RETURN VALUES
 The
 .Fn strcat
@@ -98,4 +98,4 @@ and
 .Fn strncat
 functions
 conform to
-.St -ansiC .
+.St -isoC .
diff --git a/lib/libc/string/strchr.3 b/lib/libc/string/strchr.3
index 86c8bbc43f36..9d8d6eec4541 100644
--- a/lib/libc/string/strchr.3
+++ b/lib/libc/string/strchr.3
@@ -85,4 +85,4 @@ The
 .Fn strchr
 function
 conforms to
-.St -ansiC .
+.St -isoC .
diff --git a/lib/libc/string/strcmp.3 b/lib/libc/string/strcmp.3
index 22fe3d0370e5..60d99c480762 100644
--- a/lib/libc/string/strcmp.3
+++ b/lib/libc/string/strcmp.3
@@ -94,4 +94,4 @@ and
 .Fn strncmp
 functions
 conform to
-.St -ansiC .
+.St -isoC .
diff --git a/lib/libc/string/strcoll.3 b/lib/libc/string/strcoll.3
index b6d5c75ca182..40cb2f5569f3 100644
--- a/lib/libc/string/strcoll.3
+++ b/lib/libc/string/strcoll.3
@@ -72,4 +72,4 @@ The
 .Fn strcoll
 function
 conforms to
-.St -ansiC .
+.St -isoC .
diff --git a/lib/libc/string/strcpy.3 b/lib/libc/string/strcpy.3
index 4c9212a6c9e8..cb38dce6b8fe 100644
--- a/lib/libc/string/strcpy.3
+++ b/lib/libc/string/strcpy.3
@@ -122,4 +122,4 @@ and
 .Fn strncpy
 functions
 conform to
-.St -ansiC .
+.St -isoC .
diff --git a/lib/libc/string/strcspn.3 b/lib/libc/string/strcspn.3
index 1a222a320614..c3eff53b8efe 100644
--- a/lib/libc/string/strcspn.3
+++ b/lib/libc/string/strcspn.3
@@ -82,4 +82,4 @@ The
 .Fn strcspn
 function
 conforms to
-.St -ansiC .
+.St -isoC .
diff --git a/lib/libc/string/strerror.3 b/lib/libc/string/strerror.3
index 762f89d35ee6..1799c1c6a8b2 100644
--- a/lib/libc/string/strerror.3
+++ b/lib/libc/string/strerror.3
@@ -95,7 +95,7 @@ If
 .Fa errnum
 is not a recognized error number,
 the error message string will contain
-.Dq Li "Unknown error:\0
+.Dq Li "Unknown error:\ "
 followed by the error number in decimal.
 .Pp
 The message strings can be accessed directly using the external
diff --git a/lib/libc/string/string.3 b/lib/libc/string/string.3
index 8a83a3732cb8..6a3457c12b9b 100644
--- a/lib/libc/string/string.3
+++ b/lib/libc/string/string.3
@@ -44,14 +44,14 @@
 .Nm strrchr ,
 .Nm strcmp ,
 .Nm strncmp ,
-.Nm strcasecmp,
+.Nm strcasecmp ,
 .Nm strncasecmp ,
 .Nm strcpy ,
 .Nm strncpy ,
 .Nm strerror ,
 .Nm strlen ,
 .Nm strpbrk ,
-.Nm strsep,
+.Nm strsep ,
 .Nm strspn ,
 .Nm strcspn ,
 .Nm strstr ,
@@ -155,4 +155,4 @@ and
 .Fn strtok
 functions
 conform to
-.St -ansiC .
+.St -isoC .
diff --git a/lib/libc/string/strlen.3 b/lib/libc/string/strlen.3
index 31e8ae171def..07b8f6129b52 100644
--- a/lib/libc/string/strlen.3
+++ b/lib/libc/string/strlen.3
@@ -70,4 +70,4 @@ The
 .Fn strlen
 function
 conforms to
-.St -ansiC .
+.St -isoC .
diff --git a/lib/libc/string/strpbrk.3 b/lib/libc/string/strpbrk.3
index b9a3e5227b65..b7fa71005480 100644
--- a/lib/libc/string/strpbrk.3
+++ b/lib/libc/string/strpbrk.3
@@ -77,4 +77,4 @@ The
 .Fn strpbrk
 function
 conforms to
-.St -ansiC .
+.St -isoC .
diff --git a/lib/libc/string/strrchr.3 b/lib/libc/string/strrchr.3
index d2d8c9eae9c6..4d5ec0352354 100644
--- a/lib/libc/string/strrchr.3
+++ b/lib/libc/string/strrchr.3
@@ -88,4 +88,4 @@ The
 .Fn strrchr
 function
 conforms to
-.St -ansiC .
+.St -isoC .
diff --git a/lib/libc/string/strsep.3 b/lib/libc/string/strsep.3
index bc945f7a6cf9..e0fe12402aab 100644
--- a/lib/libc/string/strsep.3
+++ b/lib/libc/string/strsep.3
@@ -111,7 +111,7 @@ function.
 While the
 .Fn strtok
 function should be preferred for portability reasons (it conforms to
-.St -ansiC )
+.St -isoC )
 it is unable to handle empty fields, i.e. detect fields delimited by
 two adjacent delimiter characters, or to be used for more than a single
 string at a time.
diff --git a/lib/libc/string/strspn.3 b/lib/libc/string/strspn.3
index 41d70ce5f8cf..07e4158c43f8 100644
--- a/lib/libc/string/strspn.3
+++ b/lib/libc/string/strspn.3
@@ -77,4 +77,4 @@ The
 .Fn strspn
 function
 conforms to
-.St -ansiC .
+.St -isoC .
diff --git a/lib/libc/string/strstr.3 b/lib/libc/string/strstr.3
index f6b20caa3d0b..c29ddf14536e 100644
--- a/lib/libc/string/strstr.3
+++ b/lib/libc/string/strstr.3
@@ -86,4 +86,4 @@ The
 .Fn strstr
 function
 conforms to
-.St -ansiC .
+.St -isoC .
diff --git a/lib/libc/string/strtok.3 b/lib/libc/string/strtok.3
index cc8c1d2f6240..297c982ec6c2 100644
--- a/lib/libc/string/strtok.3
+++ b/lib/libc/string/strtok.3
@@ -54,7 +54,7 @@
 .Dt STRTOK 3
 .Os FreeBSD
 .Sh NAME
-.Nm strtok, strtok_r
+.Nm strtok , strtok_r
 .Nd string tokens
 .Sh LIBRARY
 .Lb libc
@@ -87,6 +87,9 @@ The separator string,
 .Fa sep ,
 must be supplied each time, and may change between calls.
 .Pp
+The implementation will behave as if no library function calls
+.Fn strtok .
+.Pp
 The
 .Fn strtok_r
 function is a reentrant version of
@@ -147,7 +150,7 @@ The
 .Fn strtok
 function
 conforms to
-.St -ansiC .
+.St -isoC .
 .Sh BUGS
 The System V
 .Fn strtok ,
@@ -162,7 +165,9 @@ Since this implementation always alters the next starting point,
 such a sequence of calls would always return
 .Dv NULL .
 .Sh AUTHORS
-.An Wes Peters, Softweyr LLC: Aq wes@softweyr.com
+.An Wes Peters ,
+Softweyr LLC:
+.Aq wes@softweyr.com
 .Pp
 Based on the 
 .Fx 3.0
diff --git a/lib/libc/string/strxfrm.3 b/lib/libc/string/strxfrm.3
index 5e496587289e..617cf7c19c22 100644
--- a/lib/libc/string/strxfrm.3
+++ b/lib/libc/string/strxfrm.3
@@ -96,4 +96,4 @@ The
 .Fn strxfrm
 function
 conforms to
-.St -ansiC .
+.St -isoC .