Move --update from the actions to the options section.

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

diff --git a/man/emerge.1 b/man/emerge.1
index 072553432eb17ffd22f06cac6331b705e9c23b58..7b232056dbfbec54bfb6b1eba5961febc876bf08 100644 (file)
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -241,13 +241,6 @@ system.  Its arguments can be \fIatoms\fR or
 \fIebuilds\fR. For a dependency aware version of \fB\-\-unmerge\fR,
 use \fB\-\-depclean\fR or \fB\-\-prune\fR.
 .TP
-.BR "\-\-update " (\fB\-u\fR)
-Updates packages to the best version available, which may not always be the 
-highest version number due to masking for testing and development.
-Package atoms
-specified on the command line are greedy, meaning that unspecific atoms may
-match multiple installed versions of slotted packages.
-.TP
 .BR "\-\-version " (\fB\-V\fR)
 Displays the version number of \fBemerge\fR.
 .SH "OPTIONS"
@@ -558,6 +551,13 @@ order in which the packages will be merged. When
 constraint is removed, hopefully leading to a more
 readable dependency tree.
 .TP
+.BR "\-\-update " (\fB\-u\fR)
+Updates packages to the best version available, which may
+not always be the  highest version number due to masking
+for testing and development. Package atoms specified on
+the command line are greedy, meaning that unspecific
+atoms may match multiple versions of slotted packages.
+.TP
 .BR "\-\-use\-ebuild\-visibility[=n]"
 Use unbuilt ebuild metadata for visibility
 checks on built packages.

diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py
index ac36d0cccf8ff90d1af2afeb633c88b006369292..409bbe2909ff351bf9a4c6a689ae3a9950dd0970 100644 (file)
--- a/pym/_emerge/help.py
+++ b/pym/_emerge/help.py
@@ -232,13 +232,6 @@ def help(myopts, havecolor=1):
                print("              ebuilds. For a dependency aware version of --unmerge, use")
                print("              --depclean or --prune.")
                print()
-               print("       "+green("--update")+" ("+green("-u")+" short option)")
-               print("              Updates packages to the best version available, which may not")
-               print("              always be the highest version number due to masking for testing")
-               print("              and development. Package atoms specified on the command")
-               print("              line are greedy, meaning that unspecific atoms may match multiple")
-               print("              installed versions of slotted packages.")
-               print()
                print("       "+green("--version")+" ("+green("-V")+" short option)")
                print("              Displays the currently installed version of portage along with")
                print("              other information useful for quick reference on a system. See")
@@ -607,6 +600,15 @@ def help(myopts, havecolor=1):
                for line in wrap(desc, desc_width):
                        print(desc_indent + line)
                print()
+               print("       "+green("--update")+" ("+green("-u")+" short option)")
+               desc = "Updates packages to the best version available, which may " + \
+                       "not always be the  highest version number due to masking " + \
+                       "for testing and development. Package atoms specified on " + \
+                       "the command line are greedy, meaning that unspecific " + \
+                       "atoms may match multiple versions of slotted packages."
+               for line in wrap(desc, desc_width):
+                       print(desc_indent + line)
+               print()
                print("       " + green("--use-ebuild-visibility") + "[=%s]" % turquoise("n"))
                desc = "Use unbuilt ebuild metadata for visibility " + \
                        "checks on built packages."