diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-08-19 18:42:24 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-08-19 18:42:24 -0700 |
| commit | 59d49a224ea5d008ce9eb2cdd312e3f46870fa4b (patch) | |
| tree | 5c67e5b4de50ca2d11c6fefca2e3fc614b2a6c2a /man/emerge.1 | |
| parent | 72c0773f386df7e99e94bac877cb1c60db58833b (diff) | |
| download | portage-59d49a224ea5d008ce9eb2cdd312e3f46870fa4b.tar.gz portage-59d49a224ea5d008ce9eb2cdd312e3f46870fa4b.tar.bz2 portage-59d49a224ea5d008ce9eb2cdd312e3f46870fa4b.zip | |
Update docs, comments, and messages to refer to make.globals in
/usr/share/portage/config/ instead of /etc/make.globals.
Diffstat (limited to 'man/emerge.1')
| -rw-r--r-- | man/emerge.1 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/man/emerge.1 b/man/emerge.1 index 73c90d3fd..0f2360ff0 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -827,7 +827,7 @@ little bit untidy, it does prevent potentially valuable config files from being deleted, which is of paramount importance. .LP Protected directories are set using the \fICONFIG_PROTECT\fR variable, normally -defined in /etc/make.globals. Directory exceptions to the CONFIG_PROTECTed +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 @@ -903,7 +903,7 @@ Contains a list of default packages used to resolve virtual dependencies. Contains a list of packages used for the base system. The \fBsystem\fR and \fBworld\fR sets consult this file. \fBDo not edit this file\fR. .TP -.B /etc/make.globals +.B /usr/share/portage/config/make.globals Contains the default variables for the build process. \fBDo not edit this file\fR. .SH "SEE ALSO" |