summaryrefslogtreecommitdiffstats
path: root/man/portage.5
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-07-27 23:17:54 +0000
committerZac Medico <zmedico@gentoo.org>2007-07-27 23:17:54 +0000
commitc5b75ed8d971b3a914d9238bb29bb1d417bc65c1 (patch)
tree79dc3bdc60a23de515fc99758fad38f3fffe5b69 /man/portage.5
parent4e1b4b26214101aa4272d3d3f488fff1d5497b44 (diff)
downloadportage-c5b75ed8d971b3a914d9238bb29bb1d417bc65c1.tar.gz
portage-c5b75ed8d971b3a914d9238bb29bb1d417bc65c1.tar.bz2
portage-c5b75ed8d971b3a914d9238bb29bb1d417bc65c1.zip
For bug #186639, add more clarification about the relationship between /etc/make.profile/ and /etc/portage/profile/. (trunk r7411)
svn path=/main/branches/2.1.2/; revision=7412
Diffstat (limited to 'man/portage.5')
-rw-r--r--man/portage.58
1 files changed, 5 insertions, 3 deletions
diff --git a/man/portage.5 b/man/portage.5
index c80c4ceac..5d7e34de7 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
@@ -127,9 +129,9 @@ 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. 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