public inbox for gentoo-portage-dev@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-portage-dev] [PATCH] man pages: note that make.conf can be a directory (463266)
@ 2014-12-26 22:01 Zac Medico
  2014-12-27  6:22 ` [gentoo-portage-dev] " Duncan
  2015-01-05 13:12 ` [gentoo-portage-dev] " Alexander Berntsen
  0 siblings, 2 replies; 6+ messages in thread
From: Zac Medico @ 2014-12-26 22:01 UTC (permalink / raw
  To: gentoo-portage-dev; +Cc: Zac Medico

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
---
 man/make.conf.5 | 5 ++++-
 man/portage.5   | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index 69d95fc..a7adecc 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" "December 2014" "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 88cf3bb..542ffeb 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -568,7 +568,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.
-- 
2.0.5



^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2015-01-05 13:12 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-12-26 22:01 [gentoo-portage-dev] [PATCH] man pages: note that make.conf can be a directory (463266) Zac Medico
2014-12-27  6:22 ` [gentoo-portage-dev] " Duncan
2014-12-27  6:52   ` Zac Medico
2014-12-29  2:55     ` Duncan
2014-12-29  3:01       ` Zac Medico
2015-01-05 13:12 ` [gentoo-portage-dev] " Alexander Berntsen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox