summaryrefslogtreecommitdiffstats
path: root/man/portage.5
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-08-15 18:54:48 -0700
committerZac Medico <zmedico@gentoo.org>2010-08-15 18:54:48 -0700
commitd493a029add855e6ade95d60b57ec7b8f5aba067 (patch)
treea926b844dafa65a78857deb823abbdc729b3696e /man/portage.5
parent9f6ad12cbbea42c06b92d08e336ce5c7091a9227 (diff)
downloadportage-d493a029add855e6ade95d60b57ec7b8f5aba067.tar.gz
portage-d493a029add855e6ade95d60b57ec7b8f5aba067.tar.bz2
portage-d493a029add855e6ade95d60b57ec7b8f5aba067.zip
Add support for /etc/portage/make.conf. If present, this file will
override settings from /etc/make.conf.
Diffstat (limited to 'man/portage.5')
-rw-r--r--man/portage.55
1 files changed, 5 insertions, 0 deletions
diff --git a/man/portage.5 b/man/portage.5
index c3e8d8655..d13eee524 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -48,6 +48,7 @@ virtuals
bashrc
categories
color.map
+make.conf
mirrors
modules
package.keywords
@@ -437,6 +438,10 @@ media\-other
.BR color.map
Contains variables customizing colors. See \fBcolor.map\fR(5).
.TP
+.BR make.conf
+The global custom settings for Portage. See \fBmake.conf\fR(5).
+If present, this file will override settings from /etc/make.conf.
+.TP
.BR mirrors
Whenever portage encounters a mirror:// style URI it will look up the actual
hosts here. If the mirror set is not found here, it will check the global