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

[Mike Frysinger]

commit:     2d48093631a1e0e4996e2506a1b7f046278cf189
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 28 21:04:01 2013 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Mon Jan 28 21:04:01 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=2d480936

portage(5): improve layout.conf documentation

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

---
 man/portage.5 |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/man/portage.5 b/man/portage.5
index 4f67233..379b20c 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -457,6 +457,11 @@ This contains a path to the parent profile.  It may be either relative or
 absolute.  The paths will be relative to the location of the profile.  Most 
 commonly this file contains '..' to indicate the directory above.  Utilized 
 only in cascading profiles.
+
+If \fBlayout.conf\fR is new enough, you can also use the <repo>:<path>
+syntax.  The <repo> is the same string as is stored in the \fBrepo_name\fR
+file (or omitted to refer to the current repo), and <path> is a subdir starting
+at profiles/.
 .TP
 .BR profile.bashrc
 If needed, this file can be used to set up a special environment for ebuilds,
@@ -848,25 +853,34 @@ precedence over settings in \fBlayout.conf\fR, except tools such as
 # eclasses provided by java-overlay take precedence over identically named
 # eclasses that are provided by gentoo
 masters = gentoo java-overlay
+
 # indicate that this repo can be used as a substitute for foo-overlay
 aliases = foo-overlay
+
 # sign commits in this repo, which requires Git >=1.7.9, and
 # key configured by `git config user.signingkey key_id`
 sign\-commits = true
-# do not sign manifests in this repo
+
+# do not sign Manifest files in this repo
 sign\-manifests = false
-# thin\-manifests only contain DIST entries
+
+# Manifest files only contain DIST entries
 thin\-manifests = true
+
 # indicate that this repo requires manifests for each package, and is
 # considered a failure if a manifest file is missing/incorrect
 use\-manifests = strict
+
 # customize the set of hashes generated for Manifest entries
 manifest\-hashes = SHA256 SHA512 WHIRLPOOL
+
 # indicate that this repo enables repoman's --echangelog=y option automatically
 update\-changelog = true
+
 # indicate that this repo contains both md5-dict and pms cache formats,
 # which may be generated by egencache(1)
 cache\-formats = md5-dict pms
+
 # indicate that this repo contains profiles that may use directories for
 # package.mask, package.provided, package.use, package.use.force,
 # package.use.mask, package.use.stable.force, package.use.stable.mask,