1 files changed, 26 insertions, 12 deletions

diff --git a/src/lib/libc/string/strtok.3 b/src/lib/libc/string/strtok.3
index ed7d5158ed..fbf0abfc26 100644
--- a/src/lib/libc/string/strtok.3
+++ b/src/lib/libc/string/strtok.3
@@ -1,3 +1,5 @@
+.\"     $OpenBSD: strtok.3,v 1.20 2011/07/25 00:38:53 schwarze Exp $
+.\"
 .\" Copyright (c) 1988, 1991 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -29,9 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $OpenBSD: strtok.3,v 1.19 2007/05/31 19:19:32 jmc Exp $
-.\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: July 25 2011 $
 .Dt STRTOK 3
 .Os
 .Sh NAME
@@ -73,6 +73,14 @@ function is a version of
 .Fn strtok
 that takes an explicit context argument and is reentrant.
 .Pp
+Since
+.Fn strtok
+and
+.Fn strtok_r
+modify the string,
+.Fa str
+should not point to an area in the initialized data segment.
+.Sh RETURN VALUES
 The
 .Fn strtok
 and
@@ -82,14 +90,6 @@ in the string, after replacing the separator character itself with an
 .Tn ASCII NUL
 character.
 When no more tokens remain, a null pointer is returned.
-.Pp
-Since
-.Fn strtok
-and
-.Fn strtok_r
-modify the string,
-.Fa str
-should not point to an area in the initialized data segment.
 .Sh EXAMPLES
 The following will construct an array of pointers to each individual word in
 the string
@@ -133,12 +133,26 @@ will point to
 .Xr strrchr 3 ,
 .Xr strsep 3 ,
 .Xr strspn 3 ,
-.Xr strstr 3
+.Xr strstr 3 ,
+.Xr wcstok 3
 .Sh STANDARDS
 The
 .Fn strtok
 function conforms to
 .St -ansiC .
+.Sh HISTORY
+The
+.Fn strtok
+function first appeared in
+.At III
+and was reimplemented for
+.Bx 4.3 Tahoe .
+The
+.Fn strtok_r
+function first appeared in
+.Nx 1.3
+and was reimplemented for
+.Ox 2.7 .
 .Sh BUGS
 The System V
 .Fn strtok ,