Update --prune docs for bug #151653. (trunk r7315)

svn path=/main/branches/2.1.2/; revision=7316

diff --git a/man/emerge.1 b/man/emerge.1
index ed38ed66ef8858202048b5b05fc0c591514cd782..db51d3318326cb352c76c3663cc6e74c47309202 100644 (file)
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -125,12 +125,10 @@ package data.  It does not populate cache for the overlays listed in
 PORTDIR_OVERLAY.  In order to generate cache for overlays, use \fB\-\-regen\fR.
 .TP
 .BR "\-\-prune " (\fB\-P\fR)
-\fBWARNING: This action can remove important packages!\fR  Prune looks at each
-installed package and attempts to \fBremove\fR all but the \fBmost recently 
-installed version.  \fRPrune ignores \fBslots\fR, if you require a slot\-aware
-Prune use \fB emerge \-\-clean\fR.  Prune may inadvertently remove important 
-packages from your system.  Use \fB\-\-clean\fR instead unless you really 
-know what you're doing.
+\fBWARNING: This action can remove important packages!\fR  Removes all but the
+highest installed version of a package from your system. This action doesn't
+verify the possible binary compatibility between versions and can thus remove
+essential dependencies from your system.
 .TP
 .BR \-\-regen
 Causes portage to check and update the dependency cache of all ebuilds in the 

diff --git a/pym/emergehelp.py b/pym/emergehelp.py
index fa7bf32ce93e48be6db619e5c0ebb528a8afdf4a..4a6a042fabbd0dd746b5c99c403bab893613b100 100644 (file)
--- a/pym/emergehelp.py
+++ b/pym/emergehelp.py
@@ -87,7 +87,7 @@ def help(myaction,myopts,havecolor=1):
                print
                print "       "+green("--prune")+" ("+green("-P")+" short option)"
                print "              "+turquoise("WARNING: This action can remove important packages!")
-               print "              Removes all but the most recently installed version of a package"
+               print "              Removes all but the highest installed version of a package"
                print "              from your system. This action doesn't verify the possible binary"
                print "              compatibility between versions and can thus remove essential"
                print "              dependencies from your system."