From: Karel Zak <kzak@redhat.com>
Date: Tue, 11 Mar 2014 09:05:32 +0000 (+0100)
Subject: lib/colors: add info to man pages, add terminal-colors.d.5
X-Git-Tag: v2.25-rc1~544
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=60ec67ff4e82cf22d37fb6850256839d53cfedce;p=thirdparty%2Futil-linux.git

lib/colors: add info to man pages, add terminal-colors.d.5

Co-Author: Ondrej Oprala <ooprala@redhat.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/lib/Makemodule.am b/lib/Makemodule.am
index 6a4787f1f8..0e2aa24915 100644
--- a/lib/Makemodule.am
+++ b/lib/Makemodule.am
@@ -43,6 +43,8 @@ if HAVE_CPU_SET_T
 libcommon_la_SOURCES += lib/cpuset.c
 endif
 
+dist_man_MANS += lib/terminal-colors.d.5
+
 check_PROGRAMS += \
 	test_at \
 	test_blkdev \
diff --git a/lib/terminal-colors.d.5 b/lib/terminal-colors.d.5
new file mode 100644
index 0000000000..8a97af7476
--- /dev/null
+++ b/lib/terminal-colors.d.5
@@ -0,0 +1,25 @@
+.\" terminal-colors.d.5 --
+.\" Copyright 2014 Ondrej Oprala <ooprala@redhat.com>
+.\" Copyright (C) 2014 Karel Zak <kzak@redhat.com>
+.\" Copyright 2014 Red Hat, Inc.
+.\" May be distributed under the GNU General Public License
+.TH "TERMINAL_COLORS\&.D" "5" "January 2014" "util-linux" "terminal-colors.d"
+.SH "NAME"
+terminal-colors.d \- Configure output colorization for various utilities
+.SH "SYNOPSIS"
+.PP
+/etc/terminal-colors\&.d/[util-name\&.]disable
+.SH "DESCRIPTION"
+Files in this directory determine the default behaviour for utilities
+when coloring output.
+
+The file
+.B disable
+turns off output colorization for all utilities compatible with config files in
+.B /etc/terminal-colors\&.d.
+.PP
+.SH AVAILABILITY
+terminal-colors.d is part of the util-linux package and is available from
+.UR ftp://\:ftp.kernel.org\:/pub\:/linux\:/utils\:/util-linux/
+Linux Kernel Archive
+.UE .
diff --git a/misc-utils/cal.1 b/misc-utils/cal.1
index 470d231928..5971467b63 100644
--- a/misc-utils/cal.1
+++ b/misc-utils/cal.1
@@ -107,6 +107,17 @@ The week numbering depends on the choice of the first day of the week.  If Sunda
 American numbering will be used, i.e. the first Sunday of the year starts the
 first week.  If Monday is selected, then the ISO-8601 standard week numbering
 is used, where the first Thursday of the year is in week number 1.
+.SH COLORS
+Implicit coloring can be disabled as follows:
+.RS
+
+.br
+.BI "touch /etc/terminal-colors.d/cal.disable"
+.br
+
+.RE
+For more details see
+.BR terminal-colors.d (5).
 .SH BUGS
 .PP
 The
diff --git a/sys-utils/dmesg.1 b/sys-utils/dmesg.1
index f5d256cf71..75af1ec535 100644
--- a/sys-utils/dmesg.1
+++ b/sys-utils/dmesg.1
@@ -177,6 +177,17 @@ The
 format has the same issue as
 .BR ctime :
 the time may be inaccurate when a system is suspended and resumed.
+.SH COLORS
+Implicit coloring can be disabled as follows:
+.RS
+
+.br
+.BI "touch /etc/terminal-colors.d/dmesg.disable"
+.br
+
+.RE
+For more details see
+.BR terminal-colors.d (5).
 .SH SEE ALSO
 .BR syslogd (8)
 .SH AUTHORS
diff --git a/text-utils/hexdump.1 b/text-utils/hexdump.1
index 89b0d9168a..e48889b3af 100644
--- a/text-utils/hexdump.1
+++ b/text-utils/hexdump.1
@@ -350,6 +350,17 @@ offsets 510 and 511 green if their value is 0xAA55, red otherwise.
    "%07.7_Ax_L[cyan]\en"
    "%07.7_ax_L[cyan]  " 8/2 "   %04x_L[green:0xAA55@510-511,!red:0xAA55@510-511] " "\en"
 .nf
+.SH COLORS
+Implicit coloring can be disabled as follows:
+.RS
+
+.br
+.BI "touch /etc/terminal-colors.d/hexdump.disable"
+.br
+
+.RE
+For more details see
+.BR terminal-colors.d (5).
 .SH STANDARDS
 The
 .B hexdump