Document the --selective option.

svn path=/main/trunk/; revision=13807

diff --git a/man/emerge.1 b/man/emerge.1
index b533857bb1526cfb333ea18cca561821e5155370..4cb0c7ff225fb7f091bfb1e26797d39bc6cfdf36 100644 (file)
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -446,6 +446,10 @@ be enabled under normal circumstances. For currently supported
 \fBDEPEND\fR variable. However, behavior may change for new
 \fBEAPI\fRs when related extensions are added in the future.
 .TP
+.BR "\-\-selective"
+This is similar to the \fB\-\-noreplace\fR option, except that it
+does not take precedence over options such as \fB\-\-newuse\fR.
+.TP
 .BR "\-\-skipfirst"
 This option is only valid when used with \fB\-\-resume\fR.  It removes the 
 first package in the resume list. Dependencies are recalculated for

diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py
index f78c2e0e0f1887f39987e1082d7088d845692585..583b57aa7307dbc64c78f76643b07e7ea293ec44 100644 (file)
--- a/pym/_emerge/help.py
+++ b/pym/_emerge/help.py
@@ -467,6 +467,12 @@ def help(myopts, havecolor=1):
                for line in wrap(desc, desc_width):
                        print desc_indent + line
                print
+               print "       " + green("--selective")
+               desc = "This is similar to the --noreplace option, except that it " + \
+                       "does not take precedence over options such as --newuse."
+               for line in wrap(desc, desc_width):
+                       print desc_indent + line
+               print
                print "       "+green("--skipfirst")
                desc = "This option is only valid when " + \
                        "used with --resume.  It removes the " + \