doc: colorize -> color

Living so close to Hollywood I know that "colorize"
means adding color to something that was already monochrome,
whereas "color" means to give color to something.
Coreutils apps color text instead of colorizing it.

diff --git a/NEWS b/NEWS
index c8e8bdc161b95de76d33f91a6db5fad029a5f427..811e27e3af820554e987410f70061a2f86e01ec0 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3063,7 +3063,7 @@ GNU coreutils NEWS                                    -*- outline -*-
   install accepts a new option --strip-program to specify the program used to
   strip binaries.
 
-  ls now colorizes files with capabilities if libcap is available
+  ls now colors names of files with capabilities if libcap is available.
 
   ls -v now uses filevercmp function as sort predicate (instead of strverscmp)
 

diff --git a/cfg.mk b/cfg.mk
index 6d6c37dc2d211c19f8e910ec1611b5902c92551c..046f14167045e3945b44d698b3312244af2102be 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -49,7 +49,7 @@ export VERBOSE = yes
 # 4914152 9e
 export XZ_OPT = -8e
 
-old_NEWS_hash = 4d17651e2318a01687a1f0fdca9177e5
+old_NEWS_hash = 612bad626bf28b1847ad0114cb2cd6fe
 
 # Add an exemption for sc_makefile_at_at_check.
 _makefile_at_at_check_exceptions = ' && !/^cu_install_prog/ && !/dynamic-dep/'

diff --git a/doc/coreutils.texi b/doc/coreutils.texi
index 6068d8b08d8d3487e467d5a8092838a379408013..f7ce1654b7cfaea9d21600ce9403f1e8e9bee5cc 100644 (file)
--- a/doc/coreutils.texi
+++ b/doc/coreutils.texi
@@ -8109,7 +8109,7 @@ may be omitted, or one of:
 @end itemize
 Specifying @option{--color} and no @var{when} is equivalent to
 @option{--color=always}.
-If piping a colorized listing through a pager like @command{less},
+If piping a colored listing through a pager like @command{less},
 use the pager's @option{-R} option to pass the color codes to the terminal.
 
 @vindex LS_COLORS

diff --git a/src/dircolors.hin b/src/dircolors.hin
index b5d6452d7788557d0cdf456259b86faae84c170c..d86e0088f1d84ac2c42c2f001b8cc2b4908e7bca 100644 (file)
--- a/src/dircolors.hin
+++ b/src/dircolors.hin
@@ -9,7 +9,7 @@
 # slackware version of dircolors) are recognized but ignored.
 
 # Below are TERM entries, which can be a glob patterns, to match
-# against the TERM environment variable to determine if it is colorizable.
+# against the TERM environment variable to determine if it is colorable.
 TERM Eterm
 TERM ansi
 TERM *color*
@@ -71,7 +71,7 @@ STICKY 37;44  # dir with the sticky bit set (+t) and not other-writable
 EXEC 01;32
 
 # List any file extensions like '.gz' or '.tar' that you would like ls
-# to colorize below. Put the extension, a space, and the color init string.
+# to color below. Put the extension, a space, and the color init string.
 # (and any comments you want to add after a '#')
 
 # If you use DOS-style suffixes, you may want to uncomment the following:
@@ -80,7 +80,7 @@ EXEC 01;32
 #.com 01;32
 #.btm 01;32
 #.bat 01;32
-# Or if you want to colorize scripts even if they do not have the
+# Or if you want to color scripts even if they do not have the
 # executable bit actually set.
 #.sh  01;32
 #.csh 01;32

diff --git a/src/ls.c b/src/ls.c
index 6e87af651b39236e60e163cef771887a84ba0042..c350787b6a493c8b9c72515b6998fd1ba2859625 100644 (file)
--- a/src/ls.c
+++ b/src/ls.c
@@ -361,7 +361,7 @@ static bool color_symlink_as_referent;
 
 static char const *hostname;
 
-/* mode of appropriate file for colorization */
+/* Mode of appropriate file for coloring.  */
 static mode_t
 file_or_link_mode (struct fileinfo const *file)
 {
@@ -5424,7 +5424,7 @@ Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n\
 "), stdout);
       fputs (_("\
   -C                         list entries by columns\n\
-      --color[=WHEN]         colorize the output; WHEN can be 'always' (default\
+      --color[=WHEN]         color the output; WHEN can be 'always' (default\
 \n\
                                if omitted), 'auto', or 'never'; more info below\
 \n\

diff --git a/tests/ls/capability.sh b/tests/ls/capability.sh
index 0886f50bf1b7d15b2d641bbcbc7653db47c7de4d..5c5532dee5605f9ac8cf3719b3040c287ac495d5 100755 (executable)
--- a/tests/ls/capability.sh
+++ b/tests/ls/capability.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Ensure "ls --color" properly colorizes file with capability.
+# Ensure "ls --color" properly colors name of file with capability.
 
 # Copyright (C) 2008-2021 Free Software Foundation, Inc.
 

diff --git a/tests/ls/color-ext.sh b/tests/ls/color-ext.sh
index 5fa8c5ddfe2854a3184a974a47d278366aa00f1d..b36b00345ad5c7044b433be87238c4ccbe8a2126 100755 (executable)
--- a/tests/ls/color-ext.sh
+++ b/tests/ls/color-ext.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Ensure "ls --color" properly colorizes file extensions
+# Ensure "ls --color" properly colors file name extensions.
 
 # Copyright (C) 2018-2021 Free Software Foundation, Inc.
 

diff --git a/tests/ls/color-norm.sh b/tests/ls/color-norm.sh
index 17a790e28e743c7430fd5ab5a1a7fd797547e86b..58d172ed7634b04eaee49d86419221d60684e165 100755 (executable)
--- a/tests/ls/color-norm.sh
+++ b/tests/ls/color-norm.sh
@@ -36,7 +36,7 @@ touch nocolor || framework_failure_
 
 TCOLORS="no=7:ex=01;32"
 
-# Non coloured files inherit NORMAL attributes
+# Uncolored file names inherit NORMAL attributes.
 LS_COLORS=$TCOLORS      ls -gGU --color exe nocolor | qls >> out || fail=1
 LS_COLORS=$TCOLORS      ls -xU  --color exe nocolor       >> out || fail=1
 LS_COLORS=$TCOLORS      ls -gGU --color nocolor exe | qls >> out || fail=1

diff --git a/tests/ls/multihardlink.sh b/tests/ls/multihardlink.sh
index 2e8b1656d6cc8ebecde6454c7127f317e9b77d86..fd1a3d44152cefe50bd591e8a5d16659410d5cc3 100755 (executable)
--- a/tests/ls/multihardlink.sh
+++ b/tests/ls/multihardlink.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Ensure "ls --color" properly colorizes hard linked files.
+# Ensure "ls --color" properly colors names of hard linked files.
 
 # Copyright (C) 2008-2021 Free Software Foundation, Inc.
 

diff --git a/tests/ls/stat-free-symlinks.sh b/tests/ls/stat-free-symlinks.sh
index 6e97e8f65e7e631e3afa4b454ec8d7b681fe62d6..3397c9e01de0c8ebb9d4fb7a76486f86d0bcca8b 100755 (executable)
--- a/tests/ls/stat-free-symlinks.sh
+++ b/tests/ls/stat-free-symlinks.sh
@@ -62,7 +62,7 @@ n_stat2=$(grep -vF '+++' log2 | wc -l) || framework_failure_
 test $n_stat1 = $(($n_stat2 - 1)) \
   || { fail=1; head -n30 log*; }
 
-# Check that output is colorized, as requested, too.
+# Check that output is colored, as requested, too.
 {
   printf '\033[0m\033[01;35mlink-to-x\033[0m@\n'
   printf '\033[01;32mx\033[0m*\n'