Merge r1854 from trunk:

* doc/guide.tex: mod_muc can run in several nodes of cluster
* doc/guide.html: Likewise

SVN Revision: 1898

diff --git a/ChangeLog b/ChangeLog
index 2c239e7168c769c2076c72e6aa588217e40851a3..8526b77058752b8d217b687929dea04426f9f4e1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-02-21  Badlop  <badlop@process-one.net>
 
+       * doc/guide.tex: mod_muc can run in several nodes of cluster
+       * doc/guide.html: Likewise
+
        * src/odbc/mysql.sql: Fix complain about comment syntax
        * src/odbc/pg.sql: Likewise
 

diff --git a/doc/guide.html b/doc/guide.html
index d028538b27cf54c3d3752fd300b9e2c90e073cfb..e29d8a56af82367ba1186a2e19172986b23a5a3f 100644 (file)
--- a/doc/guide.html
+++ b/doc/guide.html
@@ -3128,11 +3128,11 @@ Writing, on the other hand, will be slower. And of course if machine with one
 of the replicas is down, other replicas will be used.</P><P>Also <A HREF="http://www.erlang.org/doc/apps/mnesia/Mnesia_chap5.html#5.3">section 5.3 (Table Fragmentation) of Mnesia User&#X2019;s Guide</A> can be helpful.
 </P><P>(alt) Same as in previous item, but for other tables.</P></LI><LI CLASS="li-enumerate">Run &#X2018;<CODE>init:stop().</CODE>&#X2019; or just &#X2018;<CODE>q().</CODE>&#X2019; to exit from
 the Erlang shell. This probably can take some time if Mnesia has not yet
-transfered and processed all data it needed from <TT>first</TT>.</LI><LI CLASS="li-enumerate">Now run <TT>ejabberd</TT> on <TT>second</TT> with almost the same config as
-on <TT>first</TT> (you probably do not need to duplicate &#X2018;<CODE>acl</CODE>&#X2019;
-and &#X2018;<CODE>access</CODE>&#X2019; options &#X2014; they will be taken from
-<TT>first</TT>, and <CODE>mod_muc</CODE> and <CODE>mod_irc</CODE> should be
-enabled only on one machine in the cluster).
+transfered and processed all data it needed from <TT>first</TT>.</LI><LI CLASS="li-enumerate">Now run <TT>ejabberd</TT> on <TT>second</TT> with a configuration similar as
+on <TT>first</TT>: you probably do not need to duplicate &#X2018;<CODE>acl</CODE>&#X2019;
+and &#X2018;<CODE>access</CODE>&#X2019; options because they will be taken from
+<TT>first</TT>; and <CODE>mod_irc</CODE> should be
+enabled only on one machine in the cluster.
 </LI></OL><P>You can repeat these steps for other machines supposed to serve this
 domain.</P><P> <A NAME="servicelb"></A> </P><!--TOC section Service Load-Balancing-->
 <H2 CLASS="section"><!--SEC ANCHOR --><A NAME="htoc78">6.3</A>&#XA0;&#XA0;<A HREF="#servicelb">Service Load-Balancing</A></H2><!--SEC END --><P> <A NAME="servicelb"></A> 

diff --git a/doc/guide.tex b/doc/guide.tex
index 4b47e48d1fe2c07421035375ee832d834b380e49..dacb2b91535f9ae9beb6df54e6d1079bcbd54a54 100644 (file)
--- a/doc/guide.tex
+++ b/doc/guide.tex
@@ -4050,11 +4050,11 @@ mnesia:change_table_copy_type(schema, node(), disc_copies).
   transfered and processed all data it needed from \term{first}.
 
 
-\item Now run \ejabberd{} on \term{second} with almost the same config as
-  on \term{first} (you probably do not need to duplicate `\verb|acl|'
-  and `\verb|access|' options --- they will be taken from
-  \term{first}, and \verb|mod_muc| and \verb|mod_irc| should be
-  enabled only on one machine in the cluster).
+\item Now run \ejabberd{} on \term{second} with a configuration similar as
+  on \term{first}: you probably do not need to duplicate `\verb|acl|'
+  and `\verb|access|' options because they will be taken from
+  \term{first}; and \verb|mod_irc| should be
+  enabled only on one machine in the cluster.
 \end{enumerate}
 
 You can repeat these steps for other machines supposed to serve this