summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-10-08 18:21:05 +0000
committerZac Medico <zmedico@gentoo.org>2006-10-08 18:21:05 +0000
commit6d1a76edd04bcab9319c6e4605978ea73c5dd42d (patch)
tree9c01507384b2427733edf27353e1158e72d3095d
parentf6478d73f49287031bd9e3e3b050efb8425664fa (diff)
downloadportage-6d1a76edd04bcab9319c6e4605978ea73c5dd42d.tar.gz
portage-6d1a76edd04bcab9319c6e4605978ea73c5dd42d.tar.bz2
portage-6d1a76edd04bcab9319c6e4605978ea73c5dd42d.zip
For bug #140021, remove autoaddcvs from the docs. Thanks to exg for this patch.
svn path=/main/trunk/; revision=4618
-rw-r--r--cnf/make.conf7
-rw-r--r--man/make.conf.57
2 files changed, 3 insertions, 11 deletions
diff --git a/cnf/make.conf b/cnf/make.conf
index 23a0d9358..6c3f415fc 100644
--- a/cnf/make.conf
+++ b/cnf/make.conf
@@ -244,9 +244,6 @@
# existing SRC_URI digests are correct. This feature also
# affects digest generation via ebuild(1) and emerge(1) (emerge
# generates digests only when the 'digest' feature is enabled).
-# 'autoaddcvs' causes portage to automatically try to add files to cvs
-# that will have to be added later. Done at generation times
-# and only has an effect when 'cvs' is also set.
# 'buildpkg' causes binary packages to be created of all packages that
# are being merged.
# 'ccache' enables ccache support via CC.
@@ -299,8 +296,8 @@
# as a security measure. As a side effect this can remove
# sandbox access violations for users.
# 'usersandbox' enables sandboxing while portage is running under userpriv.
-#FEATURES="sandbox buildpkg ccache distcc userpriv usersandbox notitles noclean noauto cvs keeptemp keepwork autoaddcvs"
-#FEATURES="sandbox ccache distcc distlocks autoaddcvs"
+#FEATURES="sandbox buildpkg ccache distcc userpriv usersandbox notitles noclean noauto cvs keeptemp keepwork"
+#FEATURES="sandbox ccache distcc distlocks"
#
# CCACHE_SIZE sets the space use limitations for ccache. The default size is
# 2G, and will be set if not defined otherwise and ccache is in features.
diff --git a/man/make.conf.5 b/man/make.conf.5
index 5f299da19..4782183a3 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -111,7 +111,7 @@ is specified.
Defines whether or not to ignore short pauses that occur when displaying
important informational messages. This variable is unset by default.
.TP
-\fBFEATURES\fR = \fI"sandbox ccache autoaddcvs"\fR
+\fBFEATURES\fR = \fI"sandbox ccache"\fR
Defines actions portage takes by default. These options should
not be changed by anyone but developers and/or maintainers. 'sandbox' is an important
part of \fBFEATURES\fR and should not be disabled by default. This is
@@ -124,11 +124,6 @@ SRC_URI digests are correct. This feature also affects digest generation via
\fBebuild\fR(1) and \fBemerge\fR(1) (emerge generates digests only when the
\fIdigest\fR feature is enabled).
.TP
-.B autoaddcvs
-Causes portage to automatically try to add files to cvs that will have to be added
-later. Done at generation times and only works when \fIcvs\fR is also in
-\fBFEATURES\fR.
-.TP
.B buildpkg
Binary packages will be created for all packages that are merged.
.TP