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 117331389E2 for ; Fri, 26 Dec 2014 22:02:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8EC50E0AC2; Fri, 26 Dec 2014 22:02:02 +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 53873E097E for ; Fri, 26 Dec 2014 22:02:01 +0000 (UTC) Received: from x202e.gaikai.int (67-203-132-147.static-ip.telepacific.net [67.203.132.147]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: zmedico) by smtp.gentoo.org (Postfix) with ESMTPSA id 0EA0C3405E8; Fri, 26 Dec 2014 22:01:59 +0000 (UTC) From: Zac Medico To: gentoo-portage-dev@lists.gentoo.org Cc: Zac Medico Subject: [gentoo-portage-dev] [PATCH] man pages: note that make.conf can be a directory (463266) Date: Fri, 26 Dec 2014 14:01:47 -0800 Message-Id: <1419631307-30949-1-git-send-email-zmedico@gentoo.org> X-Mailer: git-send-email 2.0.5 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-portage-dev@lists.gentoo.org Reply-to: gentoo-portage-dev@lists.gentoo.org X-Archives-Salt: f56dbaff-e144-43b7-bf44-c5e19451f1f9 X-Archives-Hash: 13f23046626e1f20b5c45a0e20771838 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