From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 8 May 2012 16:38:44 +0000 (-0700)
Subject: make.conf.5: COLLISION_IGNORE s/shell/fnmatch/
X-Git-Tag: v2.2.0_alpha102
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ed38cf680d220ca43f9396c1c986071ca5933bec;p=portage.git

make.conf.5: COLLISION_IGNORE s/shell/fnmatch/
---

diff --git a/man/make.conf.5 b/man/make.conf.5
index 39c3f8e48..b7108945c 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -128,10 +128,10 @@ Determines how long the countdown delay will be after running
 .br
 Defaults to 5 seconds.
 .TP
-\fBCOLLISION_IGNORE\fR = \fI[space delimited list of shell patterns]\fR
+\fBCOLLISION_IGNORE\fR = \fI[space delimited list of fnmatch patterns]\fR
 This variable allows the user to disable \fIcollision\-protect\fR and
-\fIprotect\-owned\fR for specific shell patterns. For backward
-compatibility, directories that are listed without a shell pattern will
+\fIprotect\-owned\fR for specific \fBfnmatch\fR(3) patterns. For backward
+compatibility, directories that are listed without a fnmatch pattern will
 automatically have /* appended to them.
 .br
 Defaults to "/lib/modules/* *.py[co]".