From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Fri, 20 Feb 2009 08:07:50 +0000 (+0000)
Subject: Document APCOND_* in DefaultSettings.php as requested in r47524
X-Git-Tag: 1.31.0-rc.0~42779
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=5550f6d56681cc10171be3bb37227650188b96ab;p=lhc%2Fweb%2Fwiklou.git

Document APCOND_* in DefaultSettings.php as requested in r47524
---

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 1cc3de467c..6b7addc68d 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1366,13 +1366,14 @@ $wgAutoConfirmCount = 0;
  *   array( APCOND_EMAILCONFIRMED ), *OR*
  *   array( APCOND_EDITCOUNT, number of edits ), *OR*
  *   array( APCOND_AGE, seconds since registration ), *OR*
+ *   array( APCOND_INGROUPS, group1, group2, ... ), *OR*
+ *   array( APCOND_ISIP, ip ), *OR*
+ *   array( APCOND_IPINRANGE, range ), *OR*
+ *   array( APCOND_AGE_FROM_EDIT, seconds since first edit ), *OR*
  *   similar constructs defined by extensions.
  *
  * If $wgEmailAuthentication is off, APCOND_EMAILCONFIRMED will be true for any
  * user who has provided an e-mail address.
- *
- * FIXME: The above documentation is incomplete.  Several new possible
- * conditions have been added to the software and need to be documented here.
  */
 $wgAutopromote = array(
 	'autoconfirmed' => array( '&',