summaryrefslogtreecommitdiffstats
path: root/man
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-07-09 07:35:22 +0000
committerZac Medico <zmedico@gentoo.org>2009-07-09 07:35:22 +0000
commitfb0caf19c365cf89523e2725599781b05698a59f (patch)
tree0030e494d623436d3af82d091b9159e4c0c8991e /man
parentc7188fc98450630f7b8a81f80b1ebc0d6cc7da78 (diff)
downloadportage-fb0caf19c365cf89523e2725599781b05698a59f.tar.gz
portage-fb0caf19c365cf89523e2725599781b05698a59f.tar.bz2
portage-fb0caf19c365cf89523e2725599781b05698a59f.zip
Allow --deep to take an optional integer parameter, to specify how deep it
should go. Also make --update so it no longer implies the equivalent of --deep=1. To get the old --update behavior, use --update --deep=1. svn path=/main/trunk/; revision=13812
Diffstat (limited to 'man')
-rw-r--r--man/emerge.16
1 files changed, 3 insertions, 3 deletions
diff --git a/man/emerge.1 b/man/emerge.1
index 4cb0c7ff2..07f511fa4 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -225,8 +225,8 @@ 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. This will
-also update direct dependencies which may not be what you want. Package atoms
+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
@@ -301,7 +301,7 @@ mode the bash build environment will run with the \-x option, causing
it to output verbose debugging information to stdout. This also enables
a plethora of other output (mostly dependency resolution messages).
.TP
-.BR "\-\-deep " (\fB\-D\fR)
+.BR "\-\-deep [DEPTH] " (\fB\-D\fR)
This flag forces
\fBemerge\fR to consider the entire dependency tree of packages,
instead of checking only the immediate dependencies of the packages.