diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-08-27 14:15:32 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-08-27 14:15:32 -0700 |
| commit | e978a8ffdda4e278b96e260a0a2ead8ca1c14e64 (patch) | |
| tree | 663aa1e49c7b1bbd4f1df35128bb7025aeb2f20a /man | |
| parent | 6faf12d1ce0754325bf36d87001d9a63c97fa4bb (diff) | |
| download | portage-e978a8ffdda4e278b96e260a0a2ead8ca1c14e64.tar.gz portage-e978a8ffdda4e278b96e260a0a2ead8ca1c14e64.tar.bz2 portage-e978a8ffdda4e278b96e260a0a2ead8ca1c14e64.zip | |
Bug #334817 - Make the make.conf.5 man page document the fact that
/etc/portage/make.conf overrides /etc/make.conf.
Diffstat (limited to 'man')
| -rw-r--r-- | man/make.conf.5 | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/man/make.conf.5 b/man/make.conf.5 index 909dfad34..bed88d6a7 100644 --- a/man/make.conf.5 +++ b/man/make.conf.5 @@ -7,12 +7,15 @@ make.conf \- custom settings for Portage This file contains various variables that are used by Portage. Portage will check the currently\-defined environment variables first for any settings. If no environment settings are found, -Portage then checks /etc/make.conf. If no setting is found -in make.conf, Portage checks make.globals. If no +Portage then checks the make.conf files. Both /etc/make.conf and +/etc/portage/make.conf are checked (if present), and settings from +/etc/portage/make.conf will override settings from /etc/make.conf. +If no setting is found in the make.conf files, Portage checks +make.globals. If no setting is found there, the profile's default setting is grabbed from /etc/make.profile/make.defaults. Please note that all user -settings should be made in the environment or in /etc/make.conf, -which is intended to be customized by the user. +settings should be made in the environment or in the make.conf +files, which are intended to be customized by the user. .br Exceptions are incremental variables such as USE, CONFIG_PROTECT*, and ACCEPT_KEYWORDS. Incremental variables are propagated down from |