1 |
Commit 86e75790954e766beba75443d967b2c25055c5b0 added support for |
2 |
make.conf to be a directory, but the feature was undocumented. |
3 |
Therefore, update the man pages, as suggested in bug #465164, |
4 |
comment #9. |
5 |
|
6 |
Fixes 86e75790954e ("make.conf: recurse directories, bug #463266") |
7 |
X-Gentoo-Bug: 463266 |
8 |
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=463266 |
9 |
--- |
10 |
man/make.conf.5 | 5 ++++- |
11 |
man/portage.5 | 3 ++- |
12 |
2 files changed, 6 insertions(+), 2 deletions(-) |
13 |
|
14 |
diff --git a/man/make.conf.5 b/man/make.conf.5 |
15 |
index 69d95fc..a7adecc 100644 |
16 |
--- a/man/make.conf.5 |
17 |
+++ b/man/make.conf.5 |
18 |
@@ -1,4 +1,4 @@ |
19 |
-.TH "MAKE.CONF" "5" "Apr 2014" "Portage VERSION" "Portage" |
20 |
+.TH "MAKE.CONF" "5" "December 2014" "Portage VERSION" "Portage" |
21 |
.SH "NAME" |
22 |
make.conf \- custom settings for Portage |
23 |
.SH "SYNOPSIS" |
24 |
@@ -14,6 +14,9 @@ features like arrays and special parameter expansions. For more details, see |
25 |
the Simple lexical analysis documentation: |
26 |
\fLhttp://docs.python.org/3/library/shlex.html\fR. Note that if you source |
27 |
files, they need to be in the same shlex syntax for portage to read them. |
28 |
+If make.conf is a directory, then all the files in that directory will |
29 |
+be sorted in ascending alphabetical order by file name and summed |
30 |
+together as if it were a single file. |
31 |
.br |
32 |
Portage will check the currently\-defined environment variables |
33 |
first for any settings. If no environment settings are found, |
34 |
diff --git a/man/portage.5 b/man/portage.5 |
35 |
index 88cf3bb..542ffeb 100644 |
36 |
--- a/man/portage.5 |
37 |
+++ b/man/portage.5 |
38 |
@@ -568,7 +568,8 @@ virtual/aspell\-dict app\-dicts/aspell\-en |
39 |
.RE |
40 |
.TP |
41 |
.BR /etc/portage/ |
42 |
-Any file in this directory that begins with "package." or is repos.conf can be |
43 |
+Files in this directory including make.conf, repos.conf, and any file |
44 |
+with a name that begins with "package." can be |
45 |
more than just a flat file. If it is a directory, then all the files in that |
46 |
directory will be sorted in ascending alphabetical order by file name and summed |
47 |
together as if it were a single file. |
48 |
-- |
49 |
2.0.5 |