From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 7 Sep 2010 18:24:28 +0000 (-0700)
Subject: Bug #336338 - Document FEATURES=candy.
X-Git-Tag: v2.2_rc78~31
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b945d359b14c1f2590fbbcbf8f8689c60f188e8b;p=portage.git

Bug #336338 - Document FEATURES=candy.
---

diff --git a/man/make.conf.5 b/man/make.conf.5
index 71e9581ad..68137a816 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -217,6 +217,10 @@ Binary packages will be created for all packages that are merged. Also see
 .B buildsyspkg
 Build binary packages for just packages in the system set.
 .TP
+.B candy
+Enable a special progress indicator when \fBemerge\fR(1) is calculating
+dependencies.
+.TP
 .B ccache
 Enable portage support for the ccache package.  If the ccache dir is not 
 present in the user's environment, then portage will default to