From 681f0b95675d60e0d5a71de509b464ac0404ba9a Mon Sep 17 00:00:00 2001 From: Alexey Shchepin Date: Tue, 11 Apr 2006 03:16:34 +0000 Subject: [PATCH] * src/msgs/es.msg: Updated (thanks to Badlop) * src/ejabberd.cfg.example: Updated (thanks to Badlop) * doc/guide.tex: Updated (thanks to Badlop) SVN Revision: 530 --- ChangeLog | 8 + doc/guide.html | 1219 ++++++++++++++++++++------------------ doc/guide.tex | 74 +++ src/ejabberd.cfg.example | 2 + src/msgs/es.msg | 140 +++-- 5 files changed, 805 insertions(+), 638 deletions(-) diff --git a/ChangeLog b/ChangeLog index d43c407b7..b00c46e94 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2006-04-11 Alexey Shchepin + + * src/msgs/es.msg: Updated (thanks to Badlop) + + * src/ejabberd.cfg.example: Updated (thanks to Badlop) + + * doc/guide.tex: Updated (thanks to Badlop) + 2006-04-07 Mickael Remond * src/mod_pubsub/mod_pubsub.erl: Fixed pubsub root node creation diff --git a/doc/guide.html b/doc/guide.html index 7456d9cf0..8e386a326 100644 --- a/doc/guide.html +++ b/doc/guide.html @@ -1,46 +1,29 @@ +Ejabberd 1.0.0 Installation and Operation Guide - - -Ejabberd 1.0.0 Installation and Operation Guide - - - - + + - - + -

- - -
-

Ejabberd 1.0.0 Installation and Operation Guide

-

Alexey Shchepin
+ +

Ejabberd 1.0.0 Installation and Operation Guide

+ +

Alexey Shchepin
mailto:alexey@sevcom.net
-xmpp:aleksey@jabber.ru


+xmpp:aleksey@jabber.ru
-
+
@@ -49,105 +32,106 @@ BLOCKQUOTE{margin-left:4ex;margin-right:4ex;text-align:left;}
-
I can thoroughly recommend ejabberd for ease of setup – +
I can thoroughly recommend ejabberd for ease of setup -- Kevin Smith, Current maintainer of the Psi project
- + -

Contents

+

Table of Contents

-
  • +
    • 1  Introduction -
      • + -
      • 2  Installation from Source -
        • +
        • 2  Installation from Source +
          • 2.1  Installation Requirements -
            • -2.1.1  “Unix-like” operating systems -
            • 2.1.2  Windows + -
            • 2.2  Obtaining ejabberd -
            • 2.3  Compilation - -
            • 3  Configuration -
              • +
              • 3  Configuration +
                • 3.1  Initial Configuration -
                  • + -
                  • 3.2  Creating an Initial Administrator -
                  • 3.3  Online Configuration and Monitoring - -
                  • 4  Firewall Settings -
                  • 5  SRV Records -
                  • 6  Clustering -
                    • +
                    • 4  Firewall Settings +
                    • 5  SRV Records +
                    • 6  Clustering +
                      • 6.1  How it Works - -
                      • A  Built-in Modules -
                        • +
                        • A  Built-in Modules +
                          • A.1  Common Options - -
                          • B  Internationalization and Localization -
                          • C  Release Notes - -

                            1  Introduction

                            +

                            1  Introduction

                            @@ -159,135 +143,135 @@ BLOCKQUOTE{margin-left:4ex;margin-right:4ex;text-align:left;}
                            -

                            1.1  Key Features

                            +

                            1.1  Key Features

                            ejabberd is: -
                            • +
                              • Multiplatform: ejabberd runs under Microsoft Windows and Unix derived systems such as Linux, FreeBSD and NetBSD.

                                -
                              • Distributed: You can run ejabberd on a cluster of machines and all of them will serve one Jabber domain. When you need more capacity you can simply add a new cheap node to your cluster. Accordingly, you do not need to buy an expensive high-end machine to support tens of thousands concurrent users.
                                +
                              • Distributed: You can run ejabberd on a cluster of machines and all of them will serve one Jabber domain. When you need more capacity you can simply add a new cheap node to your cluster. Accordingly, you do not need to buy an expensive high-end machine to support tens of thousands concurrent users.

                                -
                              • Fault-tolerant: You can deploy an ejabberd cluster so that all the information required for a properly working service will be replicated permanently on all nodes. This means that if one of the nodes crashes, the others will continue working without disruption. In addition, nodes also can be added or replaced “on the fly”.
                                +
                              • Fault-tolerant: You can deploy an ejabberd cluster so that all the information required for a properly working service will be replicated permanently on all nodes. This means that if one of the nodes crashes, the others will continue working without disruption. In addition, nodes also can be added or replaced ``on the fly''.

                                -
                              • Administrator Friendly: ejabberd is built on top of the Open Source Erlang. As a result you do not need to install an external database, an external web server, amongst others because everything is already included, and ready to run out of the box. Other administrator benefits include: -
                                • +
                                • Administrator Friendly: ejabberd is built on top of the Open Source Erlang. As a result you do not need to install an external database, an external web server, amongst others because everything is already included, and ready to run out of the box. Other administrator benefits include: +
                                  • Comprehensive documentation. -
                                  • Straightforward installers for Windows and Linux. -
                                  • Web interface for administration tasks. -
                                  • Shared Roster groups. -
                                  • Command line administration tool. -
                                  • Can integrate with existing authentication mechanisms. -
                                  • Capability to send announce messages. +
                                  • Straightforward installers for Windows and Linux. +
                                  • Web interface for administration tasks. +
                                  • Shared Roster groups. +
                                  • Command line administration tool. +
                                  • Can integrate with existing authentication mechanisms. +
                                  • Capability to send announce messages.


                                  -
                                • Internationalized: ejabberd leads in internationalization. Hence it is very well suited in a globalized world. Related features are: -
                                  • +
                                  • Internationalized: ejabberd leads in internationalization. Hence it is very well suited in a globalized world. Related features are: +
                                    • Translated in 11 languages. -
                                    • Support for IDNA. +
                                    • Support for IDNA.


                                    -
                                  • Open Standards: ejabberd is the first Open Source Jabber server claiming to fully comply to the XMPP standard. -
                                    • +
                                    • Open Standards: ejabberd is the first Open Source Jabber server claiming to fully comply to the XMPP standard. +
                                    -

                                    1.2  Additional Features

                                    +

                                    1.2  Additional Features

                                    Besides common Jabber server features, ejabberd comes with a wide range of other features: -
                                    • +
                                      • Modular: ejabberd's modular architecture allows easy customization: -
                                        • +
                                          • Load only the modules you want. -
                                          • Extend ejabberd with your own custom modules. +
                                          • Extend ejabberd with your own custom modules.
                                          -
                                        • Security -
                                          • +
                                          • Security +
                                            • SASL and STARTTLS for c2s and s2s connections. -
                                            • STARTTLS and Dialback s2s connections. -
                                            • Obsolete SSL for c2s connections also supported. -
                                            • Web interface accessible via HTTPS secure access. +
                                            • STARTTLS and Dialback s2s connections. +
                                            • Obsolete SSL for c2s connections also supported. +
                                            • Web interface accessible via HTTPS secure access.
                                            -
                                          • Databases -
                                            • +
                                            • Databases +
                                              • Native PostgreSQL support. -
                                              • Mnesia. -
                                              • ODBC data storage support. +
                                              • Mnesia. +
                                              • ODBC data storage support.
                                              -
                                            • Authentication -
                                              • +
                                              • Authentication +
                                                • LDAP. -
                                                • External Authentication script. -
                                                • Internal Authentication. +
                                                • External Authentication script. +
                                                • Internal Authentication.
                                                -
                                              • The ability to interface via external components with networks such as: -
                                                • +
                                                • The ability to interface via external components with networks such as: +
                                                  • AIM -
                                                  • ICQ -
                                                  • MSN +
                                                  • ICQ +
                                                  • MSN
                                                  -
                                                • Others - -

                                                  2  Installation from Source

                                                  +

                                                  2  Installation from Source

                                                  -

                                                  2.1  Installation Requirements

                                                  +

                                                  2.1  Installation Requirements

                                                  - + -

                                                  2.1.1  “Unix-like” operating systems

                                                  +

                                                  2.1.1  ``Unix-like'' operating systems

                                                  -To compile ejabberd on a “Unix-like” operating system, you need: -
                                                  • +To compile ejabberd on a ``Unix-like'' operating system, you need: +
                                                    • GNU Make; -
                                                    • GCC; -
                                                    • libexpat 1.95 or higher; -
                                                    • Erlang/OTP R8B or higher; -
                                                    • OpenSSL 0.9.6 or higher (optional). +
                                                    • GCC; +
                                                    • libexpat 1.95 or higher; +
                                                    • Erlang/OTP R8B or higher; +
                                                    • OpenSSL 0.9.6 or higher (optional).
                                                    -

                                                    2.1.2  Windows

                                                    +

                                                    2.1.2  Windows

                                                    To compile ejabberd on a Windows flavour, you need: -
                                                    • + -

                                                      2.2  Obtaining ejabberd

                                                      +

                                                      2.2  Obtaining ejabberd

                                                      @@ -296,49 +280,49 @@ Released versions of ejabberd can be obtained from

                                                      The latest development version can be retrieved from the Subversion repository. -
                                                      +
                                                         svn co http://svn.process-one.net/ejabberd/trunk ejabberd
 
                                                      
 
 
-
                                                      2.3  Compilation
                                                      
+
                                                      2.3  Compilation
                                                      
 
 
 
-
+
 
-
                                                      2.3.1  “Unix-like” operating systems
                                                      
+
                                                      2.3.1  ``Unix-like'' operating systems
                                                      
 
 
 
-Compile ejabberd on a “Unix-like” operating system by executing:
-
                                                      +Compile ejabberd on a ``Unix-like'' operating system by executing:
+
                                                         ./configure
   make
   su
   make install
 
                                                      
 These commands will:
-
                                                      • 
+
                                                        • 
 install ejabberd into the directory /var/lib/ejabberd,
-
                                                        • install the configuration file into /etc/ejabberd,
-
                                                        • create a directory called /var/log/ejabberd to store log files.
+
                                                        • install the configuration file into /etc/ejabberd,
+
                                                        • create a directory called /var/log/ejabberd to store log files.
 
                                                        
 
 
-
                                                        2.3.2  Windows
                                                        
+
                                                        2.3.2  Windows
                                                        
 
 
 
-
                                                        • 
+
                                                          • 
 Install Erlang emulator (for example, into C:\Program Files\erl5.3).
-
                                                          • Install Expat library into C:\Program Files\Expat-1.95.7
+
                                                          • Install Expat library into C:\Program Files\Expat-1.95.7
  directory.
                                                            
 
                                                            
 Copy file C:\Program Files\Expat-1.95.7\Libs\libexpat.dll
  to your Windows system directory (for example, C:\WINNT or
  C:\WINNT\System32)
-
                                                          • Build and install the Iconv library into the directory
+
                                                          • Build and install the Iconv library into the directory
  C:\Program Files\iconv-1.9.1.
                                                            
 
                                                            
 Copy file C:\Program Files\iconv-1.9.1\bin\iconv.dll to your
@@ -350,25 +334,25 @@ Note: instead of copying libexpat.dll and iconv.dll to the Windows
  C:\Program Files\Expat-1.95.7\Libs and
  C:\Program Files\iconv-1.9.1\bin to the PATH environment
  variable.
-
                                                          • While in the directory ejabberd\src run:
-
                                                            +
                                                          • While in the directory ejabberd\src run:
+
                                                             configure.bat
 nmake -f Makefile.win32
-
                                                          • Edit the file ejabberd\src\ejabberd.cfg and run
-
                                                            +
                                                          • Edit the file ejabberd\src\ejabberd.cfg and run
+
                                                             werl -s ejabberd -name ejabberd
 
                                                          
 
 
-
                                                          2.4  Starting
                                                          
+
                                                          2.4  Starting
                                                          
 
 
 
 Execute the following command to start ejabberd:
-
                                                          +
                                                             erl -pa /var/lib/ejabberd/ebin -name ejabberd -s ejabberd
 
                                                          or
-
                                                          +
                                                             erl -pa /var/lib/ejabberd/ebin -sname ejabberd -s ejabberd
 
                                                          In the latter case the Erlang node will be identified using only the first part
 of the host name, i. e. other Erlang nodes outside this domain can't contact
@@ -380,7 +364,7 @@ for storing its user database and for logging.
                                                          
 
                                                          
 To specify the path to the configuration file, the log files and the Mnesia
 database directory, you may use the following command:
-
                                                          +
                                                             erl -pa /var/lib/ejabberd/ebin \
       -sname ejabberd \
       -s ejabberd \
@@ -394,25 +378,25 @@ You can find other useful options in the Erlang manual page
 
                                                          
 To use more than 1024 connections, you should set the environment variable
 ERL_MAX_PORTS:
-
                                                          +
                                                             export ERL_MAX_PORTS=32000
 
                                                          Note that with this value, ejabberd will use more memory (approximately 6 MB
 more).
                                                          
 
                                                          
 To reduce memory usage, you may set the environment variable
 ERL_FULLSWEEP_AFTER:
-
                                                          +
                                                             export ERL_FULLSWEEP_AFTER=0
 
                                                          But in this case ejabberd can start to work slower.
                                                          
 
                                                          
 
 
-
                                                          3  Configuration
                                                          
+
                                                          3  Configuration
                                                          
 
 
 
 
-
                                                          3.1  Initial Configuration
                                                          
+
                                                          3.1  Initial Configuration
                                                          
 
 
 
@@ -423,12 +407,12 @@ configuration file are appended to the entries in the database. The
 configuration file contains a sequence of Erlang terms. Lines beginning with a
 `%' sign are ignored. Each term is a tuple of which the first element is
 the name of an option, and any further elements are that option's values. If the
-configuration file do not contain for instance the “hosts” option, the old
+configuration file do not contain for instance the ``hosts'' option, the old
 host name(s) stored in the database will be used.
                                                          
 
                                                          
 You can override the old values stored in the database by adding next lines to
 the configuration file:
-
                                                          +
                                                             override_global.
   override_local.
   override_acls.
@@ -437,7 +421,7 @@ before new ones are added.
                                                          
 
                                                          
 
 
-
                                                          3.1.1  Host Names
                                                          
+
                                                          3.1.1  Host Names
                                                          
 
 
 
@@ -445,23 +429,23 @@ The option hosts defines a list containing one or more domains that
 ejabberd will serve.
                                                          
 
                                                          
 Examples:
-
                                                          • 
+
                                                            • 
 Serving one domain:
-
                                                              • 
-
                                                                +
                                                                • 
+
                                                                     {hosts, ["example.org"]}.
-
                                                                • Backwards compatibility with older ejabberd versions can be retained
+
                                                              • Backwards compatibility with older ejabberd versions can be retained
  with:
- 
                                                                + 
                                                                   {host, "example.org"}.
 
                                                              
-
                                                            • Serving two domains:
-
                                                              +
                                                            • Serving two domains:
+
                                                                 {hosts, ["one.org", "two.org"]}.
 
                                                            
 
 
-
                                                            3.1.2  Default Language
                                                            
+
                                                            3.1.2  Default Language
                                                            
 
 
 
@@ -472,82 +456,82 @@ option language is "en". In order to take effect there must be
 translation file <language>.msg in ejabberd's msgs directory.
                                                            
 
                                                            
 Examples:
-
                                                            • 
+
                                                              • 
 To set Russian as default language:
-
                                                                +
                                                                   {language, "ru"}.
-
                                                              • To set Spanish as default language:
-
                                                                +
                                                              • To set Spanish as default language:
+
                                                                   {language, "es"}.
 
                                                              
 
 
-
                                                              3.1.3  Access Rules
                                                              
+
                                                              3.1.3  Access Rules
                                                              
 
 
 
 Access control in ejabberd is performed via Access Control Lists (ACLs). The
 declarations of ACLs in the configuration file have the following syntax:
-
                                                              +
                                                                 {acl, <aclname>, {<acltype>, ...}}.
 
                                                              
 <acltype> can be one of the following:
-
                                                              
-all
                                                               Matches all JIDs. Example:
-
                                                              +
                                                              
+all
                                                               Matches all JIDs. Example:
+
                                                               {acl, all, all}.
-
                                                              {user, <username>}
                                                               Matches the user with the name
+
                                                              {user, <username>}
                                                               Matches the user with the name
  <username> at the first virtual host. Example:
-
                                                              +
                                                               {acl, admin, {user, "yozhik"}}.
-
                                                              {user, <username>, <server>}
                                                               Matches the user with the JID
+
                                                              {user, <username>, <server>}
                                                               Matches the user with the JID
  <username>@<server> and any resource. Example:
-
                                                              +
                                                               {acl, admin, {user, "yozhik", "example.org"}}.
-
                                                              {server, <server>}
                                                               Matches any JID from server
+
                                                              {server, <server>}
                                                               Matches any JID from server
  <server>. Example:
-
                                                              +
                                                               {acl, exampleorg, {server, "example.org"}}.
-
                                                              {user_regexp, <regexp>}
                                                               Matches any local user with a name that
+
                                                              {user_regexp, <regexp>}
                                                               Matches any local user with a name that
  matches <regexp> at the first virtual host. Example:
-
                                                              +
                                                               {acl, tests, {user, "^test[0-9]*$"}}.
-
                                                              {user_regexp, <regexp>, <server>}
                                                               Matches any user with a name
+
                                                              {user_regexp, <regexp>, <server>}
                                                               Matches any user with a name
  that matches <regexp> at server <server>. Example:
-
                                                              +
                                                               {acl, tests, {user, "^test", "example.org"}}.
-
                                                              {server_regexp, <regexp>}
                                                               Matches any JID from the server that
+
                                                              {server_regexp, <regexp>}
                                                               Matches any JID from the server that
  matches <regexp>. Example:
-
                                                              +
                                                               {acl, icq, {server, "^icq\\."}}.
-
                                                              {node_regexp, <user_regexp>, <server_regexp>}
                                                               Matches any user
+
                                                              {node_regexp, <user_regexp>, <server_regexp>}
                                                               Matches any user
  with a name that matches <user_regexp> at any server that matches
  <server_regexp>. Example:
-
                                                              +
                                                               {acl, yohzik, {node_regexp, "^yohzik$", "^example.(com|org)$"}}.
-
                                                              {user_glob, <glob>}
                                                              
-
                                                              {user_glob, <glob>, <server>}
                                                              
-
                                                              {server_glob, <glob>}
                                                              
-
                                                              {node_glob, <user_glob>, <server_glob>}
                                                               This is the same as
+
                                                              {user_glob, <glob>}
                                                              
+
                                                              {user_glob, <glob>, <server>}
                                                              
+
                                                              {server_glob, <glob>}
                                                              
+
                                                              {node_glob, <user_glob>, <server_glob>}
                                                               This is the same as
  above. However, it uses shell glob patterns instead of regexp. These patterns
  can have the following special characters:
- 
                                                              
- *
                                                               matches any string including the null string.
- 
                                                              ?
                                                               matches any single character.
- 
                                                              [...]
                                                               matches any of the enclosed characters. Character
+ 
                                                              
+ *
                                                               matches any string including the null string.
+ 
                                                              ?
                                                               matches any single character.
+ 
                                                              [...]
                                                               matches any of the enclosed characters. Character
  ranges are specified by a pair of characters separated by a `-'.
  If the first character after `[' is a `!', any
  character not enclosed is matched.
  
                                                              
 
                                                              
 The following ACLs are pre-defined:
-
                                                              
-all
                                                               Matches any JID.
-
                                                              none
                                                               Matches no JID.
+
                                                              
+all
                                                               Matches any JID.
+
                                                              none
                                                               Matches no JID.
 
                                                              
 An entry allowing or denying access to different services looks similar to
 this:
-
                                                              +
                                                                 {access, <accessname>, [{allow, <aclname>},
                           {deny, <aclname>},
                           ...
@@ -555,64 +539,64 @@ this:
 
                                                              When a JID is checked to have access to <accessname>, the server
 sequentially checks if that JID mathes any of the ACLs that are named in the
 second elements of the tuples in the list. If it matches, the first element of
-the first matched tuple is returned, otherwise “deny” is returned.
                                                              
+the first matched tuple is returned, otherwise ``deny'' is returned.
                                                              
 
                                                              
 Example:
-
                                                              +
                                                                 {access, configure, [{allow, admin}]}.
   {access, something, [{deny, badmans},
                        {allow, all}]}.
 
                                                              
 The following access rules are pre-defined:
-
                                                              
-all
                                                               Always returns “allow”
-
                                                              none
                                                               Always returns “deny”
+
                                                              
+all
                                                               Always returns ``allow''
+
                                                              none
                                                               Always returns ``deny''
 
                                                              
 
 
-
                                                              3.1.4  Shapers
                                                              
+
                                                              3.1.4  Shapers
                                                              
 
 
 
 Shapers enable you to limit connection traffic. The syntax of
 shapers is like this:
-
                                                              +
                                                                 {shaper, <shapername>, <kind>}.
 
                                                              Currently only one kind of shaper called maxrate is available. It has the
 following syntax:
-
                                                              +
                                                                 {maxrate, <rate>}
 
                                                              where <rate> stands for the maximum allowed incomig rate in bytes per
 second.
                                                              
 
                                                              
 Examples:
-
                                                              • 
-To define a shaper named “normal” with traffic speed limited to
+
                                                                • 
+To define a shaper named ``normal'' with traffic speed limited to
 1,000 bytes/second:
-
                                                                  +
                                                                     {shaper, normal, {maxrate, 1000}}.
-
                                                                • To define a shaper named “fast” with traffic speed limited to
+
                                                                • To define a shaper named ``fast'' with traffic speed limited to
 50,000 bytes/second:
-
                                                                  +
                                                                     {shaper, fast, {maxrate, 50000}}.
 
                                                                
 
 
-
                                                                3.1.5  Listened Sockets
                                                                
+
                                                                3.1.5  Listened Sockets
                                                                
 
 
 
 The option listen defines for which addresses and ports ejabberd
 will listen and what services will be run on them. Each element of the list is a
 tuple with the following elements:
-
                                                                • 
+
                                                                  • 
 Port number.
-
                                                                  • Module that serves this port.
-
                                                                  • Options to this module.
+
                                                                  • Module that serves this port.
+
                                                                  • Options to this module.
 
                                                                  
 
 Currently next modules are implemented:
-
                                                                  
+
                                                                  
  
@@ -657,18 +641,18 @@ Currently next modules are implemented:
 
                                                                  
 
                                                                  ejabberd_c2s
 Descriptioncertfile, http_poll,
  inet6, ip, tls, web_admin
 
                                                                  
-
                                                                  
+
                                                                  
 (*) The mechanism for external components is defined in Jabber Component Protocol (JEP-0114).
                                                                  
 
                                                                  
 The following options are available:
-
                                                                  
- {access, <access rule>}
                                                                   This option defines
- access to the port. The default value is “all”.
- 
                                                                  {certfile, Path}
                                                                   Path to a file containing the SSL certificate.
- 
                                                                  {hosts, [Hostnames], [HostOptions]}
                                                                   This option
+
                                                                  
+ {access, <access rule>}
                                                                   This option defines
+ access to the port. The default value is ``all''.
+ 
                                                                  {certfile, Path}
                                                                   Path to a file containing the SSL certificate.
+ 
                                                                  {hosts, [Hostnames], [HostOptions]}
                                                                   This option
  defines one or more hostnames of connected services and enables you to
  specify additional options including {password, Secret}.
- 
                                                                  http_poll
                                                                   
+ 
                                                                  http_poll
                                                                   
  This option enables HTTP Polling (JEP-0025) support. HTTP Polling
  enables access via HTTP requests to ejabberd from behind firewalls which
  do not allow outgoing sockets on port 5222.
                                                                  
@@ -680,76 +664,76 @@ If HTTP Polling is enabled, it will be available at
  JWChat (there is a tutorial to
  install JWChat with
  instructions for ejabberd).
- 
                                                                  inet6
                                                                   Set up the socket for IPv6.
- 
                                                                  {ip, IPAddress}
                                                                   This option specifies which network
+ 
                                                                  inet6
                                                                   Set up the socket for IPv6.
+ 
                                                                  {ip, IPAddress}
                                                                   This option specifies which network
  interface to listen for. For example {ip, {192, 168, 1, 1}}.
- 
                                                                  {shaper, <access rule>}
                                                                   This option defines a
+ 
                                                                  {shaper, <access rule>}
                                                                   This option defines a
  shaper for the port (see section 3.1.4). The default value
- is “none”.
- 
                                                                  ssl
                                                                   This option specifies that traffic on
+ is ``none''.
+ 
                                                                  ssl
                                                                   This option specifies that traffic on
  the port will be encrypted using SSL. You should also set the
  certfile option. It is recommended to use the tls option
  instead.
- 
                                                                  starttls
                                                                   This option
+ 
                                                                  starttls
                                                                   This option
  specifies that STARTTLS encryption is available on connections to the port.
  You should also set the certfile option.
- 
                                                                  starttls_required
                                                                   This option
+ 
                                                                  starttls_required
                                                                   This option
  specifies that STARTTLS encryption is required on connections to the port.
  No unencrypted connections will be allowed. You should also set the
  certfile option.
- 
                                                                  tls
                                                                   This option specifies that traffic on
+ 
                                                                  tls
                                                                   This option specifies that traffic on
  the port will be encrypted using SSL immediately after connecting. You
  should also set the certfile option.
- 
                                                                  web_admin
                                                                   This option
+ 
                                                                  web_admin
                                                                   This option
  enables the web interface for ejabberd administration which is available
  at http://server:port/admin/. Login and password are the username and
  password of one of the registered users who are granted access by the
- “configure” access rule.
+ ``configure'' access rule.
 
                                                                  
 Also the following global options are available for s2s connections:
-
                                                                  
- {s2s_use_starttls, true|false}
                                                                  
+
                                                                  
+ {s2s_use_starttls, true|false}
                                                                  
  This option defines whether to use STARTTLS
  for s2s connections.
- 
                                                                  {s2s_certfile, Path}
                                                                   Path to the
+ 
                                                                  {s2s_certfile, Path}
                                                                   Path to the
  file containing the SSL certificate.
- 
                                                                  {domain_certfile, Domain, Path}
                                                                   Path
+ 
                                                                  {domain_certfile, Domain, Path}
                                                                   Path
  to the file containing the SSL certificate for the specified domain.
 
                                                                  
 For instance, the following configuration defines that:
-
                                                                  • 
+
                                                                    • 
 c2s connections are listened for on port 5222 and 5223 (SSL) and denied
- for the user “bad”
-
                                                                    • s2s connections are listened for on port 5269 with STARTTLS for secured
+ for the user ``bad''
+
                                                                    • s2s connections are listened for on port 5269 with STARTTLS for secured
  traffic enabled.
-
                                                                    • Port 5280 is serving the web interface and the HTTP Polling service. Note
+
                                                                    • Port 5280 is serving the web interface and the HTTP Polling service. Note
  that it is also possible to serve them on different ports. The second
  example in section 3.3.1 shows how exactly this can be done.
-
                                                                    • All users except for the administrators have a traffic of limit 
+
                                                                    • All users except for the administrators have a traffic of limit 
  1,000 Bytes/second
-
                                                                    • The
+
                                                                    • The
  AIM transport
  aim.example.org is connected to port 5233 with password
- “aimsecret”
-
                                                                    • The ICQ transport JIT (icq.example.org and
+ ``aimsecret''
+
                                                                    • The ICQ transport JIT (icq.example.org and
  sms.example.org) is connected to port 5234 with password
- “jitsecret”
-
                                                                    • The
+ ``jitsecret''
+
                                                                    • The
  MSN transport
  msn.example.org is connected to port 5235 with password
- “msnsecret”
-
                                                                    • The
+ ``msnsecret''
+
                                                                    • The
  Yahoo! transport
  yahoo.example.org is connected to port 5236 with password
- “yahoosecret”
-
                                                                    • The Gadu-Gadu transport gg.example.org is
- connected to port 5237 with password “ggsecret”
-
                                                                    • The
+ ``yahoosecret''
+
                                                                    • The Gadu-Gadu transport gg.example.org is
+ connected to port 5237 with password ``ggsecret''
+
                                                                    • The
  Jabber Mail Component
  jmc.example.org is connected to port 5238 with password
- “jmcsecret”
+ ``jmcsecret''
 
                                                                    
-
                                                                    +
                                                                       {acl, blocked, {user, "bad"}}.
   {access, c2s, [{deny, blocked},
                  {allow, all}]}.
@@ -780,7 +764,7 @@ c2s connections are listened for on port 5222 and 5223 (SSL) and denied
   {s2s_certfile, "/path/to/ssl.pem"}.
 
                                                                    Note, that for jabberd 1.4- or WPJabber-based
 services you have to make the transports log and do XDB by themselves:
-
                                                                    +
                                                                       <!--
      You have to add elogger and rlogger entries here when using ejabberd.
      In this case the transport will do the logging.
@@ -812,7 +796,7 @@ services you have to make the transports log and do XDB by themselves:
 
                                                                    
 
 
-
                                                                    3.1.6  Modules
                                                                    
+
                                                                    3.1.6  Modules
                                                                    
 
 
 
@@ -823,7 +807,7 @@ module. Read section A for detailed information
 module.
                                                                    
 
                                                                    
 Example:
-
                                                                    +
                                                                       {modules,
    [{mod_register,  []},
     {mod_roster,    []},
@@ -846,22 +830,22 @@ Example:
 
                                                                    
 
 
-
                                                                    3.1.7  Virtual Hosting
                                                                    
+
                                                                    3.1.7  Virtual Hosting
                                                                    
 
 
 
 Options can be defined separately for every virtual host using the
 host_config option. It has the following
 syntax:
-
                                                                    +
                                                                       {host_config, <hostname>, [<option>, <option>, ...]}.
 
                                                                    
 Examples:
-
                                                                    • 
+
                                                                      • 
 Domain one.org is using the internal authentication method while
  domain two.org is using the LDAP server running on the domain
  localhost to perform authentication:
-
                                                                        +
                                                                         {host_config, "one.org", [{auth_method, internal}]}.
 
 {host_config, "two.org", [{auth_method, ldap},
@@ -870,10 +854,10 @@ Domain one.org is using the internal authentication method while
                               {ldap_rootdn, "dc=localdomain"},
                               {ldap_rootdn, "dc=example,dc=com"},
                               {ldap_password, ""}]}.
-
                                                                      • Domain one.org is using ODBC to perform authentication
+
                                                                      • Domain one.org is using ODBC to perform authentication
  while domain two.org is using the LDAP servers running on the domains
  localhost and otherhost:
-
                                                                        +
                                                                         {host_config, "one.org", [{auth_method, odbc},
                               {odbc_server, "DSN=ejabberd;UID=ejabberd;PWD=ejabberd"}]}.
 
@@ -886,44 +870,44 @@ Domain one.org is using the internal authentication method while
 
                                                                      
 
 
-
                                                                      3.2  Creating an Initial Administrator
                                                                      
+
                                                                      3.2  Creating an Initial Administrator
                                                                      
 
 
 Before the web interface can be entered to perform administration tasks, an
 account with administrator rights is needed on your ejabberd deployment.
                                                                      
 
                                                                      
 Instructions to create an initial administrator account:
-
                                                                      1. 
+
                                                                        1. 
 Register an account on your ejabberd deployment. An account can be
  created in two ways:
- 
                                                                          1. 
+ 
                                                                            1. 
  Using the tool ejabberdctl (see
  section 3.3.2):
- 
                                                                              + 
                                                                               % ejabberdctl node@host register admin example.org password
-
                                                                            2. Using In-Band Registration (see section A.12): you can
+
                                                                            3. Using In-Band Registration (see section A.13): you can
  use a Jabber client to register an account.
  
                                                                            
-
                                                                          2. Edit the configuration file to promote the account created in the previous
+
                                                                          3. Edit the configuration file to promote the account created in the previous
  step to an account with administrator rights. Note that if you want to add
  more administrators, a seperate acl entry is needed for each administrator.
- 
                                                                            + 
                                                                               {acl, admins, {user, "admin", "example.org"}}.
   {access, configure, [{allow, admins}]}.
-
                                                                          4. Restart ejabberd to load the new configuration.
-
                                                                          5. Open the web interface (http://server:port/admin/) in your
+
                                                                          6. Restart ejabberd to load the new configuration.
+
                                                                          7. Open the web interface (http://server:port/admin/) in your
  favourite browser. Make sure to enter the full JID as username (in this
  example: admin@example.org. The reason that you also need to enter the
  suffix, is because ejabberd's virtual hosting support.
 
                                                                          
 
 
-
                                                                          3.3  Online Configuration and Monitoring
                                                                          
+
                                                                          3.3  Online Configuration and Monitoring
                                                                          
 
 
 
 
-
                                                                          3.3.1  Web Interface
                                                                          
+
                                                                          3.3.1  Web Interface
                                                                          
 
 
 
@@ -934,24 +918,22 @@ section 3.1.5). Then you can open
 will be asked to enter the username (the full Jabber ID) and password
 of an ejabberd user with administrator rights. After authentication
 you will see a page similar to figure 1.
-
                                                                          
+
                                                                          
  
  
  
 
  
                                                                          
-
                                                                          
-
                                                                          Figure 1: Top page from the web interface

                                                                          
-
                                                                          
+
                                                                          Figure 1: Top page from the web interface

                                                                          
 
  
-
                                                                          
+
                                                                          
 Here you can edit access restrictions, manage users, create backups,
 manage the database, enable/disable ports listened for, view server
 statistics,...
                                                                          
 
                                                                          
 Examples:
-
                                                                          • 
+
                                                                            • 
 You can serve the web interface on the same port as the
  HTTP Polling interface. In this example
  you should point your web browser to http://example.org:5280/admin/ to
@@ -960,11 +942,11 @@ You can serve the web interface on the same port as the
  virtual host two.org. Before you get access to the web interface you
  need to enter as username, the JID and password from a registered user that is
  allowed to configure ejabberd. In this example you can enter as username
- “admin@one.org” to administer all virtual hosts (first URL). If you
- log in with “admin@two.org” on
                                                                              
+ ``admin@one.org'' to administer all virtual hosts (first URL). If you
+ log in with ``admin@two.org'' on
                                                                              
 http://example.org:5280/admin/server/two.org/ you can only administer
  the virtual host two.org.
- 
                                                                              + 
                                                                                 ...
   {acl, admins, {user, "admin", "one.org"}}.
   {host_config, "two.org", [{acl, admins, {user, "admin", "two.org"}}]}.
@@ -978,11 +960,11 @@ You can serve the web interface on the same port as the
     ...
    ]
   }.
-
                                                                            • For security reasons, you can serve the web interface on a secured
+
                                                                            • For security reasons, you can serve the web interface on a secured
  connection, on a port differing from the HTTP Polling interface, and bind it
  to the internal LAN IP. The web interface will be accessible by pointing your
  web browser to https://192.168.1.1:5280/admin/:
- 
                                                                              + 
                                                                                 ...
   {hosts, ["example.org"]}.
   ...
@@ -997,13 +979,13 @@ You can serve the web interface on the same port as the
 
                                                                            
 
 
-
                                                                            3.3.2  ejabberdctl
                                                                            
+
                                                                            3.3.2  ejabberdctl
                                                                            
 
 
 It is possible to do some administration operations using the command
 line tool ejabberdctl. You can list all available options by
 running ejabberdctl without arguments:
-
                                                                            +
                                                                             % ejabberdctl
 Usage: ejabberdctl node command
 
@@ -1028,27 +1010,27 @@ Example:
   ejabberdctl ejabberd@host restart
 
                                                                            
 Additional information:
-
                                                                            
-reopen-log 
                                                                             If you use a tool to rotate logs, you have to configure it
+
                                                                            
+reopen-log 
                                                                             If you use a tool to rotate logs, you have to configure it
  so that this command is executed after each rotation.
-
                                                                            backup, restore, install-fallback, dump, load
                                                                             You can use these
+
                                                                            backup, restore, install-fallback, dump, load
                                                                             You can use these
  commands to create and restore backups. 
-
                                                                            import-file, import-dir
                                                                             
+
                                                                            import-file, import-dir
                                                                             
  These options can be used to migrate from other Jabber/XMPP servers. There
  exist tutorials to migrate from jabberd 1.4
  and to migrate from jabberd2.
-
                                                                            delete-expired-messages
                                                                             This option can be used to delete old messages
+
                                                                            delete-expired-messages
                                                                             This option can be used to delete old messages
  in offline storage. This might be useful when the number of offline messages
  is very high.
 
                                                                            
 
 
-
                                                                            4  Firewall Settings
                                                                            
+
                                                                            4  Firewall Settings
                                                                            
 
 
 
 You need to take the following ports in mind when configuring your firewall:
-
                                                                            
+
                                                                            
  
@@ -1069,28 +1051,28 @@ You need to take the following ports in mind when configuring your firewall:
 
                                                                            
 
                                                                            Port
 DescriptionOnly for clustring (see 6). This range
  is configurable (see 2.4).
 
                                                                            
-
                                                                            
+
                                                                            
 
 
-
                                                                            5  SRV Records
                                                                            
+
                                                                            5  SRV Records
                                                                            
 
 
 
-
                                                                            • 
+
 
 
-
                                                                              6  Clustering
                                                                              
+
                                                                              6  Clustering
                                                                              
 
 
 
 
 
-
                                                                              6.1  How it Works
                                                                              
+
                                                                              6.1  How it Works
                                                                              
 
 
 
@@ -1103,15 +1085,15 @@ needed because all nodes exchange information about connected users, s2s
 connections, registered services, etc...
                                                                              
 
                                                                              
 Each ejabberd node has the following modules:
-
                                                                              • 
+
                                                                                • 
 router,
-
                                                                                • local router,
-
                                                                                • session manager,
-
                                                                                • s2s manager.
+
                                                                                • local router,
+
                                                                                • session manager,
+
                                                                                • s2s manager.
 
                                                                                
 
 
-
                                                                                6.1.1  Router
                                                                                
+
                                                                                6.1.1  Router
                                                                                
 
 
 This module is the main router of Jabber packets on each node. It
@@ -1122,7 +1104,7 @@ appropriate process. If not, it is sent to the s2s manager.
                                                                                
 
                                                                                
 
 
-
                                                                                6.1.2  Local Router
                                                                                
+
                                                                                6.1.2  Local Router
                                                                                
 
 
 This module routes packets which have a destination domain equal to
@@ -1132,7 +1114,7 @@ on its content.
                                                                                
 
                                                                                
 
 
-
                                                                                6.1.3  Session Manager
                                                                                
+
                                                                                6.1.3  Session Manager
                                                                                
 
 
 This module routes packets to local users. It looks up to which user
@@ -1142,7 +1124,7 @@ storage, or bounced back.
                                                                                
 
                                                                                
 
 
-
                                                                                6.1.4  s2s Manager
                                                                                
+
                                                                                6.1.4  s2s Manager
                                                                                
 
 
 This module routes packets to other Jabber servers. First, it
@@ -1153,52 +1135,52 @@ serving this connection, otherwise a new connection is opened.
                                                                                
 
                                                                                
 
 
-
                                                                                6.2  Clustering Setup
                                                                                
+
                                                                                6.2  Clustering Setup
                                                                                
 
 
 
 Suppose you already configured ejabberd on one machine named (first),
 and you need to setup another one to make an ejabberd cluster. Then do
 following steps:
-
                                                                                1. 
+
                                                                                  1. 
 Copy ~ejabberd/.erlang.cookie file from first to
  second.
                                                                                    
 
                                                                                    
-(alt) You can also add “-cookie content_of_.erlang.cookie”
- option to all “erl” commands below.
                                                                                    
+(alt) You can also add ``-cookie content_of_.erlang.cookie''
+ option to all ``erl'' commands below.
                                                                                    
 
                                                                                    
-
                                                                                  2. On second run as the `ejabberd' user in the directory
+
                                                                                  3. On second run as the `ejabberd' user in the directory
  where ejabberd will work later the following command:
-
                                                                                    +
                                                                                     erl -sname ejabberd \
     -mnesia extra_db_nodes "['ejabberd@first']" \
     -s mnesia
 
                                                                                    
  This will start Mnesia serving the same database as ejabberd@first.
- You can check this by running the command “mnesia:info().”. You
+ You can check this by running the command ``mnesia:info().''. You
  should see a lot of remote tables and a line like the following:
-
                                                                                    +
                                                                                     running db nodes   = [ejabberd@first, ejabberd@second]
 

                                                                                    
 
                                                                                    
-
                                                                                  4. Now run the following in the same “erl” session:
-
                                                                                    +
                                                                                  5. Now run the following in the same ``erl'' session:
+
                                                                                     mnesia:change_table_copy_type(schema, node(), disc_copies).
 
                                                                                    
  This will create local disc storage for the database.
                                                                                    
 
                                                                                    
-(alt) Change storage type of `scheme' table to “RAM and disc
- copy” on the second node via the web interface.
                                                                                    
+(alt) Change storage type of `scheme' table to ``RAM and disc
+ copy'' on the second node via the web interface.
                                                                                    
 
                                                                                    
-
                                                                                  6. Now you can add replicas of various tables to this node with
- “mnesia:add_table_copy” or
- “mnesia:change_table_copy_type” as above (just replace
- “schema” with another table name and “disc_copies”
- can be replaced with “ram_copies” or
- “disc_only_copies”).
                                                                                    
+
                                                                                  7. Now you can add replicas of various tables to this node with
+ ``mnesia:add_table_copy'' or
+ ``mnesia:change_table_copy_type'' as above (just replace
+ ``schema'' with another table name and ``disc_copies''
+ can be replaced with ``ram_copies'' or
+ ``disc_only_copies'').
                                                                                    
 
                                                                                    
 Which tables to replicate is very dependant on your needs, you can get
- some hints from the command “mnesia:info().”, by looking at the
+ some hints from the command ``mnesia:info().'', by looking at the
  size of tables and the default storage type for each table on 'first'.
                                                                                    
 
                                                                                    
 Replicating a table makes lookups in this table faster on this node.
@@ -1210,13 +1192,13 @@ Also Run “init:stop().” or just “q().” to exit from
+
                                                                                  8. Run ``init:stop().'' or just ``q().'' 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 first.
                                                                                    
 
                                                                                    
-
                                                                                  9. Now run ejabberd on second with almost the same config as
- on first (you probably don't need to duplicate “acl”
- and “access” options — they will be taken from
+
                                                                                  10. Now run ejabberd on second with almost the same config as
+ on first (you probably don't need to duplicate ``acl''
+ and ``access'' options --- they will be taken from
  first, and mod_muc and mod_irc should be
  enabled only on one machine in the cluster).
 
                                                                                  
@@ -1225,13 +1207,13 @@ domain.
                                                                                  
 
                                                                                  
 
 
-
                                                                                  A  Built-in Modules
                                                                                  
+
                                                                                  A  Built-in Modules
                                                                                  
 
 
 
 
 
-
                                                                                  A.1  Common Options
                                                                                  
+
                                                                                  A.1  Common Options
                                                                                  
 
 
 The following options are used by many modules. Therefore, they are described in
@@ -1239,7 +1221,7 @@ this separate section.
                                                                                  
 
                                                                                  
 
 
-
                                                                                  A.1.1  iqdisc
                                                                                  
+
                                                                                  A.1.1  iqdisc
                                                                                  
 
 
 
@@ -1247,23 +1229,23 @@ Many modules define handlers for processing IQ queries of different namespaces
 to this server or to a user (e. g. to example.org or to
 user@example.org). This option defines processing discipline for
 these queries. Possible values are:
-
                                                                                  
-no_queue
                                                                                   All queries of a namespace with this processing discipline are
+
                                                                                  
+no_queue
                                                                                   All queries of a namespace with this processing discipline are
  processed immediately. This also means that no other packets can be processed
  until this one has been completely processed. Hence this discipline is not
  recommended if the processing of a query can take a relatively long time.
-
                                                                                  one_queue
                                                                                   In this case a separate queue is created for the processing
+
                                                                                  one_queue
                                                                                   In this case a separate queue is created for the processing
  of IQ queries of a namespace with this discipline. In addition, the processing
  of this queue is done in parallel with that of other packets. This discipline
  is most recommended.
-
                                                                                  parallel
                                                                                   For every packet with this discipline a separate Erlang process
+
                                                                                  parallel
                                                                                   For every packet with this discipline a separate Erlang process
  is spawned. Consequently, all these packets are processed in parallel.
  Although spawning of Erlang process has a relatively low cost, this can break
  the server's normal work, because the Erlang emulator has a limit on the
  number of processes (32000 by default).
 
                                                                                  
 Example:
-
                                                                                  +
                                                                                     {modules,
    [
     ...
@@ -1273,7 +1255,7 @@ Example:
 
                                                                                  
 
 
-
                                                                                  A.1.2  hosts
                                                                                  
+
                                                                                  A.1.2  hosts
                                                                                  
 
 
 
@@ -1281,19 +1263,19 @@ A module acting as a service can have one or more hostnames. These hostnames
 can be defined with the hosts option.
                                                                                  
 
                                                                                  
 Examples:
-
                                                                                  • 
+
                                                                                    • 
 Serving the echo module on one domain:
- 
                                                                                      • 
- 
                                                                                        + 
                                                                                        • 
+ 
                                                                                             {modules,
    [
     ...
     {mod_echo, [{hosts, ["echo.example.org"]}]},
     ...
    ]}.
-
                                                                                        • Backwards compatibility with older ejabberd versions can be retained
+
                                                                                      • Backwards compatibility with older ejabberd versions can be retained
  with:
- 
                                                                                        + 
                                                                                           {modules,
    [
     ...
@@ -1301,8 +1283,8 @@ Serving the echo module on one domain:
     ...
    ]}.
 
                                                                                      
- 
                                                                                    • Serving the echo module on tho domains:
- 
                                                                                      + 
                                                                                    • Serving the echo module on tho domains:
+ 
                                                                                         {modules,
    [
     ...
@@ -1312,7 +1294,7 @@ Serving the echo module on one domain:
 
                                                                                    
 
 
-
                                                                                    A.2  mod_announce
                                                                                    
+
                                                                                    A.2  mod_announce
                                                                                    
 
 
 
@@ -1322,36 +1304,36 @@ Jabber client by sending messages to specific JIDs. These JIDs are listed in
 next paragraph. The first JID in each entry will apply only to the virtual host
 example.org, while the JID between brackets will apply to all virtual
 hosts:
-
                                                                                    
-example.org/announce/all (example.org/announce/all-hosts/all)
                                                                                     The
+
                                                                                    
+example.org/announce/all (example.org/announce/all-hosts/all)
                                                                                     The
  message is sent to all registered users. If the user is online and connected
  to several resources, only the resource with the highest priority will receive
  the message. If the registered user is not connected, the message will be
  stored offline in assumption that offline storage
- (see section A.8) is enabled.
-
                                                                                    example.org/announce/online (example.org/announce/all-hosts/online)
                                                                                    The
+ (see section A.9) is enabled.
+
                                                                                    example.org/announce/online (example.org/announce/all-hosts/online)
                                                                                    The
  message is sent to all connected users. If the user is online and connected
  to several resources, all resources will receive the message.
-
                                                                                    example.org/announce/motd (example.org/announce/all-hosts/motd)
                                                                                    The
+
                                                                                    example.org/announce/motd (example.org/announce/all-hosts/motd)
                                                                                    The
  message is set as the message of the day (MOTD) and is sent to users when they
  login. In addition the message is sent to all connected users (similar to
  announce/online).
-
                                                                                    example.org/announce/motd/update (example.org/announce/all-hosts/motd/update)
                                                                                    
+
                                                                                    example.org/announce/motd/update (example.org/announce/all-hosts/motd/update)
                                                                                    
  The message is set as message of the day (MOTD) and is sent to users when they
  login. The message is not sent to any currently connected user.
-
                                                                                    example.org/announce/motd/delete (example.org/announce/all-hosts/motd/delete)
                                                                                    
+
                                                                                    example.org/announce/motd/delete (example.org/announce/all-hosts/motd/delete)
                                                                                    
  Any message sent to this JID removes the existing message of the day (MOTD).
 
                                                                                    
 Options:
-
                                                                                    
-access
                                                                                     This option specifies who is allowed to
+
                                                                                    
+access
                                                                                     This option specifies who is allowed to
  send announcements and to set the message of the day (by default, nobody is
  able to send such messages).
 
                                                                                    
 Examples:
-
                                                                                    • 
+
                                                                                      • 
 Only administrators can send announcements:
- 
                                                                                        + 
                                                                                           {access, announce, [{allow, admins}]}.
 
   {modules,
@@ -1360,8 +1342,8 @@ Only administrators can send announcements:
     {mod_announce, [{access, announce}]},
     ...
    ]}.
-
                                                                                      • Administrators as well as the direction can send announcements:
- 
                                                                                        +
                                                                                      • Administrators as well as the direction can send announcements:
+ 
                                                                                           {acl, direction, {user, "big_boss", "example.org"}}.
   {acl, direction, {user, "assistant", "example.org"}}.
   {acl, admins, {user, "admin", "example.org"}}.
@@ -1378,7 +1360,7 @@ Only administrators can send announcements:
 
                                                                                      
 
 
-
                                                                                      A.3  mod_disco
                                                                                      
+
                                                                                      A.3  mod_disco
                                                                                      
 
 
 
@@ -1391,26 +1373,26 @@ the newer Service Discovery protocol if you want them be able to discover
 the services you offer.
                                                                                      
 
                                                                                      
 Options:
-
                                                                                      
-iqdisc
                                                                                       This specifies 
+
                                                                                      
+iqdisc
                                                                                       This specifies 
 the processing discipline for Service Discovery (http://jabber.org/protocol/disco#items and
  http://jabber.org/protocol/disco#info) IQ queries
 (see section A.1.1).
-
                                                                                      extra_domains
                                                                                       With this option,
+
                                                                                      extra_domains
                                                                                       With this option,
  extra domains can be added to the Service Discovery item list.
 
                                                                                      
 Examples:
-
                                                                                      • 
+
                                                                                        • 
 To serve a link to the Jabber User Directory on jabber.org:
- 
                                                                                          + 
                                                                                             {modules,
    [
     ...
     {mod_disco, [{extra_domains, ["users.jabber.org"]}]},
     ...
    ]}.
-
                                                                                        • To serve a link to the transports on another server:
- 
                                                                                          +
                                                                                        • To serve a link to the transports on another server:
+ 
                                                                                             {modules,
    [
     ...
@@ -1418,8 +1400,8 @@ To serve a link to the Jabber User Directory on jabber.org:
                                   "msn.example.com"]}]},
     ...
    ]}.
-
                                                                                        • To serve a link to a few friendly servers:
- 
                                                                                          +
                                                                                        • To serve a link to a few friendly servers:
+ 
                                                                                             {modules,
    [
     ...
@@ -1430,7 +1412,7 @@ To serve a link to the Jabber User Directory on jabber.org:
 
                                                                                        
 
 
-
                                                                                        A.4  mod_echo
                                                                                        
+
                                                                                        A.4  mod_echo
                                                                                        
 
 
 
@@ -1439,31 +1421,31 @@ packet back to the sender. This mirror can be of interest for
 ejabberd and Jabber client debugging.
                                                                                        
 
                                                                                        
 Options:
-
                                                                                        
+
                                                                                        
 
- hosts
                                                                                          This option defines the hostnames of the
+ hosts
                                                                                          This option defines the hostnames of the
  service (see section A.1.2). If neither hosts nor
- the old host is present, the prefix “echo.” is added to all
+ the old host is present, the prefix ``echo.'' is added to all
  ejabberd hostnames.
 
 
                                                                                        
 Examples:
-
                                                                                        • 
+
                                                                                          • 
 Mirror, mirror, on the wall, who is the most beautiful
  of them all?
- 
                                                                                            + 
                                                                                               {modules,
    [
     ...
     {mod_echo, [{hosts, ["mirror.example.org"]}]},
     ...
    ]}.
-
                                                                                          • If you still do not understand the inner workings of mod_echo,
+
                                                                                          • If you still do not understand the inner workings of mod_echo,
  you can find a few more examples in section A.1.2.
 
                                                                                          
 
 
-
                                                                                          A.5  mod_irc
                                                                                          
+
                                                                                          A.5  mod_irc
                                                                                          
 
 
 
@@ -1472,49 +1454,49 @@ servers.
                                                                                          
 
                                                                                          
 End user information:
 
-
                                                                                          • 
-A Jabber client with “groupchat 1.0” support or Multi-User
+
                                                                                            • 
+A Jabber client with ``groupchat 1.0'' support or Multi-User
  Chat support (JEP-0045) is necessary to join IRC channels.
-
                                                                                            • An IRC channel can be joined in nearly the same way as joining a
+
                                                                                            • An IRC channel can be joined in nearly the same way as joining a
  Jabber Multi-User Chat room. The difference is that the room name will
- be “channel%irc.example.org” in case irc.example.org is
- the IRC server hosting “channel”. And of course the host should point
+ be ``channel%irc.example.org'' in case irc.example.org is
+ the IRC server hosting ``channel''. And of course the host should point
  to the IRC transport instead of the Multi-User Chat service.
-
                                                                                            • You can register your nickame by sending “IDENTIFY password” to
                                                                                              
+
                                                                                            • You can register your nickame by sending ``IDENTIFY password'' to
                                                                                              
 nickserver!irc.example.org@irc.jabberserver.org.
-
                                                                                            • Entering your password is possible by sending “LOGIN nick password”
                                                                                              
+
                                                                                            • Entering your password is possible by sending ``LOGIN nick password''
                                                                                              
 to nickserver!irc.example.org@irc.jabberserver.org.
-
                                                                                            • When using a popular Jabber server, it can occur that no
+
                                                                                            • When using a popular Jabber server, it can occur that no
  connection can be achieved with some IRC servers because they limit the
  number of conections from one IP.
 
                                                                                            
 Options:
-
                                                                                            
+
                                                                                            
 
- hosts
                                                                                              This option defines the hostnames of the
+ hosts
                                                                                              This option defines the hostnames of the
  service (see section A.1.2). If neither hosts nor
- the old host is present, the prefix “irc.” is added to all
+ the old host is present, the prefix ``irc.'' is added to all
  ejabberd hostnames.
 
-
                                                                                            access
                                                                                             This option can be used to specify who
+
                                                                                            access
                                                                                             This option can be used to specify who
  may use the IRC transport (default value: all).
 
                                                                                            
 Examples:
-
                                                                                            • 
+
                                                                                              • 
 In the first example, the IRC transport is available on (all) your
- virtual host(s) with the prefix “irc.”. Furthermore, anyone is
+ virtual host(s) with the prefix ``irc.''. Furthermore, anyone is
  able to use the transport.
- 
                                                                                                + 
                                                                                                   {modules,
    [
     ...
     {mod_irc, [{access, all}]},
     ...
    ]}.
-
                                                                                              • In next example the IRC transport is available on two virtual hosts
+
                                                                                              • In next example the IRC transport is available on two virtual hosts
  with different prefixes on each host. Moreover, the transport is only
  accessible by paying customers registered on our domains and on other servers.
- 
                                                                                                + 
                                                                                                   {acl, paying_customers, {user, "customer1", "one.org"}}.
   {acl, paying_customers, {user, "customer2", "two.org"}}.
   {acl, paying_customers, {user, "customer3", "example.org"}}.
@@ -1532,7 +1514,7 @@ In the first example, the IRC transport is available on (all) your
 
                                                                                              
 
 
-
                                                                                              A.6  mod_last
                                                                                              
+
                                                                                              A.6  mod_last
                                                                                              
 
 
 
@@ -1542,14 +1524,14 @@ connected user was last active on the server, or to query the uptime of the
 ejabberd server.
                                                                                              
 
                                                                                              
 Options:
-
                                                                                              
-iqdisc
                                                                                               This specifies 
+
                                                                                              
+iqdisc
                                                                                               This specifies 
 the processing discipline for Last activity (jabber:iq:last) IQ queries
 (see section A.1.1).
 
                                                                                              
 
 
-
                                                                                              A.7  mod_muc
                                                                                              
+
                                                                                              A.7  mod_muc
                                                                                              
 
 
 
@@ -1558,38 +1540,38 @@ With this module enabled, your server will support Multi-User Chat
 that this module is not (yet) clusterable.
                                                                                              
 
                                                                                              
 Some of the features of Multi-User Chat:
-
                                                                                              • 
+
                                                                                                • 
 Sending private messages to room participants.
-
                                                                                                • Inviting users.
-
                                                                                                • Setting a conference topic.
-
                                                                                                • Creating password protected rooms.
-
                                                                                                • Kicking and banning participants.
+
                                                                                                • Inviting users.
+
                                                                                                • Setting a conference topic.
+
                                                                                                • Creating password protected rooms.
+
                                                                                                • Kicking and banning participants.
 
                                                                                                
 Options:
-
                                                                                                
+
                                                                                                
 
- hosts
                                                                                                  This option defines the hostnames of the
+ hosts
                                                                                                  This option defines the hostnames of the
  service (see section A.1.2). If neither hosts nor
- the old host is present, the prefix “conference.” is added to all
+ the old host is present, the prefix ``conference.'' is added to all
  ejabberd hostnames.
 
-
                                                                                                access
                                                                                                 You can specify who is allowed to use
+
                                                                                                access
                                                                                                 You can specify who is allowed to use
  the Multi-User Chat service (by default, everyone is allowed to use it).
-
                                                                                                access_create
                                                                                                 To configure who is
+
                                                                                                access_create
                                                                                                 To configure who is
  allowed to create new rooms at the Multi-User Chat service, this option
  can be used (by default, everybody is allowed to create rooms).
-
                                                                                                access_admin
                                                                                                 This option specifies
+
                                                                                                access_admin
                                                                                                 This option specifies
  who is allowed to administrate the Multi-User Chat service (the default
  value is none, which means that only the room creator can
  administer his room).
 
                                                                                                
 Examples:
-
                                                                                                • 
+
                                                                                                  • 
 In the first example everyone is allowed to use the Multi-User Chat
  service. Everyone will also be able to create new rooms but only the user
  admin@example.org is allowed to administrate any room. In this
  example he is also a global administrator.
- 
                                                                                                    + 
                                                                                                       {acl, admins, {user, "admin", "example.org"}}.
   ...
   {access, muc_admins, [{allow, admins}]}.
@@ -1602,11 +1584,11 @@ In the first example everyone is allowed to use the Multi-User Chat
                {access_admin, muc_admins}]},
     ...
    ]}.
-
                                                                                                  • In the second example the Multi-User Chat service is only accessible by
+
                                                                                                  • In the second example the Multi-User Chat service is only accessible by
  paying customers registered on our domains and on other servers. Of course
  the administrator is also allowed to access rooms. In addition, he is the
  only authority able to create and administer rooms.
- 
                                                                                                    + 
                                                                                                       {acl, paying_customers, {user, "customer1", "one.org"}}.
   {acl, paying_customers, {user, "customer2", "two.org"}}.
   {acl, paying_customers, {user, "customer3", "example.org"}}.
@@ -1627,9 +1609,81 @@ In the first example everyone is allowed to use the Multi-User Chat
     ...
    ]}.
 
                                                                                                  
+
+
+
                                                                                                  A.8  mod_muc_log
                                                                                                  
+
+
+
+This module enables optional logging of Multi-User Chat conversations to HTML.
+Once you enable this module, join a chatroom with enought privileges using a MUC capable Jabber client,
+request the configuration form and there you will have an option to enable chatroom logging.
                                                                                                  
+
                                                                                                  
+Some of the features of generated logs:
+
                                                                                                  • 
+A lot of information about chatroom is added on top of the page: Room title, JID, subject author, subject and configuration.
+
                                                                                                  • Room title and JID are links to join the chatroom (using XMPP-IRI).
+
                                                                                                  • Subject and chatroom configuration changes are tracked and displayed.
+
                                                                                                  • Joins, leaves, nick changes, kicks, bans and /me are tracked and displayed, including the reason when available.
+
                                                                                                  • Generated HTML files are XHTML 1.0 Transitional and CSS compliant.
+
                                                                                                  • Timestamps are self-referencing links.
+
                                                                                                  • Links on top for quicker navigation: Previous day, Next day, Up.
+
                                                                                                  • CSS is used for style definition, and a custom CSS file can be used.
+
                                                                                                  • URLs on messages and subjects are converted to hyperlinks.
+
                                                                                                  • Timezone used on timestamps is shown on the log files.
+
                                                                                                  • A custom link can be added on top of page.
+
                                                                                                  
+Options:
+
                                                                                                  
+access_log
                                                                                                  
+ Restricts which users are allowed to enable or disable chatroom logging using ACL and ACCESS.
+ Default: muc_admin.
+ If you want to allow any chatroom owner put: muc.
+
                                                                                                  cssfile
                                                                                                  
+ If HTMLs will use a custom CSS file or the embedded one.
+ Allowed values:
+ false: HTMLs will include the standard CSS code;
+ "CSS-URL": the URL of the CSS file (for example: "http://example.com/my.css").
+ Default: false.
+
                                                                                                  dirtype
                                                                                                  
+ Type of directory that will be created.
+	Allowed values: 
+		subdirs: creates subdirectories for year and month; 
+ plain: the filename contains the full date, no subdirs.
+ Default: subdirs.
+
                                                                                                  outdir
                                                                                                  
+ Full path to the directory where html will be generated.
+ Make sure the system user has write access on that directory. 
+ Default: "www/muc".
+
                                                                                                  timezone
                                                                                                  
+ What timezone should be used.
+ Allowed values:
+		local: use local time, as reported to Erlang by the operating system;
+ universal: use GMT/UTC time.
+ Default: local.
+
                                                                                                  top_link
                                                                                                  
+ Customizable link on top right corner. Syntax of this option: {"URL", "Text"}.
+ Default: {"/", "Home"}.
+
                                                                                                  
+Example configuration:
+
                                                                                                  +  {modules,
+   [
+    ...
+    {mod_muc_log, [
+               {access_log, muc},
+               {cssfile, "http://example.com/my.css"},
+               {dirtype, plain},
+               {outdir, "/var/www/muclogs"},
+               {timezone, universal},
+               {top_link, {"http://www.jabber.ru", "Jabber.ru"}}
+    ]},
+    ...
+   ]}.
+
                                                                                                  
 
 
-
                                                                                                  A.8  mod_offline
                                                                                                  
+
                                                                                                  A.9  mod_offline
                                                                                                  
 
 
 
@@ -1641,78 +1695,78 @@ online again. Thus it is very similar to how email works. Note that
 
                                                                                                  
 
 
-
                                                                                                  A.9  mod_privacy
                                                                                                  
+
                                                                                                  A.10  mod_privacy
                                                                                                  
 
 
 
 This module implements Blocking Communication (also known as Privacy Rules)
 as defined in section 10 from XMPP IM. If end users have support for it in
 their Jabber client, they will be able to:
-
                                                                                                  
-
                                                                                                  • 
+
                                                                                                    
+
                                                                                                    • 
 Retrieving one's privacy lists. 
-
                                                                                                    • Adding, removing, and editing one's privacy lists. 
-
                                                                                                    • Setting, changing, or declining active lists. 
-
                                                                                                    • Setting, changing, or declining the default list (i.e., the list that
+
                                                                                                    • Adding, removing, and editing one's privacy lists. 
+
                                                                                                    • Setting, changing, or declining active lists. 
+
                                                                                                    • Setting, changing, or declining the default list (i.e., the list that
  is active by default). 
-
                                                                                                    • Allowing or blocking messages based on JID, group, or subscription type
+
                                                                                                    • Allowing or blocking messages based on JID, group, or subscription type
  (or globally). 
-
                                                                                                    • Allowing or blocking inbound presence notifications based on JID, group,
+
                                                                                                    • Allowing or blocking inbound presence notifications based on JID, group,
  or subscription type (or globally). 
-
                                                                                                    • Allowing or blocking outbound presence notifications based on JID, group,
+
                                                                                                    • Allowing or blocking outbound presence notifications based on JID, group,
  or subscription type (or globally). 
-
                                                                                                    • Allowing or blocking IQ stanzas based on JID, group, or subscription type
+
                                                                                                    • Allowing or blocking IQ stanzas based on JID, group, or subscription type
  (or globally). 
-
                                                                                                    • Allowing or blocking all communications based on JID, group, or
+
                                                                                                    • Allowing or blocking all communications based on JID, group, or
  subscription type (or globally).
 
                                                                                                    
 (from http://www.xmpp.org/specs/rfc3921.html#privacy)
 
                                                                                                    
 Options:
-
                                                                                                    
-iqdisc
                                                                                                     This specifies 
+
                                                                                                    
+iqdisc
                                                                                                     This specifies 
 the processing discipline for Blocking Communication (jabber:iq:privacy) IQ queries
 (see section A.1.1).
 
                                                                                                    
 
 
-
                                                                                                    A.10  mod_private
                                                                                                    
+
                                                                                                    A.11  mod_private
                                                                                                    
 
 
 
 This module adds support for Private XML Storage (JEP-0049):
-
                                                                                                    
+
                                                                                                    
 Using this method, Jabber entities can store private data on the server and
 retrieve it whenever necessary. The data stored might be anything, as long as
 it is valid XML. One typical usage for this namespace is the server-side storage
 of client-specific preferences; another is Bookmark Storage (JEP-0048).
 
                                                                                                    
 Options:
-
                                                                                                    
-iqdisc
                                                                                                     This specifies 
+
                                                                                                    
+iqdisc
                                                                                                     This specifies 
 the processing discipline for Private XML Storage (jabber:iq:private) IQ queries
 (see section A.1.1).
 
                                                                                                    
 
 
-
                                                                                                    A.11  mod_pubsub
                                                                                                    
+
                                                                                                    A.12  mod_pubsub
                                                                                                    
 
 
 
 This module offers a Publish-Subscribe Service (JEP-0060).
 Publish-Subscribe can be used to develop (examples are taken from the JEP):
-
                                                                                                    
-
                                                                                                    • 
+
                                                                                                      
+
                                                                                                      • 
 news feeds and content syndacation,
-
                                                                                                      • avatar management,
-
                                                                                                      • shared bookmarks,
-
                                                                                                      • auction and trading systems,
-
                                                                                                      • online catalogs,
-
                                                                                                      • workflow systems,
-
                                                                                                      • network management systems,
-
                                                                                                      • NNTP gateways,
-
                                                                                                      • vCard/profile management,
-
                                                                                                      • and weblogs.
+
                                                                                                      • avatar management,
+
                                                                                                      • shared bookmarks,
+
                                                                                                      • auction and trading systems,
+
                                                                                                      • online catalogs,
+
                                                                                                      • workflow systems,
+
                                                                                                      • network management systems,
+
                                                                                                      • NNTP gateways,
+
                                                                                                      • vCard/profile management,
+
                                                                                                      • and weblogs.
 
                                                                                                      
 
                                                                                                       
 
@@ -1722,18 +1776,18 @@ known as ESB, the Enterprise Service Bus). The J-EAI project builts upon
 ejabberd's codebase and has contributed several features to mod_pubsub.
                                                                                                      
 
                                                                                                      
 Options:
-
                                                                                                      
+
                                                                                                      
 
- hosts
                                                                                                        This option defines the hostnames of the
+ hosts
                                                                                                        This option defines the hostnames of the
  service (see section A.1.2). If neither hosts nor
- the old host is present, the prefix “pubsub.” is added to all
+ the old host is present, the prefix ``pubsub.'' is added to all
  ejabberd hostnames.
 
-
                                                                                                      served_hosts
                                                                                                       To specify which hosts needs to
+
                                                                                                      served_hosts
                                                                                                       To specify which hosts needs to
  be served, you can use this option. If absent, only the main ejabberd
  host is served. 
                                                                                                      
 Example:
-
                                                                                                      +
                                                                                                         {modules,
    [
     ...
@@ -1744,32 +1798,32 @@ Example:
 
                                                                                                      
 
 
-
                                                                                                      A.12  mod_register
                                                                                                      
+
                                                                                                      A.13  mod_register
                                                                                                      
 
 
 
 This module adds support for In-Band Registration (JEP-0077). This protocol
 enables end users to use a Jabber client to:
-
                                                                                                      • 
+
                                                                                                        • 
 Register a new account on the server.
-
                                                                                                        • Change the password from an existing account on the server.
-
                                                                                                        • Delete an existing account on the server.
+
                                                                                                        • Change the password from an existing account on the server.
+
                                                                                                        • Delete an existing account on the server.
 
                                                                                                        
 Options:
-
                                                                                                        
-access
                                                                                                         This option can be configured to specify
- rules to restrict registration. If a rule returns “deny” on the requested
+
                                                                                                        
+access
                                                                                                         This option can be configured to specify
+ rules to restrict registration. If a rule returns ``deny'' on the requested
  user name, registration for that user name is dennied. (there are no
  restrictions by default).
-
                                                                                                        iqdisc
                                                                                                         This specifies 
+
                                                                                                        iqdisc
                                                                                                         This specifies 
 the processing discipline for In-Band Registration (jabber:iq:register) IQ queries
 (see section A.1.1).
 
                                                                                                        
 Examples:
-
                                                                                                        • 
+
                                                                                                          • 
 Next example prohibits the registration of too short account names and of
  account names with exotic characters in it:
- 
                                                                                                            + 
                                                                                                               {acl, shortname, {user_glob, "?"}}.
   {acl, shortname, {user_glob, "??"}}.
   {acl, strangename, {user_regexp, "^..?$"}}.
@@ -1784,12 +1838,12 @@ Next example prohibits the registration of too short account names and of
     {mod_register, [{access, register}]},
     ...
    ]}.
-
                                                                                                          • The in-band registration of new accounts can be prohibited by changing the
+
                                                                                                          • The in-band registration of new accounts can be prohibited by changing the
  access option. If you really want to disable all In-Band Registration
  functionality, that is changing passwords in-band and deleting accounts
  in-band, you have to remove mod_register from the modules list. In this
  example all In-Band Registration functionality is disabled:
- 
                                                                                                            + 
                                                                                                               {access, register, [{deny, all}]}.
 
   {modules,
@@ -1801,21 +1855,21 @@ Next example prohibits the registration of too short account names and of
 
                                                                                                          
 
 
-
                                                                                                          A.13  mod_roster
                                                                                                          
+
                                                                                                          A.14  mod_roster
                                                                                                          
 
 
 
 This module implements roster management as defined in RFC 3921: XMPP IM.
                                                                                                          
 
                                                                                                          
 Options:
-
                                                                                                          
-iqdisc
                                                                                                           This specifies 
+
                                                                                                          
+iqdisc
                                                                                                           This specifies 
 the processing discipline for Roster Management (jabber:iq:roster) IQ queries
 (see section A.1.1).
 
                                                                                                          
 
 
-
                                                                                                          A.14  mod_service_log
                                                                                                          
+
                                                                                                          A.15  mod_service_log
                                                                                                          
 
 
 
@@ -1826,25 +1880,25 @@ packets are encapsulated in a <route/> element and sent to th
 service(s).
                                                                                                          
 
                                                                                                          
 Options:
-
                                                                                                          
-loggers
                                                                                                           With this option a (list of) service(s)
+
                                                                                                          
+loggers
                                                                                                           With this option a (list of) service(s)
  that will receive the packets can be specified.
 
                                                                                                          
 Examples:
-
                                                                                                          • 
+
                                                                                                            • 
 To log all end user packets to the Bandersnatch service running on
  bandersnatch.example.com:
- 
                                                                                                              + 
                                                                                                                 {modules,
    [
     ...
     {mod_service_log, [{loggers, ["bandersnatch.example.com"]}]},
     ...
    ]}.
-
                                                                                                            • To log all end user packets to the Bandersnatch service running on
+
                                                                                                            • To log all end user packets to the Bandersnatch service running on
  bandersnatch.example.com and the backup service on 
  bandersnatch.example.org:
- 
                                                                                                              + 
                                                                                                                 {modules,
    [
     ...
@@ -1855,7 +1909,7 @@ To log all end user packets to the Bandersnatch service running on
 
                                                                                                            
 
 
-
                                                                                                            A.15  mod_shared_roster
                                                                                                            
+
                                                                                                            A.16  mod_shared_roster
                                                                                                            
 
 
 
@@ -1867,21 +1921,21 @@ users from the shared roster groups.
                                                                                                            
 
                                                                                                            
 Shared roster groups can be edited only via the web interface. Each group
 has a unique identification and the following parameters:
-
                                                                                                            
-Name
                                                                                                             The name of the group, which will be displayed in the roster.
-
                                                                                                            Description
                                                                                                             The description of the group. This parameter doesn't affect
+
                                                                                                            
+Name
                                                                                                             The name of the group, which will be displayed in the roster.
+
                                                                                                            Description
                                                                                                             The description of the group. This parameter doesn't affect
  anything.
-
                                                                                                            Members
                                                                                                             A list of full JIDs of group members, entered one per line in
+
                                                                                                            Members
                                                                                                             A list of full JIDs of group members, entered one per line in
  the web interface.
-
                                                                                                            Displayed groups
                                                                                                             A list of groups that will be in the rosters of this
+
                                                                                                            Displayed groups
                                                                                                             A list of groups that will be in the rosters of this
  group's members.
 
                                                                                                            
 Examples:
-
                                                                                                            • 
+
                                                                                                              • 
 Take the case of a computer club that wants all its members seeing each
  other in their rosters. To achieve this, they need to create a shared roster
  group similar to next table:
-
                                                                                                                
+
                                                                                                                
  
@@ -1904,14 +1958,14 @@ Take the case of a computer club that wants all its members seeing each
 
                                                                                                                
 
                                                                                                                Identification
 Group `club_members'
                                                                                                                Displayed groups
 club_members
 
                                                                                                                
-
                                                                                                                
-
                                                                                                              • In another case we have a company which has three divisions: Management,
+
                                                                                                                • 
+
                                                                                                              • In another case we have a company which has three divisions: Management,
  Marketing and Sales. All group members should see all other members in their
  rosters. Additonally, all managers should have all marketing and sales people
  in their roster. Simultaneously, all marketeers and the whole sales team
  should see all managers. This scenario can be achieved by creating shared
  roster groups as shown in the following table:
-
                                                                                                                
+
                                                                                                                
  
@@ -1978,25 +2032,25 @@ Take the case of a computer club that wants all its members seeing each
 
                                                                                                                
 
                                                                                                                Identification
 Group `management'
                                                                                                                sales
 
                                                                                                                
 
-
                                                                                                                
+
                                                                                                                
 
                                                                                                              
 
 
-
                                                                                                              A.16  mod_stats
                                                                                                              
+
                                                                                                              A.17  mod_stats
                                                                                                              
 
 
 
 This module adds support for Statistics Gathering (JEP-0039). This protocol
 allows you to retrieve next statistics from your ejabberd deployment:
-
                                                                                                              • 
+
                                                                                                                • 
 Total number of registered users on the current virtual host (users/total).
-
                                                                                                                • Total number of registered users on all virtual hosts (users/all-hosts/total).
-
                                                                                                                • Total number of online users on the current virtual host (users/online).
-
                                                                                                                • Total number of online users on all virtual hosts (users/all-hosts/online).
+
                                                                                                                • Total number of registered users on all virtual hosts (users/all-hosts/total).
+
                                                                                                                • Total number of online users on the current virtual host (users/online).
+
                                                                                                                • Total number of online users on all virtual hosts (users/all-hosts/online).
 
                                                                                                                
 Options:
-
                                                                                                                
-iqdisc
                                                                                                                 This specifies 
+
                                                                                                                
+iqdisc
                                                                                                                 This specifies 
 the processing discipline for Statistics Gathering (http://jabber.org/protocol/stats) IQ queries
 (see section A.1.1).
 
                                                                                                                
@@ -2004,18 +2058,18 @@ As there are only a small amount of clients (for example
 Tkabber) and software libraries with
 support for this JEP, a few examples are given of the XML you need to send
 in order to get the statistics. Here they are:
-
                                                                                                                • 
+
                                                                                                                  • 
 You can request the number of online users on the current virtual host
  (example.org) by sending:
- 
                                                                                                                    + 
                                                                                                                     <iq to='example.org' type='get'>
   <query xmlns='http://jabber.org/protocol/stats'>
     <stat name='users/online'/>
   </query>
 </iq>
-
                                                                                                                  • You can request the total number of registered users on all virtual hosts
+
                                                                                                                  • You can request the total number of registered users on all virtual hosts
  by sending:
- 
                                                                                                                    + 
                                                                                                                     <iq to='example.org' type='get'>
   <query xmlns='http://jabber.org/protocol/stats'>
     <stat name='users/all-hosts/total'/>
@@ -2024,7 +2078,7 @@ You can request the number of online users on the current virtual host
 
                                                                                                                  
 
 
-
                                                                                                                  A.17  mod_time
                                                                                                                  
+
                                                                                                                  A.18  mod_time
                                                                                                                  
 
 
 
@@ -2032,14 +2086,14 @@ This module features support for Entity Time (
                                                                                                                  
-iqdisc
                                                                                                                   This specifies 
+
                                                                                                                  
+iqdisc
                                                                                                                   This specifies 
 the processing discipline for Entity Time (jabber:iq:time) IQ queries
 (see section A.1.1).
 
                                                                                                                  
 
 
-
                                                                                                                  A.18  mod_vcard
                                                                                                                  
+
                                                                                                                  A.19  mod_vcard
                                                                                                                  
 
 
 
@@ -2049,39 +2103,39 @@ implements an uncomplicated Jabber User Directory based on the vCards of
 these users. Moreover, it enables the server to send its vCard when queried.
                                                                                                                  
 
                                                                                                                  
 Options:
-
                                                                                                                  
+
                                                                                                                  
 
- hosts
                                                                                                                    This option defines the hostnames of the
+ hosts
                                                                                                                    This option defines the hostnames of the
  service (see section A.1.2). If neither hosts nor
- the old host is present, the prefix “vjud.” is added to all
+ the old host is present, the prefix ``vjud.'' is added to all
  ejabberd hostnames.
 
-
                                                                                                                  iqdisc
                                                                                                                   This specifies 
+
                                                                                                                  iqdisc
                                                                                                                   This specifies 
 the processing discipline for vcard-temp IQ queries
 (see section A.1.1).
-
                                                                                                                  search
                                                                                                                   This option specifies whether the search
+
                                                                                                                  search
                                                                                                                   This option specifies whether the search
  functionality is enabled (value: true) or disabled
  (value: false). If disabled, the option hosts will be
  ignored and the Jabber User Directory service will not appear in the
  Service Discovery item list. The default value is true.
-
                                                                                                                  matches
                                                                                                                   With this option, the number of reported
+
                                                                                                                  matches
                                                                                                                   With this option, the number of reported
  search results can be limited. If the option's value is set to infinity,
  all search results are reported. The default value is 30.
-
                                                                                                                  allow_return_all
                                                                                                                   This option enables
+
                                                                                                                  allow_return_all
                                                                                                                   This option enables
  you to specify if search operations with empty input fields should return
  all users who added some information to their vCard. The default value is
  false.
-
                                                                                                                  search_all_hosts
                                                                                                                   If this option is
+
                                                                                                                  search_all_hosts
                                                                                                                   If this option is
  set to true, search operations will apply to all virtual hosts.
  Otherwise only the current host will be searched. The default value is
  true.
 
                                                                                                                  
 Examples:
-
                                                                                                                  • 
+
                                                                                                                    • 
 In this first situation, search results are limited to twenty items,
  every user who added information to their vCard will be listed when people
  do an empty search, and only users from the current host will be returned:
- 
                                                                                                                      + 
                                                                                                                         {modules,
    [
     ...
@@ -2091,9 +2145,9 @@ In this first situation, search results are limited to twenty items,
                  {search_all_hosts, false}]},
     ...
    ]}.
-
                                                                                                                    • The second situation differs in a way that search results are not limited,
+
                                                                                                                    • The second situation differs in a way that search results are not limited,
  and that all virtual hosts will be searched instead of only the current one:
- 
                                                                                                                      + 
                                                                                                                         {modules,
    [
     ...
@@ -2105,7 +2159,7 @@ In this first situation, search results are limited to twenty items,
 
                                                                                                                    
 
 
-
                                                                                                                    A.19  mod_version
                                                                                                                    
+
                                                                                                                    A.20  mod_version
                                                                                                                    
 
 
 
@@ -2113,20 +2167,20 @@ This module implements Software Version (
                                                                                                                    
-iqdisc
                                                                                                                     This specifies 
+
                                                                                                                    
+iqdisc
                                                                                                                     This specifies 
 the processing discipline for Software Version (jabber:iq:version) IQ queries
 (see section A.1.1).
 
                                                                                                                    
 
 
-
                                                                                                                    B  Internationalization and Localization
                                                                                                                    
+
                                                                                                                    B  Internationalization and Localization
                                                                                                                    
 
 
 
 All built-in modules support the xml:lang attribute inside IQ queries.
 Figure 2, for example, shows the reply to the following query:
-
                                                                                                                    +
                                                                                                                       <iq id='5'
       to='example.org'
       type='get'
@@ -2134,44 +2188,40 @@ Figure 2, for example, shows the reply to the f
     <query xmlns='http://jabber.org/protocol/disco#items'/>
   </iq>
 
                                                                                                                    
-
                                                                                                                    
+
                                                                                                                    
  
  
  
 
  
                                                                                                                    
-
                                                                                                                    
-
                                                                                                                    Figure 2: Service Discovery when xml:lang='ru'

                                                                                                                    
-
                                                                                                                    
+
                                                                                                                    Figure 2: Service Discovery when xml:lang='ru'

                                                                                                                    
 
  
-
                                                                                                                    
+
                                                                                                                    
 The web interface also supports the Accept-Language HTTP header (compare
 figure 3 with figure 1)
-
                                                                                                                    
+
                                                                                                                    
  
  
  
 
  
                                                                                                                    
-
                                                                                                                    
-
                                                                                                                    Figure 3: Top page from the web interface with HTTP header
- “Accept-Language: ru”

                                                                                                                    
-
                                                                                                                    
+
                                                                                                                    Figure 3: Top page from the web interface with HTTP header
+ ``Accept-Language: ru''

                                                                                                                    
 
  
-
                                                                                                                    
+
                                                                                                                    
 
 
-
                                                                                                                    C  Release Notes
                                                                                                                    
+
                                                                                                                    C  Release Notes
                                                                                                                    
 
 
 
 
 
-
                                                                                                                    C.1  ejabberd 0.9
                                                                                                                    
+
                                                                                                                    C.1  ejabberd 0.9
                                                                                                                    
 
-
                                                                                                                    +
                                                                                                                            Release notes
         ejabberd 0.9
 
@@ -2263,9 +2313,9 @@ Bugfixes
 
                                                                                                                    
 
 
-
                                                                                                                    C.2  ejabberd 0.9.1
                                                                                                                    
+
                                                                                                                    C.2  ejabberd 0.9.1
                                                                                                                    
 
-
                                                                                                                    +
                                                                                                                            Release notes
        ejabberd 0.9.1
 
@@ -2331,9 +2381,9 @@ Bugfixes
 
                                                                                                                    
 
 
-
                                                                                                                    C.3  ejabberd 0.9.8
                                                                                                                    
+
                                                                                                                    C.3  ejabberd 0.9.8
                                                                                                                    
 
-
                                                                                                                    +
                                                                                                                            Release notes
        ejabberd 0.9.8
          2005-08-01
@@ -2436,9 +2486,9 @@ END
 
                                                                                                                    
 
 
-
                                                                                                                    C.4  ejabberd 1.0.0
                                                                                                                    
+
                                                                                                                    C.4  ejabberd 1.0.0
                                                                                                                    
 
-
                                                                                                                    +
                                                                                                                            Release Notes
        ejabberd 1.0.0
        14 December 2005
@@ -2562,23 +2612,26 @@ END
 
                                                                                                                    
 
 
-
                                                                                                                    D  Acknowledgements
                                                                                                                    
+
                                                                                                                    D  Acknowledgements
                                                                                                                    
 
 
 
 Thanks to all people who contributed to this guide:
-
                                                                                                                    • 
+
 
 
 
-
                                                                                                                      This document was translated from LATEX by
-HEVEA.
                                                                                                                      
+
                                                                                                                      
+
                                                                                                                      This document was translated from LATEX by
+HEVEA.
+
                                                                                                                      
+
 
diff --git a/doc/guide.tex b/doc/guide.tex
index a8bf7357f..47b2cd519 100644
--- a/doc/guide.tex
+++ b/doc/guide.tex
@@ -50,6 +50,7 @@
 \newcommand{\modirc}{\module{mod\_irc}}
 \newcommand{\modlast}{\module{mod\_last}}
 \newcommand{\modmuc}{\module{mod\_muc}}
+\newcommand{\modmuclog}{\module{mod\_muc\_log}}
 \newcommand{\modecho}{\module{mod\_echo}}
 \newcommand{\modoffline}{\module{mod\_offline}}
 \newcommand{\modprivacy}{\module{mod\_privacy}}
@@ -1498,6 +1499,79 @@ Examples:
 \end{verbatim}
 \end{itemize}
 
+\subsection{\modmuclog{}}
+\label{sec:modmuclog}
+\ind{modules!\modmuclog{}}
+
+This module enables optional logging of Multi-User Chat conversations to HTML.
+Once you enable this module, join a chatroom with enought privileges using a MUC capable Jabber client,
+request the configuration form and there you will have an option to enable chatroom logging.
+
+Some of the features of generated logs:
+\begin{itemize}
+\item A lot of information about chatroom is added on top of the page: Room title, JID, subject author, subject and configuration.
+\item Room title and JID are links to join the chatroom (using XMPP-IRI).
+\item Subject and chatroom configuration changes are tracked and displayed.
+\item Joins, leaves, nick changes, kicks, bans and /me are tracked and displayed, including the reason when available.
+\item Generated HTML files are XHTML 1.0 Transitional and CSS compliant.
+\item Timestamps are self-referencing links.
+\item Links on top for quicker navigation: Previous day, Next day, Up.
+\item CSS is used for style definition, and a custom CSS file can be used.
+\item URLs on messages and subjects are converted to hyperlinks.
+\item Timezone used on timestamps is shown on the log files.
+\item A custom link can be added on top of page.
+\end{itemize}
+
+Options:
+\begin{description}
+\titem{access\_log}\ind{options!access\_log}
+    Restricts which users are allowed to enable or disable chatroom logging using ACL and ACCESS.
+    Default: \term{muc\_admin}.
+    If you want to allow any chatroom owner put: \term{muc}.
+\titem{cssfile}\ind{options!cssfile}
+    If HTMLs will use a custom CSS file or the embedded one.
+    Allowed values:
+        \term{false}: HTMLs will include the standard CSS code;
+        \term{"CSS-URL"}: the URL of the CSS file (for example: "http://example.com/my.css").
+    Default: \term{false}.
+\titem{dirtype}\ind{options!dirtype}
+    Type of directory that will be created.
+	Allowed values: 
+		\term{subdirs}: creates subdirectories for year and month; 
+        \term{plain}: the filename contains the full date, no subdirs.
+    Default: \term{subdirs}.
+\titem{outdir}\ind{options!outdir}
+    Full path to the directory where html will be generated.
+    Make sure the system user has write access on that directory. 
+    Default: \term{"www/muc"}.
+\titem{timezone}\ind{options!timezone}
+    What timezone should be used.
+    Allowed values:
+		\term{local}: use local time, as reported to Erlang by the operating system;
+        \term{universal}: use GMT/UTC time.
+    Default: \term{local}.
+\titem{top\_link}\ind{options!top\_link}
+    Customizable link on top right corner. Syntax of this option: \term{\{"URL", "Text"\}}.
+    Default: \term{\{"/", "Home"\}}.
+\end{description}
+
+Example configuration:
+\begin{verbatim}
+  {modules,
+   [
+    ...
+    {mod_muc_log, [
+               {access_log, muc},
+               {cssfile, "http://example.com/my.css"},
+               {dirtype, plain},
+               {outdir, "/var/www/muclogs"},
+               {timezone, universal},
+               {top_link, {"http://www.jabber.ru", "Jabber.ru"}}
+    ]},
+    ...
+   ]}.
+\end{verbatim}
+
 \subsection{\modoffline{}}
 \label{sec:modoffline}
 \ind{modules!\modoffline{}}
diff --git a/src/ejabberd.cfg.example b/src/ejabberd.cfg.example
index 3d94d73df..9fa19682f 100644
--- a/src/ejabberd.cfg.example
+++ b/src/ejabberd.cfg.example
@@ -165,6 +165,8 @@
   {mod_muc,        [{access, muc},
 		    {access_create, muc},
 		    {access_admin, muc_admin}]},
+%  {mod_muc_log,    []},
+%  {mod_shared_roster, []},
   {mod_pubsub,     []},
   {mod_time,       []},
   {mod_last,       []},
diff --git a/src/msgs/es.msg b/src/msgs/es.msg
index b7026b80e..e97fea818 100644
--- a/src/msgs/es.msg
+++ b/src/msgs/es.msg
@@ -6,7 +6,6 @@
 {"No resource provided", "No se ha proporcionado recurso"}.
 
 % mod_configure.erl
-{"DB Tables Configuration at ", "Configuraci贸n de tablas de la BD en "}.
 {"Choose storage type of tables", "Selecciona tipo de almacenamiento de las tablas"}.
 {"RAM copy", "Copia en RAM"}.
 {"RAM and disc copy", "Copia en RAM y disco"}.
@@ -41,12 +40,15 @@
 {"Action on user", "Acci贸n en el usuario"}.
 {"Edit Properties", "Editar propiedades"}.
 {"Remove User", "Eliminar usuario"}.
+{"Database", "Base de datos"}.
+{"Outgoing s2s Connections", "Conexiones S2S salientes"}.
+{"Import Users From jabberd 1.4 Spool Files", "Importar usuarios de ficheros spool de jabberd-1.4"}.
+{"Database Tables Configuration at ", "Configuraci贸n de tablas de la base de datos en "}.
 
 % mod_disco.erl
 {"Configuration", "Configuraci贸n"}.
 {"Online Users", "Usuarios conectados"}.
 {"All Users", "Todos los usuarios"}.
-{"Outgoing S2S connections", "Conexiones S2S de salida"}.
 {"To ~s", "A ~s"}.
 {"From ~s", "De ~s"}.
 {"Running Nodes", "Nodos funcionando"}.
@@ -55,12 +57,9 @@
 {"Access Control Lists", "Listas de Control de Acceso"}.
 {"Access Rules", "Reglas de Acceso"}.
 {"Remove Users", "Eliminar usuarios"}.
-{"DB", "BD"}.
 {"Modules", "M贸dulos"}.
 {"Start Modules", "Iniciar m贸dulos"}.
 {"Stop Modules", "Detener m贸dulos"}.
-{"Backup Management", "Gesti贸n de copia de seguridad"}.
-{"Import users from jabberd1.4 spool files", "Importar usuarios desde ficheros jabberd1.4 spool"}.
 {"Backup", "Guardar copia de seguridad"}.
 {"Restore", "Restaurar"}.
 {"Dump to Text File", "Exportar a fichero de texto"}.
@@ -71,12 +70,16 @@
 {"Choose a username and password to register with this server", "Escoge un nombre de usuario y contrase帽a para registrarte en este servidor"}.
 
 % mod_vcard.erl
-{"Erlang Jabber Server\nCopyright (c) 2002-2005 Alexey Shchepin", "Servidor Jabber en Erlang\nCopyright (c) 2002-2005 Alexey Shchepin"}.
+{"Erlang Jabber Server\nCopyright (c) 2002-2006 Alexey Shchepin", "Servidor Jabber en Erlang\nCopyright (c) 2002-2006 Alexey Shchepin"}.
 {"Fill in the form to search for any matching Jabber User (Add * to the end of field to match substring)", "Rellena el formulario para buscar usuarios Jabber. A帽ade * al final de un campo para buscar subcadenas."}.
-{"ejabberd vCard module\nCopyright (c) 2003-2005 Alexey Shchepin", "M贸dulo vCard para ejabberd\nCopyright (c) 2002-2005 Alexey Shchepin"}.
+{"ejabberd vCard module\nCopyright (c) 2003-2006 Alexey Shchepin", "M贸dulo vCard para ejabberd\nCopyright (c) 2002-2006 Alexey Shchepin"}.
 {"You need an x:data capable client to search", "Necesitas un cliente con soporte de x:data para poder buscar"}.
 {"Search users in ", "Buscar usuarios en "}.
-{"Results of search in ", "Resultados de la b煤squeda en "}.
+
+% mod_vcard_odbc.erl
+{"Email", "correo"}.
+{"Search Results for ", "Buscar resultados por "}.
+{"Jabber ID", "Jabber ID"}.
 
 {"User",              "Usuario"}.
 {"Full Name", 	      "Nombre completo"}.
@@ -87,12 +90,11 @@
 {"Birthday", 	      "Cumplea帽os"}.
 {"Country", 	      "Pa铆s"}.
 {"City", 	      "Ciudad"}.
-{"email", 	      "correo-e"}.
 {"Organization Name", "Nombre de la organizaci贸n"}.
 {"Organization Unit", "Unidad de la organizaci贸n"}.
 
 % mod_pubsub/mod_pubsub.erl
-{"ejabberd pub/sub module\nCopyright (c) 2003-2005 Alexey Shchepin", "M贸dulo Pub/Sub para ejabberd\nCopyright (c) 2002-2005 Alexey Shchepin"}.
+{"ejabberd pub/sub module\nCopyright (c) 2003-2006 Alexey Shchepin", "M贸dulo Pub/Sub para ejabberd\nCopyright (c) 2002-2006 Alexey Shchepin"}.
 {"Node Creator", "Creador del nodo"}.
 {[], " "}.
 {"Deliver payloads with event notifications", "Enviar payloads junto con las notificaciones de eventos"}.
@@ -119,7 +121,7 @@
 {"You must fill in field \"Nickname\" in the form", "Debes rellenar el campo \"Apodo\" en el formulario"}.
 {"Specified nickname is already registered", "El apodo especificado ya est谩 registrado, tendr谩s que buscar otro"}.
 {"Room creation is denied by service policy", "Se te ha denegado crear la sala por pol铆tica del servicio"}.
-{"ejabberd MUC module\nCopyright (c) 2003-2005 Alexey Shchepin", "M贸dulo de MUC para ejabbed\nCopyright (c) 2002-2005 Alexey Shchepin"}.
+{"ejabberd MUC module\nCopyright (c) 2003-2006 Alexey Shchepin", "M贸dulo de MUC para ejabbed\nCopyright (c) 2002-2006 Alexey Shchepin"}.
 
 % mod_muc/mod_muc_room.erl
 {" has set the subject to: ", " ha puesto el asunto: "}.
@@ -169,6 +171,33 @@
 {"Description", "Descripci贸n"}.
 {"Number of occupants", "N煤mero de ocupantes"}.
 
+% mod_muc/mod_muc_log.erl
+{"Chatroom configuration modified", "Configuraci贸n de la sala modificada"}.
+{"joins the room", "entra en la sala"}.
+{"leaves the room", "sale de la sala"}.
+{"has been kicked", "ha sido expulsado"}.
+{"has been banned", "ha sido bloqueado"}.
+{"is now known as", "se cambia el nombre a"}.
+{"Monday", "lunes"}.
+{"Tuesday", "martes"}.
+{"Wednesday", "mi茅rcoles"}.
+{"Thursday", "jueves"}.
+{"Friday", "viernes"}.
+{"Saturday", "s谩bado"}.
+{"Sunday", "domingo"}.
+{"January", "enero"}.
+{"February", "febrero"}.
+{"March", "marzo"}.
+{"April", "abril"}.
+{"May", "mayo"}.
+{"June", "junio"}.
+{"July", "julio"}.
+{"August", "agosto"}.
+{"September", "septiembre"}.
+{"October", "octubre"}.
+{"November", "noviembre"}.
+{"December", "diciembre"}.
+{"Room Configuration", "Configuraci贸n de la sala"}.
 % mod_irc/mod_irc.erl
 {"You need an x:data capable client to configure mod_irc settings", "Necesitas un cliente con soporte de x:data para configurar las opciones de mod_irc"}.
 {"Registration in mod_irc for ", "Registro en mod_irc para"}.
@@ -176,112 +205,115 @@
 {"IRC Username", "Nombre de usuario en IRC"}.
 {"If you want to specify different encodings for IRC servers, fill this list with values in format '{\"irc server\", \"encoding\"}'.  By default this service use \"~s\" encoding.", "Si quieres especificar codificaciones de car谩cteres distintos para cada servidor IRC rellena esta lista con valores en el formato '{\"servidor irc\", \"codificaci贸n\"}'.  Este servicio usa por defecto la codificaci贸n \"~s\"."}.
 {"Encodings", "Codificaciones"}.
-{"ejabberd IRC module\nCopyright (c) 2003-2005 Alexey Shchepin", "M贸dulo de IRC para ejabberd\nCopyright (c) 2002-2005 Alexey Shchepin"}.
+{"ejabberd IRC module\nCopyright (c) 2003-2006 Alexey Shchepin", "M贸dulo de IRC para ejabberd\nCopyright (c) 2002-2006 Alexey Shchepin"}.
 {"Example: [{\"irc.lucky.net\", \"koi8-r\"}, {\"vendetta.fef.net\", \"iso8859-1\"}].", "Ejemplo: [{\"irc.lucky.net\", \"koi8-r\"}, {\"vendetta.fef.net\", \"iso8859-1\"}]."}.
 
 % web/ejabberd_web_admin.erl
-{"ejabberd administration", "Administraci贸n de ejabberd"}.
 {"Users", "Usuarios"}.
 {"Nodes", "Nodos"}.
 {"Statistics", "Estad铆sticas"}.
-{"(raw)", "(crudo)"}.
-{"submitted", "enviado"}.
-{"bad format", "mal formato"}.
-{"raw", "crudo"}.
-{"ejabberd access control lists configuration", "Configuraci贸n de las Listas de Control de Acceso de ejabberd"}.
 {"Delete Selected", "Eliminar los seleccionados"}.
 {"Submit", "Enviar"}.
-{"ejabberd access rules configuration", "Configuraci贸n de las Reglas de Acceso de ejabberd"}.
 {"~s access rule configuration", "Configuraci贸n de las Regla de Acceso ~s"}.
-{"ejabberd users", "Usuarios de ejabberd"}.
-{"ejabberd stats", "Estad铆sticas de ejabberd"}.
 {"Node not found", "Nodo no encontrado"}.
 {"Add New", "A帽adir nuevo"}.
-{"Registered users", "Usuarios registrados"}.
-{"Online users", "Usuarios conectados"}.
-{"Outgoing S2S servers", "Servidores conectados"}.
 {"Change Password", "Cambiar contrase帽a"}.
 {"Connected Resources:", "Recursos conectados:"}.
 {"Password:", "Contrase帽a:"}.
 {"None", "Ninguno"}.
 {"Node ", "Nodo "}.
-{"DB Management", "Gesti贸n de la BD"}.
-{"Listened Ports Management", "Gesti贸n de los puertos de escucha"}.
 {"Restart", "Reiniciar"}.
 {"Stop", "Detener"}.
-{"RPC call error", "Error en la llamada RPC"}.
-{"DB Tables at ", "Tablas de la BD en "}.
 {"Name", "Nombre"}.
 {"Storage Type", "Tipo de almacenamiento"}.
 {"Size", "Tama帽o"}.
 {"Memory", "Memoria"}.
-{"Backup Management at ", "Gesti贸n de copia de seguridad en "}.
-{"Store a backup in a file", "Almacenar una copia de seguridad en fichero"}.
+{"Backup Management", "Gesti贸n de copia de seguridad"}.
 {"OK", "Aceptar"}.
-{"Restore a backup from a file", "Recuperar una copia de seguridad de un fichero"}.
-{"Install a database fallback from a file", "Instalar una recuperaci贸n de BD desde un fichero"}.
-{"Dump a database in a text file", "Exportar una Base de Datos a un fichero de texto"}.
-{"Restore a database from a text file", "Restaurar una Base de Datos desde un fichero de texto"}.
 {"Listened Ports at ", "Puertos de escucha en "}.
-{"~p statistics", "Estad铆sticas de ~p"}.
-{"Uptime", "Tiempo de funcionamiento"}.
-{"CPU Time", "Tiempo de procesador consumido"}.
-{"Transactions commited", "Transacciones realizadas"}.
-{"Transactions aborted", "Transacciones abortadas"}.
-{"Transactions restarted", "Transacciones reiniciadas"}.
-{"Transactions logged", "Transacciones almacenadas"}.
 {"Port", "Puerto"}.
 {"Module", "M贸dulo"}.
 {"Options", "Opciones"}.
 {"Update", "Actualizar"}.
 {"Delete", "Eliminar"}.
 {"Add User", "A帽adir usuario"}.
-{"Offline messages", "Mensajes diferidos"}.
 {"Last Activity", "脷ltima actividad"}.
 {"Never", "Nunca"}.
-{"~s offline messages queue", "~s cola de mensajes diferidos"}.
 {"Time", "Fecha"}.
 {"From", "De"}.
 {"To", "Para"}.
 {"Packet", "Paquete"}.
-{"Offline messages:", "Mensajes diferidos:"}.
 {"Roster", "Lista de contactos"}.
 {"Nickname", "Apodo"}.
 {"Subscription", "Subscripci贸n"}.
 {"Pending", "Pendiente"}.
 {"Groups", "Grupos"}.
 {"Remove", "Borrar"}.
-{"Add JID", "A帽adir JID"}.
 {"User ", "Usuario "}.
 {"Roster of ", "Lista de contactos de "}.
-{"ejabberd (c) 2002-2005 Alexey Shchepin, 2004-2005 Process One", "ejabberd (c) 2002-2005 Alexey Shchepin, 2004-2005 Process One"}.
+{"ejabberd (c) 2002-2006 Alexey Shchepin, 2004-2006 Process One", "ejabberd (c) 2002-2006 Alexey Shchepin, 2004-2006 Process One"}.
 {"Shared Roster", "Grupos Compartidos"}.
 {"Online", "Conectado"}.
-{"JID", "JID"}.
 {"Validate", "Validar"}.
-{"Not found", "No encontrado"}.
-{"Shared roster groups", "Grupos Compartidos"}.
 {"Name:", "Nombre:"}.
 {"Description:", "Descripci贸n:"}.
 {"Members:", "Miembros:"}.
 {"Displayed Groups:", "Mostrar grupos:"}.
 {"Group ", "Grupo "}.
-{"Users last activity", "脷ltima actividad de los usuarios"}.
 {"Period: ", "Periodo: "}.
 {"Last month", "脷ltimo mes"}.
 {"Last year", "脷ltimo a帽o"}.
 {"All activity", "Toda la actividad"}.
 {"Show Ordinary Table", "Mostrar Tabla Ordinaria"}.
 {"Show Integral Table", "Mostrar Tabla Integral"}.
-{"Authenticated users", "Usuarios autenticados"}.
-{"No data", "No hay datos"}.
-{"Modules Management", "Gesti贸n de m贸dulos"}.
 {"Modules at ", "M贸dulos en "}.
 {"Start", "Iniciar"}.
 {"Virtual Hosts", "Hosts Virtuales"}.
 {"ejabberd virtual hosts", "Hosts virtuales de ejabberd"}.
 {"Host", "Host"}.
 {"ejabberd Web Interface", "Interfaz Web de ejabberd"}.
+{"Restore plain text backup immediately:", "Restaurar copias de seguridad de texto plano inmediatamente:"}.
+{"Statistics of ~p", "Estad铆sticas de ~p"}.
+{"Uptime:", "Tiempo desde el inicio:"}.
+{"CPU Time:", "Tiempo consumido de CPU:"}.
+{"Transactions Commited:", "Transacciones finalizadas:"}.
+{"Transactions Aborted:", "Transacciones abortadas:"}.
+{"Transactions Restarted:", "Transacciones reiniciadas:"}.
+{"Transactions Logged:", "Transacciones registradas:"}.
+{"Update ", "Actualizar"}.
+{"Update plan", "Plan de actualizaci贸n"}.
+{"Updated modules", "M贸dulos actualizados"}.
+{"Update script", "Script de actualizaci贸n"}.
+{"Low level update script", "Script de actualizaci贸n a bajo nivel"}.
+{"Script check", "Comprobaci贸n de script"}.
+{"Not Found", "No encontrado"}.
+{"Shared Roster Groups", "Grupos Compartidos"}.
+{"Administration", "Administraci贸n"}.
+{"(Raw)", "(Crudo)"}.
+{"Submitted", "Enviado"}.
+{"Bad format", "Mal formato"}.
+{"Raw", "Crudo"}.
+{"Users Last Activity", "脷ltima actividad de los usuarios"}.
+{"Registered Users", "Usuarios registrados"}.
+{"Offline Messages", "Mensajes diferidos"}.
+{"Registered Users:", "Usuarios registrados:"}.
+{"Authenticated Users:", "Usuarios autenticados:"}.
+{"Online Users:", "Usuarios conectados:"}.
+{"Outgoing s2s Connections:", "Conexiones S2S salientes:"}.
+{"Outgoing s2s Servers:", "Servidores S2S salientes:"}.
+{"Offline Messages:", "Mensajes diferidos:"}.
+{"~s's Offline Messages Queue", "Cola de mensajes diferidos de ~s"}.
+{"Add Jabber ID", "A帽adir Jabber ID"}.
+{"No Data", "Sin datos"}.
+{"Listened Ports", "Puertos de escucha"}.
+{"RPC Call Error", "Error en la llamada RPC"}.
+{"Database Tables at ", "Tablas de la base de datos en "}.
+{"Backup of ", "Copia de seguridad de "}.
+{"Remark that these options will only backup the builtin Mnesia database. If you are using the ODBC module, you also need to backup your SQL database separately.", "Ten en cuenta que estas opciones solo har谩n copia de seguridad de la base de datos Mnesia embebida. Si est谩s usando ODBC tendr谩s que hacer tambi茅n copia de seguridad de tu base de datos SQL."}.
+{"Store binary backup:", "Guardar copia de seguridad binaria:"}.
+{"Restore binary backup immediately:", "Restaurar inmediatamente copia de seguridad binaria:"}.
+{"Restore binary backup after next ejabberd restart (requires less memory):", "Restaurar copia de seguridad binaria en el siguiente reinicio de ejabberd (requiere menos memoria que si instant谩nea):"}.
+{"Store plain text backup:", "Guardar copia de seguridad en texto plano:"}.
 
 % ejabberd_c2s.erl
 {"Use of STARTTLS required", "Es obligatorio usar STARTTLS"}.
@@ -289,7 +321,6 @@
 
 % mod_vcard_ldap.erl
 {"Given Name", "Nombre dado"}.
-{"JID", "JID"}.
 {"Fill in fields to search for any matching Jabber User", "Rellena campos para buscar usuarios Jabber que concuerden"}.
 
 % mod_adhoc.erl
@@ -313,4 +344,3 @@
 % Local Variables:
 % mode: erlang
 % End:
-