From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 9 Jun 2013 23:29:09 +0000 (-0700)
Subject: man/portage.5: remove /etc/make.conf references
X-Git-Tag: v2.2.0_alpha180~8
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3ebdc44ef28c6001a9f408894d6f8a4670246e67;p=portage.git

man/portage.5: remove /etc/make.conf references

Since /etc/portage/make.conf supersedes /etc/make.conf, there's no need
to mention /etc/make.conf here anymore (it's still mentioned in
make.conf(5) though).
---

diff --git a/man/portage.5 b/man/portage.5
index e46226601..7a69054c6 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -15,11 +15,6 @@ If you are looking for information on how to emerge something, please see
 .BR emerge (1).
 .SH "SYNOPSIS"
 .TP
-.BR /etc/
-.nf
-.BR make.conf (5)
-.fi
-.TP
 \fB/etc/portage/make.profile/\fR or \fB/etc/make.profile/\fR
 site\-specific overrides go in \fB/etc/portage/profile/\fR
 .nf
@@ -53,7 +48,7 @@ bashrc
 categories
 color.map
 license_groups
-make.conf
+.BR make.conf (5)
 mirrors
 modules
 package.accept_keywords
@@ -205,13 +200,6 @@ More reading:
 .RE
 .SH "SPECIFIC FILE DESCRIPTIONS"
 .TP
-.BR /etc/
-.RS
-.TP
-.BR make.conf
-The global custom settings for Portage.  See \fBmake.conf\fR(5).
-.RE
-.TP
 \fB/etc/portage/make.profile/\fR or \fB/etc/make.profile/\fR
 This is usually just a symlink to the correct profile in 
 \fB/usr/portage/profiles/\fR.  Since it is part of the portage tree, it 
@@ -577,7 +565,6 @@ 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