Chapril/xmpp.chapril.org-ejabberd
24
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-06-24 22:25:47 +02:00
Code Releases Activity

Fix some moved URLs in the Guide

Browse Source 
SVN Revision: 2908
This commit is contained in:
Badlop 2010-01-16 14:34:35 +00:00
parent b6aa6d6f09
commit 8068fdf4e3
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
doc/guide.html
View File

@ -792,7 +792,7 @@ This was the traditional encryption method in the early Jabber software,
commonly on port 5223 for client-to-server communications. commonly on port 5223 for client-to-server communications.
But this method is nowadays deprecated and not recommended. But this method is nowadays deprecated and not recommended.
The preferable encryption method is STARTTLS on port 5222, as defined 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>, <A HREF="http://xmpp.org/rfcs/rfc3920.html#tls">RFC 3920: XMPP Core</A>,
which can be enabled in <TT>ejabberd</TT> with the option <TT>starttls</TT>. 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. 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. The option <TT>tls</TT> can also be used in <TT>ejabberd_http</TT> to support HTTPS.
@ -2716,7 +2716,7 @@ or subscription type (or globally).
</LI><LI CLASS="li-itemize">Allowing or blocking all communications based on JID, group, or </LI><LI CLASS="li-itemize">Allowing or blocking all communications based on JID, group, or
subscription type (or globally). subscription type (or globally).
</LI></UL> </LI></UL>
(from <A HREF="http://xmpp.org/specs/rfc3921.html#privacy"><TT>http://xmpp.org/specs/rfc3921.html#privacy</TT></A>) (from <A HREF="http://xmpp.org/rfcs/rfc3921.html#privacy"><TT>http://xmpp.org/rfcs/rfc3921.html#privacy</TT></A>)
</BLOCKQUOTE><P>Options: </BLOCKQUOTE><P>Options:
</P><DL CLASS="description"><DT CLASS="dt-description"> </P><DL CLASS="description"><DT CLASS="dt-description">
<B><TT>{iqdisc, Discipline}</TT></B></DT><DD CLASS="dd-description"> This specifies <B><TT>{iqdisc, Discipline}</TT></B></DT><DD CLASS="dd-description"> This specifies
@ -2951,7 +2951,7 @@ Also define a registration timeout of one hour:
</PRE></LI></UL><P> <A NAME="modroster"></A> </P><!--TOC subsection <TT>mod_roster</TT>--> </PRE></LI></UL><P> <A NAME="modroster"></A> </P><!--TOC subsection <TT>mod_roster</TT>-->
<H3 CLASS="subsection"><!--SEC ANCHOR --><A NAME="htoc58">3.3.19</A>&#XA0;&#XA0;<A HREF="#modroster"><TT>mod_roster</TT></A></H3><!--SEC END --><P> <A NAME="modroster"></A> <H3 CLASS="subsection"><!--SEC ANCHOR --><A NAME="htoc58">3.3.19</A>&#XA0;&#XA0;<A HREF="#modroster"><TT>mod_roster</TT></A></H3><!--SEC END --><P> <A NAME="modroster"></A>
</P><P>This module implements roster management as defined in </P><P>This module implements roster management as defined in
<A HREF="http://xmpp.org/specs/rfc3921.html#roster">RFC 3921: XMPP IM</A>. <A HREF="http://xmpp.org/rfcs/rfc3921.html#roster">RFC 3921: XMPP IM</A>.
It also supports Roster Versioning (<A HREF="http://xmpp.org/extensions/xep-0237.html">XEP-0237</A>).</P><P>Options: It also supports Roster Versioning (<A HREF="http://xmpp.org/extensions/xep-0237.html">XEP-0237</A>).</P><P>Options:
</P><DL CLASS="description"><DT CLASS="dt-description"> </P><DL CLASS="description"><DT CLASS="dt-description">
<B><TT>{iqdisc, Discipline}</TT></B></DT><DD CLASS="dd-description"> This specifies <B><TT>{iqdisc, Discipline}</TT></B></DT><DD CLASS="dd-description"> This specifies
@ -3534,8 +3534,7 @@ These options can be used to migrate accounts
using <A HREF="http://xmpp.org/extensions/xep-0227.html">XEP-0227</A> formatted XML files using <A HREF="http://xmpp.org/extensions/xep-0227.html">XEP-0227</A> formatted XML files
from/to other Jabber/XMPP servers from/to other Jabber/XMPP servers
or move users of a vhost to another ejabberd installation. or move users of a vhost to another ejabberd installation.
See also See also <A HREF="https://support.process-one.net/doc/display/MESSENGER/ejabberd+migration+kit">ejabberd migration kit</A>.
<A HREF="https://support.process-one.net/doc/display/P1/ejabberd+migration+kit">ejabberd migration kit</A>.
</DD><DT CLASS="dt-description"><B><TT>import_file, import_dir</TT></B></DT><DD CLASS="dd-description"> </DD><DT CLASS="dt-description"><B><TT>import_file, import_dir</TT></B></DT><DD CLASS="dd-description">
These options can be used to migrate accounts These options can be used to migrate accounts
using jabberd1.4 formatted XML files. using jabberd1.4 formatted XML files.

9
doc/guide.tex
View File

@ -938,7 +938,7 @@ This is a detailed description of each option allowed by the listening modules:
commonly on port 5223 for client-to-server communications. commonly on port 5223 for client-to-server communications.
But this method is nowadays deprecated and not recommended. But this method is nowadays deprecated and not recommended.
The preferable encryption method is STARTTLS on port 5222, as defined The preferable encryption method is STARTTLS on port 5222, as defined
\footahref{http://xmpp.org/specs/rfc3920.html\#tls}{RFC 3920: XMPP Core}, \footahref{http://xmpp.org/rfcs/rfc3920.html\#tls}{RFC 3920: XMPP Core},
which can be enabled in \ejabberd{} with the option \term{starttls}. which can be enabled in \ejabberd{} with the option \term{starttls}.
If this option is set, you should also set the \option{certfile} option. 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. The option \term{tls} can also be used in \term{ejabberd\_http} to support HTTPS.
@ -3483,7 +3483,7 @@ their \XMPP{} client, they will be able to:
\item Allowing or blocking all communications based on JID, group, or \item Allowing or blocking all communications based on JID, group, or
subscription type (or globally). subscription type (or globally).
\end{itemize} \end{itemize}
(from \ahrefurl{http://xmpp.org/specs/rfc3921.html\#privacy}) (from \ahrefurl{http://xmpp.org/rfcs/rfc3921.html\#privacy})
\end{quote} \end{quote}
Options: Options:
@ -3764,7 +3764,7 @@ Also define a registration timeout of one hour:
\ind{modules!\modroster{}}\ind{roster management}\ind{protocols!RFC 3921: XMPP IM} \ind{modules!\modroster{}}\ind{roster management}\ind{protocols!RFC 3921: XMPP IM}
This module implements roster management as defined in This module implements roster management as defined in
\footahref{http://xmpp.org/specs/rfc3921.html\#roster}{RFC 3921: XMPP IM}. \footahref{http://xmpp.org/rfcs/rfc3921.html\#roster}{RFC 3921: XMPP IM}.
It also supports Roster Versioning (\xepref{0237}). It also supports Roster Versioning (\xepref{0237}).
Options: Options:
@ -4501,8 +4501,7 @@ The most interesting ones are:
using \xepref{0227} formatted XML files using \xepref{0227} formatted XML files
from/to other Jabber/XMPP servers from/to other Jabber/XMPP servers
or move users of a vhost to another ejabberd installation. or move users of a vhost to another ejabberd installation.
See also See also \footahref{https://support.process-one.net/doc/display/MESSENGER/ejabberd+migration+kit}{ejabberd migration kit}.
\footahref{https://support.process-one.net/doc/display/P1/ejabberd+migration+kit}{ejabberd migration kit}.
\titem{import\_file, import\_dir} \ind{migration from other software} \titem{import\_file, import\_dir} \ind{migration from other software}
These options can be used to migrate accounts These options can be used to migrate accounts
using jabberd1.4 formatted XML files. using jabberd1.4 formatted XML files.