man pages: refer to /etc/portage/make.conf

8 files changed, 16 insertions, 16 deletions

diff --git a/man/color.map.5 b/man/color.map.5
index ca6b17dd7..b5f5a81fe 100644
--- a/man/color.map.5
+++ b/man/color.map.5
@@ -1,4 +1,4 @@
-.TH "COLOR.MAP" "5" "Mar 2010" "Portage VERSION" "Portage"
+.TH "COLOR.MAP" "5" "Dec 2012" "Portage VERSION" "Portage"
 .SH "NAME"
 color.map \- custom color settings for Portage
 .SH "SYNOPSIS"
@@ -192,7 +192,7 @@ Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@gmail.com>
 .B /etc/portage/color.map
 Contains variables customizing colors.
 .TP
-.B /etc/make.conf
+.B /etc/portage/make.conf
 Contains other variables.
 .SH "SEE ALSO"
 .BR console_codes (4),
diff --git a/man/ebuild.1 b/man/ebuild.1
index e74779a66..b6a7b30b5 100644
--- a/man/ebuild.1
+++ b/man/ebuild.1
@@ -1,4 +1,4 @@
-.TH "EBUILD" "1" "Feb 2011" "Portage VERSION" "Portage"
+.TH "EBUILD" "1" "Dec 2012" "Portage VERSION" "Portage"
 .SH "NAME"
 ebuild \- a low level interface to the Portage system
 .SH "SYNOPSIS"
@@ -212,7 +212,7 @@ Mike Frysinger <vapier@gentoo.org>
 .fi
 .SH "FILES"
 .TP
-.B /etc/make.conf 
+.B /etc/portage/make.conf
 Contains variables for the build\-process and overwrites those
 in make.globals.
 .TP
diff --git a/man/ebuild.5 b/man/ebuild.5
index 0045efd63..ffc2139c2 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -1507,12 +1507,12 @@ The \fI/usr/sbin/ebuild.sh\fR script.
 .TP
 The helper apps in \fI/usr/lib/portage/bin\fR.
 .TP
-.B /etc/make.conf
+.B /etc/portage/make.conf
 Contains variables for the build\-process and overwrites those in make.defaults.
 .TP
 .B /usr/share/portage/config/make.globals
 Contains the default variables for the build\-process, you should edit
-\fI/etc/make.conf\fR instead.
+\fI/etc/portage/make.conf\fR instead.
 .TP
 .B /etc/portage/color.map
 Contains variables customizing colors.
diff --git a/man/egencache.1 b/man/egencache.1
index 57a509d6e..7f942c799 100644
--- a/man/egencache.1
+++ b/man/egencache.1
@@ -1,4 +1,4 @@
-.TH "EGENCACHE" "1" "Oct 2010" "Portage VERSION" "Portage"
+.TH "EGENCACHE" "1" "Dec 2012" "Portage VERSION" "Portage"
 .SH "NAME"
 egencache \- generate metadata cache for ebuild repositories
 .SH "SYNOPSIS"
@@ -150,7 +150,7 @@ Zac Medico <zmedico@gentoo.org>
 .fi
 .SH "FILES"
 .TP
-.B /etc/make.conf
+.B /etc/portage/make.conf
 Contains variables.
 .SH "SEE ALSO"
 .BR emerge (1),
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
diff --git a/man/make.conf.5 b/man/make.conf.5
index 9152ab295..fe873df4a 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -1,4 +1,4 @@
-.TH "MAKE.CONF" "5" "Oct 2012" "Portage VERSION" "Portage"
+.TH "MAKE.CONF" "5" "Dec 2012" "Portage VERSION" "Portage"
 .SH "NAME"
 make.conf \- custom settings for Portage
 .SH "SYNOPSIS"
@@ -915,7 +915,7 @@ be necessary in order to continue a partially downloaded file located at
 Use \fBROOT\fR to specify the target root filesystem to be used for merging 
 packages or ebuilds.
 Typically, you should set this setting in the environment rather than in 
-\fI/etc/make.conf\fR itself.  It's commonly used for creating new build 
+\fImake.conf\fR itself. It's commonly used for creating new build
 images. Make sure you use an absolute path. Refer to the
 \fBCross-compilation\fR section of \fBebuild\fR(5) for information about
 how dependencies are handled for \fBROOT\fR.
@@ -999,7 +999,7 @@ Saleem Abdulrasool <compnerd@gentoo.org>
 Contains variables for the build\-process and overwrites those in make.defaults.
 .TP
 .B /usr/share/portage/config/make.globals
-Contains the default variables for the build\-process, you should edit \fI/etc/make.conf\fR instead.
+Contains the default variables for the build\-process, you should edit \fI/etc/portage/make.conf\fR instead.
 .TP
 .B /etc/portage/color.map
 Contains variables customizing colors.
diff --git a/man/portage.5 b/man/portage.5
index 067ae6879..39ccfb22d 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -1,4 +1,4 @@
-.TH "PORTAGE" "5" "Oct 2012" "Portage VERSION" "Portage"
+.TH "PORTAGE" "5" "Nov 2012" "Portage VERSION" "Portage"
 .SH NAME
 portage \- the heart of Gentoo
 .SH "DESCRIPTION"
diff --git a/man/quickpkg.1 b/man/quickpkg.1
index 7e78c1e1b..0d3016367 100644
--- a/man/quickpkg.1
+++ b/man/quickpkg.1
@@ -66,7 +66,7 @@ Mike Frysinger <vapier@gentoo.org> (revamped version)
 .fi
 .SH "FILES"
 .TP
-.B /etc/make.conf
+.B /etc/portage/make.conf
 The \fBPKGDIR\fR variable is defined here.
 .SH "SEE ALSO"
 .BR ebuild (5),