Merge from trunk:

------------------------------------------------------------------------
r10291 | zmedico | 2008-05-11 12:37:31 -0700 (Sun, 11 May 2008) | 2 lines

Add back the warning for DISTDIR about storing stuff inside PORTDIR.

------------------------------------------------------------------------
r10290 | zmedico | 2008-05-11 12:35:26 -0700 (Sun, 11 May 2008) | 2 lines

Sync make.conf.example with make.conf.5 for bug #220111.

------------------------------------------------------------------------
r10289 | zmedico | 2008-05-11 12:21:28 -0700 (Sun, 11 May 2008) | 3 lines

Bug #220111 - Update the DISTDIR docs to clarify that it's safe to remove
any and all files from this location after packages are built.

------------------------------------------------------------------------
r10288 | zmedico | 2008-05-11 11:25:35 -0700 (Sun, 11 May 2008) | 2 lines

Make the summary more accurate.

------------------------------------------------------------------------

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

diff --git a/cnf/make.conf b/cnf/make.conf
index d310367271eacd1bf535aae40eef18e4ef7aadee..df7bddc279a5bec93403a14b24c5e08a31f4744a 100644 (file)
--- a/cnf/make.conf
+++ b/cnf/make.conf
@@ -87,12 +87,13 @@
 #PORTDIR=/usr/portage
 #
 # DISTDIR is where all of the source code tarballs will be placed for
-#     emerges. The source code is maintained here unless you delete
-#     it. The entire repository of tarballs for Gentoo is 9G. This is
-#     considerably more than any user will ever download. 2-3G is
-#     a large DISTDIR. Note that locations under /usr/portage are not
-#     necessarily safe for data storage. See the PORTDIR documentation
-#     for more information.
+#     emerges. After packages are built, it is safe to remove any and
+#     all files from this directory since they will be automatically
+#     fetched on demand for a given build. If you would like to
+#     selectively prune obsolete files from this directory, see
+#     eclean from the gentoolkit package. Note that locations under
+#     /usr/portage are not necessarily safe for data storage. See the
+#     PORTDIR documentation for more information.
 #DISTDIR=/usr/portage/distfiles
 #
 # PKGDIR is the location of binary packages that you can have created

diff --git a/man/emaint.1 b/man/emaint.1
index 98c33429f5bdf300d75fbf3477facad44dcc4f68..2cf31420fdc6fa924f32f6664ae1cc39c2b24c32 100644 (file)
--- a/man/emaint.1
+++ b/man/emaint.1
@@ -1,6 +1,6 @@
 .TH "EMAINT" "1" "Dec 2005" "Portage 2.1" "Portage"
 .SH NAME
-emaint \- updates environment settings automatically
+emaint \- performs system health checks and maintenance
 .SH SYNOPSIS
 .BR emaint
 [\fIoptions\fR]

diff --git a/man/make.conf.5 b/man/make.conf.5
index ac4555ed0a5b76a1ac7501528bd1e0e9607d9cd6..df4e08c92815f841cc79ffdf25a2d359ea17df1a 100644 (file)
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -98,7 +98,11 @@ This variable is passed by the \fIebuild scripts\fR to the \fIconfigure\fR
 as \fI\-\-target=${CTARGET}\fR only if it is defined.
 .TP
 \fBDISTDIR\fR = \fI[path]\fR
-Defines the location of your local source file repository.  Note
+Defines the location of your local source file repository. After packages
+are built, it is safe to remove any and all files from this directory since
+they will be automatically fetched on demand for a given build. If you would
+like to selectively prune obsolete files from this directory, see
+\fBeclean\fR(1) from the gentoolkit package. Note
 that locations under /usr/portage are not necessarily safe for data storage.
 See the \fBPORTDIR\fR documentation for more information.
 .br