Unify wording for LC_CTYPE in ENVIRONMENT:

* Consistently use "character encoding locale" as suggested by stsp@.
* Resolve various gratuitious wording variations.
OK jmc@.

10 files changed, 65 insertions, 55 deletions

diff --git a/bin/ls/ls.1 b/bin/ls/ls.1
index d637fd1a8f9..d34d9e8b7fa 100644
--- a/bin/ls/ls.1
+++ b/bin/ls/ls.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ls.1,v 1.78 2016/09/08 05:52:19 jmc Exp $
+.\"	$OpenBSD: ls.1,v 1.79 2016/10/24 13:46:58 schwarze Exp $
 .\"	$NetBSD: ls.1,v 1.14 1995/12/05 02:44:01 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1991, 1993, 1994
@@ -33,7 +33,7 @@
 .\"
 .\"     @(#)ls.1	8.7 (Berkeley) 7/29/94
 .\"
-.Dd $Mdocdate: September 8 2016 $
+.Dd $Mdocdate: October 24 2016 $
 .Dt LS 1
 .Os
 .Sh NAME
@@ -442,11 +442,14 @@ Otherwise,
 .Nm
 defaults to the terminal width, or 80 columns if the output is not a terminal.
 .It Ev LC_CTYPE
-If set to a string ending in
-.Qq .UTF-8 ,
-.Nm
-respects character display widths when columnating output.
-Otherwise, non-ASCII bytes are replaced by question marks.
+The character encoding
+.Xr locale 1 .
+It decides which byte sequences form characters
+and what their display width is.
+If unset or set to
+.Qq C ,
+.Qq POSIX ,
+or an unsupported value, non-ASCII bytes are replaced by question marks.
 .It Ev TZ
 The time zone to use when displaying dates.
 See
diff --git a/usr.bin/colrm/colrm.1 b/usr.bin/colrm/colrm.1
index 161e1f1c344..7179727fd97 100644
--- a/usr.bin/colrm/colrm.1
+++ b/usr.bin/colrm/colrm.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: colrm.1,v 1.9 2016/01/18 20:31:36 schwarze Exp $
+.\"	$OpenBSD: colrm.1,v 1.10 2016/10/24 13:46:58 schwarze Exp $
 .\"	$NetBSD: colrm.1,v 1.3 1995/03/26 09:04:01 glass Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)colrm.1	8.1 (Berkeley) 6/6/93
 .\"
-.Dd $Mdocdate: January 18 2016 $
+.Dd $Mdocdate: October 24 2016 $
 .Dt COLRM 1
 .Os
 .Sh NAME
@@ -92,15 +92,15 @@ character, and the second one does not decrement the column count.
 .Sh ENVIRONMENT
 .Bl -tag -width LC_CTYPE
 .It Ev LC_CTYPE
-The character set
+The character encoding
 .Xr locale 1 .
-It decides which sequences of bytes are treated as characters,
+It decides which byte sequences form characters
 and what their display width is.
 If unset or set to
 .Qq C ,
 .Qq POSIX ,
 or an unsupported value, each byte except tab and backspace is treated
-as a character of width 1.
+as a character of display width 1.
 .El
 .Sh SEE ALSO
 .Xr awk 1 ,
diff --git a/usr.bin/cut/cut.1 b/usr.bin/cut/cut.1
index 4be908bdca8..6b201e8e185 100644
--- a/usr.bin/cut/cut.1
+++ b/usr.bin/cut/cut.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cut.1,v 1.26 2015/12/06 06:15:05 schwarze Exp $
+.\"	$OpenBSD: cut.1,v 1.27 2016/10/24 13:46:58 schwarze Exp $
 .\"	$NetBSD: cut.1,v 1.6 1995/10/02 20:19:26 jtc Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993
@@ -33,7 +33,7 @@
 .\"
 .\"     @(#)cut.1	8.1 (Berkeley) 6/6/93
 .\"
-.Dd $Mdocdate: December 6 2015 $
+.Dd $Mdocdate: October 24 2016 $
 .Dt CUT 1
 .Os
 .Sh NAME
@@ -123,9 +123,9 @@ Unless specified, lines with no delimiters are passed through unmodified.
 .Sh ENVIRONMENT
 .Bl -tag -width LC_CTYPE
 .It Ev LC_CTYPE
-The character set
-.Xr locale 1 ,
-defining which byte sequences form characters.
+The character encoding
+.Xr locale 1 .
+It decides which byte sequences form characters.
 If unset or set to
 .Qq C ,
 .Qq POSIX ,
diff --git a/usr.bin/fmt/fmt.1 b/usr.bin/fmt/fmt.1
index b2e023acf99..0a7f7765daf 100644
--- a/usr.bin/fmt/fmt.1
+++ b/usr.bin/fmt/fmt.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: fmt.1,v 1.29 2015/12/15 17:48:16 jmc Exp $
+.\" $OpenBSD: fmt.1,v 1.30 2016/10/24 13:46:58 schwarze Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"     @(#)fmt.1	8.1 (Berkeley) 6/6/93
 .\"
-.Dd $Mdocdate: December 15 2015 $
+.Dd $Mdocdate: October 24 2016 $
 .Dt FMT 1
 .Os
 .Sh NAME
@@ -142,15 +142,15 @@ evening the lines:
 .Sh ENVIRONMENT
 .Bl -tag -width LC_CTYPE
 .It Ev LC_CTYPE
-The character set
+The character encoding
 .Xr locale 1 .
-It is used to decide which byte sequences form characters and what
-their display width is.
-If it is unset or set to
+It decides which byte sequences form characters
+and what their display width is.
+If unset or set to
 .Qq C ,
 .Qq POSIX ,
-or an unsupported value, each byte except the tab is assumed
-to represent a character of display width 1.
+or an unsupported value, each byte except the tab
+is treated as a character of display width 1.
 .El
 .Sh EXIT STATUS
 .Ex -std
diff --git a/usr.bin/fold/fold.1 b/usr.bin/fold/fold.1
index ab6e09027fc..286fdb8748f 100644
--- a/usr.bin/fold/fold.1
+++ b/usr.bin/fold/fold.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fold.1,v 1.18 2016/05/23 10:31:42 schwarze Exp $
+.\"	$OpenBSD: fold.1,v 1.19 2016/10/24 13:46:58 schwarze Exp $
 .\"	$NetBSD: fold.1,v 1.5 1995/09/01 01:42:42 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	@(#)fold.1	8.1 (Berkeley) 6/6/93
 .\"
-.Dd $Mdocdate: May 23 2016 $
+.Dd $Mdocdate: October 24 2016 $
 .Dt FOLD 1
 .Os
 .Sh NAME
@@ -71,16 +71,15 @@ a tab advances the column position to the next multiple of eight.
 .Sh ENVIRONMENT
 .Bl -tag -width 8n
 .It Ev LC_CTYPE
-The character set
+The character encoding
 .Xr locale 1 .
-It is used to decide which byte sequences form characters and what
-their display width is.
-If it is unset or set to
+It decides which byte sequences form characters
+and what their display width is.
+If unset or set to
 .Qq C ,
 .Qq POSIX ,
 or an unsupported value, each byte except backspace, tab, newline,
-and carriage return is assumed to represent a character of display
-width 1.
+and carriage return is treated as a character of display width 1.
 .El
 .Sh EXIT STATUS
 .Ex -std fold
diff --git a/usr.bin/less/less.1 b/usr.bin/less/less.1
index feb604644aa..0a220ad570f 100644
--- a/usr.bin/less/less.1
+++ b/usr.bin/less/less.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: less.1,v 1.51 2015/11/23 12:56:13 tb Exp $
+.\"	$OpenBSD: less.1,v 1.52 2016/10/24 13:46:58 schwarze Exp $
 .\"
 .\" Copyright (C) 1984-2012  Mark Nudelman
 .\"
@@ -23,7 +23,7 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: November 23 2015 $
+.Dd $Mdocdate: October 24 2016 $
 .Dt LESS 1
 .Os
 .Sh NAME
@@ -1798,7 +1798,10 @@ Name of the user's home directory
 .It Ev LANG
 Language for determining the character set.
 .It Ev LC_CTYPE
-Language for determining the character set.
+The character encoding
+.Xr locale 1 .
+It decides which byte sequences form characters, what their display
+width is, and which characters are composing or combining characters.
 .It Ev LESS
 Options which are passed to
 .Nm
diff --git a/usr.bin/rs/rs.1 b/usr.bin/rs/rs.1
index d5afec4682f..2fe1df24ccd 100644
--- a/usr.bin/rs/rs.1
+++ b/usr.bin/rs/rs.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rs.1,v 1.18 2016/01/04 23:21:28 schwarze Exp $
+.\"	$OpenBSD: rs.1,v 1.19 2016/10/24 13:46:58 schwarze Exp $
 .\"	$FreeBSD: src/usr.bin/rs/rs.1,v 1.4 1999/08/28 01:05:21 peter Exp $
 .\"
 .\" Copyright (c) 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	@(#)rs.1	8.2 (Berkeley) 12/30/93
 .\"
-.Dd $Mdocdate: January 4 2016 $
+.Dd $Mdocdate: October 24 2016 $
 .Dt RS 1
 .Os
 .Sh NAME
@@ -170,10 +170,10 @@ number as zero unless otherwise indicated.
 .Sh ENVIRONMENT
 .Bl -tag -width LC_CTYPE
 .It Ev LC_CTYPE
-The character set
+The character encoding
 .Xr locale 1 .
-It is used to calculate required column widths and to adjust entries
-within columns.
+It decides which byte sequences form characters
+and what their display width is.
 If unset or set to
 .Qq C ,
 .Qq POSIX ,
diff --git a/usr.bin/ul/ul.1 b/usr.bin/ul/ul.1
index a9cc036c38d..3d79649d9f3 100644
--- a/usr.bin/ul/ul.1
+++ b/usr.bin/ul/ul.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ul.1,v 1.16 2016/01/18 17:34:26 schwarze Exp $
+.\"	$OpenBSD: ul.1,v 1.17 2016/10/24 13:46:58 schwarze Exp $
 .\"	$NetBSD: ul.1,v 1.3 1994/12/07 00:28:23 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)ul.1	8.1 (Berkeley) 6/6/93
 .\"
-.Dd $Mdocdate: January 18 2016 $
+.Dd $Mdocdate: October 24 2016 $
 .Dt UL 1
 .Os
 .Sh NAME
@@ -153,10 +153,10 @@ Overrides the terminal type specified in the environment with
 .Sh ENVIRONMENT
 .Bl -tag -width LC_CTYPE
 .It Ev LC_CTYPE
-The character set
+The character encoding
 .Xr locale 1 .
-It decides which byte sequences form characters, which characters are
-printable, and how many output display columns each character occupies.
+It decides which byte sequences form characters, which characters
+are printable, and what their display width is.
 If set to
 .Qq C ,
 .Qq POSIX ,
diff --git a/usr.bin/uniq/uniq.1 b/usr.bin/uniq/uniq.1
index d7e275372e2..1c3f10cad8d 100644
--- a/usr.bin/uniq/uniq.1
+++ b/usr.bin/uniq/uniq.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: uniq.1,v 1.18 2015/12/19 10:21:01 schwarze Exp $
+.\"	$OpenBSD: uniq.1,v 1.19 2016/10/24 13:46:58 schwarze Exp $
 .\"	$NetBSD: uniq.1,v 1.5 1994/12/06 07:51:15 jtc Exp $
 .\"
 .\" Copyright (c) 1991, 1993
@@ -33,7 +33,7 @@
 .\"
 .\"     @(#)uniq.1	8.1 (Berkeley) 6/6/93
 .\"
-.Dd $Mdocdate: December 19 2015 $
+.Dd $Mdocdate: October 24 2016 $
 .Dt UNIQ 1
 .Os
 .Sh NAME
@@ -117,10 +117,15 @@ denotes the standard input or the standard output
 .Sh ENVIRONMENT
 .Bl -tag -width LC_CTYPE
 .It Ev LC_CTYPE
-The character set
+The character encoding
 .Xr locale 1 .
-Determines which groups of bytes are treated as characters
+It decides which byte sequences form characters
 and which characters are considered blank.
+If unset or set to
+.Qq C ,
+.Qq POSIX ,
+or an unsupported value, each byte is treated as a character,
+and only space and tab are considered blank.
 .El
 .Sh EXIT STATUS
 .Ex -std uniq
diff --git a/usr.bin/wc/wc.1 b/usr.bin/wc/wc.1
index afd78b00567..dcbb3b61311 100644
--- a/usr.bin/wc/wc.1
+++ b/usr.bin/wc/wc.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: wc.1,v 1.26 2015/12/08 01:00:44 schwarze Exp $
+.\"	$OpenBSD: wc.1,v 1.27 2016/10/24 13:46:58 schwarze Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -32,7 +32,7 @@
 .\"
 .\"     from: @(#)wc.1	8.2 (Berkeley) 4/19/94
 .\"
-.Dd $Mdocdate: December 8 2015 $
+.Dd $Mdocdate: October 24 2016 $
 .Dt WC 1
 .Os
 .Sh NAME
@@ -106,9 +106,9 @@ are integers separated by spaces.
 .Sh ENVIRONMENT
 .Bl -tag -width LC_CTYPE
 .It Ev LC_CTYPE
-The character set
-.Xr locale 1 ,
-defining which byte sequences form characters.
+The character encoding
+.Xr locale 1 .
+It decides which byte sequences form characters.
 If unset or set to
 .Qq C ,
 .Qq POSIX ,