[gentoo-commits] proj/portage:master commit in: man/ru/, man/

[gentoo-commits] proj/portage:master commit in: man/ru/, man/

[Sam James]

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 данная опция

[gentoo-commits] proj/portage:master commit in: man/ru/, man/

[Zac Medico]

commit:     b264a7aeb342ac8e2004a851aaa23e97a173de4d
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 12 16:29:39 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Aug 12 16:29:39 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=b264a7ae

Correct ebuild.sh path in man pages, bug #462802

---
 man/make.conf.5 | 4 ++--
 man/ru/ebuild.1 | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index f83dd03..6c4710a 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -1,4 +1,4 @@
-.TH "MAKE.CONF" "5" "Jul 2013" "Portage VERSION" "Portage"
+.TH "MAKE.CONF" "5" "Aug 2013" "Portage VERSION" "Portage"
 .SH "NAME"
 make.conf \- custom settings for Portage
 .SH "SYNOPSIS"
@@ -1094,6 +1094,6 @@ Contains a list of all local USE variables.
 .BR ebuild (1),
 .BR ebuild (5)
 .TP
-The \fI/usr/sbin/ebuild.sh\fR script.
+The \fI/usr/lib/portage/bin/ebuild.sh\fR script.
 .TP
 The helper apps in \fI/usr/lib/portage/bin\fR.

diff --git a/man/ru/ebuild.1 b/man/ru/ebuild.1
index c0524f7..37aadb4 100644
--- a/man/ru/ebuild.1
+++ b/man/ru/ebuild.1
@@ -1,4 +1,4 @@
-.TH "EBUILD" "1" "Jan 2013" "Portage VERSION" "Portage"
+.TH "EBUILD" "1" "Aug 2013" "Portage VERSION" "Portage"
 .SH "НАЗВАНИЕ"
 ebuild \- низкоуровневый интерфейс системы Portage
 .SH "СИНТАКСИС"
@@ -234,7 +234,7 @@ Mike Frysinger <vapier@gentoo.org>
 .BR make.conf (5),
 .BR color.map (5)
 .TP
-Сценарий \fI/usr/sbin/ebuild.sh\fR.
+Сценарий \fI/usr/lib/portage/bin/ebuild.sh\fR.
 .TP
 Вспомогательные приложения в \fI/usr/lib/portage/bin\fR.
 

[gentoo-commits] proj/portage:master commit in: man/ru/, man/

[Arfrever Frehtes Taifersar Arahesis]

commit:     9790b7e73a649ac4dbcd5b86b922e73af8e582a8
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Tue Jul 23 20:55:30 2013 +0000
Commit:     Arfrever Frehtes Taifersar Arahesis <arfrever.fta <AT> gmail <DOT> com>
CommitDate: Tue Jul 23 20:55:30 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=9790b7e7

Use consistent e-mail address in manuals.

---
 man/color.map.5    | 4 ++--
 man/ebuild.5       | 4 ++--
 man/emerge.1       | 1 +
 man/make.conf.5    | 1 +
 man/portage.5      | 2 +-
 man/ru/color.map.5 | 6 +++---
 6 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/man/color.map.5 b/man/color.map.5
index b5f5a81..175729a 100644
--- a/man/color.map.5
+++ b/man/color.map.5
@@ -1,4 +1,4 @@
-.TH "COLOR.MAP" "5" "Dec 2012" "Portage VERSION" "Portage"
+.TH "COLOR.MAP" "5" "Jul 2013" "Portage VERSION" "Portage"
 .SH "NAME"
 color.map \- custom color settings for Portage
 .SH "SYNOPSIS"
@@ -185,7 +185,7 @@ Defines color used for warnings.
 Please report bugs via http://bugs.gentoo.org/
 .SH "AUTHORS"
 .nf
-Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@gmail.com>
+Arfrever Frehtes Taifersar Arahesis <arfrever@apache.org>
 .fi
 .SH "FILES"
 .TP

diff --git a/man/ebuild.5 b/man/ebuild.5
index b461437..cca87e8 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1,4 +1,4 @@
-.TH "EBUILD" "5" "May 2013" "Portage VERSION" "Portage"
+.TH "EBUILD" "5" "Jul 2013" "Portage VERSION" "Portage"
 
 .SH "NAME"
 ebuild \- the internal format, variables, and functions in an ebuild script
@@ -1551,6 +1551,6 @@ Achim Gottinger <achim@gentoo.org>
 Mark Guertin <gerk@gentoo.org>
 Nicholas Jones <carpaski@gentoo.org>
 Mike Frysinger <vapier@gentoo.org>
-Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@gmail.com>
+Arfrever Frehtes Taifersar Arahesis <arfrever@apache.org>
 Fabian Groffen <grobian@gentoo.org>
 .fi

diff --git a/man/emerge.1 b/man/emerge.1
index cd4595d..fd48089 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -1131,6 +1131,7 @@ Marius Mauch <genone@gentoo.org>
 Jason Stubbs <jstubbs@gentoo.org>
 Brian Harring <ferringb@gmail.com>
 Zac Medico <zmedico@gentoo.org>
+Arfrever Frehtes Taifersar Arahesis <arfrever@apache.org>
 .fi
 .SH "FILES"
 Here is a common list of files you will probably be interested in.  For a 

diff --git a/man/make.conf.5 b/man/make.conf.5
index 6a34cc9..74f047b 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -1025,6 +1025,7 @@ Daniel Robbins <drobbins@gentoo.org>
 Nicholas Jones <carpaski@gentoo.org>
 Mike Frysinger <vapier@gentoo.org>
 Saleem Abdulrasool <compnerd@gentoo.org>
+Arfrever Frehtes Taifersar Arahesis <arfrever@apache.org>
 .fi
 .SH "FILES"
 .TP

diff --git a/man/portage.5 b/man/portage.5
index 48b7ea9..27c3ffe 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -1289,7 +1289,7 @@ Please report bugs via http://bugs.gentoo.org/
 Marius Mauch <genone@gentoo.org>
 Mike Frysinger <vapier@gentoo.org>
 Drake Wyrm <wyrm@haell.com>
-Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+Arfrever Frehtes Taifersar Arahesis <arfrever@apache.org>
 .fi
 .SH "SEE ALSO"
 .BR emerge (1),

diff --git a/man/ru/color.map.5 b/man/ru/color.map.5
index a566ce7..f7e65e3 100644
--- a/man/ru/color.map.5
+++ b/man/ru/color.map.5
@@ -1,4 +1,4 @@
-.TH "COLOR.MAP" "5" "Dec 2012" "Portage VERSION" "Portage"
+.TH "COLOR.MAP" "5" "Jul 2013" "Portage VERSION" "Portage"
 .SH "НАЗВАНИЕ"
 color.map \- пользовательские настройки цвета в Portage
 .SH "ПАРАМЕТРЫ"
@@ -192,7 +192,7 @@ color.map \- пользовательские настройки цвета в P
 Об обнаруженных ошибках сообщайте на http://bugs.gentoo.org/
 .SH "АВТОРЫ"
 .nf
-Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@gmail.com>
+Arfrever Frehtes Taifersar Arahesis <arfrever@apache.org>
 .fi
 .SH "ФАЙЛЫ"
 .TP
@@ -214,4 +214,4 @@ Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@gmail.com>
 .nf
 \fRПереводчик\fR - Елена Гаврилова <e.vl.gavrilova@yandex.ru>
 \fRРедактор\fR - Романов Владимир <blueboar2@gmail.com>
-.fi
\ No newline at end of file
+.fi