commit: 1d267aa670e7773b31bb88fc285dec9819fd9770
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 26 22:01:25 2014 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Jan 5 20:00:59 2015 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=1d267aa6
man pages: note that make.conf can be a directory (463266)
Commit 86e75790954e766beba75443d967b2c25055c5b0 added support for
make.conf to be a directory, but the feature was undocumented.
Therefore, update the man pages, as suggested in bug #465164,
comment #9.
Fixes 86e75790954e ("make.conf: recurse directories, bug #463266")
X-Gentoo-Bug: 463266
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=463266
Acked-by: Alexander Berntsen <bernalex <AT> gentoo.org>
---
man/make.conf.5 | 5 ++++-
man/portage.5 | 5 +++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/man/make.conf.5 b/man/make.conf.5
index 69d95fc..ed5fc78 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -1,4 +1,4 @@
-.TH "MAKE.CONF" "5" "Apr 2014" "Portage VERSION" "Portage"
+.TH "MAKE.CONF" "5" "Jan 2015" "Portage VERSION" "Portage"
.SH "NAME"
make.conf \- custom settings for Portage
.SH "SYNOPSIS"
@@ -14,6 +14,9 @@ features like arrays and special parameter expansions. For
more details, see
the Simple lexical analysis documentation:
\fLhttp://docs.python.org/3/library/shlex.html\fR. Note that if you source
files, they need to be in the same shlex syntax for portage to read them.
+If make.conf is a directory, then all the files in that directory will
+be sorted in ascending alphabetical order by file name and summed
+together as if it were a single file.
.br
Portage will check the currently\-defined environment variables
first for any settings. If no environment settings are found,
diff --git a/man/portage.5 b/man/portage.5
index fbff9a6..ed0423f 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -1,4 +1,4 @@
-.TH "PORTAGE" "5" "December 2014" "Portage VERSION" "Portage"
+.TH "PORTAGE" "5" "Jan 2015" "Portage VERSION" "Portage"
.SH NAME
portage \- the heart of Gentoo
.SH "DESCRIPTION"
@@ -573,7 +573,8 @@ virtual/aspell\-dict app\-dicts/aspell\-en
.RE
.TP
.BR /etc/portage/
-Any file in this directory that begins with "package." or is repos.conf can be
+Files in this directory including make.conf, repos.conf, and any file
+with a name that begins with "package." can be
more than just a flat file. If it is a directory, then all the files in that
directory will be sorted in ascending alphabetical order by file name and
summed
together as if it were a single file.
