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/portage.5 | |
| 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/portage.5')
| -rw-r--r-- | man/portage.5 | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/man/portage.5 b/man/portage.5 index 41224deb3..3a472a8ac 100644 --- a/man/portage.5 +++ b/man/portage.5 @@ -17,7 +17,6 @@ If you are looking for information on how to emerge something, please see .TP .BR /etc/ .nf -make.globals .BR make.conf (5) .fi .TP @@ -87,6 +86,11 @@ use.desc use.local.desc .fi .TP +.BR /usr/share/portage/config/ +.nf +make.globals +.fi +.TP .BR /var/cache/edb/ misc internal cache files .TP @@ -136,11 +140,6 @@ More reading: .BR /etc/ .RS .TP -.BR make.globals -The global default settings for Portage. This comes from the portage package -itself. Settings in \fBmake.conf\fR override values here. The format -is described extensivly in \fBmake.conf\fR(5). -.TP .BR make.conf The global custom settings for Portage. See \fBmake.conf\fR(5). .RE @@ -869,6 +868,15 @@ games\-emulation/xmess:net \- Adds network support .fi .RE .TP +.BR /usr/share/portage/config/ +.RS +.TP +.BR make.globals +The global default settings for Portage. This comes from the portage package +itself. Settings in \fBmake.conf\fR override values here. The format +is described extensivly in \fBmake.conf\fR(5). +.RE +.TP .BR /var/cache/edb/ .RS This directory is used to store internal portage cache files. The names and |