From add568169ea3f74376fbbb954b56289adfefdf84 Mon Sep 17 00:00:00 2001
From: Badlop <badlop@process-one.net>
Date: Wed, 12 Nov 2008 00:21:47 +0000
Subject: [PATCH] * doc/guide.tex: Improve legibility of mod_irc example config

SVN Revision: 1677
---
 ChangeLog      |  4 ++++
 doc/guide.html | 15 +++++++--------
 doc/guide.tex  | 15 +++++++--------
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 963d76e76..e2e3bfbc2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-11-12  Badlop  <badlop@process-one.net>
+
+	* doc/guide.tex: Improve legibility of mod_irc example config
+
 2008-11-10  Alexey Shchepin  <alexey@process-one.net>
 
 	* src/tls/tls_drv.c: Don't create a SSL context on every
diff --git a/doc/guide.html b/doc/guide.html
index c28115c21..c15a76df7 100644
--- a/doc/guide.html
+++ b/doc/guide.html
@@ -1928,19 +1928,18 @@ able to use the transport. The default encoding is set to "iso8859-15".
   ...
  ]}.
 </PRE></LI><LI CLASS="li-itemize">In next example the IRC transport is available with JIDs with prefix <TT>irc-t.net</TT>.
-Moreover, the transport is only accessible by paying customers registered on
-our domains and on other servers.
-<PRE CLASS="verbatim">{acl, paying_customers, {user, "customer1", "example.net"}}.
-{acl, paying_customers, {user, "customer2", "example.com"}}.
-{acl, paying_customers, {user, "customer3", "example.org"}}.
+Moreover, the transport is only accessible to two users 
+of <TT>example.org</TT>, and any user of <TT>example.com</TT>:
+<PRE CLASS="verbatim">{acl, paying_customers, {user, "customer1", "example.org"}}.
+{acl, paying_customers, {user, "customer2", "example.org"}}.
+{acl, paying_customers, {server, "example.com"}}.
 
-{access, paying_customers, [{allow, paying_customers},
-                              {deny, all}]}.
+{access, irc_users, [{allow, paying_customers}, {deny, all}]}.
 
 {modules,
  [
   ...
-  {mod_irc, [{access, paying_customers},
+  {mod_irc, [{access, irc_users},
              {host, "irc.example.net"}]},
   ...
  ]}.
diff --git a/doc/guide.tex b/doc/guide.tex
index 14cc4c627..6702880f3 100644
--- a/doc/guide.tex
+++ b/doc/guide.tex
@@ -2543,20 +2543,19 @@ Examples:
  ]}.
 \end{verbatim}
 \item In next example the IRC transport is available with JIDs with prefix \jid{irc-t.net}.
-  Moreover, the transport is only accessible by paying customers registered on
-  our domains and on other servers.
+  Moreover, the transport is only accessible to two users 
+  of \term{example.org}, and any user of \term{example.com}:
 \begin{verbatim}
-{acl, paying_customers, {user, "customer1", "example.net"}}.
-{acl, paying_customers, {user, "customer2", "example.com"}}.
-{acl, paying_customers, {user, "customer3", "example.org"}}.
+{acl, paying_customers, {user, "customer1", "example.org"}}.
+{acl, paying_customers, {user, "customer2", "example.org"}}.
+{acl, paying_customers, {server, "example.com"}}.
 
-{access, paying_customers, [{allow, paying_customers},
-                              {deny, all}]}.
+{access, irc_users, [{allow, paying_customers}, {deny, all}]}.
 
 {modules,
  [
   ...
-  {mod_irc, [{access, paying_customers},
+  {mod_irc, [{access, irc_users},
              {host, "irc.example.net"}]},
   ...
  ]}.