aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--doc/guide.tex6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index d3fadd445..747fdb8e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-24 Mickael Remond <mickael.remond@process-one.net>
+
+ * doc/guide.tex: Fixed regexp ACL configuration examples
+ (Thanks to Massimiliano Mirra).
+
2006-11-23 Alexey Shchepin <alexey@sevcom.net>
* src/eldap/eldap.erl: Bugfix (thanks to Evgeniy Khramtsov)
diff --git a/doc/guide.tex b/doc/guide.tex
index 9e97cd0c7..d28b9b1a2 100644
--- a/doc/guide.tex
+++ b/doc/guide.tex
@@ -753,18 +753,18 @@ declarations of ACLs in the configuration file have the following syntax:
\titem{\{user\_regexp, <regexp>\}} Matches any local user with a name that
matches \term{<regexp>} at the first virtual host. Example:
\begin{verbatim}
-{acl, tests, {user, "^test[0-9]*$"}}.
+{acl, tests, {user_regexp, "^test[0-9]*$"}}.
\end{verbatim}
%$
\titem{\{user\_regexp, <regexp>, <server>\}} Matches any user with a name
that matches \term{<regexp>} at server \term{<server>}. Example:
\begin{verbatim}
-{acl, tests, {user, "^test", "example.org"}}.
+{acl, tests, {user_regexp, "^test", "example.org"}}.
\end{verbatim}
\titem{\{server\_regexp, <regexp>\}} Matches any JID from the server that
matches \term{<regexp>}. Example:
\begin{verbatim}
-{acl, icq, {server, "^icq\\."}}.
+{acl, icq, {server_regexp, "^icq\\."}}.
\end{verbatim}
\titem{\{node\_regexp, <user\_regexp>, <server\_regexp>\}} Matches any user
with a name that matches \term{<user\_regexp>} at any server that matches