2 files changed, 2 insertions, 8 deletions

diff --git a/doc/guide.html b/doc/guide.html
index a4ec1acb4..68876eace 100644
--- a/doc/guide.html
+++ b/doc/guide.html
@@ -779,10 +779,7 @@ password of one of the registered users who are granted access by the
 ‘configure’ access rule.
 </DD><DT CLASS="dt-description"><B><TT>zlib</TT></B></DT><DD CLASS="dd-description"> This
 option specifies that Zlib stream compression (as defined in <A HREF="http://xmpp.org/extensions/xep-0138.html">XEP-0138</A>)
-is available on connections to the port. Client connections cannot use
-stream compression and stream encryption simultaneously. Hence, if you
-specify both <TT>starttls</TT> (or <TT>tls</TT>) and <TT>zlib</TT>, the latter
-option will not affect connections (there will be no stream compression).
+is available on connections to the port.
 </DD></DL><P>There are some additional global options that can be specified in the ejabberd configuration file (outside <TT>listen</TT>):
 </P><DL CLASS="description"><DT CLASS="dt-description">
 <B><TT>{s2s_use_starttls, true|false}</TT></B></DT><DD CLASS="dd-description">
diff --git a/doc/guide.tex b/doc/guide.tex
index b80b8be7d..32e3d67fe 100644
--- a/doc/guide.tex
+++ b/doc/guide.tex
@@ -920,10 +920,7 @@ This is a detailed description of each option allowed by the listening modules:
     `configure' access rule.
   \titem{zlib} \ind{options!zlib}\ind{protocols!XEP-0138: Stream Compression}\ind{Zlib}This
     option specifies that Zlib stream compression (as defined in \xepref{0138})
-    is available on connections to the port. Client connections cannot use
-    stream compression and stream encryption simultaneously. Hence, if you
-    specify both \option{starttls} (or \option{tls}) and \option{zlib}, the latter
-    option will not affect connections (there will be no stream compression).
+    is available on connections to the port.
 \end{description}
 
 There are some additional global options that can be specified in the ejabberd configuration file (outside \term{listen}):