summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-07-30 07:04:47 +0000
committerZac Medico <zmedico@gentoo.org>2007-07-30 07:04:47 +0000
commitbf6fed5ae94d84c21dd8b981ccd02b566bc675c8 (patch)
treecae855f0c3109074a521992a3d2735b0d3779935
parent6336c2c3c5a8cf76f20f38df9410964835aa079b (diff)
downloadportage-bf6fed5ae94d84c21dd8b981ccd02b566bc675c8.tar.gz
portage-bf6fed5ae94d84c21dd8b981ccd02b566bc675c8.tar.bz2
portage-bf6fed5ae94d84c21dd8b981ccd02b566bc675c8.zip
For bug #186639, note that /etc/portage/profile/ supports all of the same file types that /etc/make.profile/ does, except parent. (branches/2.1.2 r7411:7414)
svn path=/main/branches/2.1.2.9/; revision=7509
-rw-r--r--man/portage.59
1 files changed, 6 insertions, 3 deletions
diff --git a/man/portage.5 b/man/portage.5
index dc72d5467..cc0110a23 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -22,11 +22,13 @@ make.globals
.fi
.TP
.BR /etc/make.profile/
+site\-specific overrides go in \fB/etc/portage/profile/\fR
.nf
deprecated
make.defaults
packages
packages.build
+package.mask
package.provided
package.use
package.use.force
@@ -126,9 +128,10 @@ may easily be updated/regenerated by running `emerge \-\-sync`. It defines
what a profile is (usually arch specific stuff). If you need a custom
profile, then you should make your own \fB/etc/make.profile/\fR
directory and populate it. However, if you just wish to override some
-settings, do NOT edit these files because they WILL be lost with the
-next `emerge \-\-sync`. See the section below on \fB/etc/portage/\fR for
-overriding.
+settings, use \fB/etc/portage/profile/\fR (it supports all of the same file
+types that \fB/etc/make.profile/\fR does, except parent). Do NOT edit the
+settings in \fB/etc/make.profile/\fR because they WILL be lost with the next
+`emerge \-\-sync`.
.RS
.TP
.BR deprecated