commit: 1255f758559e9f0bd733154abc8b89641351531d Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Tue Mar 21 09:55:44 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Mar 21 23:52:40 2023 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=1255f758
man/*: Document NO_COLOR Bug https://bugs.gentoo.org/898224 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> Closes: https://github.com/gentoo/portage/pull/1011 Signed-off-by: Sam James <sam <AT> gentoo.org> man/ebuild.1 | 9 +++++---- man/emerge.1 | 9 +++++---- man/make.conf.5 | 10 ++++++++-- man/ru/ebuild.1 | 10 +++++----- 4 files changed, 23 insertions(+), 15 deletions(-) diff --git a/man/ebuild.1 b/man/ebuild.1 index 113d04092..09974b755 100644 --- a/man/ebuild.1 +++ b/man/ebuild.1 @@ -1,4 +1,4 @@ -.TH "EBUILD" "1" "Mar 2013" "Portage VERSION" "Portage" +.TH "EBUILD" "1" "Mar 2023" "Portage VERSION" "Portage" .SH "NAME" ebuild \- a low level interface to the Portage system .SH "SYNOPSIS" @@ -202,9 +202,10 @@ Run bash with the \-x option, causing it to output verbose debugging information to stdout. .TP .BR "\-\-color < y | n >" -Enable or disable color output. This option will override \fINOCOLOR\fR -(see \fBmake.conf\fR(5)) and may also be used to force color output when stdout -is not a tty (by default, color is disabled unless stdout is a tty). +Enable or disable color output. This option will override \fINO_COLOR\fR +and \fINOCOLOR\fR (see \fBmake.conf\fR(5)) and may also be used to force +color output when stdout is not a tty (by default, color is disabled +unless stdout is a tty). .TP .BR "\-\-force" When used together with the digest or manifest command, diff --git a/man/emerge.1 b/man/emerge.1 index a1c5f33be..191ea4757 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -1,4 +1,4 @@ -.TH "EMERGE" "1" "Dec 2021" "Portage VERSION" "Portage" +.TH "EMERGE" "1" "Mar 2023" "Portage VERSION" "Portage" .SH "NAME" emerge \- Command\-line interface to the Portage system .SH "SYNOPSIS" @@ -513,9 +513,10 @@ has a special binding to FEATURES="test" (see \fBmake.conf\fR(5) for more information about \fBFEATURES\fR settings). .TP .BR "\-\-color < y | n >" -Enable or disable color output. This option will override \fINOCOLOR\fR -(see \fBmake.conf\fR(5)) and may also be used to force color output when stdout -is not a tty (by default, color is disabled unless stdout is a tty). +Enable or disable color output. This option will override \fINO_COLOR\fR +and \fINOCOLOR\fR (see \fBmake.conf\fR(5)) and may also be used to force +color output when stdout is not a tty (by default, color is disabled +unless stdout is a tty). .TP .BR \-\-columns Used alongside \fB\-\-pretend\fR to cause the package name, new version, diff --git a/man/make.conf.5 b/man/make.conf.5 index f3a6d8e27..85ee88c05 100644 --- a/man/make.conf.5 +++ b/man/make.conf.5 @@ -1,4 +1,4 @@ -.TH "MAKE.CONF" "5" "Jan 2023" "Portage VERSION" "Portage" +.TH "MAKE.CONF" "5" "Mar 2023" "Portage VERSION" "Portage" .SH "NAME" make.conf \- custom settings for Portage .SH "SYNOPSIS" @@ -939,8 +939,14 @@ For more information, see \fBmake\fR(1). Also see \fBemerge\fR(1) for information about analogous \fB\-\-jobs\fR and \fB\-\-load\-average\fR options. Defaults to the number of processors if left unset. .TP +\fBNO_COLOR\fR = \fI[any string]\fR +Set to any nonempty string (e.g. "1") to disable color by default. +.br +Defaults to unset. +.TP \fBNOCOLOR\fR = \fI["true" | "false"]\fR -Defines if color should be disabled by default. +Defines if color should be disabled by default. Deprecated in favor +of \fBNO_COLOR\fR. .br Defaults to false. .TP diff --git a/man/ru/ebuild.1 b/man/ru/ebuild.1 index 8767811d7..7c666f2e7 100644 --- a/man/ru/ebuild.1 +++ b/man/ru/ebuild.1 @@ -1,4 +1,4 @@ -.TH "EBUILD" "1" "Jan 2014" "Portage VERSION" "Portage" +.TH "EBUILD" "1" "Mar 2023" "Portage VERSION" "Portage" .SH "НАЗВАНИЕ" ebuild \- низкоуровневый интерфейс системы Portage .SH "СИНТАКСИС" @@ -197,10 +197,10 @@ SRC_URI, будет использована стандартная src_unpack() .TP .BR "\-\-color < y | n >" Включить или отключить цветное отображение. Эта опция переопределяет -значение переменной \fINOCOLOR\fR (см. \fBmake.conf\fR(5)) и может быть -использована для принудительного назначения цвета в том случае, если -стандартный вывод - не терминал (по умолчанию цвет включен только в том -случае, если стандартный вывод - терминал). +значение переменной \fINO_COLOR\fR и \fINOCOLOR\fR (см. \fBmake.conf\fR(5)) +и может быть использована для принудительного назначения цвета в том +случае, если стандартный вывод - не терминал (по умолчанию цвет включен +только в том случае, если стандартный вывод - терминал). .TP .BR "\-\-force" При использовании в связке с командой digest или manifest данная опция
