summaryrefslogtreecommitdiff
path: root/lib/libc
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2010-09-10 18:38:21 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2010-09-10 18:38:21 +0000
commita82cc7915115ee40094d8ba1e454fbd3abec7e8b (patch)
tree7bda42594fbe3c9701a60b332177452f792f78bd /lib/libc
parent924988b6ec2a9e6a026b5489028ad504451931ac (diff)
observe the following spelling:
- wide character (noun) - wide-character (adjective) this is the "fix of least resistance", and appears to be in line with posix style; a tiny fix still needed for curses, but i'll mail that upstream;
Diffstat (limited to 'lib/libc')
-rw-r--r--lib/libc/locale/iswalnum.36
-rw-r--r--lib/libc/locale/mbsrtowcs.312
-rw-r--r--lib/libc/locale/mbstowcs.310
-rw-r--r--lib/libc/locale/towlower.36
-rw-r--r--lib/libc/locale/wcsrtombs.310
-rw-r--r--lib/libc/locale/wcstod.36
-rw-r--r--lib/libc/locale/wcstol.36
-rw-r--r--lib/libc/locale/wcstombs.310
-rw-r--r--lib/libc/stdio/fgetws.36
-rw-r--r--lib/libc/stdio/fputws.36
-rw-r--r--lib/libc/stdio/getwc.310
-rw-r--r--lib/libc/stdio/putwc.310
-rw-r--r--lib/libc/stdio/ungetwc.316
-rw-r--r--lib/libc/string/wcstok.310
-rw-r--r--lib/libc/string/wmemchr.38
15 files changed, 66 insertions, 66 deletions
diff --git a/lib/libc/locale/iswalnum.3 b/lib/libc/locale/iswalnum.3
index c5daa9c0268..4a0eae2cf85 100644
--- a/lib/libc/locale/iswalnum.3
+++ b/lib/libc/locale/iswalnum.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: iswalnum.3,v 1.2 2007/05/31 19:19:29 jmc Exp $
+.\" $OpenBSD: iswalnum.3,v 1.3 2010/09/10 18:38:19 jmc Exp $
.\" $NetBSD: iswalnum.3,v 1.8 2003/09/08 17:54:31 wiz Exp $
.\"
.\" Copyright (c) 1991 The Regents of the University of California.
@@ -34,7 +34,7 @@
.\"
.\" @(#)isalnum.3 5.2 (Berkeley) 6/29/91
.\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: September 10 2010 $
.Dt ISWALNUM 3
.Os
.Sh NAME
@@ -50,7 +50,7 @@
.Nm iswspace ,
.Nm iswupper ,
.Nm iswxdigit
-.Nd wide character classification utilities
+.Nd wide-character classification utilities
.Sh SYNOPSIS
.Fd #include <wctype.h>
.Ft int
diff --git a/lib/libc/locale/mbsrtowcs.3 b/lib/libc/locale/mbsrtowcs.3
index 72c8215aa0d..4f88fb7603c 100644
--- a/lib/libc/locale/mbsrtowcs.3
+++ b/lib/libc/locale/mbsrtowcs.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mbsrtowcs.3,v 1.2 2007/05/31 19:19:29 jmc Exp $
+.\" $OpenBSD: mbsrtowcs.3,v 1.3 2010/09/10 18:38:19 jmc Exp $
.\" $NetBSD: mbsrtowcs.3,v 1.6 2003/09/08 17:54:31 wiz Exp $
.\"
.\" Copyright (c)2002 Citrus Project,
@@ -25,13 +25,13 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: September 10 2010 $
.Dt MBSRTOWCS 3
.Os
.\" ----------------------------------------------------------------------
.Sh NAME
.Nm mbsrtowcs
-.Nd converts a multibyte character string to a wide character string \
+.Nd converts a multibyte character string to a wide-character string \
(restartable)
.\" ----------------------------------------------------------------------
.Sh SYNOPSIS
@@ -45,7 +45,7 @@ The
.Fn mbsrtowcs
converts the multibyte character string indirectly pointed to by
.Fa s
-to the corresponding wide character string, and stores it in the
+to the corresponding wide-character string, and stores it in the
array pointed to by
.Fa pwcs .
The conversion stops due to the following reasons:
@@ -101,7 +101,7 @@ These are the special cases:
.It "s == NULL || *s == NULL"
Undefined (may cause the program to crash).
.It "pwcs == NULL"
-The conversion hass taken place, but the resultant wide character string
+The conversion has taken place, but the resultant wide-character string
was discarded.
In this case, the pointer object pointed to by
.Fa s
@@ -136,7 +136,7 @@ If
.Fa pwcs
is not null and the value returned is equal to
.Fa n ,
-the wide character string pointed to by
+the wide-character string pointed to by
.Fa pwcs
is not null terminated.
If
diff --git a/lib/libc/locale/mbstowcs.3 b/lib/libc/locale/mbstowcs.3
index 627f8aaa5d0..47a93981b93 100644
--- a/lib/libc/locale/mbstowcs.3
+++ b/lib/libc/locale/mbstowcs.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mbstowcs.3,v 1.2 2007/05/31 19:19:29 jmc Exp $
+.\" $OpenBSD: mbstowcs.3,v 1.3 2010/09/10 18:38:19 jmc Exp $
.\" $NetBSD: mbstowcs.3,v 1.6 2003/09/08 17:54:31 wiz Exp $
.\"
.\" Copyright (c)2002 Citrus Project,
@@ -25,13 +25,13 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: September 10 2010 $
.Dt MBSTOWCS 3
.Os
.\" ----------------------------------------------------------------------
.Sh NAME
.Nm mbstowcs
-.Nd converts a multibyte character string to a wide character string
+.Nd converts a multibyte character string to a wide-character string
.\" ----------------------------------------------------------------------
.Sh SYNOPSIS
.Fd #include <stdlib.h>
@@ -43,7 +43,7 @@ The
.Fn mbstowcs
converts a null-terminated multibyte character string pointed to by
.Fa s
-to the corresponding wide character string and stores it in the array
+to the corresponding wide-character string and stores it in the array
pointed to by
.Fa pwcs .
This function may modify the first at most
@@ -66,7 +66,7 @@ These are the special cases:
.Bl -tag -width 012345678901
.It pwcs == NULL
.Fn mbstowcs
-returns the number of elements to store the whole wide character string
+returns the number of elements to store the whole wide-character string
corresponding to the multibyte character string pointed to by
.Fa s .
In this case,
diff --git a/lib/libc/locale/towlower.3 b/lib/libc/locale/towlower.3
index 35f8eb15201..f491a8776e3 100644
--- a/lib/libc/locale/towlower.3
+++ b/lib/libc/locale/towlower.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: towlower.3,v 1.3 2007/05/31 19:19:29 jmc Exp $
+.\" $OpenBSD: towlower.3,v 1.4 2010/09/10 18:38:19 jmc Exp $
.\" $NetBSD: towlower.3,v 1.7 2003/09/08 17:54:31 wiz Exp $
.\"
.\" Copyright (c) 1989, 1991 The Regents of the University of California.
@@ -34,12 +34,12 @@
.\"
.\" @(#)tolower.3 5.2 (Berkeley) 6/29/91
.\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: September 10 2010 $
.Dt TOWLOWER 3
.Os
.Sh NAME
.Nm towlower
-.Nd wide character case letter conversion utilities
+.Nd wide-character case letter conversion utilities
.Sh SYNOPSIS
.In wctype.h
.Ft wint_t
diff --git a/lib/libc/locale/wcsrtombs.3 b/lib/libc/locale/wcsrtombs.3
index 722d30ac23a..012620ceb79 100644
--- a/lib/libc/locale/wcsrtombs.3
+++ b/lib/libc/locale/wcsrtombs.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: wcsrtombs.3,v 1.2 2007/05/31 19:19:29 jmc Exp $
+.\" $OpenBSD: wcsrtombs.3,v 1.3 2010/09/10 18:38:19 jmc Exp $
.\" $NetBSD: wcsrtombs.3,v 1.6 2003/09/08 17:54:32 wiz Exp $
.\"
.\" Copyright (c)2002 Citrus Project,
@@ -25,13 +25,13 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: September 10 2010 $
.Dt WCSRTOMBS 3
.Os
.\" ----------------------------------------------------------------------
.Sh NAME
.Nm wcsrtombs
-.Nd converts a wide character string to a multibyte character string \
+.Nd converts a wide-character string to a multibyte character string \
(restartable)
.\" ----------------------------------------------------------------------
.Sh SYNOPSIS
@@ -43,7 +43,7 @@
.Sh DESCRIPTION
The
.Fn wcsrtombs
-converts the null-terminated wide character string indirectly pointed to by
+converts the null-terminated wide-character string indirectly pointed to by
.Fa pwcs
to the corresponding multibyte character string,
and store it to the array pointed to by
@@ -103,7 +103,7 @@ These are the special cases:
.It "s == NULL"
.Fn wcsrtombs
returns the number of bytes to store the whole multibyte character string
-corresponding to the wide character string pointed to by
+corresponding to the wide-character string pointed to by
.Fa pwcs ,
not including the terminating null byte.
In this case,
diff --git a/lib/libc/locale/wcstod.3 b/lib/libc/locale/wcstod.3
index a2e0e79a44b..ed3fedce03d 100644
--- a/lib/libc/locale/wcstod.3
+++ b/lib/libc/locale/wcstod.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: wcstod.3,v 1.1 2009/01/13 18:44:01 kettenis Exp $
+.\" $OpenBSD: wcstod.3,v 1.2 2010/09/10 18:38:19 jmc Exp $
.\" $NetBSD: wcstod.3,v 1.5 2007/05/21 15:29:51 tnozaki Exp $
.\"
.\" Copyright (c) 2002, 2003 Tim J. Robbins
@@ -27,14 +27,14 @@
.\"
.\" $FreeBSD: wcstod.3,v 1.4 2003/05/22 13:02:27 ru Exp $
.\"
-.Dd $Mdocdate: January 13 2009 $
+.Dd $Mdocdate: September 10 2010 $
.Dt WCSTOD 3
.Os
.Sh NAME
.Nm wcstod ,
.Nm wcstof ,
.Nm wcstold
-.Nd convert wide character string to double, float or "long double"
+.Nd convert wide-character string to double, float or "long double"
.Sh SYNOPSIS
.In wchar.h
.Ft double
diff --git a/lib/libc/locale/wcstol.3 b/lib/libc/locale/wcstol.3
index e8f1dedf14b..e28e261ed85 100644
--- a/lib/libc/locale/wcstol.3
+++ b/lib/libc/locale/wcstol.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: wcstol.3,v 1.1 2008/12/20 23:08:08 kettenis Exp $
+.\" $OpenBSD: wcstol.3,v 1.2 2010/09/10 18:38:19 jmc Exp $
.\" $NetBSD: wcstol.3,v 1.2 2006/08/08 17:32:05 wiz Exp $
.\"
.\" Copyright (c) 2002 Tim J. Robbins
@@ -27,14 +27,14 @@
.\"
.\" $FreeBSD: src/lib/libc/locale/wcstol.3,v 1.4 2002/11/29 17:35:09 ru Exp $
.\"
-.Dd $Mdocdate: December 20 2008 $
+.Dd $Mdocdate: September 10 2010 $
.Dt WCSTOL 3
.Os
.Sh NAME
.Nm wcstol , wcstoul ,
.Nm wcstoll , wcstoull ,
.Nm wcstoimax , wcstoumax
-.Nd "convert a wide character string value to a long, unsigned long,"
+.Nd "convert a wide-character string value to a long, unsigned long,"
long long, unsigned long long, intmax_t or uintmax_t integer
.Sh SYNOPSIS
.In wchar.h
diff --git a/lib/libc/locale/wcstombs.3 b/lib/libc/locale/wcstombs.3
index 155dc9347ca..81ccc6086b4 100644
--- a/lib/libc/locale/wcstombs.3
+++ b/lib/libc/locale/wcstombs.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: wcstombs.3,v 1.3 2007/05/31 19:19:29 jmc Exp $
+.\" $OpenBSD: wcstombs.3,v 1.4 2010/09/10 18:38:19 jmc Exp $
.\" $NetBSD: wcstombs.3,v 1.5 2003/09/08 17:54:32 wiz Exp $
.\"
.\" Copyright (c)2002 Citrus Project,
@@ -25,13 +25,13 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: September 10 2010 $
.Dt WCSTOMBS 3
.Os
.\" ----------------------------------------------------------------------
.Sh NAME
.Nm wcstombs
-.Nd converts a wide character string to a multibyte character string
+.Nd converts a wide-character string to a multibyte character string
.\" ----------------------------------------------------------------------
.Sh SYNOPSIS
.Fd #include <stdlib.h>
@@ -40,7 +40,7 @@
.\" ----------------------------------------------------------------------
.Sh DESCRIPTION
.Fn wcstombs
-converts the null-terminated wide character string pointed to by
+converts the null-terminated wide-character string pointed to by
.Fa pwcs
to the corresponding multibyte character string,
and stores it in the array pointed to by
@@ -73,7 +73,7 @@ There are special cases:
The
.Fn wcstombs
returns the number of bytes to store the whole multibyte character string
-corresponding to the wide character string pointed to by
+corresponding to the wide-character string pointed to by
.Fa pwcs .
In this case,
.Fa n
diff --git a/lib/libc/stdio/fgetws.3 b/lib/libc/stdio/fgetws.3
index a3dfd839311..02725b4c5f7 100644
--- a/lib/libc/stdio/fgetws.3
+++ b/lib/libc/stdio/fgetws.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: fgetws.3,v 1.3 2007/05/31 19:19:31 jmc Exp $
+.\" $OpenBSD: fgetws.3,v 1.4 2010/09/10 18:38:19 jmc Exp $
.\"
.\" $NetBSD: fgetws.3,v 1.2 2003/08/07 16:43:23 agc Exp $
.\"
@@ -39,7 +39,7 @@
.\" FreeBSD: src/lib/libc/stdio/fgets.3,v 1.16 2002/05/31 05:01:17 archie Exp
.\" FreeBSD: src/lib/libc/stdio/fgetws.3,v 1.2 2002/09/06 11:23:55 tjr Exp
.\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: September 10 2010 $
.Dt FGETWS 3
.Os
.Sh NAME
@@ -58,7 +58,7 @@ reads at most one less than the number of characters specified by
.Fa n
from the given
.Fa fp
-and stores them in the wide character string
+and stores them in the wide-character string
.Fa ws .
Reading stops when a newline character is found,
at end-of-file, or error.
diff --git a/lib/libc/stdio/fputws.3 b/lib/libc/stdio/fputws.3
index ba2bceac9c5..75d5cea266c 100644
--- a/lib/libc/stdio/fputws.3
+++ b/lib/libc/stdio/fputws.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: fputws.3,v 1.3 2007/05/31 19:19:31 jmc Exp $
+.\" $OpenBSD: fputws.3,v 1.4 2010/09/10 18:38:19 jmc Exp $
.\"
.\" $NetBSD: fputws.3,v 1.2 2003/08/07 16:43:24 agc Exp $
.\"
@@ -39,7 +39,7 @@
.\" FreeBSD: src/lib/libc/stdio/fputs.3,v 1.8 2001/10/01 16:08:59 ru Exp
.\" FreeBSD: src/lib/libc/stdio/fputws.c,v 1.4 2002/09/20 13:25:40 tjr Exp
.\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: September 10 2010 $
.Dt FPUTWS 3
.Os
.Sh NAME
@@ -53,7 +53,7 @@
.Sh DESCRIPTION
The
.Fn fputws
-function writes the wide character string pointed to by
+function writes the wide-character string pointed to by
.Fa ws
to the stream pointed to by
.Fa fp .
diff --git a/lib/libc/stdio/getwc.3 b/lib/libc/stdio/getwc.3
index a6e3d1f2c12..b0b076dbe49 100644
--- a/lib/libc/stdio/getwc.3
+++ b/lib/libc/stdio/getwc.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: getwc.3,v 1.3 2007/05/31 19:19:31 jmc Exp $
+.\" $OpenBSD: getwc.3,v 1.4 2010/09/10 18:38:19 jmc Exp $
.\"
.\" $NetBSD: getwc.3,v 1.7 2003/09/08 17:54:32 wiz Exp $
.\"
@@ -35,14 +35,14 @@
.\"
.\" @(#)getc.3 8.1 (Berkeley) 6/4/93
.\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: September 10 2010 $
.Dt GETWC 3
.Os
.Sh NAME
.Nm fgetwc ,
.Nm getwc ,
.Nm getwchar
-.Nd get next wide-character from input stream
+.Nd get next wide character from input stream
.Sh SYNOPSIS
.In stdio.h
.In wchar.h
@@ -56,7 +56,7 @@
The
.Fn fgetwc
function
-obtains the next input wide-character (if present) from the stream pointed at by
+obtains the next input wide character (if present) from the stream pointed at by
.Fa stream ,
or the next character pushed back on the stream via
.Xr ungetwc 3 .
@@ -75,7 +75,7 @@ is equivalent to
.Fn getwc
with the argument stdin.
.Sh RETURN VALUES
-If successful, these routines return the next wide-character
+If successful, these routines return the next wide character
from the
.Fa stream .
If the stream is at end-of-file or a read error occurs,
diff --git a/lib/libc/stdio/putwc.3 b/lib/libc/stdio/putwc.3
index fabc6b180f8..ee780fb0f40 100644
--- a/lib/libc/stdio/putwc.3
+++ b/lib/libc/stdio/putwc.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: putwc.3,v 1.3 2007/05/31 19:19:31 jmc Exp $
+.\" $OpenBSD: putwc.3,v 1.4 2010/09/10 18:38:19 jmc Exp $
.\"
.\" $NetBSD: putwc.3,v 1.7 2003/09/08 17:54:32 wiz Exp $
.\"
@@ -35,14 +35,14 @@
.\"
.\" @(#)putc.3 8.1 (Berkeley) 6/4/93
.\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: September 10 2010 $
.Dt PUTWC 3
.Os
.Sh NAME
.Nm fputwc ,
.Nm putwc ,
.Nm putwchar
-.Nd output a wide-character to a stream
+.Nd output a wide character to a stream
.Sh SYNOPSIS
.In stdio.h
.In wchar.h
@@ -56,7 +56,7 @@
The
.Fn fputwc
function
-writes the wide-character
+writes the wide character
.Fa wc
to the output stream pointed to by
.Fa stream .
@@ -82,7 +82,7 @@ The functions,
.Fn putwc
and
.Fn putwchar
-return the wide-character written.
+return the wide character written.
If an error occurs, the value
.Dv WEOF
is returned.
diff --git a/lib/libc/stdio/ungetwc.3 b/lib/libc/stdio/ungetwc.3
index c4bfd536e5c..d5f7337e7d2 100644
--- a/lib/libc/stdio/ungetwc.3
+++ b/lib/libc/stdio/ungetwc.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ungetwc.3,v 1.3 2007/05/31 19:19:31 jmc Exp $
+.\" $OpenBSD: ungetwc.3,v 1.4 2010/09/10 18:38:19 jmc Exp $
.\"
.\" $NetBSD: ungetwc.3,v 1.7 2003/09/08 17:54:32 wiz Exp $
.\"
@@ -35,12 +35,12 @@
.\"
.\" @(#)ungetc.3 8.1 (Berkeley) 6/4/93
.\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: September 10 2010 $
.Dt UNGETWC 3
.Os
.Sh NAME
.Nm ungetwc
-.Nd un-get wide-character from input stream
+.Nd un-get wide character from input stream
.Sh SYNOPSIS
.In stdio.h
.In wchar.h
@@ -49,12 +49,12 @@
.Sh DESCRIPTION
The
.Fn ungetwc
-function pushes the wide-character
+function pushes the wide character
.Fa wc
(converted to an wchar_t)
back onto the input stream pointed to by
.Fa stream .
-The pushed-backed wide-characters will be returned by subsequent reads on the
+The pushed-backed wide characters will be returned by subsequent reads on the
stream (in reverse order).
A successful intervening call, using the same stream, to one of the file
positioning functions
@@ -62,9 +62,9 @@ positioning functions
.Xr fsetpos 3 ,
or
.Xr rewind 3
-will discard the pushed back wide-characters.
+will discard the pushed back wide characters.
.Pp
-One wide-character of push-back is guaranteed,
+One wide character of push-back is guaranteed,
but as long as there is
sufficient memory, an effectively infinite amount of pushback is allowed.
.Pp
@@ -75,7 +75,7 @@ The
.Fn ungetwc
function
returns
-the wide-character pushed back after the conversion, or
+the wide character pushed back after the conversion, or
.Dv WEOF
if the operation fails.
If the value of the argument
diff --git a/lib/libc/string/wcstok.3 b/lib/libc/string/wcstok.3
index fe65f120e3a..945ec9b990e 100644
--- a/lib/libc/string/wcstok.3
+++ b/lib/libc/string/wcstok.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: wcstok.3,v 1.5 2007/05/31 19:19:32 jmc Exp $
+.\" $OpenBSD: wcstok.3,v 1.6 2010/09/10 18:38:20 jmc Exp $
.\"
.\" $NetBSD: wcstok.3,v 1.3 2003/09/08 17:54:33 wiz Exp $
.\"
@@ -54,7 +54,7 @@
.\" Original version ID:
.\" FreeBSD: src/lib/libc/string/wcstok.3,v 1.4 2002/10/15 09:49:54 tjr Exp
.\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: September 10 2010 $
.Dt WCSTOK 3
.Os
.Sh NAME
@@ -68,7 +68,7 @@
The
.Fn wcstok
function
-is used to isolate sequential tokens in a NUL-terminated wide character
+is used to isolate sequential tokens in a NUL-terminated wide-character
string,
.Fa str .
These tokens are separated in the string by at least one of the
@@ -89,7 +89,7 @@ must be provided on each call.
.Pp
The
.Fn wcstok
-function is the wide character counterpart of the
+function is the wide-character counterpart of the
.Fn strtok_r
function.
.Sh RETURN VALUES
@@ -100,7 +100,7 @@ returns a pointer to the beginning of each subsequent token in the string,
after replacing the token itself with a NUL wide character (L'\e0').
When no more tokens remain, a null pointer is returned.
.Sh EXAMPLES
-The following code fragment splits a wide character string on
+The following code fragment splits a wide-character string on
.Tn ASCII
space, tab, and newline characters and writes the tokens to
standard output:
diff --git a/lib/libc/string/wmemchr.3 b/lib/libc/string/wmemchr.3
index 395488829d4..ff82c7b5309 100644
--- a/lib/libc/string/wmemchr.3
+++ b/lib/libc/string/wmemchr.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: wmemchr.3,v 1.3 2007/05/31 19:19:32 jmc Exp $
+.\" $OpenBSD: wmemchr.3,v 1.4 2010/09/10 18:38:20 jmc Exp $
.\"
.\" $NetBSD: wmemchr.3,v 1.9 2003/09/08 17:54:33 wiz Exp $
.\"
@@ -35,7 +35,7 @@
.\"
.\" from: @(#)strcpy.3 8.1 (Berkeley) 6/4/93
.\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: September 10 2010 $
.Dt WMEMCHR 3
.Os
.Sh NAME
@@ -59,7 +59,7 @@
.Nm wcsrchr ,
.Nm wcsspn ,
.Nm wcsstr
-.Nd wide character string manipulation operations
+.Nd wide-character string manipulation operations
.Sh SYNOPSIS
.In wchar.h
.Ft wchar_t *
@@ -103,7 +103,7 @@
.Ft wchar_t *
.Fn wcsstr "const wchar_t *s1" "const wchar_t *s2"
.Sh DESCRIPTION
-These functions implement string manipulation operations over wide character
+These functions implement string manipulation operations over wide-character
strings.
For a detailed description, refer to documents for the respective single-byte
counterpart, such as