*7985* Updated release notes

Puckohue · Oct 26, 2012 · 459fbc5 · 459fbc5
1 parent 381c99c
commit 459fbc5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 14 deletions.
diff --git a/config.TEMPLATE.inc.php b/config.TEMPLATE.inc.php
@@ -373,8 +373,14 @@
 
 [captcha]
 
-; Whether or not to enable Captcha features
-captcha = off
+; Whether or not to enable ReCaptcha
+recaptcha = off
+
+; Public key for reCaptcha (see http://www.google.com/recaptcha)
+; recaptcha_public_key = your_public_key
+
+; Private key for reCaptcha (see http://www.google.com/recaptcha)
+; recaptcha_private_key = your_private_key
 
 ; Whether or not to use Captcha on user registration
 captcha_on_register = on
@@ -385,18 +391,6 @@
 ; Whether or not to use Captcha on notification mailing list registration
 captcha_on_mailinglist = on
 
-; Font location for font to use in Captcha images
-font_location = /usr/share/fonts/truetype/freefont/FreeSerif.ttf
-
-; Whether to use reCaptcha instead of default Captcha
-recaptcha = off
-
-; Public key for reCaptcha (see http://www.google.com/recaptcha)
-; recaptcha_public_key = your_public_key
-
-; Private key for reCaptcha (see http://www.google.com/recaptcha)
-; recaptcha_private_key = your_private_key
-
 
 ;;;;;;;;;;;;;;;;;;;;;
 ; External Commands ;

diff --git a/docs/release-notes/README-3.0 b/docs/release-notes/README-3.0
@@ -18,3 +18,6 @@ Changed config.inc.php parameters:
 	- security:allowed_html: The format of this setting has changed for
 		compatibility with HTMLPurifier's HTML.Allowed setting. See
 		config.TEMPLATE.inc.php for a sensible default.
+	- captcha:captcha: This option has been deprecated in favour of
+		ReCaptcha. See config.TEMPLATE.inc.php in the [captcha] section
+		for the replacement configuration options.