diff options
author | Zac Medico <zmedico@gentoo.org> | 2011-02-13 18:20:16 -0800 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2011-02-13 18:20:16 -0800 |
commit | ec113fa7a8b9e8f13c4b4dfd110b10fe9a0c7cfc (patch) | |
tree | 5fa17cb12c08d0c540f3f2bd91ef34e6785df186 /man | |
parent | 04da1ea51947b171f5994d0cc054769442d48cdf (diff) | |
download | portage-ec113fa7a8b9e8f13c4b4dfd110b10fe9a0c7cfc.tar.gz portage-ec113fa7a8b9e8f13c4b4dfd110b10fe9a0c7cfc.tar.bz2 portage-ec113fa7a8b9e8f13c4b4dfd110b10fe9a0c7cfc.zip |
Display: tweak output and docs for bug 58416
Now the masking display is disabled by the --quiet option if the
--verbose option is not enabled simultaneously. Also, docs are
updated as per bug 58416, comment #11 and #12.
Diffstat (limited to 'man')
-rw-r--r-- | man/emerge.1 | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/man/emerge.1 b/man/emerge.1 index 05498ff97..311ce75c7 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -721,11 +721,12 @@ displayed. .B [ebuild U *] sys\-apps/portage\-2.2.0_alpha6 [2.1.9.25] Portage 2.1.9.25 is installed, but if you run the command, then portage will upgrade to version 2.2.0_alpha6. In this case, -\fB\-\-verbose\fR causes the \fB*\fR symbol to be displayed, in -order to indicate that version 2.2.0_alpha6 is masked by missing -keyword. The following symbols are used to indicate various types +the \fB*\fR symbol is displayed, in order to indicate that version +2.2.0_alpha6 is masked by missing keyword. This type of masking +display is disabled by the \fB\-\-quiet\fR option if the +\fB\-\-verbose\fR option is not enabled simultaneously. +The following symbols are used to indicate various types of masking: - .TS l l __ @@ -736,6 +737,10 @@ Symbol Mask Type * missing keyword ~ unstable keyword .TE + +\fBNOTE:\fR The unstable keyword symbol (~) will not be shown in cases +in which the corresponding unstable keywords have been accepted +globally via \fBACCEPT_KEYWORDS\fR. .TP |