From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 000E1138A1A for ; Mon, 5 Jan 2015 20:02:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BB9ECE083C; Mon, 5 Jan 2015 20:02:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 63ED1E083C for ; Mon, 5 Jan 2015 20:02:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3F40D3406FB for ; Mon, 5 Jan 2015 20:02:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DFD0AEF03 for ; Mon, 5 Jan 2015 20:02:47 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1420488059.1d267aa670e7773b31bb88fc285dec9819fd9770.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: man/ X-VCS-Repository: proj/portage X-VCS-Files: man/make.conf.5 man/portage.5 X-VCS-Directories: man/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 1d267aa670e7773b31bb88fc285dec9819fd9770 X-VCS-Branch: master Date: Mon, 5 Jan 2015 20:02:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 5df55bad-f46c-449c-b5a7-1e94fbc8eb85 X-Archives-Hash: 31f7960d0764ab5255ece45d4b398baf commit: 1d267aa670e7773b31bb88fc285dec9819fd9770 Author: Zac Medico gentoo org> AuthorDate: Fri Dec 26 22:01:25 2014 +0000 Commit: Zac Medico gentoo 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 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.