aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--doc/guide.tex5
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e09de808d..179d7653a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-08-09 Alexey Shchepin <alexey@sevcom.net>
+
+ * doc/guide.tex: Minor update (thanks to Sergei Golovan)
+
2007-08-08 Mickael Remond <mickael.remond@process-one.net>
* src/mod_offline.erl: Only count messages if a quota has been
diff --git a/doc/guide.tex b/doc/guide.tex
index ed608075b..3903a16eb 100644
--- a/doc/guide.tex
+++ b/doc/guide.tex
@@ -422,8 +422,9 @@ the configuration file:
override_local.
override_acls.
\end{verbatim}
-With these lines the old global options, local options and ACLs will be removed
-before new ones are added.
+With these lines the old global options (shared between all ejabberd nodes in a
+cluster), local options (which are specific for this particular ejabberd node)
+and ACLs will be removed before new ones are added.
\subsection{Host Names}
\label{hostnames}