* Rename option captcha to captcha_protected for consistency.

* Document captcha_protected option

doc/guide.tex

@@ -3775,6 +3775,8 @@ Options:
 doesn't allow to register new accounts from s2s or existing c2s sessions. You can
 change it by defining access rule in this option. Use with care: allowing registration
 from s2s leads to uncontrolled massive accounts creation by rogue users.
+\titem{\{captcha\_protected, false|true\}} \ind{options!captcha\_protected}
+Protect registrations with CAPTCHA (see section \ref{captcha}). The default is \term{false}.
 \titem{\{welcome\_message, Message\}} \ind{options!welcomem}Set a welcome message that
   is sent to each newly registered account. The first string is the subject, and
   the second string is the message body.

src/mod_register.erl

@@ -94,7 +94,7 @@ process_iq(From, To,
 	   #iq{type = Type, lang = Lang, sub_el = SubEl, id = ID} = IQ,
 	   Source) ->
     IsCaptchaEnabled = case gen_mod:get_module_opt(
-			      To#jid.lserver, ?MODULE, captcha, false) of
+			      To#jid.lserver, ?MODULE, captcha_protected, false) of
 			   true ->
 			       true;
 			   _ ->