From 0e2cd7a8d0f44255654b47f74c43813a2ae7c0b7 Mon Sep 17 00:00:00 2001
From: Badlop <badlop@process-one.net>
Date: Wed, 23 Dec 2009 09:05:02 +0000
Subject: [PATCH] Clarify that 'tls' option is still useful in ejabberd_http
 for HTTPS.

SVN Revision: 2820
---
 doc/guide.html | 1 +
 doc/guide.tex  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/doc/guide.html b/doc/guide.html
index 1faccce94..5710638a5 100644
--- a/doc/guide.html
+++ b/doc/guide.html
@@ -777,6 +777,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 630c61e72..aa1cb46f4 100644
--- a/doc/guide.tex
+++ b/doc/guide.tex
@@ -917,6 +917,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