From: Zac Medico Date: Fri, 17 Sep 2010 22:01:04 +0000 (-0700) Subject: Update emerge --autounmask docs to indicate support for LICENSE X-Git-Tag: v2.2_rc84~26 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a6847096d5e4140cca468c26d78366abf8467184;p=portage.git Update emerge --autounmask docs to indicate support for LICENSE masks. --- diff --git a/man/emerge.1 b/man/emerge.1 index 9caca445c..45a7c8486 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -291,8 +291,8 @@ after the merge list and emerge will immediately abort. If the displayed configuration changes are satisfactory, you should copy and paste them into the specified configuration file(s). Currently, -this only works for unstable KEYWORDS masks and -package.use settings. +this only works for unstable KEYWORDS masks, +LICENSE masks, and package.use settings. .TP .BR \-\-backtrack=COUNT Specifies an integer number of times to backtrack if diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py index b0d91c8c5..ce494ffd5 100644 --- a/pym/_emerge/help.py +++ b/pym/_emerge/help.py @@ -306,8 +306,8 @@ def help(myopts, havecolor=1): "abort. If the displayed configuration changes are " + \ "satisfactory, you should copy and paste them into " + \ "the specified configuration file(s). Currently, " + \ - "this only works for unstable KEYWORDS masks and " + \ - "package.use settings." + "this only works for unstable KEYWORDS masks, " + \ + "LICENSE masks, and package.use settings." for line in wrap(desc, desc_width): print(desc_indent + line) print()