Remove the --avoid-update option and make it the default behavior when

--update is not specified, as suggested by Allen Brooker (AllenJB)
<gentoo-bugs@allenjb.me.uk> in bug #275945, comment #2.

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

1 files changed, 0 insertions, 12 deletions

diff --git a/man/emerge.1 b/man/emerge.1
index a1dbcde73..df054c9e9 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -90,15 +90,6 @@ option if you want to install a tbz2\fR.  The packages are added
 to the \fBworld\fR file at the end, so that they are considered for
 later updating.
 .TP
-.BR "\-\-avoid\-update "
-Tries to prevent package updates. This may not always be
-possible since new packages or new dependencies due to USE
-flag changes may require a newer version of an installed
-package. Furthermore, this option may lead to slot conflicts
-(Multiple package instances within a single package slot
-have been pulled into the dependency graph). It is not
-possible to use this option in such a case.
-.TP
 .BR "\-\-clean " (\fB\-c\fR)
 Cleans up the system by examining the installed packages and removing older
 packages.  This is accomplished by looking at each installed package and separating
@@ -373,9 +364,6 @@ A USE flag was turned off for a package.
 
 USE flags may be toggled by your profile as well as your USE and package.use
 settings.
-
-\fB\-\-avoid\-update\fR may prevent updates of installed packages without 
-use flag changes. Note that \fB\-\-avoid-\update\fR may lead to slot conflicts.
 .TP
 .BR "\-\-noconfmem"
 Causes portage to disregard merge records indicating that a config file