autounmask: reference EMERGE_DEFAULT_OPTS in docs

diff --git a/man/emerge.1 b/man/emerge.1
index 1ab8e4b12d4edec7f05169ed83be30a9d44d6b02..df576ee10b16c10f37b1cd1cfd3cf14927227d73 100644 (file)
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -300,7 +300,9 @@ 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), or enable the
-\fB\-\-autounmask\-write\fR option.
+\fB\-\-autounmask\-write\fR option. The
+\fBEMERGE_DEFAULT_OPTS\fR variable may be used to
+disable this option by default in \fBmake.conf\fR(5).
 .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 9d60f3a7059d791c331f113685e8ab6ce98f828e..5b5658d9fe0120ab11fbb17417c879d2dd918a8a 100644 (file)
--- a/pym/_emerge/help.py
+++ b/pym/_emerge/help.py
@@ -317,7 +317,9 @@ 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), or enable the " + \
-                       "--autounmask-write option."
+                       "--autounmask-write option. The " + \
+                       "EMERGE_DEFAULT_OPTS variable may be used to " + \
+                       "disable this option by default in make.conf(5)."
                for line in wrap(desc, desc_width):
                        print(desc_indent + line)
                print()