From b34ffde06c0c209832d7bf49b8fda9d79dc3e96e Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 2 Nov 2006 08:30:44 +0000 Subject: Document the new --color < y | n > option for bug #42115. svn path=/main/trunk/; revision=4907 --- man/emerge.1 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/man/emerge.1 b/man/emerge.1 index 242fe89e3..d9e634c4e 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -225,6 +225,11 @@ dependencies must already be emerged on the system. Use this in conjunction with the \fB\-\-pretend\fR option. This will show the ChangeLog entries for all the packages that will be upgraded. .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). +.TP .BR "\-\-columns" Used alongside \fB\-\-pretend\fR to cause the package name, new version, and old version to be displayed in an aligned format for easy cut\-n\-paste. @@ -280,9 +285,6 @@ Tells emerge to include installed packages where USE flags have changed since compilation. An asterisk marks when a USE flag has changed since the package was compiled. .TP -.BR "\-\-nocolor " -Suppresses all coloring of portage's output. -.TP .BR "\-\-noconfmem" Causes portage to disregard merge records indicating that a config file inside of a \fBCONFIG_PROTECT\fR directory has been merged already. Portage -- cgit v1.2.3-1-g7c22