Document that --autounmask is enabled by default.

diff --git a/man/emerge.1 b/man/emerge.1
index 0f2acc1d12e7e783de9e56932077b90b0204da65..0760e5289feb0294930adcdfb4ec402995ca03cf 100644 (file)
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -292,14 +292,15 @@ intended to be set in the \fBmake.conf\fR(5)
 \fBEMERGE_DEFAULT_OPTS\fR variable.
 .TP
 .BR "\-\-autounmask [ y | n ]"
-Automatically unmask packages. If any configuration
+Automatically unmask packages and generate package.use
+settings as necessary to satisfy dependencies. This
+option is enabled by default. If any configuration
 changes are required, then they will be displayed
 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,
-LICENSE masks, and package.use settings.
+the specified configuration file(s), or enable the
+\fB\-\-autounmask\-write\fR option.
 .TP
 .BR "\-\-autounmask\-write [ y | n ]"
 If \-\-autounmask is enabled, changes are written

diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py
index ddaa62602a9170412937203a9f5cccf6f78fb88d..9dc38b764d401d6ccf1f4521a9e0c41cd9b51ecb 100644 (file)
--- a/pym/_emerge/help.py
+++ b/pym/_emerge/help.py
@@ -309,14 +309,15 @@ def help(myopts, havecolor=1):
                print() 
                print("       " + green("--autounmask") + " [ %s | %s ]" % \
                        (turquoise("y"), turquoise("n")))
-               desc = "Automatically unmask packages. If any configuration " + \
+               desc = "Automatically unmask packages and generate package.use " + \
+                       "settings as necessary to satisfy dependencies. This " + \
+                       "option is enabled by default. If any configuration " + \
                        "changes are required, then they will be displayed " + \
                        "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, " + \
-                       "LICENSE masks, and package.use settings."
+                       "the specified configuration file(s), or enable the " + \
+                       "--autounmask-write option."
                for line in wrap(desc, desc_width):
                        print(desc_indent + line)
                print()