summaryrefslogtreecommitdiffstats
path: root/man/emerge.1
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2012-12-28 13:36:04 -0800
committerZac Medico <zmedico@gentoo.org>2012-12-28 13:44:02 -0800
commita4c4e125ee7fdcedef1903eb9272c76d963978be (patch)
tree1912993bd091c75a1e0d038c62b488c99fdb3e9f /man/emerge.1
parent74cf5fac5c2425a743233156a52abb0654995530 (diff)
downloadportage-a4c4e125ee7fdcedef1903eb9272c76d963978be.tar.gz
portage-a4c4e125ee7fdcedef1903eb9272c76d963978be.tar.bz2
portage-a4c4e125ee7fdcedef1903eb9272c76d963978be.zip
man pages: refer to /etc/portage/make.conf
Diffstat (limited to 'man/emerge.1')
-rw-r--r--man/emerge.16
1 files changed, 3 insertions, 3 deletions
diff --git a/man/emerge.1 b/man/emerge.1
index cd54dab8e..356bb930d 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -1040,13 +1040,13 @@ defined in make.globals. Directory exceptions to the CONFIG_PROTECTed
directories can be specified using the \fICONFIG_PROTECT_MASK\fR variable. To find
files that need to be updated in /etc, type \fBfind /etc \-iname \'._cfg????_*\'\fR.
.LP
-You can disable this feature by setting \fICONFIG_PROTECT="\-*"\fR in /etc/make.conf.
+You can disable this feature by setting \fICONFIG_PROTECT="\-*"\fR in \fBmake.conf\fR(5).
Then, Portage will mercilessly auto\-update your config files. Alternatively,
you can leave Config File Protection on but tell Portage that it can overwrite
files in certain specific /etc subdirectories. For example, if you wanted
Portage to automatically update your rc scripts and your wget configuration,
but didn't want any other changes made without your explicit approval, you'd
-add this to /etc/make.conf:
+add this to \fBmake.conf\fR(5):
.LP
.I CONFIG_PROTECT_MASK="/etc/wget /etc/rc.d"
.LP
@@ -1090,7 +1090,7 @@ This is like the world file but instead of package atoms it contains
packages sets which always begin with the \fB@\fR character. Use
\fB/etc/portage/sets/\fR to define user package sets.
.TP
-.B /etc/make.conf
+.B /etc/portage/make.conf
Contains variables for the build process, overriding those in
\fBmake.globals\fR.
.TP