aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBadlop <badlop@process-one.net>2010-01-16 14:34:31 +0000
committerBadlop <badlop@process-one.net>2010-01-16 14:34:31 +0000
commitb6aa6d6f09076040191efd7bf45fa7a4f8ee1874 (patch)
treea739267565ca77a0f0e28ad017dbadfd9fd8966b
parentFix OTP version detection to work with old supported R10 and R11 (diff)
Document the option route_subdomains in the Guide (EJAB-1164)
SVN Revision: 2907
-rw-r--r--doc/guide.html5
-rw-r--r--doc/guide.tex5
2 files changed, 10 insertions, 0 deletions
diff --git a/doc/guide.html b/doc/guide.html
index f5a39904a..fd1215f16 100644
--- a/doc/guide.html
+++ b/doc/guide.html
@@ -839,6 +839,11 @@ If the option is not specified for an <TT>ejabberd_service</TT> listener,
the globally configured value is used.
The allowed values are integers and &#X2019;undefined&#X2019;.
Default value: &#X2019;undefined&#X2019;.
+</DD><DT CLASS="dt-description"><B><TT>{route_subdomains, local|s2s}</TT></B></DT><DD CLASS="dd-description">
+Defines if ejabberd must route stanzas directed to subdomains locally (compliant with
+<A HREF="http://xmpp.org/rfcs/rfc3920.html#rules.subdomain">RFC 3920: XMPP Core</A>),
+or to foreign server using S2S (compliant with
+<A HREF="http://tools.ietf.org/html/draft-saintandre-rfc3920bis-09#section-11.3">RFC 3920 bis</A>).
</DD></DL><P> <A NAME="listened-examples"></A> </P><!--TOC subsubsection Examples-->
<H4 CLASS="subsubsection"><!--SEC ANCHOR --><A HREF="#listened-examples">Examples</A></H4><!--SEC END --><P> <A NAME="listened-examples"></A> </P><P>For example, the following simple configuration defines:
</P><UL CLASS="itemize"><LI CLASS="li-itemize">
diff --git a/doc/guide.tex b/doc/guide.tex
index 3fb7a7622..08292edbf 100644
--- a/doc/guide.tex
+++ b/doc/guide.tex
@@ -987,6 +987,11 @@ There are some additional global options that can be specified in the ejabberd c
the globally configured value is used.
The allowed values are integers and 'undefined'.
Default value: 'undefined'.
+ \titem{\{route\_subdomains, local|s2s\}}
+ Defines if ejabberd must route stanzas directed to subdomains locally (compliant with
+ \footahref{http://xmpp.org/rfcs/rfc3920.html\#rules.subdomain}{RFC 3920: XMPP Core}),
+ or to foreign server using S2S (compliant with
+ \footahref{http://tools.ietf.org/html/draft-saintandre-rfc3920bis-09\#section-11.3}{RFC 3920 bis}).
\end{description}
\makesubsubsection{listened-examples}{Examples}