Merge branch 'add-allow-registration-doc' of...

Merge branch 'add-allow-registration-doc' of https://github.com/gbonvehi/converse.js into gbonvehi-add-allow-registration-doc

Conflicts:
	docs/CHANGES.rst

docs/CHANGES.rst

@@ -7,7 +7,8 @@ Changelog
 * Norwegian Bokmål translations. [Andreas Lorentsen]
 * Updated Afrikaans translations. [jcbrand]
 * Add responsiveness to CSS. We now use Sass preprocessor for generating CSS. [jcbrand]
-* Add fullname and jid to contact's tooltip in roster, solves #252 and #253. [gbonvehi]
+* #252, 253 Add fullname and jid to contact's tooltip in roster. [gbonvehi]
+* #295 Document "allow_registration". [gbonvehi]
 
 0.8.6 (2014-12-07)
 ------------------

docs/source/configuration.rst

@@ -53,6 +53,15 @@ Default:  ``true``
 
 Allow Off-the-record encryption of single-user chat messages.
 
+allow_registration
+---------
+
+Default:  ``true``
+
+Support for `XEP-0077: In band registration <http://xmpp.org/extensions/xep-0077.html>`_
+
+Allow XMPP account registration showing the corresponding UI register form interface.
+
 animate
 -------