aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Kerrisk <mtk.manpages@gmail.com>2011-09-28 05:46:39 +0200
committerMichael Kerrisk <mtk.manpages@gmail.com>2011-09-28 06:20:52 +0200
commite9c23bc636426366d659809bc99cd84661e86464 (patch)
tree1881c18a967109517e7881109e9a3171200d5788
parent24511dc14f814eaa7e4306cd32fe401b06c22a2a (diff)
downloadman-pages-e9c23bc636426366d659809bc99cd84661e86464.tar.gz
fgetws.3, fputws.3, mbrtowc.3, mbsnrtowcs.3, mbsrtowcs.3, mbstowcs.3, wcpcpy.3, wcpncpy.3, wcrtomb.3, wcscat.3, wcscpy.3, wcslen.3, wcsncat.3, wcsncmp.3, wcsncpy.3, wcsnlen.3, wcsnrtombs.3, wcsrtombs.3, wcsstr.3, wcstok.3, wcstombs.3, wcwidth.3: Global fix: consistent use of "null wide character"
Bring more consistency to the discussion of "[terminating] null wide character" by writing (at least in the initial use in a page) "[terminating] null wide character (L'\0')". Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
-rw-r--r--man3/fgetws.34
-rw-r--r--man3/fputws.34
-rw-r--r--man3/mbrtowc.35
-rw-r--r--man3/mbsnrtowcs.36
-rw-r--r--man3/mbsrtowcs.38
-rw-r--r--man3/mbstowcs.36
-rw-r--r--man3/wcpcpy.37
-rw-r--r--man3/wcpncpy.34
-rw-r--r--man3/wcrtomb.38
-rw-r--r--man3/wcscat.34
-rw-r--r--man3/wcscpy.35
-rw-r--r--man3/wcslen.34
-rw-r--r--man3/wcsncat.34
-rw-r--r--man3/wcsncmp.34
-rw-r--r--man3/wcsncpy.38
-rw-r--r--man3/wcsnlen.37
-rw-r--r--man3/wcsnrtombs.310
-rw-r--r--man3/wcsrtombs.310
-rw-r--r--man3/wcsstr.36
-rw-r--r--man3/wcstok.34
-rw-r--r--man3/wcstombs.36
-rw-r--r--man3/wcwidth.34
22 files changed, 66 insertions, 62 deletions
diff --git a/man3/fgetws.3 b/man3/fgetws.3
index 99a5d8253a..1d63668920 100644
--- a/man3/fgetws.3
+++ b/man3/fgetws.3
@@ -13,7 +13,7 @@
.\" ISO/IEC 9899:1999
.\"
.\" Modified Tue Oct 16 23:18:40 BST 2001 by John Levon <moz@compsoc.man.ac.uk>
-.TH FGETWS 3 1999-07-25 "GNU" "Linux Programmer's Manual"
+.TH FGETWS 3 2011-09-28 "GNU" "Linux Programmer's Manual"
.SH NAME
fgetws \- read a wide-character string from a FILE stream
.SH SYNOPSIS
@@ -31,7 +31,7 @@ of the
function.
It reads a string of at most \fIn\-1\fP wide characters into the
wide-character array pointed to by \fIws\fP,
-and adds a terminating L\(aq\\0\(aq character.
+and adds a terminating null wide character (L\(aq\\0\(aq).
It stops reading wide characters after it has encountered and
stored a newline wide character.
It also stops when end of stream is reached.
diff --git a/man3/fputws.3 b/man3/fputws.3
index 833631e25e..bfa0b11a2c 100644
--- a/man3/fputws.3
+++ b/man3/fputws.3
@@ -11,7 +11,7 @@
.\" OpenGroup's Single UNIX specification http://www.UNIX-systems.org/online.html
.\" ISO/IEC 9899:1999
.\"
-.TH FPUTWS 3 1999-07-25 "GNU" "Linux Programmer's Manual"
+.TH FPUTWS 3 2011-09-28 "GNU" "Linux Programmer's Manual"
.SH NAME
fputws \- write a wide-character string to a FILE stream
.SH SYNOPSIS
@@ -28,7 +28,7 @@ the
.BR fputs (3)
function.
It writes the wide-character string starting at \fIws\fP, up to but
-not including the terminating L\(aq\\0\(aq character, to \fIstream\fP.
+not including the terminating null wide character (L\(aq\\0\(aq), to \fIstream\fP.
.PP
For a nonlocking counterpart, see
.BR unlocked_stdio (3).
diff --git a/man3/mbrtowc.3 b/man3/mbrtowc.3
index f233baff8f..3d8393c336 100644
--- a/man3/mbrtowc.3
+++ b/man3/mbrtowc.3
@@ -12,7 +12,7 @@
.\" http://www.UNIX-systems.org/online.html
.\" ISO/IEC 9899:1999
.\"
-.TH MBRTOWC 3 2001-11-22 "GNU" "Linux Programmer's Manual"
+.TH MBRTOWC 3 2011-09-28 "GNU" "Linux Programmer's Manual"
.SH NAME
mbrtowc \- convert a multibyte sequence to a wide character
.SH SYNOPSIS
@@ -33,7 +33,8 @@ multibyte character, converts it to a wide character and stores it at
\fI*pwc\fP.
It updates the shift state \fI*ps\fP.
If the converted wide
-character is not L\(aq\\0\(aq, it returns the number of bytes that were consumed
+character is not L\(aq\\0\(aq (the null wide character),
+it returns the number of bytes that were consumed
from \fIs\fP.
If the converted wide character is L\(aq\\0\(aq, it resets the shift
state \fI*ps\fP to the initial state and returns 0.
diff --git a/man3/mbsnrtowcs.3 b/man3/mbsnrtowcs.3
index 5118b351d7..df79c2f929 100644
--- a/man3/mbsnrtowcs.3
+++ b/man3/mbsnrtowcs.3
@@ -10,7 +10,7 @@
.\" Dinkumware C library reference http://www.dinkumware.com/
.\" OpenGroup's Single UNIX specification http://www.UNIX-systems.org/online.html
.\"
-.TH MBSNRTOWCS 3 2010-09-15 "GNU" "Linux Programmer's Manual"
+.TH MBSNRTOWCS 3 2011-09-28 "GNU" "Linux Programmer's Manual"
.SH NAME
mbsnrtowcs \- convert a multibyte string to a wide-character string
.SH SYNOPSIS
@@ -80,12 +80,12 @@ next multibyte sequence to be converted, and the number of wide characters
written to \fIdest\fP is returned.
.IP 3.
The multibyte string has been completely converted, including the
-terminating \(aq\\0\(aq
+terminating null wide character (\(aq\\0\(aq)
(which has the side effect of bringing back \fI*ps\fP to the
initial state).
In this case \fI*src\fP is set to NULL, and the number of wide
characters written to \fIdest\fP,
-excluding the terminating L\(aq\\0\(aq character,
+excluding the terminating null wide character,
is returned.
.PP
If \fIdest\fP is NULL, \fIlen\fP is ignored, and the conversion proceeds as
diff --git a/man3/mbsrtowcs.3 b/man3/mbsrtowcs.3
index 4c93acc9e3..fcf47caaef 100644
--- a/man3/mbsrtowcs.3
+++ b/man3/mbsrtowcs.3
@@ -11,7 +11,7 @@
.\" OpenGroup's Single UNIX specification http://www.UNIX-systems.org/online.html
.\" ISO/IEC 9899:1999
.\"
-.TH MBSRTOWCS 3 1999-07-25 "GNU" "Linux Programmer's Manual"
+.TH MBSRTOWCS 3 2011-09-28 "GNU" "Linux Programmer's Manual"
.SH NAME
mbsrtowcs \- convert a multibyte string to a wide-character string
.SH SYNOPSIS
@@ -51,12 +51,12 @@ multibyte sequence to be converted,
and the number of wide characters written to \fIdest\fP is returned.
.IP 3.
The multibyte string has been completely converted, including the
-terminating \(aq\\0\(aq (which has the side
+terminating null wide character (\(aq\\0\(aq), which has the side
effect of bringing back \fI*ps\fP to the
-initial state).
+initial state.
In this case \fI*src\fP is set to NULL, and the number of wide
characters written to \fIdest\fP,
-excluding the terminating L\(aq\\0\(aq character, is returned.
+excluding the terminating null wide character, is returned.
.PP
If \fIdest\fP is NULL, \fIlen\fP is ignored,
and the conversion proceeds as above,
diff --git a/man3/mbstowcs.3 b/man3/mbstowcs.3
index e95a7a37a0..a8f8deb9d5 100644
--- a/man3/mbstowcs.3
+++ b/man3/mbstowcs.3
@@ -11,7 +11,7 @@
.\" OpenGroup's Single UNIX specification http://www.UNIX-systems.org/online.html
.\" ISO/IEC 9899:1999
.\"
-.TH MBSTOWCS 3 2011-09-10 "GNU" "Linux Programmer's Manual"
+.TH MBSTOWCS 3 2011-09-28 "GNU" "Linux Programmer's Manual"
.SH NAME
mbstowcs \- convert a multibyte string to a wide-character string
.SH SYNOPSIS
@@ -42,9 +42,9 @@ case the number of wide characters written to \fIdest\fP is returned, but the
shift state at this point is lost.
.IP 3.
The multibyte string has been completely converted, including the
-terminating \(aq\\0\(aq.
+terminating null wide character (\(aq\\0\(aq).
In this case the number of wide characters written to
-\fIdest\fP, excluding the terminating L\(aq\\0\(aq character, is returned.
+\fIdest\fP, excluding the terminating null wide character, is returned.
.PP
The programmer must ensure that there is room for at least \fIn\fP wide
characters at \fIdest\fP.
diff --git a/man3/wcpcpy.3 b/man3/wcpcpy.3
index d61d0c9020..b333e4883b 100644
--- a/man3/wcpcpy.3
+++ b/man3/wcpcpy.3
@@ -10,7 +10,7 @@
.\" Dinkumware C library reference http://www.dinkumware.com/
.\" OpenGroup's Single UNIX specification http://www.UNIX-systems.org/online.html
.\"
-.TH WCPCPY 3 2010-09-15 "GNU" "Linux Programmer's Manual"
+.TH WCPCPY 3 2011-09-28 "GNU" "Linux Programmer's Manual"
.SH NAME
wcpcpy \- copy a wide-character string, returning a pointer to its end
.SH SYNOPSIS
@@ -45,7 +45,8 @@ function is the wide-character equivalent of the
.BR stpcpy (3)
function.
It copies the wide-character string pointed to by \fIsrc\fP,
-including the terminating L\(aq\\0\(aq character, to the array pointed to by
+including the terminating null wide character (L\(aq\\0\(aq),cw
+to the array pointed to by
\fIdest\fP.
.PP
The strings may not overlap.
@@ -56,7 +57,7 @@ wide characters at \fIdest\fP.
.SH "RETURN VALUE"
.BR wcpcpy ()
returns a pointer to the end of the wide-character string
-\fIdest\fP, that is, a pointer to the terminating L\(aq\\0\(aq character.
+\fIdest\fP, that is, a pointer to the terminating null wide character.
.SH "CONFORMING TO"
This function is a GNU extension.
.SH "SEE ALSO"
diff --git a/man3/wcpncpy.3 b/man3/wcpncpy.3
index fd2f2ad362..80647770cd 100644
--- a/man3/wcpncpy.3
+++ b/man3/wcpncpy.3
@@ -10,7 +10,7 @@
.\" Dinkumware C library reference http://www.dinkumware.com/
.\" OpenGroup's Single UNIX specification http://www.UNIX-systems.org/online.html
.\"
-.TH WCPNCPY 3 2010-09-15 "GNU" "Linux Programmer's Manual"
+.TH WCPNCPY 3 2011-09-28 "GNU" "Linux Programmer's Manual"
.SH NAME
wcpncpy \- copy a fixed-size string of wide characters,
returning a pointer to its end
@@ -48,7 +48,7 @@ of the
function.
It copies at most \fIn\fP wide characters from the wide-character
string pointed to by \fIsrc\fP,
-including the terminating L\(aq\\0\(aq character,
+including the terminating null wide (L\(aq\\0\(aq),
to the array pointed to by \fIdest\fP.
Exactly \fIn\fP wide characters are
written at \fIdest\fP.
diff --git a/man3/wcrtomb.3 b/man3/wcrtomb.3
index beee81cf6d..216fba7933 100644
--- a/man3/wcrtomb.3
+++ b/man3/wcrtomb.3
@@ -11,7 +11,7 @@
.\" OpenGroup's Single UNIX specification http://www.UNIX-systems.org/online.html
.\" ISO/IEC 9899:1999
.\"
-.TH WCRTOMB 3 1999-07-25 "GNU" "Linux Programmer's Manual"
+.TH WCRTOMB 3 2011-09-28 "GNU" "Linux Programmer's Manual"
.SH NAME
wcrtomb \- convert a wide character to a multibyte sequence
.SH SYNOPSIS
@@ -22,8 +22,7 @@ wcrtomb \- convert a wide character to a multibyte sequence
.fi
.SH DESCRIPTION
The main case for this function is when \fIs\fP is
-not NULL and \fIwc\fP is not
-L\(aq\\0\(aq.
+not NULL and \fIwc\fP is not a null wide character (L\(aq\\0\(aq).
In this case, the
.BR wcrtomb ()
function
@@ -36,7 +35,8 @@ returns the length of said multibyte representation,
that is, the number of bytes
written at \fIs\fP.
.PP
-A different case is when \fIs\fP is not NULL but \fIwc\fP is L\(aq\\0\(aq.
+A different case is when \fIs\fP is not NULL,
+ but \fIwc\fP is a null wide character (L\(aq\\0\(aq).
In this
case the
.BR wcrtomb ()
diff --git a/man3/wcscat.3 b/man3/wcscat.3
index c8d1c96aca..580dc86b9c 100644
--- a/man3/wcscat.3
+++ b/man3/wcscat.3
@@ -11,7 +11,7 @@
.\" OpenGroup's Single UNIX specification http://www.UNIX-systems.org/online.html
.\" ISO/IEC 9899:1999
.\"
-.TH WCSCAT 3 1999-07-25 "GNU" "Linux Programmer's Manual"
+.TH WCSCAT 3 2011-09-28 "GNU" "Linux Programmer's Manual"
.SH NAME
wcscat \- concatenate two wide-character strings
.SH SYNOPSIS
@@ -28,7 +28,7 @@ of the
.BR strcat (3)
function.
It copies the wide-character string pointed to by \fIsrc\fP,
-including the terminating L\(aq\\0\(aq character,
+including the terminating null wide character (L\(aq\\0\(aq),
to the end of the wide-character string pointed to by \fIdest\fP.
.PP
The strings may not overlap.
diff --git a/man3/wcscpy.3 b/man3/wcscpy.3
index 7b54df4147..49541934bd 100644
--- a/man3/wcscpy.3
+++ b/man3/wcscpy.3
@@ -11,7 +11,7 @@
.\" OpenGroup's Single UNIX specification http://www.UNIX-systems.org/online.html
.\" ISO/IEC 9899:1999
.\"
-.TH WCSCPY 3 1999-07-25 "GNU" "Linux Programmer's Manual"
+.TH WCSCPY 3 2011-09-28 "GNU" "Linux Programmer's Manual"
.SH NAME
wcscpy \- copy a wide-character string
.SH SYNOPSIS
@@ -28,7 +28,8 @@ of the
.BR strcpy (3)
function.
It copies the wide-character string pointed to by \fIsrc\fP,
-including the terminating L\(aq\\0\(aq character, to the array pointed to by
+including the terminating null wide character (L\(aq\\0\(aq),
+to the array pointed to by
\fIdest\fP.
.PP
The strings may not overlap.
diff --git a/man3/wcslen.3 b/man3/wcslen.3
index ae2ab579cf..8d34867923 100644
--- a/man3/wcslen.3
+++ b/man3/wcslen.3
@@ -11,7 +11,7 @@
.\" OpenGroup's Single UNIX specification http://www.UNIX-systems.org/online.html
.\" ISO/IEC 9899:1999
.\"
-.TH WCSLEN 3 1999-07-25 "GNU" "Linux Programmer's Manual"
+.TH WCSLEN 3 2011-09-28 "GNU" "Linux Programmer's Manual"
.SH NAME
wcslen \- determine the length of a wide-character string
.SH SYNOPSIS
@@ -28,7 +28,7 @@ of the
.BR strlen (3)
function.
It determines the length of the wide-character string pointed to
-by \fIs\fP, excluding the terminating L\(aq\\0\(aq character.
+by \fIs\fP, excluding the terminating null wide chharacter (L\(aq\\0\(aq).
.SH "RETURN VALUE"
The
.BR wcslen ()
diff --git a/man3/wcsncat.3 b/man3/wcsncat.3
index 02ce547a7d..64c7749bd8 100644
--- a/man3/wcsncat.3
+++ b/man3/wcsncat.3
@@ -11,7 +11,7 @@
.\" OpenGroup's Single UNIX specification http://www.UNIX-systems.org/online.html
.\" ISO/IEC 9899:1999
.\"
-.TH WCSNCAT 3 1999-07-25 "GNU" "Linux Programmer's Manual"
+.TH WCSNCAT 3 2011-09-28 "GNU" "Linux Programmer's Manual"
.SH NAME
wcsncat \- concatenate two wide-character strings
.SH SYNOPSIS
@@ -28,7 +28,7 @@ function is the wide-character equivalent of the
function.
It copies at most \fIn\fP wide characters from the wide-character
string pointed to by \fIsrc\fP to the end of the wide-character string pointed
-to by \fIdest\fP, and adds a terminating L\(aq\\0\(aq character.
+to by \fIdest\fP, and adds a terminating null wide character (L\(aq\\0\(aq).
.PP
The strings may not overlap.
.PP
diff --git a/man3/wcsncmp.3 b/man3/wcsncmp.3
index b7e6a1f91e..dcb1d943a2 100644
--- a/man3/wcsncmp.3
+++ b/man3/wcsncmp.3
@@ -11,7 +11,7 @@
.\" OpenGroup's Single UNIX specification http://www.UNIX-systems.org/online.html
.\" ISO/IEC 9899:1999
.\"
-.TH WCSNCMP 3 1999-07-25 "GNU" "Linux Programmer's Manual"
+.TH WCSNCMP 3 2011-09-28 "GNU" "Linux Programmer's Manual"
.SH NAME
wcsncmp \- compare two fixed-size wide-character strings
.SH SYNOPSIS
@@ -30,7 +30,7 @@ It compares the wide-character string pointed to by \fIs1\fP and the
wide-character string pointed to by \fIs2\fP, but at most \fIn\fP wide
characters from each string.
In each string, the comparison extends only up
-to the first occurrence of a L\(aq\\0\(aq character, if any.
+to the first occurrence of a nulll wide character (L\(aq\\0\(aq), if any.
.SH "RETURN VALUE"
The
.BR wcsncmp ()
diff --git a/man3/wcsncpy.3 b/man3/wcsncpy.3
index 3368cf1b1b..7ff29ae6ed 100644
--- a/man3/wcsncpy.3
+++ b/man3/wcsncpy.3
@@ -11,7 +11,7 @@
.\" OpenGroup's Single UNIX specification http://www.UNIX-systems.org/online.html
.\" ISO/IEC 9899:1999
.\"
-.TH WCSNCPY 3 1999-07-25 "GNU" "Linux Programmer's Manual"
+.TH WCSNCPY 3 2011-09-28 "GNU" "Linux Programmer's Manual"
.SH NAME
wcsncpy \- copy a fixed-size string of wide characters
.SH SYNOPSIS
@@ -28,17 +28,17 @@ function is the wide-character equivalent of the
function.
It copies at most \fIn\fP wide characters from the wide-character
string pointed to by \fIsrc\fP,
-including the terminating L\(aq\\0\(aq character,
+including the terminating null wide character (L\(aq\\0\(aq),
to the array pointed to by \fIdest\fP.
Exactly \fIn\fP wide characters are
written at \fIdest\fP.
If the length \fIwcslen(src)\fP is smaller than \fIn\fP,
the remaining wide characters in the array
pointed to by \fIdest\fP are filled
-with L\(aq\\0\(aq characters.
+with null wide characters.
If the length \fIwcslen(src)\fP is greater or equal
to \fIn\fP, the string pointed to by \fIdest\fP
-will not be L\(aq\\0\(aq terminated.
+will not be terminated by a null wide character.
.PP
The strings may not overlap.
.PP
diff --git a/man3/wcsnlen.3 b/man3/wcsnlen.3
index 9f6829f3a7..1d591305b1 100644
--- a/man3/wcsnlen.3
+++ b/man3/wcsnlen.3
@@ -10,7 +10,7 @@
.\" Dinkumware C library reference http://www.dinkumware.com/
.\" OpenGroup's Single UNIX specification http://www.UNIX-systems.org/online.html
.\"
-.TH WCSNLEN 3 2011-09-21 "GNU" "Linux Programmer's Manual"
+.TH WCSNLEN 3 2011-09-28 "GNU" "Linux Programmer's Manual"
.SH NAME
wcsnlen \- determine the length of a fixed-size wide-character string
.SH SYNOPSIS
@@ -46,7 +46,8 @@ of the
.BR strnlen (3)
function.
It returns the number of wide-characters in the string pointed to by
-\fIs\fP, not including the terminating L\(aq\\0\(aq character, but at most
+\fIs\fP, not including the terminating null wide character (L\(aq\\0\(aq),
+but at most
\fImaxlen\fP
wide characters (note: this parameter is not a byte count).
In doing this,
@@ -57,7 +58,7 @@ wide characters at \fIs\fP and never beyond \fIs+maxlen\fP.
The
.BR wcsnlen ()
function returns \fIwcslen(s)\fP, if that is less than
-\fImaxlen\fP, or \fImaxlen\fP if there is no L\(aq\\0\(aq character among the
+\fImaxlen\fP, or \fImaxlen\fP if there is no null wide character among the
first \fImaxlen\fP wide characters pointed to by \fIs\fP.
.SH VERSIONS
The
diff --git a/man3/wcsnrtombs.3 b/man3/wcsnrtombs.3
index 39fc29fbfa..456c56375a 100644
--- a/man3/wcsnrtombs.3
+++ b/man3/wcsnrtombs.3
@@ -10,7 +10,7 @@
.\" Dinkumware C library reference http://www.dinkumware.com/
.\" OpenGroup's Single UNIX specification http://www.UNIX-systems.org/online.html
.\"
-.TH WCSNRTOMBS 3 2010-09-15 "GNU" "Linux Programmer's Manual"
+.TH WCSNRTOMBS 3 2011-09-28 "GNU" "Linux Programmer's Manual"
.SH NAME
wcsnrtombs \- convert a wide-character string to a multibyte string
.SH SYNOPSIS
@@ -76,17 +76,17 @@ is returned,
and \fIerrno\fP is set to \fBEILSEQ\fP.
.PP
2. \fInwc\fP wide characters have been
-converted without encountering a L\(aq\\0\(aq,
+converted without encountering a null wide character (L\(aq\\0\(aq),
or the length limit forces a stop.
In this case \fI*src\fP is left pointing
to the next wide character to be converted, and the number of bytes written
to \fIdest\fP is returned.
.PP
3. The wide-character string has been completely converted, including the
-terminating L\(aq\\0\(aq (which has the side effect of bringing back \fI*ps\fP
+terminating null wide character (which has the side effect of bringing back \fI*ps\fP
to the initial state).
In this case \fI*src\fP is set to NULL, and the number
-of bytes written to \fIdest\fP, excluding the terminating \(aq\\0\(aq byte, is
+of bytes written to \fIdest\fP, excluding the terminating null, is
returned.
.PP
If \fIdest\fP is NULL, \fIlen\fP is ignored,
@@ -106,7 +106,7 @@ The
function returns
the number of bytes that make up the
converted part of multibyte sequence,
-not including the terminating null byte.
+not including the terminating null.
If a wide character was encountered which
could not be converted,
.I (size_t)\ \-1
diff --git a/man3/wcsrtombs.3 b/man3/wcsrtombs.3
index f2a34deda5..cbc6a9379b 100644
--- a/man3/wcsrtombs.3
+++ b/man3/wcsrtombs.3
@@ -11,7 +11,7 @@
.\" OpenGroup's Single UNIX specification http://www.UNIX-systems.org/online.html
.\" ISO/IEC 9899:1999
.\"
-.TH WCSRTOMBS 3 1999-07-25 "GNU" "Linux Programmer's Manual"
+.TH WCSRTOMBS 3 2011-09-28 "GNU" "Linux Programmer's Manual"
.SH NAME
wcsrtombs \- convert a wide-character string to a multibyte string
.SH SYNOPSIS
@@ -57,11 +57,11 @@ and the number of bytes written to
\fIdest\fP is returned.
.PP
3. The wide-character string has been completely converted, including the
-terminating L\(aq\\0\(aq (which has the side effect of bringing back \fI*ps\fP
-to the initial state).
+terminating null wide character (L\(aq\\0\(aq),
+which has the side effect of bringing back \fI*ps\fP
+to the initial state.
In this case \fI*src\fP is set to NULL, and the number
-of bytes written to \fIdest\fP, excluding the terminating \(aq\\0\(aq byte, is
-returned.
+of bytes written to \fIdest\fP, excluding the terminating null, is returned.
.PP
If \fIdest\fP is NULL, \fIlen\fP is ignored,
and the conversion proceeds as above, except that the converted bytes
diff --git a/man3/wcsstr.3 b/man3/wcsstr.3
index 8a8a696a72..242cbaf21e 100644
--- a/man3/wcsstr.3
+++ b/man3/wcsstr.3
@@ -11,7 +11,7 @@
.\" OpenGroup's Single UNIX specification http://www.UNIX-systems.org/online.html
.\" ISO/IEC 9899:1999
.\"
-.TH WCSSTR 3 1999-07-25 "GNU" "Linux Programmer's Manual"
+.TH WCSSTR 3 2011-09-28 "GNU" "Linux Programmer's Manual"
.SH NAME
wcsstr \- locate a substring in a wide-character string
.SH SYNOPSIS
@@ -27,8 +27,8 @@ function is the wide-character equivalent of the
.BR strstr (3)
function.
It searches for the first occurrence of the wide-character string
-\fIneedle\fP (without its terminating L\(aq\\0\(aq character) as a substring in
-the wide-character string \fIhaystack\fP.
+\fIneedle\fP (without its terminating null wide character (L\(aq\\0\(aq))
+as a substring in the wide-character string \fIhaystack\fP.
.SH "RETURN VALUE"
The
.BR wcsstr ()
diff --git a/man3/wcstok.3 b/man3/wcstok.3
index 6f8ee0ada1..aeb3af953d 100644
--- a/man3/wcstok.3
+++ b/man3/wcstok.3
@@ -11,7 +11,7 @@
.\" OpenGroup's Single UNIX specification http://www.UNIX-systems.org/online.html
.\" ISO/IEC 9899:1999
.\"
-.TH WCSTOK 3 1999-07-25 "GNU" "Linux Programmer's Manual"
+.TH WCSTOK 3 2011-09-28 "GNU" "Linux Programmer's Manual"
.SH NAME
wcstok \- split wide-character string into tokens
.SH SYNOPSIS
@@ -49,7 +49,7 @@ Otherwise, the
function recognizes the beginning of a token
and returns a pointer to it, but before doing that, it zero-terminates the
token by replacing the next wide-character which occurs in \fIdelim\fP with
-a L\(aq\\0\(aq character,
+a null wide character (L\(aq\\0\(aq),
and it updates \fI*ptr\fP so that subsequent calls will
continue searching after the end of recognized token.
.SH "RETURN VALUE"
diff --git a/man3/wcstombs.3 b/man3/wcstombs.3
index bf70f4cba5..7e89e2f7a7 100644
--- a/man3/wcstombs.3
+++ b/man3/wcstombs.3
@@ -11,7 +11,7 @@
.\" OpenGroup's Single UNIX specification http://www.UNIX-systems.org/online.html
.\" ISO/IEC 9899:1999
.\"
-.TH WCSTOMBS 3 2011-09-08 "GNU" "Linux Programmer's Manual"
+.TH WCSTOMBS 3 2011-09-28 "GNU" "Linux Programmer's Manual"
.SH NAME
wcstombs \- convert a wide-character string to a multibyte string
.SH SYNOPSIS
@@ -42,10 +42,10 @@ In this case the number of bytes written to
\fIdest\fP is returned, but the shift state at this point is lost.
.PP
3. The wide-character string has been completely converted, including the
-terminating L\(aq\\0\(aq.
+terminating null wide character (L\(aq\\0\(aq).
In this case the conversion ends in the initial state.
The number of bytes written to \fIdest\fP,
-excluding the terminating \(aq\\0\(aq byte, is returned.
+excluding the terminating null, is returned.
.PP
The programmer must ensure that there is room for at least \fIn\fP bytes
at \fIdest\fP.
diff --git a/man3/wcwidth.3 b/man3/wcwidth.3
index 1579362b97..2cabe6d609 100644
--- a/man3/wcwidth.3
+++ b/man3/wcwidth.3
@@ -10,7 +10,7 @@
.\" Dinkumware C library reference http://www.dinkumware.com/
.\" OpenGroup's Single UNIX specification http://www.UNIX-systems.org/online.html
.\"
-.TH WCWIDTH 3 1999-07-25 "GNU" "Linux Programmer's Manual"
+.TH WCWIDTH 3 2011-09-28 "GNU" "Linux Programmer's Manual"
.SH NAME
wcwidth \- determine columns needed for a wide character
.SH SYNOPSIS
@@ -27,7 +27,7 @@ function returns the number of columns
needed to represent the wide character \fIc\fP.
If \fIc\fP is a printable wide character, the value
is at least 0.
-If \fIc\fP is L\(aq\\0\(aq, the value is 0.
+If \fIc\fP is null wide character (L\(aq\\0\(aq), the value is 0.
Otherwise \-1 is returned.
.SH "RETURN VALUE"
The