34 files changed, 175 insertions, 174 deletions
diff --git a/man3/fgetwc.3 b/man3/fgetwc.3
index 9c001139d1..9b4d3df41a 100644
--- a/man3/fgetwc.3
+++ b/man3/fgetwc.3
@@ -31,7 +31,7 @@ of the \fBfgetc\fP() function.
 It reads a wide character from \fIstream\fP and returns it.
 If the end of stream is reached, or if \fIferror(stream)\fP becomes true,
 it returns WEOF.
-If a wide character conversion error occurs, it sets
+If a wide-character conversion error occurs, it sets
 \fIerrno\fP to \fBEILSEQ\fP and returns WEOF.
 .PP
 The \fBgetwc\fP() function or macro functions identically to \fBfgetwc\fP().
diff --git a/man3/fgetws.3 b/man3/fgetws.3
index ae372fc6f0..dd3b086ed1 100644
--- a/man3/fgetws.3
+++ b/man3/fgetws.3
@@ -14,7 +14,7 @@
 .\" 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"
 .SH NAME
-fgetws \- read a wide character string from a FILE stream
+fgetws \- read a wide-character string from a FILE stream
 .SH SYNOPSIS
 .nf
 .B #include <wchar.h>
@@ -51,7 +51,7 @@ In the absence of additional information passed to the
 call, it is
 reasonable to expect that \fBfgetws\fP()
 will actually read a multibyte string
-from the stream and then convert it to a wide character string.
+from the stream and then convert it to a wide-character string.
 .PP
 This function is unreliable,
 because it does not permit to deal properly with
diff --git a/man3/fputwc.3 b/man3/fputwc.3
index 42dbfba982..6a922281aa 100644
--- a/man3/fputwc.3
+++ b/man3/fputwc.3
@@ -29,7 +29,7 @@ equivalent of the \fBfputc\fP() function.
 It writes the wide character \fIwc\fP to \fIstream\fP.
 If
 \fIferror(stream)\fP becomes true, it returns WEOF.
-If a wide character conversion error occurs,
+If a wide-character conversion error occurs,
 it sets \fIerrno\fP to \fBEILSEQ\fP and returns WEOF.
 Otherwise it returns \fIwc\fP.
 .PP
diff --git a/man3/fputws.3 b/man3/fputws.3
index 0e55dee751..ec2ffc6f1c 100644
--- a/man3/fputws.3
+++ b/man3/fputws.3
@@ -13,7 +13,7 @@
 .\"
 .TH FPUTWS 3  1999-07-25 "GNU" "Linux Programmer's Manual"
 .SH NAME
-fputws \- write a wide character string to a FILE stream
+fputws \- write a wide-character string to a FILE stream
 .SH SYNOPSIS
 .nf
 .B #include <wchar.h>
@@ -23,7 +23,7 @@ fputws \- write a wide character string to a FILE stream
 .SH DESCRIPTION
 The \fBfputws\fP() function is the wide-character equivalent of
 the \fBfputs\fP() function.
-It writes the wide character string starting at \fIws\fP, up to but
+It writes the wide-character string starting at \fIws\fP, up to but
 not including the terminating L'\\0' character, to \fIstream\fP.
 .PP
 For a non-locking counterpart, see
@@ -42,7 +42,7 @@ In the absence of additional information passed to the
 .BR fopen ()
 call, it is
 reasonable to expect that \fBfputws\fP() will actually write the multibyte
-string corresponding to the wide character string \fIws\fP.
+string corresponding to the wide-character string \fIws\fP.
 .SH "SEE ALSO"
 .BR fputwc (3),
 .BR unlocked_stdio (3)
diff --git a/man3/fwide.3 b/man3/fwide.3
index 36d67dd0fd..f514c17d7d 100644
--- a/man3/fwide.3
+++ b/man3/fwide.3
@@ -24,14 +24,14 @@ fwide \- set and determine the orientation of a FILE stream
 When \fImode\fP is zero, the \fBfwide\fP() function determines the current
 orientation of \fIstream\fP.
 It returns a value > 0 if \fIstream\fP is
-wide-character oriented, i.e. if wide character I/O is permitted but char
+wide-character oriented, i.e. if wide-character I/O is permitted but char
 I/O is disallowed.
 It returns a value < 0 if \fIstream\fP is byte oriented,
-i.e. if char I/O is permitted but wide character I/O is disallowed.
+i.e. if char I/O is permitted but wide-character I/O is disallowed.
 It
 returns zero if \fIstream\fP has no orientation yet; in this case the next
 I/O operation might change the orientation (to byte oriented if it is a char
-I/O operation, or to wide-character oriented if it is a wide character I/O
+I/O operation, or to wide-character oriented if it is a wide-character I/O
 operation).
 .PP
 Once a stream has an orientation, it cannot be changed and persists until
diff --git a/man3/getwchar.3 b/man3/getwchar.3
index 595008317c..4798016546 100644
--- a/man3/getwchar.3
+++ b/man3/getwchar.3
@@ -28,7 +28,7 @@ It reads a wide character from \fBstdin\fP and returns
 it.
 If the end of stream is reached, or if \fIferror(stdin)\fP becomes
 true, it returns WEOF.
-If a wide character conversion error occurs, it sets
+If a wide-character conversion error occurs, it sets
 \fIerrno\fP to \fBEILSEQ\fP and returns WEOF.
 .PP
 For a non-locking counterpart, see
diff --git a/man3/iswalnum.3 b/man3/iswalnum.3
index d948d74334..4f05c6ac8c 100644
--- a/man3/iswalnum.3
+++ b/man3/iswalnum.3
@@ -24,33 +24,33 @@ iswalnum \- test for alphanumeric wide character
 The \fBiswalnum\fP() function is the wide-character equivalent of the
 \fBisalnum\fP() function.
 It tests whether \fIwc\fP is a wide character
-belonging to the wide character class "alnum".
+belonging to the wide-character class "alnum".
 .PP
-The wide character class "alnum" is a subclass of the wide character class
-"graph", and therefore also a subclass of the wide character class "print".
+The wide-character class "alnum" is a subclass of the wide-character class
+"graph", and therefore also a subclass of the wide-character class "print".
 .PP
-Being a subclass of the wide character class "print",
-the wide character class
-"alnum" is disjoint from the wide character class "cntrl".
+Being a subclass of the wide-character class "print",
+the wide-character class
+"alnum" is disjoint from the wide-character class "cntrl".
 .PP
-Being a subclass of the wide character class "graph",
-the wide character class "alnum" is disjoint from
-the wide character class "space" and its subclass "blank".
+Being a subclass of the wide-character class "graph",
+the wide-character class "alnum" is disjoint from
+the wide-character class "space" and its subclass "blank".
 .PP
-The wide character class "alnum" is disjoint from the wide character class
+The wide-character class "alnum" is disjoint from the wide-character class
 "punct".
 .PP
-The wide character class "alnum" is the union of the wide character classes
+The wide-character class "alnum" is the union of the wide-character classes
 "alpha" and "digit".
-As such, it also contains the wide character class
+As such, it also contains the wide-character class
 "xdigit".
 .PP
-The wide character class "alnum" always contains at least the letters 'A'
+The wide-character class "alnum" always contains at least the letters 'A'
 to 'Z', 'a' to 'z' and the digits '0' to '9'.
 .SH "RETURN VALUE"
 The \fBiswalnum\fP() function returns non-zero
 if \fIwc\fP is a wide character
-belonging to the wide character class "alnum".
+belonging to the wide-character class "alnum".
 Otherwise it returns zero.
 .SH "CONFORMING TO"
 C99.
diff --git a/man3/iswalpha.3 b/man3/iswalpha.3
index 158d5c2bec..e2eb50923a 100644
--- a/man3/iswalpha.3
+++ b/man3/iswalpha.3
@@ -24,37 +24,37 @@ iswalpha \- test for alphabetic wide character
 The \fBiswalpha\fP() function is the wide-character equivalent of the
 \fBisalpha\fP() function.
 It tests whether \fIwc\fP is a wide character
-belonging to the wide character class "alpha".
+belonging to the wide-character class "alpha".
 .PP
-The wide character class "alpha" is a subclass of the 
-wide character class "alnum", 
-and therefore also a subclass of the wide character class "graph" and
-of the wide character class "print".
+The wide-character class "alpha" is a subclass of the 
+wide-character class "alnum", 
+and therefore also a subclass of the wide-character class "graph" and
+of the wide-character class "print".
 .PP
-Being a subclass of the wide character class "print",
-the wide character class
-"alpha" is disjoint from the wide character class "cntrl".
+Being a subclass of the wide-character class "print",
+the wide-character class
+"alpha" is disjoint from the wide-character class "cntrl".
 .PP
-Being a subclass of the wide character class "graph",
-the wide character class "alpha" is disjoint from 
-the wide character class "space" and its subclass "blank".
+Being a subclass of the wide-character class "graph",
+the wide-character class "alpha" is disjoint from 
+the wide-character class "space" and its subclass "blank".
 .PP
-Being a subclass of the wide character class "alnum",
-the wide character class "alpha" is disjoint from the
-wide character class "punct".
+Being a subclass of the wide-character class "alnum",
+the wide-character class "alpha" is disjoint from the
+wide-character class "punct".
 .PP
-The wide character class "alpha" is disjoint from the wide character class
+The wide-character class "alpha" is disjoint from the wide-character class
 "digit".
 .PP
-The wide character class "alpha" contains the wide character classes "upper"
+The wide-character class "alpha" contains the wide-character classes "upper"
 and "lower".
 .PP
-The wide character class "alpha" always contains at least the letters 'A'
+The wide-character class "alpha" always contains at least the letters 'A'
 to 'Z' and 'a' to 'z'.
 .SH "RETURN VALUE"
 The \fBiswalpha\fP() function returns non-zero
 if \fIwc\fP is a wide character
-belonging to the wide character class "alpha".
+belonging to the wide-character class "alpha".
 Otherwise it returns zero.
 .SH "CONFORMING TO"
 C99.
diff --git a/man3/iswblank.3 b/man3/iswblank.3
index fe0f67a3ae..0efd461c01 100644
--- a/man3/iswblank.3
+++ b/man3/iswblank.3
@@ -24,24 +24,24 @@ iswblank \- test for whitespace wide character
 The \fBiswblank\fP() function is the wide-character equivalent of the
 \fBisblank\fP() function.
 It tests whether \fIwc\fP is a wide character
-belonging to the wide character class "blank".
+belonging to the wide-character class "blank".
 .PP
-The wide character class "blank" is a subclass of the wide character class
+The wide-character class "blank" is a subclass of the wide-character class
 "space".
 .PP
-Being a subclass of the wide character class "space",
-the wide character class "blank" is disjoint from the
-wide character class "graph" and therefore also disjoint
+Being a subclass of the wide-character class "space",
+the wide-character class "blank" is disjoint from the
+wide-character class "graph" and therefore also disjoint
 from its subclasses "alnum", "alpha", "upper", "lower", "digit",
 "xdigit", "punct".
 .PP
-The wide character class "blank" always contains
+The wide-character class "blank" always contains
 at least the space character
 and the control character '\\t'.
 .SH "RETURN VALUE"
 The \fBiswblank\fP() function returns non-zero
 if \fIwc\fP is a wide character
-belonging to the wide character class "blank".
+belonging to the wide-character class "blank".
 Otherwise it returns zero.
 .SH "CONFORMING TO"
 This function is a GNU extension.
diff --git a/man3/iswcntrl.3 b/man3/iswcntrl.3
index 77e8d2539a..c1448620d4 100644
--- a/man3/iswcntrl.3
+++ b/man3/iswcntrl.3
@@ -24,9 +24,9 @@ iswcntrl \- test for control wide character
 The \fBiswcntrl\fP() function is the wide-character equivalent of the
 \fBiscntrl\fP() function.
 It tests whether \fIwc\fP is a wide character
-belonging to the wide character class "cntrl".
+belonging to the wide-character class "cntrl".
 .PP
-The wide character class "cntrl" is disjoint from the wide character class
+The wide-character class "cntrl" is disjoint from the wide-character class
 "print" and therefore also disjoint from its subclasses "graph", "alpha",
 "upper", "lower", "digit", "xdigit", "punct".
 .PP
@@ -35,7 +35,7 @@ implies \fIiswcntrl(btowc(c))\fP,
 but not vice versa.
 .SH "RETURN VALUE"
 The \fBiswcntrl\fP() function returns non-zero if \fIwc\fP is a
-wide character belonging to the wide character class "cntrl".
+wide character belonging to the wide-character class "cntrl".
 Otherwise it returns zero.
 .SH "CONFORMING TO"
 C99.
diff --git a/man3/iswctype.3 b/man3/iswctype.3
index fd055eda2c..e41340e75f 100644
--- a/man3/iswctype.3
+++ b/man3/iswctype.3
@@ -13,7 +13,7 @@
 .\"
 .TH ISWCTYPE 3  1999-07-25 "GNU" "Linux Programmer's Manual"
 .SH NAME
-iswctype \- wide character classification
+iswctype \- wide-character classification
 .SH SYNOPSIS
 .nf
 .B #include <wctype.h>
diff --git a/man3/iswdigit.3 b/man3/iswdigit.3
index 40f7992617..7a45f08f8d 100644
--- a/man3/iswdigit.3
+++ b/man3/iswdigit.3
@@ -24,36 +24,36 @@ iswdigit \- test for decimal digit wide character
 The \fBiswdigit\fP() function is the wide-character equivalent of the
 \fBisdigit\fP() function.
 It tests whether \fIwc\fP is a wide character
-belonging to the wide character class "digit".
+belonging to the wide-character class "digit".
 .PP
-The wide character class "digit" is a subclass of the wide character class
+The wide-character class "digit" is a subclass of the wide-character class
 "xdigit", and therefore also a subclass 
-of the wide character class "alnum", of
-the wide character class "graph" and of the wide character class "print".
+of the wide-character class "alnum", of
+the wide-character class "graph" and of the wide-character class "print".
 .PP
 Being a subclass of the wide character 
-class "print", the wide character class
-"digit" is disjoint from the wide character class "cntrl".
+class "print", the wide-character class
+"digit" is disjoint from the wide-character class "cntrl".
 .PP
-Being a subclass of the wide character class "graph", 
-the wide character class
-"digit" is disjoint from the wide character class "space" and its subclass
+Being a subclass of the wide-character class "graph", 
+the wide-character class
+"digit" is disjoint from the wide-character class "space" and its subclass
 "blank".
 .PP
-Being a subclass of the wide character 
-class "alnum", the wide character class
-"digit" is disjoint from the wide character class "punct".
+Being a subclass of the wide-character 
+class "alnum", the wide-character class
+"digit" is disjoint from the wide-character class "punct".
 .PP
-The wide character class "digit" is 
-disjoint from the wide character class
+The wide-character class "digit" is 
+disjoint from the wide-character class
 "alpha" and therefore also disjoint from its subclasses "lower", "upper".
 .PP
-The wide character class "digit" always 
+The wide-character class "digit" always 
 contains exactly the digits '0' to '9'.
 .SH "RETURN VALUE"
 The \fBiswdigit\fP() function returns non-zero 
 if \fIwc\fP is a wide character
-belonging to the wide character class "digit".
+belonging to the wide-character class "digit".
 Otherwise it returns zero.
 .SH "CONFORMING TO"
 C99.
diff --git a/man3/iswgraph.3 b/man3/iswgraph.3
index 7cf6354027..9aa1f8f741 100644
--- a/man3/iswgraph.3
+++ b/man3/iswgraph.3
@@ -24,29 +24,29 @@ iswgraph \- test for graphic wide character
 The \fBiswgraph\fP() function is the wide-character equivalent of the
 \fBisgraph\fP() function.
 It tests whether \fIwc\fP is a wide character
-belonging to the wide character class "graph".
+belonging to the wide-character class "graph".
 .PP
-The wide character class "graph" is a subclass of the wide character class
+The wide-character class "graph" is a subclass of the wide-character class
 "print".
 .PP
-Being a subclass of the wide character class "print",
-the wide character class
-"graph" is disjoint from the wide character class "cntrl".
+Being a subclass of the wide-character class "print",
+the wide-character class
+"graph" is disjoint from the wide-character class "cntrl".
 .PP
-The wide character class "graph" is disjoint from the wide character class
+The wide-character class "graph" is disjoint from the wide-character class
 "space" and therefore also disjoint from its subclass "blank".
 .\" Note: UNIX98 (susv2/xbd/locale.html) says that "graph" and "space" may
 .\" have characters in common, except U+0020. But C99 (ISO/IEC 9899:1999
 .\" section 7.25.2.1.10) says that "space" and "graph" are disjoint.
 .PP
-The wide character class "graph" contains all the wide characters from the
-wide character class "print" except the space character.
+The wide-character class "graph" contains all the wide characters from the
+wide-character class "print" except the space character.
 It therefore contains
-the wide character classes "alnum" and "punct".
+the wide-character classes "alnum" and "punct".
 .SH "RETURN VALUE"
 The \fBiswgraph\fP() function returns non-zero
 if \fIwc\fP is a wide character
-belonging to the wide character class "graph".
+belonging to the wide-character class "graph".
 Otherwise it returns zero.
 .SH "CONFORMING TO"
 C99.
diff --git a/man3/iswlower.3 b/man3/iswlower.3
index c710a539aa..8d95a1ecd1 100644
--- a/man3/iswlower.3
+++ b/man3/iswlower.3
@@ -24,41 +24,41 @@ iswlower \- test for lowercase wide character
 The \fBiswlower\fP() function is the wide-character equivalent of the
 \fBislower\fP() function.
 It tests whether \fIwc\fP is a wide character
-belonging to the wide character class "lower".
+belonging to the wide-character class "lower".
 .PP
-The wide character class "lower" is a subclass of the wide character class
+The wide-character class "lower" is a subclass of the wide-character class
 "alpha", and therefore also a subclass 
-of the wide character class "alnum", of
-the wide character class "graph" and of the wide character class "print".
+of the wide-character class "alnum", of
+the wide-character class "graph" and of the wide-character class "print".
 .PP
-Being a subclass of the wide character class "print",
-the wide character class
-"lower" is disjoint from the wide character class "cntrl".
+Being a subclass of the wide-character class "print",
+the wide-character class
+"lower" is disjoint from the wide-character class "cntrl".
 .PP
-Being a subclass of the wide character class "graph",
-the wide character class "lower" is disjoint from the 
-wide character class "space" and its subclass "blank".
+Being a subclass of the wide-character class "graph",
+the wide-character class "lower" is disjoint from the 
+wide-character class "space" and its subclass "blank".
 .PP
-Being a subclass of the wide character class "alnum",
-the wide character class
-"lower" is disjoint from the wide character class "punct".
+Being a subclass of the wide-character class "alnum",
+the wide-character class
+"lower" is disjoint from the wide-character class "punct".
 .PP
-Being a subclass of the wide character class "alpha",
-the wide character class
-"lower" is disjoint from the wide character class "digit".
+Being a subclass of the wide-character class "alpha",
+the wide-character class
+"lower" is disjoint from the wide-character class "digit".
 .PP
-The wide character class "lower" contains at least
+The wide-character class "lower" contains at least
 those characters \fIwc\fP
 which are equal to \fItowlower(wc)\fP and different
 from \fItowupper(wc)\fP.
 .PP
-The wide character class "lower" always contains
+The wide-character class "lower" always contains
 at least the letters 'a'
 to 'z'.
 .SH "RETURN VALUE"
 The \fBiswlower\fP() function returns non-zero
 if \fIwc\fP is a wide character
-belonging to the wide character class "lower".
+belonging to the wide-character class "lower".
 Otherwise it returns zero.
 .SH "CONFORMING TO"
 C99.
diff --git a/man3/iswprint.3 b/man3/iswprint.3
index c630e2579a..38b2052b82 100644
--- a/man3/iswprint.3
+++ b/man3/iswprint.3
@@ -24,15 +24,15 @@ iswprint \- test for printing wide character
 The \fBiswprint\fP() function is the wide-character equivalent of the
 \fBisprint\fP() function.
 It tests whether \fIwc\fP is a wide character
-belonging to the wide character class "print".
+belonging to the wide-character class "print".
 .PP
-The wide character class "print" is disjoint from the wide character class
+The wide-character class "print" is disjoint from the wide-character class
 "cntrl".
 .PP
-The wide character class "print" contains the wide character class "graph".
+The wide-character class "print" contains the wide-character class "graph".
 .SH "RETURN VALUE"
 The \fBiswprint\fP() function returns non-zero if \fIwc\fP is a
-wide character belonging to the wide character class "print".
+wide character belonging to the wide-character class "print".
 Otherwise it returns zero.
 .SH "CONFORMING TO"
 C99.
diff --git a/man3/iswpunct.3 b/man3/iswpunct.3
index f5d49257ac..1357b757ec 100644
--- a/man3/iswpunct.3
+++ b/man3/iswpunct.3
@@ -24,26 +24,27 @@ iswpunct \- test for punctuation or symbolic wide character
 The \fBiswpunct\fP() function is the wide-character equivalent of the
 \fBispunct\fP() function.
 It tests whether \fIwc\fP is a wide character
-belonging to the wide character class "punct".
+belonging to the wide-character class "punct".
 .PP
-The wide character class "punct" is a subclass of the wide character class
-"graph", and therefore also a subclass of the wide character class "print".
+The wide-character class "punct" is a subclass of the wide-character class
+"graph", and therefore also a subclass of the wide-character class "print".
 .PP
-The wide character class "punct" is disjoint from the wide character class
+The wide-character class "punct" is disjoint from the wide-character class
 "alnum" and therefore also disjoint from its subclasses "alpha", "upper",
 "lower", "digit", "xdigit".
 .PP
-Being a subclass of the wide character class "print",
-the wide character class
-"punct" is disjoint from the wide character class "cntrl".
+Being a subclass of the wide-character class "print",
+the wide-character class
+"punct" is disjoint from the wide-character class "cntrl".
 .PP
-Being a subclass of the wide character class "graph",
-the wide character class
-"punct" is disjoint from the wide character class "space" and its subclass
+Being a subclass of the wide-character class "graph",
+the wide-character class
+"punct" is disjoint from the wide-character class "space" and its subclass
 "blank".
 .SH "RETURN VALUE"
-The \fBiswpunct\fP() function returns non-zero if \fIwc\fP is a wide character
-belonging to the wide character class "punct".
+The \fBiswpunct\fP() function returns non-zero
+if \fIwc\fP is a wide-character
+belonging to the wide-character class "punct".
 Otherwise it returns zero.
 .SH "CONFORMING TO"
 C99.
@@ -55,5 +56,5 @@ The behaviour of \fBiswpunct\fP() depends on the LC_CTYPE category of the
 current locale.
 .PP
 This function's name is a misnomer when dealing with Unicode characters,
-because the wide character class "punct" contains both punctuation characters
+because the wide-character class "punct" contains both punctuation characters
 and symbol (math, currency, etc.) characters.
diff --git a/man3/iswspace.3 b/man3/iswspace.3
index a2b94142db..a1717212f9 100644
--- a/man3/iswspace.3
+++ b/man3/iswspace.3
@@ -24,22 +24,22 @@ iswspace \- test for whitespace wide character
 The \fBiswspace\fP() function is the wide-character equivalent of the
 \fBisspace\fP() function.
 It tests whether \fIwc\fP is a wide character
-belonging to the wide character class "space".
+belonging to the wide-character class "space".
 .PP
-The wide character class "space" is disjoint from the wide character class
+The wide-character class "space" is disjoint from the wide-character class
 "graph" and therefore also disjoint from its subclasses "alnum", "alpha",
 "upper", "lower", "digit", "xdigit", "punct".
 .\" Note: UNIX98 (susv2/xbd/locale.html) says that "space" and "graph" may
 .\" have characters in common, except U+0020. But C99 (ISO/IEC 9899:1999
 .\" section 7.25.2.1.10) says that "space" and "graph" are disjoint.
 .PP
-The wide character class "space" contains the wide character class "blank".
+The wide-character class "space" contains the wide-character class "blank".
 .PP
-The wide character class "space" always contains at least the space character
+The wide-character class "space" always contains at least the space character
 and the control characters '\\f', '\\n', '\\r', '\\t', '\\v'.
 .SH "RETURN VALUE"
 The \fBiswspace\fP() function returns non-zero if \fIwc\fP is a wide character
-belonging to the wide character class "space".
+belonging to the wide-character class "space".
 Otherwise it returns zero.
 .SH "CONFORMING TO"
 C99.
diff --git a/man3/iswupper.3 b/man3/iswupper.3
index ce9cd38e27..3aaba77c87 100644
--- a/man3/iswupper.3
+++ b/man3/iswupper.3
@@ -24,33 +24,33 @@ iswupper \- test for uppercase wide character
 The \fBiswupper\fP() function is the wide-character equivalent of the
 \fBisupper\fP() function.
 It tests whether \fIwc\fP is a wide character
-belonging to the wide character class "upper".
+belonging to the wide-character class "upper".
 .PP
-The wide character class "upper" is a subclass of the wide character class
-"alpha", and therefore also a subclass of the wide character class "alnum", of
-the wide character class "graph" and of the wide character class "print".
+The wide-character class "upper" is a subclass of the wide-character class
+"alpha", and therefore also a subclass of the wide-character class "alnum", of
+the wide-character class "graph" and of the wide-character class "print".
 .PP
-Being a subclass of the wide character class "print", the wide character class
-"upper" is disjoint from the wide character class "cntrl".
+Being a subclass of the wide-character class "print", the wide-character class
+"upper" is disjoint from the wide-character class "cntrl".
 .PP
-Being a subclass of the wide character class "graph", the wide character class
-"upper" is disjoint from the wide character class "space" and its subclass
+Being a subclass of the wide-character class "graph", the wide-character class
+"upper" is disjoint from the wide-character class "space" and its subclass
 "blank".
 .PP
-Being a subclass of the wide character class "alnum", the wide character class
-"upper" is disjoint from the wide character class "punct".
+Being a subclass of the wide-character class "alnum", the wide-character class
+"upper" is disjoint from the wide-character class "punct".
 .PP
-Being a subclass of the wide character class "alpha", the wide character class
-"upper" is disjoint from the wide character class "digit".
+Being a subclass of the wide-character class "alpha", the wide-character class
+"upper" is disjoint from the wide-character class "digit".
 .PP
-The wide character class "upper" contains at least those characters \fIwc\fP
+The wide-character class "upper" contains at least those characters \fIwc\fP
 which are equal to \fItowupper(wc)\fP and different from \fItowlower(wc)\fP.
 .PP
-The wide character class "upper" always contains at least the letters 'A'
+The wide-character class "upper" always contains at least the letters 'A'
 to 'Z'.
 .SH "RETURN VALUE"
 The \fBiswupper\fP() function returns non-zero if \fIwc\fP is a wide character
-belonging to the wide character class "upper".
+belonging to the wide-character class "upper".
 Otherwise it returns zero.
 .SH "CONFORMING TO"
 C99.
diff --git a/man3/iswxdigit.3 b/man3/iswxdigit.3
index b4a37a05c0..d4dd5914d5 100644
--- a/man3/iswxdigit.3
+++ b/man3/iswxdigit.3
@@ -24,27 +24,27 @@ iswxdigit \- test for hexadecimal digit wide character
 The \fBiswxdigit\fP() function is the wide-character equivalent of the
 \fBisxdigit\fP() function.
 It tests whether \fIwc\fP is a wide character
-belonging to the wide character class "xdigit".
+belonging to the wide-character class "xdigit".
 .PP
-The wide character class "xdigit" is a subclass of the wide character class
-"alnum", and therefore also a subclass of the wide character class "graph" and
-of the wide character class "print".
+The wide-character class "xdigit" is a subclass of the wide-character class
+"alnum", and therefore also a subclass of the wide-character class "graph" and
+of the wide-character class "print".
 .PP
-Being a subclass of the wide character class "print", the wide character class
-"xdigit" is disjoint from the wide character class "cntrl".
+Being a subclass of the wide-character class "print", the wide-character class
+"xdigit" is disjoint from the wide-character class "cntrl".
 .PP
-Being a subclass of the wide character class "graph", the wide character class
-"xdigit" is disjoint from the wide character class "space" and its subclass
+Being a subclass of the wide-character class "graph", the wide-character class
+"xdigit" is disjoint from the wide-character class "space" and its subclass
 "blank".
 .PP
-Being a subclass of the wide character class "alnum", the wide character class
-"xdigit" is disjoint from the wide character class "punct".
+Being a subclass of the wide-character class "alnum", the wide-character class
+"xdigit" is disjoint from the wide-character class "punct".
 .PP
-The wide character class "xdigit" always contains at least the letters 'A'
+The wide-character class "xdigit" always contains at least the letters 'A'
 to 'F', 'a' to 'f' and the digits '0' to '9'.
 .SH "RETURN VALUE"
 The \fBiswxdigit\fP() function returns non-zero if \fIwc\fP is a wide character
-belonging to the wide character class "xdigit".
+belonging to the wide-character class "xdigit".
 Otherwise it returns zero.
 .SH "CONFORMING TO"
 C99.
diff --git a/man3/mbsinit.3 b/man3/mbsinit.3
index bd349b091d..78091d19d7 100644
--- a/man3/mbsinit.3
+++ b/man3/mbsinit.3
@@ -39,7 +39,7 @@ representation for an initial state.
 For 8-bit encodings, all states are equivalent to the initial state.
 For multibyte encodings like UTF-8, EUC-*, BIG5 or SJIS, the wide character
 to multibyte conversion functions never produce non-initial states, but the
-multibyte to wide character conversion functions like \fBmbrtowc\fP() do
+multibyte to wide-character conversion functions like \fBmbrtowc\fP() do
 produce non-initial states when interrupted in the middle of a character.
 .PP
 One possible way to create an mbstate_t in initial state is to set it to zero:
diff --git a/man3/mbsnrtowcs.3 b/man3/mbsnrtowcs.3
index f12c868f8a..528c385136 100644
--- a/man3/mbsnrtowcs.3
+++ b/man3/mbsnrtowcs.3
@@ -12,7 +12,7 @@
 .\"
 .TH MBSNRTOWCS 3  1999-07-25 "GNU" "Linux Programmer's Manual"
 .SH NAME
-mbsnrtowcs \- convert a multibyte string to a wide character string
+mbsnrtowcs \- convert a multibyte string to a wide-character string
 .SH SYNOPSIS
 .nf
 .B #include <wchar.h>
@@ -68,7 +68,7 @@ The programmer must ensure that there is room for at least \fIlen\fP wide
 characters at \fIdest\fP.
 .SH "RETURN VALUE"
 The \fBmbsnrtowcs\fP() function returns the number of wide characters
-that make up the converted part of the wide character string,
+that make up the converted part of the wide-character string,
 not including the terminating null wide character.
 If an invalid multibyte sequence was
 encountered, (size_t)(\-1) is returned, and \fIerrno\fP set to \fBEILSEQ\fP.
diff --git a/man3/mbsrtowcs.3 b/man3/mbsrtowcs.3
index 087a9ddcc5..1a92f9d8a3 100644
--- a/man3/mbsrtowcs.3
+++ b/man3/mbsrtowcs.3
@@ -13,7 +13,7 @@
 .\"
 .TH MBSRTOWCS 3  1999-07-25 "GNU" "Linux Programmer's Manual"
 .SH NAME
-mbsrtowcs \- convert a multibyte string to a wide character string
+mbsrtowcs \- convert a multibyte string to a wide-character string
 .SH SYNOPSIS
 .nf
 .B #include <wchar.h>
@@ -61,7 +61,7 @@ The programmer must ensure that there is room for at least \fIlen\fP wide
 characters at \fIdest\fP.
 .SH "RETURN VALUE"
 The \fBmbsrtowcs\fP() function returns the number of wide characters that make
-up the converted part of the wide character string, not including the
+up the converted part of the wide-character string, not including the
 terminating null wide character.
 If an invalid multibyte sequence was
 encountered, (size_t)(\-1) is returned, and \fIerrno\fP set to \fBEILSEQ\fP.
diff --git a/man3/mbstowcs.3 b/man3/mbstowcs.3
index e5b15d9066..76e271caeb 100644
--- a/man3/mbstowcs.3
+++ b/man3/mbstowcs.3
@@ -13,7 +13,7 @@
 .\"
 .TH MBSTOWCS 3  1999-07-25 "GNU" "Linux Programmer's Manual"
 .SH NAME
-mbstowcs \- convert a multibyte string to a wide character string
+mbstowcs \- convert a multibyte string to a wide-character string
 .SH SYNOPSIS
 .nf
 .B #include <stdlib.h>
@@ -54,7 +54,7 @@ In order to avoid the case 2 above, the programmer should make sure \fIn\fP is
 greater or equal to \fImbstowcs(NULL,src,0)+1\fP.
 .SH "RETURN VALUE"
 The \fBmbstowcs\fP() function returns the number of wide characters that make
-up the converted part of the wide character string, not including the
+up the converted part of the wide-character string, not including the
 terminating null wide character.
 If an invalid multibyte sequence was
 encountered, (size_t)(\-1) is returned.
diff --git a/man3/scanf.3 b/man3/scanf.3
index 34a0ad0bde..99f13c9a04 100644
--- a/man3/scanf.3
+++ b/man3/scanf.3
@@ -314,7 +314,7 @@ If used with
 or
 .I %s
 the corresponding parameter is considered
-as a pointer to a wide character or wide character string respectively.
+as a pointer to a wide character or wide-character string respectively.
 .\" This use of l was introduced in Amendment 1 to ISO C90.
 .TP
 .B L
diff --git a/man3/ungetwc.3 b/man3/ungetwc.3
index 1b924fbe1e..9f92612dbe 100644
--- a/man3/ungetwc.3
+++ b/man3/ungetwc.3
@@ -30,13 +30,13 @@ If \fIwc\fP is an invalid wide character,
 it sets \fIerrno\fP to \fBEILSEQ\fP and returns WEOF.
 .PP
 If \fIwc\fP is a valid wide character, it is pushed back onto the stream
-and thus becomes available for future wide character read operations.
+and thus becomes available for future wide-character read operations.
 The file-position indicator is decremented by one or more.
 The end-of-file
 indicator is cleared.
 The backing storage of the file is not affected.
 .PP
-Note: \fIwc\fP need not be the last wide character read from the stream;
+Note: \fIwc\fP need not be the last wide-character read from the stream;
 it can be any other valid wide character.
 .PP
 If the implementation supports multiple push-back operations in a row, the
diff --git a/man3/wcpcpy.3 b/man3/wcpcpy.3
index 5757ddf43f..0fadb77a19 100644
--- a/man3/wcpcpy.3
+++ b/man3/wcpcpy.3
@@ -12,7 +12,7 @@
 .\"
 .TH WCPCPY 3  1999-07-25 "GNU" "Linux Programmer's Manual"
 .SH NAME
-wcpcpy \- copy a wide character string, returning a pointer to its end
+wcpcpy \- copy a wide-character string, returning a pointer to its end
 .SH SYNOPSIS
 .nf
 .B #define _GNU_SOURCE
@@ -24,7 +24,7 @@ wcpcpy \- copy a wide character string, returning a pointer to its end
 .SH DESCRIPTION
 The \fBwcpcpy\fP() function is the wide-character equivalent of the \fBstpcpy\fP()
 function.
-It copies the wide character string pointed to by \fIsrc\fP,
+It copies the wide-character string pointed to by \fIsrc\fP,
 including the terminating L'\\0' character, to the array pointed to by
 \fIdest\fP.
 .PP
diff --git a/man3/wcscpy.3 b/man3/wcscpy.3
index a7ad85ec35..c76cfd1770 100644
--- a/man3/wcscpy.3
+++ b/man3/wcscpy.3
@@ -13,7 +13,7 @@
 .\"
 .TH WCSCPY 3  1999-07-25 "GNU" "Linux Programmer's Manual"
 .SH NAME
-wcscpy \- copy a wide character string
+wcscpy \- copy a wide-character string
 .SH SYNOPSIS
 .nf
 .B #include <wchar.h>
@@ -23,7 +23,7 @@ wcscpy \- copy a wide character string
 .SH DESCRIPTION
 The \fBwcscpy\fP() function is the wide-character equivalent
 of the \fBstrcpy\fP() function.
-It copies the wide character string pointed to by \fIsrc\fP,
+It copies the wide-character string pointed to by \fIsrc\fP,
 including the terminating L'\\0' character, to the array pointed to by
 \fIdest\fP.
 .PP
diff --git a/man3/wcsnrtombs.3 b/man3/wcsnrtombs.3
index b82dc6618d..0de0ff1523 100644
--- a/man3/wcsnrtombs.3
+++ b/man3/wcsnrtombs.3
@@ -12,7 +12,7 @@
 .\"
 .TH WCSNRTOMBS 3  1999-07-25 "GNU" "Linux Programmer's Manual"
 .SH NAME
-wcsnrtombs \- convert a wide character string to a multibyte string
+wcsnrtombs \- convert a wide-character string to a multibyte string
 .SH SYNOPSIS
 .nf
 .B #include <wchar.h>
diff --git a/man3/wcsrtombs.3 b/man3/wcsrtombs.3
index 726a192406..a66e20d6b8 100644
--- a/man3/wcsrtombs.3
+++ b/man3/wcsrtombs.3
@@ -13,7 +13,7 @@
 .\"
 .TH WCSRTOMBS 3  1999-07-25 "GNU" "Linux Programmer's Manual"
 .SH NAME
-wcsrtombs \- convert a wide character string to a multibyte string
+wcsrtombs \- convert a wide-character string to a multibyte string
 .SH SYNOPSIS
 .nf
 .B #include <wchar.h>
diff --git a/man3/wcstombs.3 b/man3/wcstombs.3
index 33c7a16cfb..84d9f41734 100644
--- a/man3/wcstombs.3
+++ b/man3/wcstombs.3
@@ -13,7 +13,7 @@
 .\"
 .TH WCSTOMBS 3  1999-07-25 "GNU" "Linux Programmer's Manual"
 .SH NAME
-wcstombs \- convert a wide character string to a multibyte string
+wcstombs \- convert a wide-character string to a multibyte string
 .SH SYNOPSIS
 .nf
 .B #include <stdlib.h>
diff --git a/man3/wcswidth.3 b/man3/wcswidth.3
index ab6b11dfe7..4b5389de01 100644
--- a/man3/wcswidth.3
+++ b/man3/wcswidth.3
@@ -12,7 +12,7 @@
 .\"
 .TH WCSWIDTH 3  1999-07-25 "GNU" "Linux Programmer's Manual"
 .SH NAME
-wcswidth \- determine columns needed for a fixed-size wide character string
+wcswidth \- determine columns needed for a fixed-size wide-character string
 .SH SYNOPSIS
 .nf
 .B #include <wchar.h>
diff --git a/man3/wctrans.3 b/man3/wctrans.3
index 3d7b5f69a4..99b022b0ae 100644
--- a/man3/wctrans.3
+++ b/man3/wctrans.3
@@ -13,7 +13,7 @@
 .\"
 .TH WCTRANS 3  1999-07-25 "GNU" "Linux Programmer's Manual"
 .SH NAME
-wctrans \- wide character translation mapping
+wctrans \- wide-character translation mapping
 .SH SYNOPSIS
 .nf
 .B #include <wctype.h>
@@ -28,7 +28,7 @@ Its nature is implementation dependent, but the special
 value \fI(wctrans_t)\ 0\fP denotes an invalid mapping.
 Nonzero \fBwctrans_t\fP
 values can be passed to the \fBtowctrans\fP() function to actually perform
-the wide character mapping.
+the wide-character mapping.
 .PP
 The \fBwctrans\fP() function returns a mapping, given by its name.
 The set of
diff --git a/man3/wctype.3 b/man3/wctype.3
index e115ffaa27..4df2abb98d 100644
--- a/man3/wctype.3
+++ b/man3/wctype.3
@@ -13,7 +13,7 @@
 .\"
 .TH WCTYPE 3  1999-07-25 "GNU" "Linux Programmer's Manual"
 .SH NAME
-wctype \- wide character classification
+wctype \- wide-character classification
 .SH SYNOPSIS
 .nf
 .B #include <wctype.h>
diff --git a/man3/wprintf.3 b/man3/wprintf.3
index 7090880e49..963e218c4c 100644
--- a/man3/wprintf.3
+++ b/man3/wprintf.3
@@ -14,7 +14,7 @@
 .TH WPRINTF 3  1999-11-20 "GNU" "Linux Programmer's Manual"
 .SH NAME
 wprintf, fwprintf, swprintf, vwprintf, vfwprintf, vswprintf \- formatted
-wide character output conversion
+wide-character output conversion
 .SH SYNOPSIS
 .nf
 .B #include <stdio.h>
@@ -40,17 +40,17 @@ It performs formatted output of wide
 characters.
 .PP
 The \fBwprintf\fP() and \fBvwprintf\fP() functions
-perform wide character output to \fBstdout\fP.
+perform wide-character output to \fBstdout\fP.
 \fBstdout\fP must not be byte oriented; see function
 \fBfwide\fP() for more information.
 .PP
 The \fBfwprintf\fP() and \fBvfwprintf\fP() functions
-perform wide character output to \fIstream\fP.
+perform wide-character output to \fIstream\fP.
 \fIstream\fP must not be byte oriented; see function
 \fBfwide\fP() for more information.
 .PP
 The \fBswprintf\fP() and \fBvswprintf\fP() functions
-perform wide character output
+perform wide-character output
 to an array of wide characters.
 The programmer must ensure that there is
 room for at least \fImaxlen\fP wide
@@ -63,7 +63,7 @@ functions except for the
 following differences:
 .TP
 .B \(bu
-The \fIformat\fP string is a wide character string.
+The \fIformat\fP string is a wide-character string.
 .TP
 .B \(bu
 The output consists of wide characters, not bytes.