[gentoo-commits] proj/portage:master commit in: man/

["Zac Medico" <zmedico@gentoo.org>]

commit:     ff54f5db6658c0bfecc7fe365d383c5879f20221
Author:     Alexander Berntsen <alexander <AT> plaimi <DOT> net>
AuthorDate: Sun Aug 11 21:32:42 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Aug 11 22:27:33 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ff54f5db

man/make.conf.5: Document shlex a bit, bug 309941

---
 man/make.conf.5 | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/man/make.conf.5 b/man/make.conf.5
index 236fdf0..f83dd03 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -4,7 +4,16 @@ make.conf \- custom settings for Portage
 .SH "SYNOPSIS"
 \fB/etc/make.conf\fR and \fB/etc/portage/make.conf\fR
 .SH "DESCRIPTION"
-This file contains various variables that are used by Portage.
+
+This file contains various variables that are used by Portage. The file has a
+newline-delimited list of \fI<key>=<value>\fR pairs (see the default file for
+examples) which are accessible from the environment of ebuilds. It supports
+simple shell\-like expansion of the form \fIvar="${var}"\fR, the source
+keyword and variable substituton, but not some of the more advanced BASH
+features like arrays and special parameter expansions. For more details, see
+the Simple lexical analysis documentanion:
+\fLhttp://docs.python.org/3/library/shlex.html\fR.
+.br
 Portage will check the currently\-defined environment variables
 first for any settings.  If no environment settings are found,
 Portage then checks the make.conf files. Both /etc/make.conf and