diff options
| author | Badlop <badlop@process-one.net> | 2009-12-23 09:04:39 +0000 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2009-12-23 09:04:39 +0000 |
| commit | 4cdf7fba4f161b07baa26b560b2acf54b7808c80 (patch) | |
| tree | a4910ff0b9b457b831ee2d8c4ab9c9211550896e /doc | |
| parent | Remove the old note about LDAP lack of encryption. (diff) | |
Clarify that 'tls' option is still useful in ejabberd_http for HTTPS.
SVN Revision: 2819
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/guide.html | 1 | ||||
| -rw-r--r-- | doc/guide.tex | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/doc/guide.html b/doc/guide.html index 1fbc9499f..a3841f901 100644 --- a/doc/guide.html +++ b/doc/guide.html @@ -795,6 +795,7 @@ The preferable encryption method is STARTTLS on port 5222, as defined <A HREF="http://xmpp.org/specs/rfc3920.html#tls">RFC 3920: XMPP Core</A>, which can be enabled in <TT>ejabberd</TT> with the option <TT>starttls</TT>. If this option is set, you should also set the <TT>certfile</TT> option. +The option <TT>tls</TT> can also be used in <TT>ejabberd_http</TT> to support HTTPS. </DD><DT CLASS="dt-description"><B><TT>web_admin</TT></B></DT><DD CLASS="dd-description"> This option enables the Web Admin for <TT>ejabberd</TT> administration which is available at <CODE>http://server:port/admin/</CODE>. Login and password are the username and diff --git a/doc/guide.tex b/doc/guide.tex index 47e87daaf..966f0334b 100644 --- a/doc/guide.tex +++ b/doc/guide.tex @@ -941,6 +941,7 @@ This is a detailed description of each option allowed by the listening modules: \footahref{http://xmpp.org/specs/rfc3920.html\#tls}{RFC 3920: XMPP Core}, which can be enabled in \ejabberd{} with the option \term{starttls}. If this option is set, you should also set the \option{certfile} option. + The option \term{tls} can also be used in \term{ejabberd\_http} to support HTTPS. \titem{web\_admin} \ind{options!web\_admin}\ind{web admin}This option enables the Web Admin for \ejabberd{} administration which is available at \verb|http://server:port/admin/|. Login and password are the username and |