-- 
cgit v1.2.3

From 6bdabb0c3ba9b2a2755fffc27ed3795a9968556d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20R=C3=A9mond?=
 <mickael.remond@process-one.net>
Date: Fri, 22 Sep 2006 07:13:42 +0000
Subject: Bugfixes coming from trunk (SVN #599): * src/mod_shared_roster.erl:
 Bugfix * src/mod_roster_odbc.erl: Bugfix

SVN Revision: 609
---
 ChangeLog                 | 6 ++++++
 src/mod_roster_odbc.erl   | 9 ++++-----
 src/mod_shared_roster.erl | 3 ++-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 212f96e31..f20eeaef0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-05  Alexey Shchepin  <alexey@sevcom.net>
+
+	* src/mod_shared_roster.erl: Bugfix
+
+	* src/mod_roster_odbc.erl: Bugfix
+
 2006-09-03  Mickael Remond  <mickael.remond@process-one.net>
 
 	* src/odbc/odbc_queries.erl: Support for Microsoft SQL Server as a
diff --git a/src/mod_roster_odbc.erl b/src/mod_roster_odbc.erl
index cc94d10c6..9509cc68c 100644
--- a/src/mod_roster_odbc.erl
+++ b/src/mod_roster_odbc.erl
@@ -141,11 +141,10 @@ get_user_roster(Acc, {LUser, LServer}) ->
 				   R ->
 				       SJID = jlib:jid_to_string(R#roster.jid),
 				       Groups = lists:flatmap(
-						  fun({S, G}) ->
-							  case jlib:jid_tolower(S) of
-							      SJID -> [G];
-							      _ -> []
-							  end
+						  fun({S, G}) when S == SJID ->
+							  [G];
+						     (_) ->
+							  []
 						  end, JIDGroups),
 				       [R#roster{groups = Groups}]
 			       end
diff --git a/src/mod_shared_roster.erl b/src/mod_shared_roster.erl
index 6a438e673..a0160b959 100644
--- a/src/mod_shared_roster.erl
+++ b/src/mod_shared_roster.erl
@@ -332,7 +332,8 @@ get_user_displayed_groups(US) ->
     [Group || Group <- DisplayedGroups1, is_group_enabled(Host, Group)].
 
 is_user_in_group(US, Group, Host) ->
-    case mnesia:match_object(#sr_user{us=US, group_host={Group, Host}}) of
+    case catch mnesia:dirty_match_object(
+		 #sr_user{us=US, group_host={Group, Host}}) of
 	[] -> false;
 	_  -> true
     end.
-- 
cgit v1.2.3


From 42115402722e1eb238a472964851dd60f7b39b62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20R=C3=A9mond?=
 <mickael.remond@process-one.net>
Date: Fri, 22 Sep 2006 07:25:18 +0000
Subject: Improvement coming from trunk (SVN #601): * src/mod_muc/mod_muc.erl:
 It is now possible to configure the MUC room history feature. A new option
 has been added in ejabberd muc module configuration (history_size) to define
 the size of the history. 0 is used to disable the feature. *
 src/mod_muc/mod_muc_room.erl: Likewise. * doc/guide.tex: Likewise.

SVN Revision: 610
---
 ChangeLog                    |  9 +++++++++
 doc/guide.html               | 19 +++++++++++++++----
 doc/guide.tex                | 17 ++++++++++++++---
 src/mod_muc/mod_muc.erl      | 26 ++++++++++++++++----------
 src/mod_muc/mod_muc_room.erl | 34 ++++++++++++++++++++--------------
 5 files changed, 74 insertions(+), 31 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f20eeaef0..6ee8c5d9e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-09-05  Mickael Remond  <mickael.remond@process-one.net>
+
+	* src/mod_muc/mod_muc.erl: It is now possible to configure the MUC room
+	history feature. A new option has been added in ejabberd muc module
+	configuration (history_size) to define the size of the history. 0 is
+        used to disable the feature.
+	* src/mod_muc/mod_muc_room.erl: Likewise.
+	* doc/guide.tex: Likewise.
+
 2006-09-05  Alexey Shchepin  <alexey@sevcom.net>
 
 	* src/mod_shared_roster.erl: Bugfix
diff --git a/doc/guide.html b/doc/guide.html
index 554201a54..5c9558f34 100644
--- a/doc/guide.html
+++ b/doc/guide.html
@@ -1980,7 +1980,14 @@ Options:
  value is <TT>none</TT>, which means that only the room creator can
  administer his room). By sending a message to the service JID,
  administrators can send service messages that will be displayed in every
- active room.
+ active room.<BR>
+<BR>
+<DT CLASS="dt-description"><B><TT>history_size</TT></B><DD CLASS="dd-description"> a small history of the
+ current discussion is send to users when they enter the room. This option make
+ it possible to define the number of history messages to keep and send to the
+ user joining the room. The value is a integer. Setting the value to <TT>0</TT>
+ disable the history feature and nothing is kept in memory. The default value
+ is <TT>20</TT>. This value is global and affects all MUC rooms on the server.
 </DL>
 Examples:
 <UL CLASS="itemize"><LI CLASS="li-itemize">
@@ -1991,7 +1998,8 @@ In the first example everyone is allowed to use the Multi-User Chat
  sends a message such as &#8220;Tomorrow, the Jabber server will be moved
  to new hardware. This will involve service breakdowns around 23:00 UMT.
  We apologise for this inconvenience.&#8221; to <TT>conference.example.org</TT>,
- it will be displayed in all active rooms.
+ it will be displayed in all active rooms. In this example the history
+ feature is disabled.
  <PRE CLASS="verbatim">
   {acl, admins, {user, "admin", "example.org"}}.
   ...
@@ -2002,7 +2010,8 @@ In the first example everyone is allowed to use the Multi-User Chat
     ...
     {mod_muc, [{access, all},
                {access_create, all},
-               {access_admin, muc_admins}]},
+               {access_admin, muc_admins},
+               {history_size, 0}]},
     ...
    ]}.
 </PRE><LI CLASS="li-itemize">In the second example the Multi-User Chat service is only accessible by
@@ -2012,7 +2021,9 @@ In the first example everyone is allowed to use the Multi-User Chat
  <TT>admin@example.org</TT> sends a message such as &#8220;Tomorrow, the Jabber
  server will be moved to new hardware. This will involve service breakdowns
  around 23:00 UMT. We apologise for this inconvenience.&#8221; to
- <TT>conference.example.org</TT>, it will be displayed in all active rooms.
+ <TT>conference.example.org</TT>, it will be displayed in all active rooms. No
+ <TT>history_size</TT> option is used, this means that the feature is enabled
+ and the default value of 20 history messages will be send to the users.
  <PRE CLASS="verbatim">
   {acl, paying_customers, {user, "customer1", "example.net"}}.
   {acl, paying_customers, {user, "customer2", "example.com"}}.
diff --git a/doc/guide.tex b/doc/guide.tex
index 0a757ca58..53a07c585 100644
--- a/doc/guide.tex
+++ b/doc/guide.tex
@@ -1710,6 +1710,13 @@ Options:
   administer his room). By sending a message to the service JID,
   administrators can send service messages that will be displayed in every
   active room.
+
+  \titem{history\_size} \ind{options!history\_size}a small history of the
+  current discussion is send to users when they enter the room. This option make
+  it possible to define the number of history messages to keep and send to the
+  user joining the room. The value is a integer. Setting the value to \term{0}
+  disable the history feature and nothing is kept in memory. The default value
+  is \term{20}. This value is global and affects all MUC rooms on the server.
 \end{description}
 
 Examples:
@@ -1721,7 +1728,8 @@ Examples:
   sends a message such as ``Tomorrow, the \Jabber{} server will be moved
   to new hardware. This will involve service breakdowns around 23:00 UMT.
   We apologise for this inconvenience.'' to \jid{conference.example.org},
-  it will be displayed in all active rooms.
+  it will be displayed in all active rooms. In this example the history
+  feature is disabled.
   \begin{verbatim}
   {acl, admins, {user, "admin", "example.org"}}.
   ...
@@ -1732,7 +1740,8 @@ Examples:
     ...
     {mod_muc, [{access, all},
                {access_create, all},
-               {access_admin, muc_admins}]},
+               {access_admin, muc_admins},
+               {history_size, 0}]},
     ...
    ]}.
 \end{verbatim}
@@ -1743,7 +1752,9 @@ Examples:
   \jid{admin@example.org} sends a message such as ``Tomorrow, the \Jabber{}
   server will be moved to new hardware. This will involve service breakdowns
   around 23:00 UMT. We apologise for this inconvenience.'' to
-  \jid{conference.example.org}, it will be displayed in all active rooms.
+  \jid{conference.example.org}, it will be displayed in all active rooms. No
+  \term{history\_size} option is used, this means that the feature is enabled
+  and the default value of 20 history messages will be send to the users.
   \begin{verbatim}
   {acl, paying_customers, {user, "customer1", "example.net"}}.
   {acl, paying_customers, {user, "customer2", "example.com"}}.
diff --git a/src/mod_muc/mod_muc.erl b/src/mod_muc/mod_muc.erl
index 6e40d0bdf..196181f3f 100644
--- a/src/mod_muc/mod_muc.erl
+++ b/src/mod_muc/mod_muc.erl
@@ -36,7 +36,7 @@
 -record(muc_online_room, {name_host, pid}).
 -record(muc_registered, {us_host, nick}).
 
--record(state, {host, server_host, access}).
+-record(state, {host, server_host, access, history_size}).
 
 -define(PROCNAME, ejabberd_mod_muc).
 
@@ -148,14 +148,17 @@ init([Host, Opts]) ->
     Access = gen_mod:get_opt(access, Opts, all),
     AccessCreate = gen_mod:get_opt(access_create, Opts, all),
     AccessAdmin = gen_mod:get_opt(access_admin, Opts, none),
+    HistorySize = gen_mod:get_opt(history_size, Opts, 20),
     catch ets:new(muc_online_room, [named_table,
 				    public,
 				    {keypos, #muc_online_room.name_host}]),
     ejabberd_router:register_route(MyHost),
-    load_permanent_rooms(MyHost, Host, {Access, AccessCreate, AccessAdmin}),
+    load_permanent_rooms(MyHost, Host, {Access, AccessCreate, AccessAdmin},
+			 HistorySize),
     {ok, #state{host = MyHost,
 		server_host = Host,
-		access = {Access, AccessCreate, AccessAdmin}}}.
+		access = {Access, AccessCreate, AccessAdmin},
+		history_size = HistorySize}}.
 
 %%--------------------------------------------------------------------
 %% Function: %% handle_call(Request, From, State) -> {reply, Reply, State} |
@@ -187,8 +190,9 @@ handle_cast(_Msg, State) ->
 handle_info({route, From, To, Packet},
 	    #state{host = Host,
 		   server_host = ServerHost,
-		   access = Access} = State) ->
-    case catch do_route(Host, ServerHost, Access, From, To, Packet) of
+		   access = Access,
+		   history_size = HistorySize} = State) ->
+    case catch do_route(Host, ServerHost, Access, HistorySize, From, To, Packet) of
 	{'EXIT', Reason} ->
 	    ?ERROR_MSG("~p", [Reason]);
 	_ ->
@@ -239,11 +243,11 @@ stop_supervisor(Host) ->
     supervisor:terminate_child(ejabberd_sup, Proc),
     supervisor:delete_child(ejabberd_sup, Proc).
 
-do_route(Host, ServerHost, Access, From, To, Packet) ->
+do_route(Host, ServerHost, Access, HistorySize, From, To, Packet) ->
     {AccessRoute, _AccessCreate, _AccessAdmin} = Access,
     case acl:match_rule(ServerHost, AccessRoute, From) of
 	allow ->
-	    do_route1(Host, ServerHost, Access, From, To, Packet);
+	    do_route1(Host, ServerHost, Access, HistorySize, From, To, Packet);
 	_ ->
 	    {xmlelement, _Name, Attrs, _Els} = Packet,
 	    Lang = xml:get_attr_s("xml:lang", Attrs),
@@ -254,7 +258,7 @@ do_route(Host, ServerHost, Access, From, To, Packet) ->
     end.
 
 
-do_route1(Host, ServerHost, Access, From, To, Packet) ->
+do_route1(Host, ServerHost, Access, HistorySize, From, To, Packet) ->
     {_AccessRoute, AccessCreate, AccessAdmin} = Access,
     {Room, _, Nick} = jlib:jid_tolower(To),
     {xmlelement, Name, Attrs, _Els} = Packet,
@@ -379,7 +383,8 @@ do_route1(Host, ServerHost, Access, From, To, Packet) ->
 				    ?DEBUG("MUC: open new room '~s'~n", [Room]),
 				    {ok, Pid} = mod_muc_room:start(
 						  Host, ServerHost, Access,
-						  Room, From, Nick),
+						  Room, HistorySize, From,
+						  Nick),
 				    ets:insert(
 				      muc_online_room,
 				      #muc_online_room{name_host = {Room, Host},
@@ -411,7 +416,7 @@ do_route1(Host, ServerHost, Access, From, To, Packet) ->
 
 
 
-load_permanent_rooms(Host, ServerHost, Access) ->
+load_permanent_rooms(Host, ServerHost, Access, HistorySize) ->
     case catch mnesia:dirty_select(
 		 muc_room, [{#muc_room{name_host = {'_', Host}, _ = '_'},
 			     [],
@@ -427,6 +432,7 @@ load_permanent_rooms(Host, ServerHost, Access) ->
 						ServerHost,
 						Access,
 						Room,
+						HistorySize,
 						R#muc_room.opts),
 				  ets:insert(
 				    muc_online_room,
diff --git a/src/mod_muc/mod_muc_room.erl b/src/mod_muc/mod_muc_room.erl
index 3ae1934ac..44eceb476 100644
--- a/src/mod_muc/mod_muc_room.erl
+++ b/src/mod_muc/mod_muc_room.erl
@@ -14,10 +14,10 @@
 
 
 %% External exports
--export([start_link/6,
-	 start_link/5,
+-export([start_link/7,
+	 start_link/6,
+	 start/7,
 	 start/6,
-	 start/5,
 	 route/4]).
 
 %% gen_fsm callbacks
@@ -85,22 +85,22 @@
 %%%----------------------------------------------------------------------
 %%% API
 %%%----------------------------------------------------------------------
-start(Host, ServerHost, Access, Room, Creator, Nick) ->
+start(Host, ServerHost, Access, Room, HistorySize, Creator, Nick) ->
     Supervisor = gen_mod:get_module_proc(ServerHost, ejabberd_mod_muc_sup),
     supervisor:start_child(
-      Supervisor, [Host, ServerHost, Access, Room, Creator, Nick]).
+      Supervisor, [Host, ServerHost, Access, Room, HistorySize, Creator, Nick]).
 
-start(Host, ServerHost, Access, Room, Opts) ->
+start(Host, ServerHost, Access, Room, HistorySize, Opts) ->
     Supervisor = gen_mod:get_module_proc(ServerHost, ejabberd_mod_muc_sup),
     supervisor:start_child(
-      Supervisor, [Host, ServerHost, Access, Room, Opts]).
+      Supervisor, [Host, ServerHost, Access, Room, HistorySize, Opts]).
 
-start_link(Host, ServerHost, Access, Room, Creator, Nick) ->
-    gen_fsm:start_link(?MODULE, [Host, ServerHost, Access, Room, Creator, Nick],
+start_link(Host, ServerHost, Access, Room, HistorySize, Creator, Nick) ->
+    gen_fsm:start_link(?MODULE, [Host, ServerHost, Access, Room, HistorySize, Creator, Nick],
 		       ?FSMOPTS).
 
-start_link(Host, ServerHost, Access, Room, Opts) ->
-    gen_fsm:start_link(?MODULE, [Host, ServerHost, Access, Room, Opts],
+start_link(Host, ServerHost, Access, Room, HistorySize, Opts) ->
+    gen_fsm:start_link(?MODULE, [Host, ServerHost, Access, Room, HistorySize, Opts],
 		       ?FSMOPTS).
 
 %%%----------------------------------------------------------------------
@@ -114,20 +114,22 @@ start_link(Host, ServerHost, Access, Room, Opts) ->
 %%          ignore                              |
 %%          {stop, StopReason}                   
 %%----------------------------------------------------------------------
-init([Host, ServerHost, Access, Room, Creator, _Nick]) ->
+init([Host, ServerHost, Access, Room, HistorySize, Creator, _Nick]) ->
     State = set_affiliation(Creator, owner,
 			    #state{host = Host,
 				   server_host = ServerHost,
 				   access = Access,
 				   room = Room,
+				   history = lqueue_new(HistorySize),
 				   jid = jlib:make_jid(Room, Host, ""),
 				   just_created = true}),
     {ok, normal_state, State};
-init([Host, ServerHost, Access, Room, Opts]) ->
+init([Host, ServerHost, Access, Room, HistorySize, Opts]) ->
     State = set_opts(Opts, #state{host = Host,
 				  server_host = ServerHost,
 				  access = Access,
 				  room = Room,
+				  history = lqueue_new(HistorySize),
 				  jid = jlib:make_jid(Room, Host, "")}),
     {ok, normal_state, State}.
 
@@ -1372,7 +1374,11 @@ lqueue_new(Max) ->
 	    len = 0,
 	    max = Max}.
 
-lqueue_in(Item, #lqueue{queue = Q1, len = Len, max = Max}) ->
+%% If the message queue limit is set to 0, do not store messages.
+lqueue_in(Item, LQ = #lqueue{max = 0}) ->
+    LQ;
+%% Otherwise, rotate messages in the queue store.
+lqueue_in(Item, LQ = #lqueue{queue = Q1, len = Len, max = Max}) ->
     Q2 = queue:in(Item, Q1),
     if
 	Len >= Max ->
-- 
cgit v1.2.3


From 8c8c7b1e3f7c46369e805796965d5e3b7419fb04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20R=C3=A9mond?=
 <mickael.remond@process-one.net>
Date: Fri, 22 Sep 2006 07:35:55 +0000
Subject: Improvement coming from trunk (SVN #602): *
 src/mod_muc/mod_muc_log.erl: Fixed html special characters escaping, added
 new image buttons, chatroom titles now point to xmpp: URIs (thanks to Badlop)

SVN Revision: 611
---
 ChangeLog                    |   6 ++
 src/mod_muc/mod_muc_log.erl  | 215 ++++++++++++++++++++++++++++++++++++++-----
 src/mod_muc/mod_muc_room.erl |   4 +-
 3 files changed, 200 insertions(+), 25 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6ee8c5d9e..eef5e0557 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-10  Alexey Shchepin  <alexey@sevcom.net>
+
+	* src/mod_muc/mod_muc_log.erl: Fixed html special characters
+	escaping, added new image buttons, chatroom titles now point to
+	xmpp: URIs (thanks to Badlop)
+
 2006-09-05  Mickael Remond  <mickael.remond@process-one.net>
 
 	* src/mod_muc/mod_muc.erl: It is now possible to configure the MUC room
diff --git a/src/mod_muc/mod_muc_log.erl b/src/mod_muc/mod_muc_log.erl
index 1888562fc..15afd6350 100644
--- a/src/mod_muc/mod_muc_log.erl
+++ b/src/mod_muc/mod_muc_log.erl
@@ -179,10 +179,10 @@ add_to_log2(text, {Nick, Packet}, Room, Opts, State) ->
 	{false, false} ->
 	    ok;
 	{false, SubEl} ->
-	    Message = {body, htmlize(xml:get_tag_cdata(SubEl))},
+	    Message = {body, xml:get_tag_cdata(SubEl)},
 	    add_message_to_log(Nick, Message, Room, Opts, State);
 	{SubEl, _} ->
-	    Message = {subject, htmlize(xml:get_tag_cdata(SubEl))},
+	    Message = {subject, xml:get_tag_cdata(SubEl)},
 	    add_message_to_log(Nick, Message, Room, Opts, State)
     end;
 
@@ -238,16 +238,24 @@ get_timestamp_daydiff(TimeStamp, Daydiff) ->
     {Date2, HMS}.
 
 % Try to close the previous day log, if it exists
-close_previous_log(Fn) ->
+close_previous_log(Fn, Images_dir) ->
     case file:read_file_info(Fn) of
 	{ok, _} ->
 	    {ok, F} = file:open(Fn, [append]),
-	    fw(F, "<div class=\"legend\">ejabberd/mod_muc log<span class=\"w3c\"><a href=\"http://validator.w3.org/check?uri=referer\"><img src=\"http://www.w3.org/Icons/valid-xhtml10\" alt=\"Valid XHTML 1.0 Transitional\" height=\"31\" width=\"88\" /></a> <a href=\"http://jigsaw.w3.org/css-validator/\"><img style=\"border:0;width:88px;height:31px\" src=\"http://jigsaw.w3.org/css-validator/images/vcss\" alt=\"Valid CSS!\" /></a></span></div></body></html>"),
+	    %fw(F, "<div class=\"legend\">ejabberd/mod_muc log<span class=\"w3c\">"),
+	    fw(F, "<div class=\"legend\">"),
+	    fw(F, "  <a href=\"http://ejabberd.jabber.ru\"><img style=\"border:0\" src=\"~s/powered-by-ejabberd.png\" alt=\"Powered by ejabberd\"/></a>", [Images_dir]),
+	    fw(F, "  <a href=\"http://www.erlang.org/\"><img style=\"border:0\" src=\"~s/powered-by-erlang.png\" alt=\"Powered by Erlang\"/></a>", [Images_dir]),
+	    fw(F, "<span class=\"w3c\">"),
+	    fw(F, "  <a href=\"http://validator.w3.org/check?uri=referer\"><img style=\"border:0;width:88px;height:31px\" src=\"~s/valid-xhtml10.png\" alt=\"Valid XHTML 1.0 Transitional\" /></a>", [Images_dir]),
+	    fw(F, "  <a href=\"http://jigsaw.w3.org/css-validator/\"><img style=\"border:0;width:88px;height:31px\" src=\"~s/vcss.png\" alt=\"Valid CSS!\"/></a>", [Images_dir]),
+	    fw(F, "</span></div></body></html>"),
 	    file:close(F);
 	_ -> ok
     end.
 
-add_message_to_log(Nick, Message, RoomJID, Opts, State) ->
+add_message_to_log(Nick1, Message, RoomJID, Opts, State) ->
+    Nick = htmlize(Nick1),
     #state{out_dir = OutDir,
 	   dir_type = DirType,
 	   css_file = CSSFile,
@@ -286,7 +294,14 @@ add_message_to_log(Nick, Message, RoomJID, Opts, State) ->
 	    put_header(F, Room, Datestring, CSSFile, Lang,
 		       HourOffset, DatePrev, DateNext, TopLink),
 
-	    close_previous_log(FnYesterday)
+		Images_dir = filename:join([OutDir, "images"]),
+	    file:make_dir(Images_dir),
+		create_image_files(Images_dir),
+		Images_url = case DirType of
+			subdirs -> "../../../images";
+			plain -> "../images"
+		end,
+	    close_previous_log(FnYesterday, Images_url)
     end,
 
     % Build message
@@ -304,33 +319,33 @@ add_message_to_log(Nick, Message, RoomJID, Opts, State) ->
 				 [Nick, ?T("leaves the room")]);
 	       {leave, Reason} ->  
 		   io_lib:format("<font class=\"ml\">~s ~s: ~s</font><br/>", 
-				 [Nick, ?T("leaves the room"), Reason]);
+				 [Nick, ?T("leaves the room"), htmlize(Reason)]);
 	       {kickban, "307", ""} ->  
 		   io_lib:format("<font class=\"mk\">~s ~s</font><br/>", 
 				 [Nick, ?T("has been kicked")]);
 	       {kickban, "307", Reason} ->  
 		   io_lib:format("<font class=\"mk\">~s ~s: ~s</font><br/>", 
-				 [Nick, ?T("has been kicked"), Reason]);
+				 [Nick, ?T("has been kicked"), htmlize(Reason)]);
 	       {kickban, "301", ""} ->  
 		   io_lib:format("<font class=\"mb\">~s ~s</font><br/>", 
 				 [Nick, ?T("has been banned")]);
 	       {kickban, "301", Reason} ->  
 		   io_lib:format("<font class=\"mb\">~s ~s: ~s</font><br/>", 
-				 [Nick, ?T("has been banned"), Reason]);
+				 [Nick, ?T("has been banned"), htmlize(Reason)]);
 	       {nickchange, OldNick} ->  
 		   io_lib:format("<font class=\"mnc\">~s ~s ~s</font><br/>", 
 				 [OldNick, ?T("is now known as"), Nick]);
 	       {subject, T} ->  
 		   io_lib:format("<font class=\"msc\">~s~s~s</font><br/>", 
-				 [Nick, ?T(" has set the subject to: "), T]);
+				 [Nick, ?T(" has set the subject to: "), htmlize(T)]);
 	       {body, T} ->  
 		   case regexp:first_match(T, "^/me\s") of
 		       {match, _, _} ->
 			   io_lib:format("<font class=\"mne\">~s ~s</font><br/>", 
-					 [Nick, string:substr(T, 5)]);
+					 [Nick, string:substr(htmlize(T), 5)]);
 		       nomatch ->
 			   io_lib:format("<font class=\"mn\">&lt;~s&gt;</font> ~s<br/>", 
-					 [Nick, T])
+					 [Nick, htmlize(T)])
 		   end
 	   end,
     {Hour, Minute, Second} = Time,
@@ -391,6 +406,160 @@ make_dir_rec(Dir) ->
 	    file:make_dir(Dir)
     end.
 
+
+% {ok, F1}=file:open("valid-xhtml10.png", [read]).
+% {ok, F1b}=file:read(F1, 1000000).
+% c("../../ejabberd/src/jlib.erl").
+% jlib:encode_base64(F1b).
+
+image_base64("powered-by-erlang.png") ->
+	"iVBORw0KGgoAAAANSUhEUgAAAGUAAAAfCAYAAAD+xQNoAAADN0lEQVRo3u1a"
+	"P0waURz+rjGRRQ+nUyRCYmJyDPTapDARaSIbTUjt1gVSh8ZW69aBAR0cWLSx"
+	"CXWp59LR1jbdqKnGxoQuRZZrSYyHEVM6iZMbHewROA7u3fHvkr5vOn737vcu"
+	"33ffu9/vcQz+gef5Cij6CkmSGABgFEH29r5SVvqIsTEOHo8HkiQxDBXEOjg9"
+	"PcHc3BxuUSqsI8jR0REAUFGsCCoKFYWCBAN6AxyO0Z7cyMXFb6oGqSgAsIrJ"
+	"ut9hMQlvdNbUhKWshLd3HtTF4jihShgVpRaBxKKmIGX5HL920/hz/BM2+zAm"
+	"pn2YioQaxnECj0BiEYcrG0Tzzc8/rfudSm02jaVSm9Vr1MdG8rSKKXlJ7lHr"
+	"fjouCut2IrC82BDPbe/gc+xlXez7KxEz63H4lmIN473Rh8Si1BKhRY6aEJI8"
+	"pLmbjSPN0xOnBBILmg5RC6Lg28preKOzsNmHG8R1Bf0o7GdMucUslDy1pJLG"
+	"2sndVVG0lq3c9vum4zmBR1kuwiYMN5ybmCYXxQg57ThFOTYznzpPO+IQi+IK"
+	"+jXjg/YhuIJ+cIIHg+wQJoJ+2N3jYN3Olvk4ge/IU98spne+FfGtlslm16nn"
+	"a8fduntfDscoVjGJqUgIjz686ViFUdjP4N39x9Xq638viZVtlq2tLXKncLf5"
+	"ticuZSWU5XOUshJKxxKtfdtdvs4OyNb/68urKvlluYizgwwu5SLK8jllu1t9"
+	"ihYOlzdwdpBBKSvh+vKKzHkCj1JW3y1m+hSj13WjqOiJKK0qpXKhSFxJAYBv"
+	"KYaZ9TjWRu4SiWi2LyDtb6wghGmn5HfTml16ILGA/G5al2DW7URYTFYrOU7g"
+	"icQ020sYqYDM9CbdgqFd4vzHL03JfvLjk6ZgADAVCSEsJvHsdL+utNYrm2uf"
+	"ZDVZSkzPKaQkW8kthpyS297BvRdRzR6DdTurJbPy9Ov1K6xr3HBPQuIMowR3"
+	"asegUyDuU9SuUG+dmIGyZ0b7FBN9St3WunyC5yMsrVv7uXzRP58s/qKn6C4q"
+	"lQoVxVIvd4YBwzBUFKs6ZaD27U9hEdcAN98Sx2IxykafIYrizbfESoB+dd9/"
+	"KF/d/wX3cJvREzl1vAAAAABJRU5ErkJggg==";
+
+image_base64("valid-xhtml10.png") ->
+	"iVBORw0KGgoAAAANSUhEUgAAAFgAAAAfCAMAAAEjEcpEAAACiFBMVEUAAADe"
+	"5+fOezmtra3ejEKlhELvvWO9WlrehELOe3vepaWclHvetVLGc3PerVKcCAj3"
+	"vVqUjHOUe1JjlL0xOUpjjL2UAAC91ueMrc7vrVKlvdbW3u+EpcbO3ufO1ucY"
+	"WpSMKQi9SiF7e3taWkoQEAiMczkQSoxaUkpzc3O1lEoICACEazEhGAgIAACE"
+	"YzFra2utjELWcznGnEr/7+9jY2POazHOYzGta2NShLVrlL05OUqctdacCADG"
+	"a2ucAADGpVqUtc61ORg5OTmlUikYGAiUezl7YzEYEAiUczkxMTG9nEqtIRDe"
+	"3t4AMXu9lEoQCACMazEAKXspKSmljFrW1ta1jELOzs7n7/fGxsa9pVqEOSkp"
+	"Y5xznL29tZxahLXOpVr/99ZrY1L/79ZjUiljSikAOYTvxmMAMYScezmchFqU"
+	"czGtlFp7c2utjFqUlJStxt73///39/9Ce61CSkq9xsZznMbW5+9Cc62MjIxC"
+	"Qkrv9/fv7/fOzsbnlErWjIz/3mtCORhza1IpIRBzWjH/1mtCMRhzY1L/zmvn"
+	"vVpSQiHOpVJrUinntVr3zmOEc1L3xmNaWlq1nFo5QkrGWim1lFoISpRSUlK1"
+	"zt4hWpwASoz///////8xa6WUaykAQoxKe61KSkp7nMbWtWPe5+9jWlL39/f3"
+	"9/fWrWNCQkLera3nvWPv7+85MRjntWPetVp7c1IxKRCUlHtKORh7a1IxIRCU"
+	"jHtaSiHWrVIpIQhzWinvvVpaQiH/1mPWpVKMe1L/zmP/xmNrUiGErc4YGBj/"
+	"73PG1ucQWpT/53O9nFoQUpS1SiEQEBC9zt69vb05c6UISoxSUko5a6UICAhS"
+	"SkohUpS1tbXetWMAQoSUgD+kAAAA2HRSTlP/////////iP9sSf//dP//////"
+	"//////////////////////////////////////////8M////////////ef//"
+	"////////////////////////////////////////////////////////////"
+	"//////////////////////9d////////////////////////////////////"
+	"AP//////////////CP//RP//////////////////////////////////////"
+	"//////////////////////9xPp1gAAAFvUlEQVR42pVWi18URRwfy7vsYUba"
+	"iqBRBFmICUQGVKcZckQeaRJQUCLeycMSfKGH0uo5NELpIvGQGzokvTTA85VH"
+	"KTpbRoeJnPno/p1+M7t3txj20e/Nzu7Ofve7v/k9Zg4Vc+wRQMW0eyLx1ZSA"
+	"NeBDxVmxZZSwEUYkGAewm1eIBOMRvhv1UA+q8KXIVuxGdCelFYwxAnxOrxgb"
+	"Y8Ti1t4VA0QHYz4x3FnVC8OVLXv9fkKGSWDoW/4lG6VbdtBblesOs+MjmEmz"
+	"JKNIJWFEfEQTCWNPFKvcKEymjLO1b8bwYQd1hCiiDCl5KsrDCIlhj4fSuvcp"
+	"fSpgJmyv6dzeZv+nMPx3dhbt94II07/JZliEtm1N2RIYPkTYshwYm245a/zk"
+	"WjJwcyFh6ZIcYxxmqiaDSYxhOhFUsqngi3Fzcj3ljdYDNE9uzA1YD/5MhnzW"
+	"1KRqF7mYG8jFYXLcfLpjOe2LA0fuGqQrQHl10sdK0sFcFSOSlzF0BgXQH9h3"
+	"QZDBI0ccNEhftjXuippBDD2/eMRiETmwwNEYHyqhdDyo22w+3QHuNbdve5a7"
+	"eOkHmDVJ0ixNmfbz1h0qo/Q6GuSB2wQJQbpOjOQAl7woWSRJ0m2ewhvAOUiY"
+	"YtZtaZL0CZZmtmVOQttLfr/dbveLZodrfrL7W75wG/JjqkQxoNTtNsTKELQp"
+	"QL6/D5loaSmyTT8TUhsmi8iFA0hZiyltf7OiNKdarRm5w2So2lTNdPLuIzR+"
+	"AiLj8VTRJaj0LmX4VhJ27f/VJV/yycilWPOrk8NkXi7Qqmj5bHqVZlJKZIRk"
+	"1wFzKrt0WUbnXMPJ1fk4TJ5oWBA61p1V76DeIs0MX+s3GxRlA1vtw83KhgNp"
+	"hc1nyErLO5zcvbOsrq+scbZnpzc6QVFPenLwGxmC+BOfYI+DN55QYddh4Q/N"
+	"E/yGYYj4TOGNngQavAZnzzTovEA+kcMJ+247uYexNA+4Fsvjmuv662jsWxPZ"
+	"x2xg890bYMYnTgya7bjmCiEY0qgJ0vMF3c+NoFdPyzxz6V3Uxs3AOWCDchRv"
+	"OsQtBrbFsrT2fhHEc7ByGzu/dA4IO0A3HdfeP9yMqAwP6NPEb6cbwn0PWVU1"
+	"7/FDBQh/CPIrbfcg027IZrsAT/Bf3FNWyn9RSR4cvvwn3e4HFmYPDl/thYcR"
+	"Vi8qPEoXVUWBl6FTBFTtnqmKKg5wnlF4wZ1yeLv7TiwXKektE+iDBNicWEyL"
+	"pnFhfDkpJc3q2khSPyQBbE0dMJnOoDzTwGsI7cdyMkL5gWqUjCF6Txst/twx"
+	"Cv1WzzHoy21ZDQ1xnuDzdPDWR4knr14v0tYn3IxaMFFdiMOlEOJHw1jOQ4sW"
+	"t5rQopRkXZhMEi7pmeDCVWBlfUKwhMZ7rsF6elKsvbwiKxgxIdewa3ErsaYo"
+	"mCVZFYJb0GUu3JqGUNoplBxYiYby8vLBFWef+Cri4/I1sbQ/1OtYTrNtdXS+"
+	"rSe7kQ52eSObL99/iErCWUjCy5W4JLygmCouGfG9x9fmx17XhBuDCaOerbt5"
+	"38erta7TFktLvdHghZcCbcPQO33zIJG9kxF5hoVXnzTzRz0r5js8oTj6uyPk"
+	"GRf346HOLcasgFexueNUWFPtuFKzjoSFYYedhwVlhsRVYWWJpltv1XPQT1Rl"
+	"0bjZIBlb1XujVDzY/Kj4k6Ku3+Z0jo1owjVzDpFTXe1juvBSWNFmNWGZy8Lv"
+	"zUl5PN4JCwyNDzbQ0aAj4Zrjz0FatGJJYhvq4j7mGSpvytGFlZtHf2C4o/28"
+	"Zu8z7wo7eYPfXysnF0i9NnPh1t1zR7VBb9GqaOXhtTmHQdgMFXE+Z608cnpO"
+	"DdZdjL+TuDY44Q38kJXHhccWLoOd9uv1AwwvO+48uu+faCSJPJ1bmy6Thyvp"
+	"ivBmYWgjxPDPAp7JTemY/yGKFEiRt/jG/2P79s8KCwoLCgoLC/khUBA5F0Sf"
+	"QZ+RYfpNE/4Xosmq7jsZAJsAAAAASUVORK5CYII=";
+
+image_base64("vcss.png") ->
+	"iVBORw0KGgoAAAANSUhEUgAAAFgAAAAfCAMAAABUFvrSAAABKVBMVEUAAAAj"
+	"Ix8MR51ZVUqAdlmdnZ3ejEWLDAuNjY1kiMG0n2d9fX19Ghfrp1FtbW3y39+3"
+	"Ph6lIRNdXV2qJBFcVUhcVUhPT0/dsmpUfLr57+/u7u4/PDWZAACZAADOp1Gd"
+	"GxG+SyTgvnNdSySzk16+mkuxw+BOS0BOS0DOzs7MzMy4T09RRDwsJBG+vr73"
+	"wV6fkG6eCQRFcLSurq6/X1+ht9nXfz5sepHuwV59ZTHetFjQ2+wMCQQ2ZK5t"
+	"WCsmWajsz8+Sq9NMPh4hVaY8MRj///////////////////////9MTEyOp9Lu"
+	"8vhXU1A8PDyjOSTBz+YLRJ2rLy8sLCwXTaKujEUcHByDn82dfz7/zGafDw+f"
+	"Dw+zRSlzlMcMDAyNcji1tbXf5vIcFgvATJOjAAAAY3RSTlP/8///////////"
+	"//////8A//////P/////ov//8//////////////z///T//////////+i////"
+	"//////////8w/////6IA/xAgMP//////////8/////////8w0/////////+z"
+	"ehebAAACkUlEQVR42u2VfVPTQBDG19VqC6LY+lKrRIxFQaFSBPuSvhBPF8SI"
+	"UZK2J5Yav/+HcO8uZdLqTCsU/nKnyWwvk1/unnt2D9ZmH+8/cMAaTRFy+ng6"
+	"9/yiwC/+gy8R3McGv5zHvGJEGAdR4eBgi1IbZwevIEZE24pFtBtzG1Q4AoD5"
+	"zvw5pEDcJvIQV/TE3/l+H9GnNJwcdABS5wAbFQLMqI98/UReoAaOTlaJsp0z"
+	"aHx7LwZvY0BUR2xpWTzqam0gzY8KGzG4MhBCNGucha4QbpETy+Yk/BP85nt7"
+	"34AjpQLTsE4ZFpf/dnkUCglXVNYB+OfUZJHvAqAoa45OeuPgm4+Xjtv7xm4N"
+	"7PMV4C61+Mrz3H2WImm3ATiWrAiwZRWcUA5Ej4dgIEMxDv6yxHHcNuAutnjv"
+	"2HZ1NeuycoVPh0mwC834zZC9Ao5dkZZKwLVGwT+WdLw0YOZ1saEkUDoT+QGW"
+	"KZ0E2xpcrPakVW2KXwyUtYEtlEAj3GXD/fYwrryAdeiyGqidQSw1eqtJcA8c"
+	"Zq4zXqhPuCBYE1fKJjh/5X6MwRm9c2xf7WVdLf5oSdt64esVIwVAKC1HJ2ol"
+	"i8vj3L0YzC4zjkMagt+arDAs6bApbL1RVlWIqrJbreqKZmh4y6VR7rAJeUYD"
+	"VRj9VqRXkErpJ9lbEwtE83KlIfeG4p52t7zWIMO1XcaGz54uUyet+hBM7BXX"
+	"DS8Xc5+8Gmmbu1xwSoGIokA3oTptQecQ4Iimm/Ew7jwbPfMi3TM91T9XVIGo"
+	"+W9xC8oWpugVCXLuwXijjxJ3r/6PjX7nlFua8QmyM+TO/Gja2TTc2Z95C5ua"
+	"ewGH6cJi6bJO6Z+TY276eH3tbgy+/3ly3Js+rj66osG/AV5htgaQ9SeRAAAA"
+	"AElFTkSuQmCC";
+
+image_base64("powered-by-ejabberd.png") ->
+	"iVBORw0KGgoAAAANSUhEUgAAAGUAAAAfCAMAAADJG/NaAAAAw1BMVEUAAAAj"
+	"BgYtBAM5AwFCAAAYGAJNAABcAABIDQ5qAAAoJRV7AACFAAAoKSdJHByLAAAw"
+	"Lwk1NQA1MzFJKyo4NxtDQQBEQT5KSCxSTgBSUBlgQ0JYSEpZWQJPUU5hYABb"
+	"W0ZiYClcW1poaCVwbQRpaDhzYWNsakhuZ2VrbFZ8dwCEgAB3dnd4d2+OjACD"
+	"hYKcmACJi4iQkpWspgCYmJm5swCmqazEwACwsbS4ub3X0QLExsPLyszW1Nnc"
+	"3ODm5ugMBwAWAwPHm1IFAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJ"
+	"cEhZcwAACxMAAAsTAQCanBgAAAAHdElNRQfVCRQOBA7VBkCMAAACcElEQVRI"
+	"x72WjXKiMBSFQalIFbNiy1pdrJZaRVYR5deGwPs/VRNBSBB2OjvQO0oYjPfj"
+	"5J6bCcdx8i2UldxKcDhk1HbIPwFBF/kHKJfjPSVAyIRHF9rRZ4sUX3EDdWOv"
+	"1+u2tESaavpnYTbv9zvd0WwDy3/QcGQXlH5uTxB1l07MJlRpsUei0JF6Qi+O"
+	"HyGK7ijXxPklHe/umIllim3iUBMJDIEULxxPP0TVWhhKJoN9fUpdmQLteV8a"
+	"DgEAg9gIcTjL4F4L+r4WVKEF+rbJdwYYAoQHY+oQjnGootyKwxapoi73WkyF"
+	"FySQBv988naEEp4+YMMec5VUCQDJTscEy7Kc0HsLmqNE7rovDjMpIHHGYeid"
+	"Xn4TQcaxMYqP3RV3C8oCl2WvrlSPaNpGZadRnmPGCk8ylM2okAJ4i9TEe1Ke"
+	"rsXxSl6jUt5uayiIodirtcKLOaWblj50wiyMv1F9lm9TUDArGAD0FmEpvCUs"
+	"VoZy6dW81Fg0aDaHogQa36ekAPG5DDGsbdZrGsrzZUnzvBo1I2tLmuL69kSi"
+	"tAweyHKN9b3leDfQMnu3nIIKWfmXnqGVKedJT6QpICbJvf2f8aOsvn68v+k7"
+	"/cwUQdPoxaMoRTnKFHNlKsKQphCTOa84u64vpi8bH31CqsbF6lSONRTkTyQG"
+	"Arq49/fEvjBwz4eDS2/JpaXRNOoXRD/VmOrDVTJJRIZCTLav3VrqbPvP3vdd"
+	"uGEhQJzilncbpSA4F3vsihErO+dayv/sY5/yRE0GDEXCu2VoNiMlo5i+P2Kl"
+	"gMEvTNk2eYa5XEyh12Ex17Z8vzQUR3KEPbYd6XG87eC4Ly75RneS5ZYHAAAA"
+	"AElFTkSuQmCC".
+
+create_image_files(Images_dir) ->
+	Filenames = [
+	    "powered-by-ejabberd.png",
+	    "powered-by-erlang.png",
+	    "valid-xhtml10.png",
+	    "vcss.png"
+	],
+	lists:foreach(
+		fun(Filename) ->
+			Filename_full = filename:join([Images_dir, Filename]),
+			{ok, F} = file:open(Filename_full, [write]),
+			Image = jlib:decode_base64(image_base64(Filename)),
+			io:format(F, "~s", [Image]),
+			file:close(F)
+		end,
+		Filenames),
+	ok.
+
 fw(F, S, O) -> io:format(F, S ++ "~n", O).
 fw(F, S) -> fw(F, S, []).
 
@@ -399,19 +568,19 @@ put_header(F, Room, Date, CSSFile, Lang, Hour_offset, Date_prev, Date_next, Top_
     fw(F, "<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"~s\" lang=\"~s\">", [Lang, Lang]),
     fw(F, "<head>"),
     fw(F, "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />"),
-    fw(F, "<title>~s - ~s</title>", [Room#room.title, Date]),
+    fw(F, "<title>~s - ~s</title>", [htmlize(Room#room.title), Date]),
     put_header_css(F, CSSFile),
     put_header_script(F),
     fw(F, "</head>"),
     fw(F, "<body>"),
     {Top_url, Top_text} = Top_link,
     fw(F, "<div style=\"text-align: right;\"><a style=\"color: #AAAAAA; font-family: monospace; text-decoration: none; font-weight: bold;\" href=\"~s\">~s</a></div>", [Top_url, Top_text]),
-    fw(F, "<div class=\"roomtitle\"><a class=\"roomtitle\" href=\"xmpp:~s?join\">~s</a></div>", [Room#room.jid, Room#room.title]),
+    fw(F, "<div class=\"roomtitle\">~s</div>", [htmlize(Room#room.title)]),
     fw(F, "<a class=\"roomjid\" href=\"xmpp:~s?join\">~s</a>", [Room#room.jid, Room#room.jid]),
     fw(F, "<div class=\"logdate\">~s<span class=\"w3c\"><a class=\"nav\" href=\"~s\">&lt;</a> <a class=\"nav\" href=\".\/\">^</a> <a class=\"nav\" href=\"~s\">&gt;</a></span></div>", [Date, Date_prev, Date_next]),
-    case {Room#room.subject_author, Room#room.subject} of
+    case {htmlize(Room#room.subject_author), htmlize(Room#room.subject)} of
 	{"", ""} -> ok;
-	{SuA, Su} -> fw(F, "<div class=\"roomsubject\">~s~s~s</div>", [SuA, ?T(" has set the subject to: "), htmlize(Su)])
+	{SuA, Su} -> fw(F, "<div class=\"roomsubject\">~s~s~s</div>", [SuA, ?T(" has set the subject to: "), Su])
     end,
     RoomConfig = roomconfig_to_string(Room#room.config, Lang),
     put_room_config(F, RoomConfig, Lang),
@@ -436,7 +605,7 @@ put_header_css(F, false) ->
     fw(F, ".mne {color: #AA0099;}"),
     fw(F, "a.nav {color: #AAAAAA; font-family: monospace; letter-spacing: 3px; text-decoration: none;}"),
     fw(F, "div.roomtitle {border-bottom: #224466 solid 3pt; margin-left: 20pt;}"),
-    fw(F, "a.roomtitle {color: #336699; font-size: 24px; font-weight: bold; font-family: sans-serif; letter-spacing: 3px; text-decoration: none;}"),
+    fw(F, "div.roomtitle {color: #336699; font-size: 24px; font-weight: bold; font-family: sans-serif; letter-spacing: 3px; text-decoration: none;}"),
     fw(F, "a.roomjid {color: #336699; font-size: 24px; font-weight: bold; font-family: sans-serif; letter-spacing: 3px; margin-left: 20pt; text-decoration: none;}"),
     fw(F, "div.logdate {color: #663399; font-size: 20px; font-weight: bold; font-family: sans-serif; letter-spacing: 2px; border-bottom: #224466 solid 1pt; margin-left:80pt; margin-top:20px;}"),
     fw(F, "div.roomsubject {color: #336699; font-size: 18px; font-family: sans-serif; margin-left: 80pt; margin-bottom: 10px;}"),
@@ -485,11 +654,11 @@ htmlize(S1) ->
       S2_list).
 
 htmlize2(S1) ->
-    S2 = element(2, regexp:gsub(S1, "<", "\\&lt;")),
-    S3 = element(2, regexp:gsub(S2, ">", "\\&gt;")),
-    S4 = element(2, regexp:gsub(S3, "(http|ftp)://.[^ ]*", "<a href=\"&\">&</a>")),
-    %element(2, regexp:gsub(S4, "  ", "\\&nbsp;")).
-    S4.
+    S2 = element(2, regexp:gsub(S1, "\\&", "\\&amp;")),
+    S3 = element(2, regexp:gsub(S2, "<", "\\&lt;")),
+    S4 = element(2, regexp:gsub(S3, ">", "\\&gt;")),
+    S5 = element(2, regexp:gsub(S4, "(http|ftp)://.[^ ]*", "<a href=\"&\">&</a>")),
+    S6.
 
 get_room_info(RoomJID, Opts) ->
     Title =
@@ -544,7 +713,7 @@ roomconfig_to_string(Options, Lang) ->
 			       T -> 
 				   case Opt of
 				       password -> "<div class=\"rcoe\">" ++ OptText ++ "</div>";
-				       title -> "<div class=\"rcot\">" ++ ?T("Room title") ++ ": \"" ++ T ++ "\"</div>";
+				       title -> "<div class=\"rcot\">" ++ ?T("Room title") ++ ": \"" ++ htmlize(T) ++ "\"</div>";
 				       _ -> "\"" ++ T ++ "\""
 				   end
 			   end,
diff --git a/src/mod_muc/mod_muc_room.erl b/src/mod_muc/mod_muc_room.erl
index 44eceb476..6c895d30b 100644
--- a/src/mod_muc/mod_muc_room.erl
+++ b/src/mod_muc/mod_muc_room.erl
@@ -1375,10 +1375,10 @@ lqueue_new(Max) ->
 	    max = Max}.
 
 %% If the message queue limit is set to 0, do not store messages.
-lqueue_in(Item, LQ = #lqueue{max = 0}) ->
+lqueue_in(_Item, LQ = #lqueue{max = 0}) ->
     LQ;
 %% Otherwise, rotate messages in the queue store.
-lqueue_in(Item, LQ = #lqueue{queue = Q1, len = Len, max = Max}) ->
+lqueue_in(Item, #lqueue{queue = Q1, len = Len, max = Max}) ->
     Q2 = queue:in(Item, Q1),
     if
 	Len >= Max ->
-- 
cgit v1.2.3


From 0b660a42f4da3162dff48ff4146fefb519ffbc08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20R=C3=A9mond?=
 <mickael.remond@process-one.net>
Date: Fri, 22 Sep 2006 07:58:58 +0000
Subject: Bugfixes coming from trunk (SVN #603): * src/mod_muc/mod_muc_log.erl:
 bugfix.

SVN Revision: 612
---
 src/mod_muc/mod_muc_log.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mod_muc/mod_muc_log.erl b/src/mod_muc/mod_muc_log.erl
index 15afd6350..1ba731e7c 100644
--- a/src/mod_muc/mod_muc_log.erl
+++ b/src/mod_muc/mod_muc_log.erl
@@ -658,7 +658,7 @@ htmlize2(S1) ->
     S3 = element(2, regexp:gsub(S2, "<", "\\&lt;")),
     S4 = element(2, regexp:gsub(S3, ">", "\\&gt;")),
     S5 = element(2, regexp:gsub(S4, "(http|ftp)://.[^ ]*", "<a href=\"&\">&</a>")),
-    S6.
+    S5.
 
 get_room_info(RoomJID, Opts) ->
     Title =
-- 
cgit v1.2.3


From ec668cd85a5dbd726aa3d5e4a48fad3d1674f7df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20R=C3=A9mond?=
 <mickael.remond@process-one.net>
Date: Fri, 22 Sep 2006 08:05:50 +0000
Subject: Update coming from trunk (SVN #604): * src/ejd2odbc.erl: Updated

SVN Revision: 613
---
 ChangeLog        | 2 ++
 src/ejd2odbc.erl | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index eef5e0557..a42f782fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2006-09-10  Alexey Shchepin  <alexey@sevcom.net>
 
+	* src/ejd2odbc.erl: Updated
+
 	* src/mod_muc/mod_muc_log.erl: Fixed html special characters
 	escaping, added new image buttons, chatroom titles now point to
 	xmpp: URIs (thanks to Badlop)
diff --git a/src/ejd2odbc.erl b/src/ejd2odbc.erl
index a03af9d33..8a7f6ada0 100644
--- a/src/ejd2odbc.erl
+++ b/src/ejd2odbc.erl
@@ -74,7 +74,7 @@ export_roster(Server, Output) ->
 	       "        and jid='", SJID, "';"
 	       "insert into rosterusers("
 	       "              username, jid, nick, "
-	       "              subscription, ask, "
+	       "              subscription, ask, askmessage, "
 	       "              server, subscribe, type) "
 	       " values ", ItemVals, ";"
 	       "delete from rostergroups "
@@ -271,7 +271,8 @@ output(LServer, IO, SQL) ->
 record_to_string(#roster{usj = {User, Server, JID},
 			 name = Name,
 			 subscription = Subscription,
-			 ask = Ask}) ->
+			 ask = Ask,
+			 askmessage = AskMessage}) ->
     Username = ejabberd_odbc:escape(User),
     SJID = ejabberd_odbc:escape(jlib:jid_to_string(JID)),
     Nick = ejabberd_odbc:escape(Name),
@@ -295,6 +296,7 @@ record_to_string(#roster{usj = {User, Server, JID},
      "'", Nick, "',"
      "'", SSubscription, "',"
      "'", SAsk, "',"
+     "'", AskMessage, "',"
      "'N', '', 'item')"].
 
 groups_to_string(#roster{usj = {User, Server, JID},
-- 
cgit v1.2.3


From 677a6004cf5e2dc6f3e73f9cda4a31d890b9b8f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20R=C3=A9mond?=
 <mickael.remond@process-one.net>
Date: Fri, 22 Sep 2006 08:08:37 +0000
Subject: Improvement coming from trunk (SVN #605): * src/odbc/mssql.sql:
 Removed unused fields.

SVN Revision: 614
---
 ChangeLog          | 4 ++++
 src/odbc/mssql.sql | 2 --
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a42f782fe..b1f4326ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-09-11  Mickael Remond  <mickael.remond@process-one.net>
+
+	* src/odbc/mssql.sql: Removed unused fields.
+
 2006-09-10  Alexey Shchepin  <alexey@sevcom.net>
 
 	* src/ejd2odbc.erl: Updated
diff --git a/src/odbc/mssql.sql b/src/odbc/mssql.sql
index 6a8a298d9..49fcd218c 100644
--- a/src/odbc/mssql.sql
+++ b/src/odbc/mssql.sql
@@ -88,7 +88,6 @@ CREATE TABLE [dbo].[last] (
 	[username] [varchar] (250) NOT NULL ,
 	[seconds] [varchar] (50) NOT NULL ,
 	[state] [varchar] (100) NULL ,
-	[Modify_Date] [datetime] NULL 
 ) ON [PRIMARY]
 GO
 
@@ -118,7 +117,6 @@ CREATE TABLE [dbo].[spool] (
 	[xml] [text] NULL ,
 	[notifyprocessed] [bit] NULL ,
 	[created] [datetime] NULL ,
-	[MustDelete] [bit] NULL 
 ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
 GO
 
-- 
cgit v1.2.3


From 23b78b0f0c871183a56f40b05fc25e20b4c75a7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20R=C3=A9mond?=
 <mickael.remond@process-one.net>
Date: Fri, 22 Sep 2006 08:36:09 +0000
Subject: Improvement coming from trunk (SVN #606): * doc/guide.tex: Updated
 (thanks to Evgeniy Khramtsov) * src/ejabberd_auth_ldap.erl: Better LDAP
 support (thanks to Evgeniy Khramtsov) * src/mod_vcard_ldap.erl: Likewise *
 src/eldap/eldap_filter.erl: Likewise

SVN Revision: 615
---
 ChangeLog                  |    9 +
 doc/guide.html             | 1662 ++++++++++++++++++++++++++------------------
 doc/guide.tex              |  341 ++++++++-
 src/ejabberd_auth_ldap.erl |  353 ++++++++--
 src/eldap/Makefile.in      |    3 +-
 src/eldap/Makefile.win32   |    3 +-
 src/mod_vcard_ldap.erl     |  877 ++++++++++++++---------
 7 files changed, 2176 insertions(+), 1072 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b1f4326ac..2771d1a3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-09-14  Alexey Shchepin  <alexey@sevcom.net>
+
+	* doc/guide.tex: Updated (thanks to Evgeniy Khramtsov)
+
+	* src/ejabberd_auth_ldap.erl: Better LDAP support (thanks to
+	Evgeniy Khramtsov)
+	* src/mod_vcard_ldap.erl: Likewise
+	* src/eldap/eldap_filter.erl: Likewise
+
 2006-09-11  Mickael Remond  <mickael.remond@process-one.net>
 
 	* src/odbc/mssql.sql: Removed unused fields.
diff --git a/doc/guide.html b/doc/guide.html
index 5c9558f34..3c8a473e0 100644
--- a/doc/guide.html
+++ b/doc/guide.html
@@ -1,46 +1,29 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
             "http://www.w3.org/TR/REC-html40/loose.dtd">
 <HTML>
+<HEAD><TITLE>Ejabberd 1.1.1 Installation and Operation Guide</TITLE>
 
-<HEAD>
-
-<TITLE>Ejabberd 1.1.1 Installation and Operation Guide</TITLE>
-
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<META name="GENERATOR" content="hevea 1.08">
-<STYLE type="text/css">
-.toc{list-style:none;}
-.title{margin:auto;text-align:center}
-.center{text-align:center;margin-left:auto;margin-right:auto;}
-.flushleft{text-align:left;margin-left:0ex;margin-right:auto;}
-.flushright{text-align:right;margin-left:auto;margin-right:0ex;}
-DIV TABLE{margin-left:inherit;margin-right:inherit;}
-PRE{text-align:left;margin-left:0ex;margin-right:auto;}
-BLOCKQUOTE{margin-left:4ex;margin-right:4ex;text-align:left;}
-.part{margin:auto;text-align:center}
-</STYLE>
+<META http-equiv="Content-Type" content="text/html; charset=KOI8-R">
+<META name="GENERATOR" content="hevea 1.07">
 </HEAD>
-
 <BODY >
-<!--HEVEA command line is: hevea guide.tex -->
+<!--HEVEA command line is: /usr/bin/hevea guide.tex -->
 <!--HTMLHEAD-->
 <!--ENDHTML-->
 <!--PREFIX <ARG ></ARG>-->
 <!--CUT DEF section 1 -->
-
 <BR>
 <BR>
 <A NAME="sec:titlepage"></A>
 
- <TABLE CLASS="title">
-<TR><TD>
-<H1 CLASS="titlemain">Ejabberd 1.1.1 Installation and Operation Guide</H1>
-<H3 CLASS="titlerest">Alexey Shchepin<BR>
+ 
+<H1 ALIGN=center>Ejabberd 1.1.1 Installation and Operation Guide</H1>
+
+<H3 ALIGN=center>Alexey Shchepin<BR>
 <A HREF="mailto:alexey@sevcom.net"><TT>mailto:alexey@sevcom.net</TT></A><BR>
-<A HREF="xmpp:aleksey@jabber.ru"><TT>xmpp:aleksey@jabber.ru</TT></A></H3></TD>
-</TR></TABLE><BR>
+<A HREF="xmpp:aleksey@jabber.ru"><TT>xmpp:aleksey@jabber.ru</TT></A></H3>
 <BR>
-<DIV CLASS="center">
+<DIV ALIGN=center>
  
  <IMG SRC="logo.png">
  
@@ -49,117 +32,125 @@ BLOCKQUOTE{margin-left:4ex;margin-right:4ex;text-align:left;}
 <BR>
 
  </DIV>
-<BLOCKQUOTE CLASS="quotation"><I>I can thoroughly recommend ejabberd for ease of setup &ndash;
+<BLOCKQUOTE><I>I can thoroughly recommend ejabberd for ease of setup --
  Kevin Smith, Current maintainer of the Psi project</I></BLOCKQUOTE>
-<!--TOC section Contents-->
+<!--TOC section Table of Contents-->
 
-<H2 CLASS="section">Contents</H2><!--SEC END -->
+<H2>Table of Contents</H2><!--SEC END -->
 
-<UL CLASS="toc"><LI CLASS="li-toc">
+<UL><LI>
 <A HREF="#htoc1">1&nbsp;&nbsp;Introduction</A>
-<UL CLASS="toc"><LI CLASS="li-toc">
+<UL><LI>
 <A HREF="#htoc2">1.1&nbsp;&nbsp;Key Features</A>
-<LI CLASS="li-toc"><A HREF="#htoc3">1.2&nbsp;&nbsp;Additional Features</A>
+<LI><A HREF="#htoc3">1.2&nbsp;&nbsp;Additional Features</A>
 </UL>
-<LI CLASS="li-toc"><A HREF="#htoc4">2&nbsp;&nbsp;Installation from Source</A>
-<UL CLASS="toc"><LI CLASS="li-toc">
+<LI><A HREF="#htoc4">2&nbsp;&nbsp;Installation from Source</A>
+<UL><LI>
 <A HREF="#htoc5">2.1&nbsp;&nbsp;Installation Requirements</A>
-<UL CLASS="toc"><LI CLASS="li-toc">
-<A HREF="#htoc6">2.1.1&nbsp;&nbsp;&#8220;Unix-like&#8221; operating systems</A>
-<LI CLASS="li-toc"><A HREF="#htoc7">2.1.2&nbsp;&nbsp;Windows</A>
+<UL><LI>
+<A HREF="#htoc6">2.1.1&nbsp;&nbsp;``Unix-like'' operating systems</A>
+<LI><A HREF="#htoc7">2.1.2&nbsp;&nbsp;Windows</A>
 </UL>
-<LI CLASS="li-toc"><A HREF="#htoc8">2.2&nbsp;&nbsp;Obtaining <TT>ejabberd</TT></A>
-<LI CLASS="li-toc"><A HREF="#htoc9">2.3&nbsp;&nbsp;Compilation</A>
-<UL CLASS="toc"><LI CLASS="li-toc">
-<A HREF="#htoc10">2.3.1&nbsp;&nbsp;&#8220;Unix-like&#8221; operating systems</A>
-<LI CLASS="li-toc"><A HREF="#htoc11">2.3.2&nbsp;&nbsp;Windows</A>
+<LI><A HREF="#htoc8">2.2&nbsp;&nbsp;Obtaining <TT>ejabberd</TT></A>
+<LI><A HREF="#htoc9">2.3&nbsp;&nbsp;Compilation</A>
+<UL><LI>
+<A HREF="#htoc10">2.3.1&nbsp;&nbsp;``Unix-like'' operating systems</A>
+<LI><A HREF="#htoc11">2.3.2&nbsp;&nbsp;Windows</A>
 </UL>
-<LI CLASS="li-toc"><A HREF="#htoc12">2.4&nbsp;&nbsp;Starting</A>
+<LI><A HREF="#htoc12">2.4&nbsp;&nbsp;Starting</A>
 </UL>
-<LI CLASS="li-toc"><A HREF="#htoc13">3&nbsp;&nbsp;Configuration</A>
-<UL CLASS="toc"><LI CLASS="li-toc">
+<LI><A HREF="#htoc13">3&nbsp;&nbsp;Configuration</A>
+<UL><LI>
 <A HREF="#htoc14">3.1&nbsp;&nbsp;Initial Configuration</A>
-<UL CLASS="toc"><LI CLASS="li-toc">
+<UL><LI>
 <A HREF="#htoc15">3.1.1&nbsp;&nbsp;Host Names</A>
-<LI CLASS="li-toc"><A HREF="#htoc16">3.1.2&nbsp;&nbsp;Default Language</A>
-<LI CLASS="li-toc"><A HREF="#htoc17">3.1.3&nbsp;&nbsp;Access Rules</A>
-<LI CLASS="li-toc"><A HREF="#htoc18">3.1.4&nbsp;&nbsp;Shapers</A>
-<LI CLASS="li-toc"><A HREF="#htoc19">3.1.5&nbsp;&nbsp;Limitation of the number of opened sessions</A>
-<LI CLASS="li-toc"><A HREF="#htoc20">3.1.6&nbsp;&nbsp;Listened Sockets</A>
-<LI CLASS="li-toc"><A HREF="#htoc21">3.1.7&nbsp;&nbsp;Modules</A>
-<LI CLASS="li-toc"><A HREF="#htoc22">3.1.8&nbsp;&nbsp;Virtual Hosting</A>
-<LI CLASS="li-toc"><A HREF="#htoc23">3.1.9&nbsp;&nbsp;SASL anonymous and anonymous login</A>
+<LI><A HREF="#htoc16">3.1.2&nbsp;&nbsp;Default Language</A>
+<LI><A HREF="#htoc17">3.1.3&nbsp;&nbsp;Access Rules</A>
+<LI><A HREF="#htoc18">3.1.4&nbsp;&nbsp;Shapers</A>
+<LI><A HREF="#htoc19">3.1.5&nbsp;&nbsp;Limitation of the number of opened sessions</A>
+<LI><A HREF="#htoc20">3.1.6&nbsp;&nbsp;Listened Sockets</A>
+<LI><A HREF="#htoc21">3.1.7&nbsp;&nbsp;Modules</A>
+<LI><A HREF="#htoc22">3.1.8&nbsp;&nbsp;Virtual Hosting</A>
+<LI><A HREF="#htoc23">3.1.9&nbsp;&nbsp;SASL anonymous and anonymous login</A>
 </UL>
-<LI CLASS="li-toc"><A HREF="#htoc24">3.2&nbsp;&nbsp;Relational Database Support</A>
-<UL CLASS="toc"><LI CLASS="li-toc">
+<LI><A HREF="#htoc24">3.2&nbsp;&nbsp;Relational Database Support</A>
+<UL><LI>
 <A HREF="#htoc25">3.2.1&nbsp;&nbsp;Preliminary steps</A>
-<LI CLASS="li-toc"><A HREF="#htoc26">3.2.2&nbsp;&nbsp;Authentication against a relational database</A>
-<LI CLASS="li-toc"><A HREF="#htoc27">3.2.3&nbsp;&nbsp;Relational database for other modules</A>
+<LI><A HREF="#htoc26">3.2.2&nbsp;&nbsp;Authentication against a relational database</A>
+<LI><A HREF="#htoc27">3.2.3&nbsp;&nbsp;Relational database for other modules</A>
 </UL>
-<LI CLASS="li-toc"><A HREF="#htoc28">3.3&nbsp;&nbsp;Creating an Initial Administrator</A>
-<LI CLASS="li-toc"><A HREF="#htoc29">3.4&nbsp;&nbsp;Online Configuration and Monitoring</A>
-<UL CLASS="toc"><LI CLASS="li-toc">
+<LI><A HREF="#htoc28">3.3&nbsp;&nbsp;Creating an Initial Administrator</A>
+<LI><A HREF="#htoc29">3.4&nbsp;&nbsp;Online Configuration and Monitoring</A>
+<UL><LI>
 <A HREF="#htoc30">3.4.1&nbsp;&nbsp;Web Interface</A>
-<LI CLASS="li-toc"><A HREF="#htoc31">3.4.2&nbsp;&nbsp;<TT>ejabberdctl</TT></A>
+<LI><A HREF="#htoc31">3.4.2&nbsp;&nbsp;<TT>ejabberdctl</TT></A>
 </UL>
 </UL>
-<LI CLASS="li-toc"><A HREF="#htoc32">4&nbsp;&nbsp;Firewall Settings</A>
-<LI CLASS="li-toc"><A HREF="#htoc33">5&nbsp;&nbsp;SRV Records</A>
-<LI CLASS="li-toc"><A HREF="#htoc34">6&nbsp;&nbsp;Clustering</A>
-<UL CLASS="toc"><LI CLASS="li-toc">
+<LI><A HREF="#htoc32">4&nbsp;&nbsp;Firewall Settings</A>
+<LI><A HREF="#htoc33">5&nbsp;&nbsp;SRV Records</A>
+<LI><A HREF="#htoc34">6&nbsp;&nbsp;Clustering</A>
+<UL><LI>
 <A HREF="#htoc35">6.1&nbsp;&nbsp;How it Works</A>
-<UL CLASS="toc"><LI CLASS="li-toc">
+<UL><LI>
 <A HREF="#htoc36">6.1.1&nbsp;&nbsp;Router</A>
-<LI CLASS="li-toc"><A HREF="#htoc37">6.1.2&nbsp;&nbsp;Local Router</A>
-<LI CLASS="li-toc"><A HREF="#htoc38">6.1.3&nbsp;&nbsp;Session Manager</A>
-<LI CLASS="li-toc"><A HREF="#htoc39">6.1.4&nbsp;&nbsp;s2s Manager</A>
+<LI><A HREF="#htoc37">6.1.2&nbsp;&nbsp;Local Router</A>
+<LI><A HREF="#htoc38">6.1.3&nbsp;&nbsp;Session Manager</A>
+<LI><A HREF="#htoc39">6.1.4&nbsp;&nbsp;s2s Manager</A>
 </UL>
-<LI CLASS="li-toc"><A HREF="#htoc40">6.2&nbsp;&nbsp;Clustering Setup</A>
+<LI><A HREF="#htoc40">6.2&nbsp;&nbsp;Clustering Setup</A>
 </UL>
-<LI CLASS="li-toc"><A HREF="#htoc41">A&nbsp;&nbsp;Built-in Modules</A>
-<UL CLASS="toc"><LI CLASS="li-toc">
+<LI><A HREF="#htoc41">A&nbsp;&nbsp;Built-in Modules</A>
+<UL><LI>
 <A HREF="#htoc42">A.1&nbsp;&nbsp;Overview</A>
-<LI CLASS="li-toc"><A HREF="#htoc43">A.2&nbsp;&nbsp;Common Options</A>
-<UL CLASS="toc"><LI CLASS="li-toc">
+<LI><A HREF="#htoc43">A.2&nbsp;&nbsp;Common Options</A>
+<UL><LI>
 <A HREF="#htoc44">A.2.1&nbsp;&nbsp;<TT>iqdisc</TT></A>
-<LI CLASS="li-toc"><A HREF="#htoc45">A.2.2&nbsp;&nbsp;<TT>hosts</TT></A>
+<LI><A HREF="#htoc45">A.2.2&nbsp;&nbsp;<TT>hosts</TT></A>
+</UL>
+<LI><A HREF="#htoc46">A.3&nbsp;&nbsp;<TT>mod_announce</TT></A>
+<LI><A HREF="#htoc47">A.4&nbsp;&nbsp;<TT>mod_disco</TT></A>
+<LI><A HREF="#htoc48">A.5&nbsp;&nbsp;<TT>mod_echo</TT></A>
+<LI><A HREF="#htoc49">A.6&nbsp;&nbsp;<TT>mod_irc</TT></A>
+<LI><A HREF="#htoc50">A.7&nbsp;&nbsp;<TT>mod_last</TT></A>
+<LI><A HREF="#htoc51">A.8&nbsp;&nbsp;<TT>mod_muc</TT></A>
+<LI><A HREF="#htoc52">A.9&nbsp;&nbsp;<TT>mod_muc_log</TT></A>
+<LI><A HREF="#htoc53">A.10&nbsp;&nbsp;<TT>mod_offline</TT></A>
+<LI><A HREF="#htoc54">A.11&nbsp;&nbsp;<TT>mod_privacy</TT></A>
+<LI><A HREF="#htoc55">A.12&nbsp;&nbsp;<TT>mod_private</TT></A>
+<LI><A HREF="#htoc56">A.13&nbsp;&nbsp;<TT>mod_pubsub</TT></A>
+<LI><A HREF="#htoc57">A.14&nbsp;&nbsp;<TT>mod_register</TT></A>
+<LI><A HREF="#htoc58">A.15&nbsp;&nbsp;<TT>mod_roster</TT></A>
+<LI><A HREF="#htoc59">A.16&nbsp;&nbsp;<TT>mod_service_log</TT></A>
+<LI><A HREF="#htoc60">A.17&nbsp;&nbsp;<TT>mod_shared_roster</TT></A>
+<LI><A HREF="#htoc61">A.18&nbsp;&nbsp;<TT>mod_stats</TT></A>
+<LI><A HREF="#htoc62">A.19&nbsp;&nbsp;<TT>mod_time</TT></A>
+<LI><A HREF="#htoc63">A.20&nbsp;&nbsp;<TT>mod_vcard</TT></A>
+<LI><A HREF="#htoc64">A.21&nbsp;&nbsp;LDAP and <TT>mod_vcard_ldap</TT></A>
+<UL><LI>
+<A HREF="#htoc65">A.21.1&nbsp;&nbsp;Features</A>
+<LI><A HREF="#htoc66">A.21.2&nbsp;&nbsp;Connection</A>
+<LI><A HREF="#htoc67">A.21.3&nbsp;&nbsp;Authentication</A>
+<LI><A HREF="#htoc68">A.21.4&nbsp;&nbsp;vCards and Search</A>
+<LI><A HREF="#htoc69">A.21.5&nbsp;&nbsp;Examples</A>
 </UL>
-<LI CLASS="li-toc"><A HREF="#htoc46">A.3&nbsp;&nbsp;<TT>mod_announce</TT></A>
-<LI CLASS="li-toc"><A HREF="#htoc47">A.4&nbsp;&nbsp;<TT>mod_disco</TT></A>
-<LI CLASS="li-toc"><A HREF="#htoc48">A.5&nbsp;&nbsp;<TT>mod_echo</TT></A>
-<LI CLASS="li-toc"><A HREF="#htoc49">A.6&nbsp;&nbsp;<TT>mod_irc</TT></A>
-<LI CLASS="li-toc"><A HREF="#htoc50">A.7&nbsp;&nbsp;<TT>mod_last</TT></A>
-<LI CLASS="li-toc"><A HREF="#htoc51">A.8&nbsp;&nbsp;<TT>mod_muc</TT></A>
-<LI CLASS="li-toc"><A HREF="#htoc52">A.9&nbsp;&nbsp;<TT>mod_muc_log</TT></A>
-<LI CLASS="li-toc"><A HREF="#htoc53">A.10&nbsp;&nbsp;<TT>mod_offline</TT></A>
-<LI CLASS="li-toc"><A HREF="#htoc54">A.11&nbsp;&nbsp;<TT>mod_privacy</TT></A>
-<LI CLASS="li-toc"><A HREF="#htoc55">A.12&nbsp;&nbsp;<TT>mod_private</TT></A>
-<LI CLASS="li-toc"><A HREF="#htoc56">A.13&nbsp;&nbsp;<TT>mod_pubsub</TT></A>
-<LI CLASS="li-toc"><A HREF="#htoc57">A.14&nbsp;&nbsp;<TT>mod_register</TT></A>
-<LI CLASS="li-toc"><A HREF="#htoc58">A.15&nbsp;&nbsp;<TT>mod_roster</TT></A>
-<LI CLASS="li-toc"><A HREF="#htoc59">A.16&nbsp;&nbsp;<TT>mod_service_log</TT></A>
-<LI CLASS="li-toc"><A HREF="#htoc60">A.17&nbsp;&nbsp;<TT>mod_shared_roster</TT></A>
-<LI CLASS="li-toc"><A HREF="#htoc61">A.18&nbsp;&nbsp;<TT>mod_stats</TT></A>
-<LI CLASS="li-toc"><A HREF="#htoc62">A.19&nbsp;&nbsp;<TT>mod_time</TT></A>
-<LI CLASS="li-toc"><A HREF="#htoc63">A.20&nbsp;&nbsp;<TT>mod_vcard</TT></A>
-<LI CLASS="li-toc"><A HREF="#htoc64">A.21&nbsp;&nbsp;<TT>mod_version</TT></A>
+<LI><A HREF="#htoc70">A.22&nbsp;&nbsp;<TT>mod_version</TT></A>
 </UL>
-<LI CLASS="li-toc"><A HREF="#htoc65">B&nbsp;&nbsp;Internationalization and Localization</A>
-<LI CLASS="li-toc"><A HREF="#htoc66">C&nbsp;&nbsp;Release Notes</A>
-<UL CLASS="toc"><LI CLASS="li-toc">
-<A HREF="#htoc67">C.1&nbsp;&nbsp;ejabberd 0.9</A>
-<LI CLASS="li-toc"><A HREF="#htoc68">C.2&nbsp;&nbsp;ejabberd 0.9.1</A>
-<LI CLASS="li-toc"><A HREF="#htoc69">C.3&nbsp;&nbsp;ejabberd 0.9.8</A>
-<LI CLASS="li-toc"><A HREF="#htoc70">C.4&nbsp;&nbsp;ejabberd 1.0.0</A>
-<LI CLASS="li-toc"><A HREF="#htoc71">C.5&nbsp;&nbsp;ejabberd 1.1.0</A>
-<LI CLASS="li-toc"><A HREF="#htoc72">C.6&nbsp;&nbsp;ejabberd 1.1.1</A>
+<LI><A HREF="#htoc71">B&nbsp;&nbsp;Internationalization and Localization</A>
+<LI><A HREF="#htoc72">C&nbsp;&nbsp;Release Notes</A>
+<UL><LI>
+<A HREF="#htoc73">C.1&nbsp;&nbsp;ejabberd 0.9</A>
+<LI><A HREF="#htoc74">C.2&nbsp;&nbsp;ejabberd 0.9.1</A>
+<LI><A HREF="#htoc75">C.3&nbsp;&nbsp;ejabberd 0.9.8</A>
+<LI><A HREF="#htoc76">C.4&nbsp;&nbsp;ejabberd 1.0.0</A>
+<LI><A HREF="#htoc77">C.5&nbsp;&nbsp;ejabberd 1.1.0</A>
+<LI><A HREF="#htoc78">C.6&nbsp;&nbsp;ejabberd 1.1.1</A>
 </UL>
-<LI CLASS="li-toc"><A HREF="#htoc73">D&nbsp;&nbsp;Acknowledgements</A>
+<LI><A HREF="#htoc79">D&nbsp;&nbsp;Acknowledgements</A>
 </UL>
 
 <!--TOC section Introduction-->
 
-<H2 CLASS="section"><A NAME="htoc1">1</A>&nbsp;&nbsp;Introduction</H2><!--SEC END -->
+<H2><A NAME="htoc1">1</A>&nbsp;&nbsp;Introduction</H2><!--SEC END -->
 
 <A NAME="sec:intr"></A>
  
@@ -171,135 +162,135 @@ BLOCKQUOTE{margin-left:4ex;margin-right:4ex;text-align:left;}
 <BR>
 <!--TOC subsection Key Features-->
 
-<H3 CLASS="subsection"><A NAME="htoc2">1.1</A>&nbsp;&nbsp;Key Features</H3><!--SEC END -->
+<H3><A NAME="htoc2">1.1</A>&nbsp;&nbsp;Key Features</H3><!--SEC END -->
 
 <A NAME="sec:keyfeatures"></A>
 
 <TT>ejabberd</TT> is:
-<UL CLASS="itemize"><LI CLASS="li-itemize">
+<UL><LI>
 Multiplatform: <TT>ejabberd</TT> runs under Microsoft Windows and Unix derived systems such as Linux, FreeBSD and NetBSD.<BR>
 <BR>
-<LI CLASS="li-itemize">Distributed: You can run <TT>ejabberd</TT> on a cluster of machines and all of them will serve the same Jabber domain(s). 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.<BR>
+<LI>Distributed: You can run <TT>ejabberd</TT> on a cluster of machines and all of them will serve the same Jabber domain(s). 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.<BR>
 <BR>
-<LI CLASS="li-itemize">Fault-tolerant: You can deploy an <TT>ejabberd</TT> 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 &#8220;on the fly&#8221;.<BR>
+<LI>Fault-tolerant: You can deploy an <TT>ejabberd</TT> 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''.<BR>
 <BR>
-<LI CLASS="li-itemize">Administrator Friendly: <TT>ejabberd</TT> 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:
-<UL CLASS="itemize"><LI CLASS="li-itemize">
+<LI>Administrator Friendly: <TT>ejabberd</TT> 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:
+<UL><LI>
 Comprehensive documentation.
-<LI CLASS="li-itemize">Straightforward installers for Linux, Mac OS X, and Windows.
-<LI CLASS="li-itemize">Web interface for administration tasks.
-<LI CLASS="li-itemize">Shared Roster Groups.
-<LI CLASS="li-itemize">Command line administration tool.
-<LI CLASS="li-itemize">Can integrate with existing authentication mechanisms.
-<LI CLASS="li-itemize">Capability to send announce messages.
+<LI>Straightforward installers for Linux, Mac OS X, and Windows.
+<LI>Web interface for administration tasks.
+<LI>Shared Roster Groups.
+<LI>Command line administration tool.
+<LI>Can integrate with existing authentication mechanisms.
+<LI>Capability to send announce messages.
 </UL><BR>
 <BR>
-<LI CLASS="li-itemize">Internationalized: <TT>ejabberd</TT> leads in internationalization. Hence it is very well suited in a globalized world. Related features are:
-<UL CLASS="itemize"><LI CLASS="li-itemize">
+<LI>Internationalized: <TT>ejabberd</TT> leads in internationalization. Hence it is very well suited in a globalized world. Related features are:
+<UL><LI>
 Translated in 11 languages.
-<LI CLASS="li-itemize">Support for <A HREF="http://www.ietf.org/rfc/rfc3490.txt">IDNA</A>.
+<LI>Support for <A HREF="http://www.ietf.org/rfc/rfc3490.txt">IDNA</A>.
 </UL><BR>
 <BR>
-<LI CLASS="li-itemize">Open Standards: <TT>ejabberd</TT> is the first Open Source Jabber server claiming to fully comply to the XMPP standard.
-<UL CLASS="itemize"><LI CLASS="li-itemize">
+<LI>Open Standards: <TT>ejabberd</TT> is the first Open Source Jabber server claiming to fully comply to the XMPP standard.
+<UL><LI>
 Fully XMPP compliant 
-<LI CLASS="li-itemize">XML-based protocol
-<LI CLASS="li-itemize"><A HREF="http://ejabberd.jabber.ru/protocols">Many JEPs supported</A>.
+<LI>XML-based protocol
+<LI><A HREF="http://ejabberd.jabber.ru/protocols">Many JEPs supported</A>.
 </UL></UL>
 <!--TOC subsection Additional Features-->
 
-<H3 CLASS="subsection"><A NAME="htoc3">1.2</A>&nbsp;&nbsp;Additional Features</H3><!--SEC END -->
+<H3><A NAME="htoc3">1.2</A>&nbsp;&nbsp;Additional Features</H3><!--SEC END -->
 
 <A NAME="sec:addfeatures"></A>
 
 Besides common Jabber server features, <TT>ejabberd</TT> comes with a wide range of other features:
-<UL CLASS="itemize"><LI CLASS="li-itemize">
+<UL><LI>
 Modular
-<UL CLASS="itemize"><LI CLASS="li-itemize">
+<UL><LI>
 Load only the modules you want.
-<LI CLASS="li-itemize">Extend <TT>ejabberd</TT> with your own custom modules.
+<LI>Extend <TT>ejabberd</TT> with your own custom modules.
 </UL>
-<LI CLASS="li-itemize">Security
-<UL CLASS="itemize"><LI CLASS="li-itemize">
+<LI>Security
+<UL><LI>
 SASL and STARTTLS for c2s and s2s connections.
-<LI CLASS="li-itemize">STARTTLS and Dialback s2s connections.
-<LI CLASS="li-itemize">Web interface accessible via HTTPS secure access.
+<LI>STARTTLS and Dialback s2s connections.
+<LI>Web interface accessible via HTTPS secure access.
 </UL>
-<LI CLASS="li-itemize">Databases
-<UL CLASS="itemize"><LI CLASS="li-itemize">
+<LI>Databases
+<UL><LI>
 Native MySQL support.
-<LI CLASS="li-itemize">Native PostgreSQL support.
-<LI CLASS="li-itemize">Mnesia.
-<LI CLASS="li-itemize">ODBC data storage support. 
-<LI CLASS="li-itemize">Microsoft SQL Server support (via ODBC).
+<LI>Native PostgreSQL support.
+<LI>Mnesia.
+<LI>ODBC data storage support. 
+<LI>Microsoft SQL Server support (via ODBC).
 </UL>
-<LI CLASS="li-itemize">Authentication
-<UL CLASS="itemize"><LI CLASS="li-itemize">
+<LI>Authentication
+<UL><LI>
 LDAP and ODBC. 
-<LI CLASS="li-itemize">External Authentication script.
-<LI CLASS="li-itemize">Internal Authentication.
+<LI>External Authentication script.
+<LI>Internal Authentication.
 </UL>
-<LI CLASS="li-itemize">Others
-<UL CLASS="itemize"><LI CLASS="li-itemize">
+<LI>Others
+<UL><LI>
 Compressing XML streams with Stream Compression (<A HREF="http://www.jabber.org/jeps/jep-0138.html">JEP-0138</A>).
-<LI CLASS="li-itemize">Interface with networks such as AIM, ICQ and MSN.
-<LI CLASS="li-itemize">Statistics via Statistics Gathering (<A HREF="http://www.jabber.org/jeps/jep-0039.html">JEP-0039</A>).
-<LI CLASS="li-itemize">IPv6 support both for c2s and s2s connections.
-<LI CLASS="li-itemize"><A HREF="http://www.jabber.org/jeps/jep-0045.html">Multi-User Chat</A> module with logging.
-<LI CLASS="li-itemize">Users Directory based on users vCards.
-<LI CLASS="li-itemize"><A HREF="http://www.jabber.org/jeps/jep-0060.html">Publish-Subscribe</A> component.
-<LI CLASS="li-itemize">Support for virtual hosting. 
-<LI CLASS="li-itemize"><A HREF="http://www.jabber.org/jeps/jep-0025.html">HTTP Polling</A> service.
-<LI CLASS="li-itemize">IRC transport.
+<LI>Interface with networks such as AIM, ICQ and MSN.
+<LI>Statistics via Statistics Gathering (<A HREF="http://www.jabber.org/jeps/jep-0039.html">JEP-0039</A>).
+<LI>IPv6 support both for c2s and s2s connections.
+<LI><A HREF="http://www.jabber.org/jeps/jep-0045.html">Multi-User Chat</A> module with logging.
+<LI>Users Directory based on users vCards.
+<LI><A HREF="http://www.jabber.org/jeps/jep-0060.html">Publish-Subscribe</A> component.
+<LI>Support for virtual hosting. 
+<LI><A HREF="http://www.jabber.org/jeps/jep-0025.html">HTTP Polling</A> service.
+<LI>IRC transport.
 </UL>
 </UL>
 <!--TOC section Installation from Source-->
 
-<H2 CLASS="section"><A NAME="htoc4">2</A>&nbsp;&nbsp;Installation from Source</H2><!--SEC END -->
+<H2><A NAME="htoc4">2</A>&nbsp;&nbsp;Installation from Source</H2><!--SEC END -->
 
 <A NAME="sec:installation"></A>
 
 <!--TOC subsection Installation Requirements-->
 
-<H3 CLASS="subsection"><A NAME="htoc5">2.1</A>&nbsp;&nbsp;Installation Requirements</H3><!--SEC END -->
+<H3><A NAME="htoc5">2.1</A>&nbsp;&nbsp;Installation Requirements</H3><!--SEC END -->
 
 <A NAME="sec:installreq"></A>
-<!--TOC subsubsection &#8220;Unix-like&#8221; operating systems-->
+<!--TOC subsubsection ``Unix-like'' operating systems-->
 
-<H4 CLASS="subsubsection"><A NAME="htoc6">2.1.1</A>&nbsp;&nbsp;&#8220;Unix-like&#8221; operating systems</H4><!--SEC END -->
+<H4><A NAME="htoc6">2.1.1</A>&nbsp;&nbsp;``Unix-like'' operating systems</H4><!--SEC END -->
 
 <A NAME="sec:installrequnix"></A>
 
-To compile <TT>ejabberd</TT> on a &#8220;Unix-like&#8221; operating system, you need:
-<UL CLASS="itemize"><LI CLASS="li-itemize">
+To compile <TT>ejabberd</TT> on a ``Unix-like'' operating system, you need:
+<UL><LI>
 GNU Make;
-<LI CLASS="li-itemize">GCC;
-<LI CLASS="li-itemize">libexpat 1.95 or higher;
-<LI CLASS="li-itemize">Erlang/OTP R9C-2 or higher;
-<LI CLASS="li-itemize">OpenSSL 0.9.6 or higher (optional).
-<LI CLASS="li-itemize">Zlib 1.2.3 or higher (optional).
-<LI CLASS="li-itemize">GNU Iconv 1.8 or higher (optional, not needed at all on systems with GNU libc).
+<LI>GCC;
+<LI>libexpat 1.95 or higher;
+<LI>Erlang/OTP R9C-2 or higher;
+<LI>OpenSSL 0.9.6 or higher (optional).
+<LI>Zlib 1.2.3 or higher (optional).
+<LI>GNU Iconv 1.8 or higher (optional, not needed at all on systems with GNU libc).
 </UL>
 <!--TOC subsubsection Windows-->
 
-<H4 CLASS="subsubsection"><A NAME="htoc7">2.1.2</A>&nbsp;&nbsp;Windows</H4><!--SEC END -->
+<H4><A NAME="htoc7">2.1.2</A>&nbsp;&nbsp;Windows</H4><!--SEC END -->
 
 <A NAME="sec:installreqwin"></A>
 
 To compile <TT>ejabberd</TT> on a Windows flavour, you need:
-<UL CLASS="itemize"><LI CLASS="li-itemize">
+<UL><LI>
 MS Visual C++ 6.0 Compiler
-<LI CLASS="li-itemize"><A HREF="http://erlang.org/download.html">Erlang/OTP R9C-2 or higher</A>
-<LI CLASS="li-itemize"><A HREF="http://sourceforge.net/project/showfiles.php?group_id=10127&package_id=11277">Expat 1.95.7 or higher</A>
-<LI CLASS="li-itemize"><A HREF="http://www.gnu.org/software/libiconv/">GNU Iconv 1.9.1</A>
+<LI><A HREF="http://erlang.org/download.html">Erlang/OTP R9C-2 or higher</A>
+<LI><A HREF="http://sourceforge.net/project/showfiles.php?group_id=10127&package_id=11277">Expat 1.95.7 or higher</A>
+<LI><A HREF="http://www.gnu.org/software/libiconv/">GNU Iconv 1.9.1</A>
 (optional)
-<LI CLASS="li-itemize"><A HREF="http://www.slproweb.com/products/Win32OpenSSL.html">Shining Light OpenSSL</A>
+<LI><A HREF="http://www.slproweb.com/products/Win32OpenSSL.html">Shining Light OpenSSL</A>
 (to enable SSL connections)
-<LI CLASS="li-itemize"><A HREF="http://www.zlib.net/">Zlib 1.2.3 or higher</A>
+<LI><A HREF="http://www.zlib.net/">Zlib 1.2.3 or higher</A>
 </UL>
 <!--TOC subsection Obtaining <TT>ejabberd</TT>-->
 
-<H3 CLASS="subsection"><A NAME="htoc8">2.2</A>&nbsp;&nbsp;Obtaining <TT>ejabberd</TT></H3><!--SEC END -->
+<H3><A NAME="htoc8">2.2</A>&nbsp;&nbsp;Obtaining <TT>ejabberd</TT></H3><!--SEC END -->
 
 <A NAME="sec:obtaining"></A>
 
@@ -308,49 +299,49 @@ Released versions of <TT>ejabberd</TT> can be obtained from <BR>
 <BR>
 
 The latest development version can be retrieved from the Subversion repository.
-<PRE CLASS="verbatim">
+<PRE>
   svn co http://svn.process-one.net/ejabberd/trunk ejabberd
 </PRE>
 <!--TOC subsection Compilation-->
 
-<H3 CLASS="subsection"><A NAME="htoc9">2.3</A>&nbsp;&nbsp;Compilation</H3><!--SEC END -->
+<H3><A NAME="htoc9">2.3</A>&nbsp;&nbsp;Compilation</H3><!--SEC END -->
 
 <A NAME="sec:compilation"></A>
 
-<!--TOC subsubsection &#8220;Unix-like&#8221; operating systems-->
+<!--TOC subsubsection ``Unix-like'' operating systems-->
 
-<H4 CLASS="subsubsection"><A NAME="htoc10">2.3.1</A>&nbsp;&nbsp;&#8220;Unix-like&#8221; operating systems</H4><!--SEC END -->
+<H4><A NAME="htoc10">2.3.1</A>&nbsp;&nbsp;``Unix-like'' operating systems</H4><!--SEC END -->
 
 <A NAME="sec:compilationunix"></A>
 
-Compile <TT>ejabberd</TT> on a &#8220;Unix-like&#8221; operating system by executing:
-<PRE CLASS="verbatim">
+Compile <TT>ejabberd</TT> on a ``Unix-like'' operating system by executing:
+<PRE>
   ./configure
   make
   su
   make install
 </PRE>
 These commands will:
-<UL CLASS="itemize"><LI CLASS="li-itemize">
+<UL><LI>
 install <TT>ejabberd</TT> into the directory <CODE>/var/lib/ejabberd</CODE>,
-<LI CLASS="li-itemize">install the configuration file into <CODE>/etc/ejabberd</CODE>,
-<LI CLASS="li-itemize">create a directory called <CODE>/var/log/ejabberd</CODE> to store log files.
+<LI>install the configuration file into <CODE>/etc/ejabberd</CODE>,
+<LI>create a directory called <CODE>/var/log/ejabberd</CODE> to store log files.
 </UL>
 <!--TOC subsubsection Windows-->
 
-<H4 CLASS="subsubsection"><A NAME="htoc11">2.3.2</A>&nbsp;&nbsp;Windows</H4><!--SEC END -->
+<H4><A NAME="htoc11">2.3.2</A>&nbsp;&nbsp;Windows</H4><!--SEC END -->
 
 <A NAME="sec:compilationwin"></A>
 
-<UL CLASS="itemize"><LI CLASS="li-itemize">
+<UL><LI>
 Install Erlang emulator (for example, into <CODE>C:\Program Files\erl5.3</CODE>).
-<LI CLASS="li-itemize">Install Expat library into <CODE>C:\Program Files\Expat-1.95.7</CODE>
+<LI>Install Expat library into <CODE>C:\Program Files\Expat-1.95.7</CODE>
  directory.<BR>
 <BR>
 Copy file <CODE>C:\Program Files\Expat-1.95.7\Libs\libexpat.dll</CODE>
  to your Windows system directory (for example, <CODE>C:\WINNT</CODE> or
  <CODE>C:\WINNT\System32</CODE>)
-<LI CLASS="li-itemize">Build and install the Iconv library into the directory
+<LI>Build and install the Iconv library into the directory
  <CODE>C:\Program Files\iconv-1.9.1</CODE>.<BR>
 <BR>
 Copy file <CODE>C:\Program Files\iconv-1.9.1\bin\iconv.dll</CODE> to your
@@ -362,25 +353,25 @@ Note: instead of copying libexpat.dll and iconv.dll to the Windows
  <CODE>C:\Program Files\Expat-1.95.7\Libs</CODE> and
  <CODE>C:\Program Files\iconv-1.9.1\bin</CODE> to the <CODE>PATH</CODE> environment
  variable.
-<LI CLASS="li-itemize">While in the directory <CODE>ejabberd\src</CODE> run:
-<PRE CLASS="verbatim">
+<LI>While in the directory <CODE>ejabberd\src</CODE> run:
+<PRE>
 configure.bat
 nmake -f Makefile.win32
-</PRE><LI CLASS="li-itemize">Edit the file <CODE>ejabberd\src\ejabberd.cfg</CODE> and run
-<PRE CLASS="verbatim">
+</PRE><LI>Edit the file <CODE>ejabberd\src\ejabberd.cfg</CODE> and run
+<PRE>
 werl -s ejabberd -name ejabberd
 </PRE></UL>
 <!--TOC subsection Starting-->
 
-<H3 CLASS="subsection"><A NAME="htoc12">2.4</A>&nbsp;&nbsp;Starting</H3><!--SEC END -->
+<H3><A NAME="htoc12">2.4</A>&nbsp;&nbsp;Starting</H3><!--SEC END -->
 
 <A NAME="sec:starting"></A>
 
 Execute the following command to start <TT>ejabberd</TT>:
-<PRE CLASS="verbatim">
+<PRE>
   erl -pa /var/lib/ejabberd/ebin -name ejabberd -s ejabberd
 </PRE>or
-<PRE CLASS="verbatim">
+<PRE>
   erl -pa /var/lib/ejabberd/ebin -sname ejabberd -s ejabberd
 </PRE>In the latter case the Erlang node will be identified using only the first part
 of the host name, i.&nbsp;e. other Erlang nodes outside this domain can't contact
@@ -392,7 +383,7 @@ for storing its user database and for logging.<BR>
 <BR>
 To specify the path to the configuration file, the log files and the Mnesia
 database directory, you may use the following command:
-<PRE CLASS="verbatim">
+<PRE>
   erl -pa /var/lib/ejabberd/ebin \
       -sname ejabberd \
       -s ejabberd \
@@ -406,25 +397,25 @@ You can find other useful options in the Erlang manual page
 <BR>
 To use more than 1024 connections, you should set the environment variable
 <CODE>ERL_MAX_PORTS</CODE>:
-<PRE CLASS="verbatim">
+<PRE>
   export ERL_MAX_PORTS=32000
 </PRE>Note that with this value, <TT>ejabberd</TT> will use more memory (approximately 6&nbsp;MB
 more).<BR>
 <BR>
 To reduce memory usage, you may set the environment variable
 <CODE>ERL_FULLSWEEP_AFTER</CODE>:
-<PRE CLASS="verbatim">
+<PRE>
   export ERL_FULLSWEEP_AFTER=0
 </PRE>But in this case <TT>ejabberd</TT> can start to work slower.<BR>
 <BR>
 <!--TOC section Configuration-->
 
-<H2 CLASS="section"><A NAME="htoc13">3</A>&nbsp;&nbsp;Configuration</H2><!--SEC END -->
+<H2><A NAME="htoc13">3</A>&nbsp;&nbsp;Configuration</H2><!--SEC END -->
 
 <A NAME="sec:configuration"></A>
 <!--TOC subsection Initial Configuration-->
 
-<H3 CLASS="subsection"><A NAME="htoc14">3.1</A>&nbsp;&nbsp;Initial Configuration</H3><!--SEC END -->
+<H3><A NAME="htoc14">3.1</A>&nbsp;&nbsp;Initial Configuration</H3><!--SEC END -->
 
 <A NAME="sec:initconfig"></A>
 
@@ -435,12 +426,12 @@ configuration file are appended to the entries in the database. The
 configuration file contains a sequence of Erlang terms. Lines beginning with a
 <TT>`%'</TT> 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 &#8220;hosts&#8221; 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.<BR>
 <BR>
 You can override the old values stored in the database by adding next lines to
 the configuration file:
-<PRE CLASS="verbatim">
+<PRE>
   override_global.
   override_local.
   override_acls.
@@ -449,7 +440,7 @@ before new ones are added.<BR>
 <BR>
 <!--TOC subsubsection Host Names-->
 
-<H4 CLASS="subsubsection"><A NAME="htoc15">3.1.1</A>&nbsp;&nbsp;Host Names</H4><!--SEC END -->
+<H4><A NAME="htoc15">3.1.1</A>&nbsp;&nbsp;Host Names</H4><!--SEC END -->
 
 <A NAME="sec:confighostname"></A>
 
@@ -457,23 +448,23 @@ The option <TT>hosts</TT> defines a list containing one or more domains that
 <TT>ejabberd</TT> will serve.<BR>
 <BR>
 Examples:
-<UL CLASS="itemize"><LI CLASS="li-itemize">
+<UL><LI>
 Serving one domain:
-<UL CLASS="itemize"><LI CLASS="li-itemize">
-<PRE CLASS="verbatim">
+<UL><LI>
+<PRE>
   {hosts, ["example.org"]}.
-</PRE><LI CLASS="li-itemize">Backwards compatibility with older <TT>ejabberd</TT> versions can be retained
+</PRE><LI>Backwards compatibility with older <TT>ejabberd</TT> versions can be retained
  with:
- <PRE CLASS="verbatim">
+ <PRE>
   {host, "example.org"}.
 </PRE></UL>
-<LI CLASS="li-itemize">Serving two domains:
-<PRE CLASS="verbatim">
+<LI>Serving two domains:
+<PRE>
   {hosts, ["example.net", "example.com"]}.
 </PRE></UL>
 <!--TOC subsubsection Default Language-->
 
-<H4 CLASS="subsubsection"><A NAME="htoc16">3.1.2</A>&nbsp;&nbsp;Default Language</H4><!--SEC END -->
+<H4><A NAME="htoc16">3.1.2</A>&nbsp;&nbsp;Default Language</H4><!--SEC END -->
 
 <A NAME="sec:configlanguage"></A>
 
@@ -484,82 +475,82 @@ option <TT>language</TT> is <TT>"en"</TT>. In order to take effect there must be
 translation file <TT>&lt;language&gt;.msg</TT> in <TT>ejabberd</TT>'s <TT>msgs</TT> directory.<BR>
 <BR>
 Examples:
-<UL CLASS="itemize"><LI CLASS="li-itemize">
+<UL><LI>
 To set Russian as default language:
-<PRE CLASS="verbatim">
+<PRE>
   {language, "ru"}.
-</PRE><LI CLASS="li-itemize">To set Spanish as default language:
-<PRE CLASS="verbatim">
+</PRE><LI>To set Spanish as default language:
+<PRE>
   {language, "es"}.
 </PRE></UL>
 <!--TOC subsubsection Access Rules-->
 
-<H4 CLASS="subsubsection"><A NAME="htoc17">3.1.3</A>&nbsp;&nbsp;Access Rules</H4><!--SEC END -->
+<H4><A NAME="htoc17">3.1.3</A>&nbsp;&nbsp;Access Rules</H4><!--SEC END -->
 
 <A NAME="sec:configaccess"></A>
 
 Access control in <TT>ejabberd</TT> is performed via Access Control Lists (ACLs). The
 declarations of ACLs in the configuration file have the following syntax:
-<PRE CLASS="verbatim">
+<PRE>
   {acl, &lt;aclname&gt;, {&lt;acltype&gt;, ...}}.
 </PRE>
 <TT>&lt;acltype&gt;</TT> can be one of the following:
-<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
-<B><TT>all</TT></B><DD CLASS="dd-description"> Matches all JIDs. Example:
-<PRE CLASS="verbatim">
+<DL COMPACT=compact><DT>
+<B><TT>all</TT></B><DD> Matches all JIDs. Example:
+<PRE>
 {acl, all, all}.
-</PRE><DT CLASS="dt-description"><B><TT>{user, &lt;username&gt;}</TT></B><DD CLASS="dd-description"> Matches the user with the name
+</PRE><DT><B><TT>{user, &lt;username&gt;}</TT></B><DD> Matches the user with the name
  <TT>&lt;username&gt;</TT> at the first virtual host. Example:
-<PRE CLASS="verbatim">
+<PRE>
 {acl, admin, {user, "yozhik"}}.
-</PRE><DT CLASS="dt-description"><B><TT>{user, &lt;username&gt;, &lt;server&gt;}</TT></B><DD CLASS="dd-description"> Matches the user with the JID
+</PRE><DT><B><TT>{user, &lt;username&gt;, &lt;server&gt;}</TT></B><DD> Matches the user with the JID
  <TT>&lt;username&gt;@&lt;server&gt;</TT> and any resource. Example:
-<PRE CLASS="verbatim">
+<PRE>
 {acl, admin, {user, "yozhik", "example.org"}}.
-</PRE><DT CLASS="dt-description"><B><TT>{server, &lt;server&gt;}</TT></B><DD CLASS="dd-description"> Matches any JID from server
+</PRE><DT><B><TT>{server, &lt;server&gt;}</TT></B><DD> Matches any JID from server
  <TT>&lt;server&gt;</TT>. Example:
-<PRE CLASS="verbatim">
+<PRE>
 {acl, exampleorg, {server, "example.org"}}.
-</PRE><DT CLASS="dt-description"><B><TT>{user_regexp, &lt;regexp&gt;}</TT></B><DD CLASS="dd-description"> Matches any local user with a name that
+</PRE><DT><B><TT>{user_regexp, &lt;regexp&gt;}</TT></B><DD> Matches any local user with a name that
  matches <TT>&lt;regexp&gt;</TT> at the first virtual host. Example:
-<PRE CLASS="verbatim">
+<PRE>
 {acl, tests, {user, "^test[0-9]*$"}}.
-</PRE><DT CLASS="dt-description"><B><TT>{user_regexp, &lt;regexp&gt;, &lt;server&gt;}</TT></B><DD CLASS="dd-description"> Matches any user with a name
+</PRE><DT><B><TT>{user_regexp, &lt;regexp&gt;, &lt;server&gt;}</TT></B><DD> Matches any user with a name
  that matches <TT>&lt;regexp&gt;</TT> at server <TT>&lt;server&gt;</TT>. Example:
-<PRE CLASS="verbatim">
+<PRE>
 {acl, tests, {user, "^test", "example.org"}}.
-</PRE><DT CLASS="dt-description"><B><TT>{server_regexp, &lt;regexp&gt;}</TT></B><DD CLASS="dd-description"> Matches any JID from the server that
+</PRE><DT><B><TT>{server_regexp, &lt;regexp&gt;}</TT></B><DD> Matches any JID from the server that
  matches <TT>&lt;regexp&gt;</TT>. Example:
-<PRE CLASS="verbatim">
+<PRE>
 {acl, icq, {server, "^icq\\."}}.
-</PRE><DT CLASS="dt-description"><B><TT>{node_regexp, &lt;user_regexp&gt;, &lt;server_regexp&gt;}</TT></B><DD CLASS="dd-description"> Matches any user
+</PRE><DT><B><TT>{node_regexp, &lt;user_regexp&gt;, &lt;server_regexp&gt;}</TT></B><DD> Matches any user
  with a name that matches <TT>&lt;user_regexp&gt;</TT> at any server that matches
  <TT>&lt;server_regexp&gt;</TT>. Example:
-<PRE CLASS="verbatim">
+<PRE>
 {acl, yohzik, {node_regexp, "^yohzik$", "^example.(com|org)$"}}.
-</PRE><DT CLASS="dt-description"><B><TT>{user_glob, &lt;glob&gt;}</TT></B><DD CLASS="dd-description">
-<DT CLASS="dt-description"><B><TT>{user_glob, &lt;glob&gt;, &lt;server&gt;}</TT></B><DD CLASS="dd-description">
-<DT CLASS="dt-description"><B><TT>{server_glob, &lt;glob&gt;}</TT></B><DD CLASS="dd-description">
-<DT CLASS="dt-description"><B><TT>{node_glob, &lt;user_glob&gt;, &lt;server_glob&gt;}</TT></B><DD CLASS="dd-description"> This is the same as
+</PRE><DT><B><TT>{user_glob, &lt;glob&gt;}</TT></B><DD>
+<DT><B><TT>{user_glob, &lt;glob&gt;, &lt;server&gt;}</TT></B><DD>
+<DT><B><TT>{server_glob, &lt;glob&gt;}</TT></B><DD>
+<DT><B><TT>{node_glob, &lt;user_glob&gt;, &lt;server_glob&gt;}</TT></B><DD> This is the same as
  above. However, it uses shell glob patterns instead of regexp. These patterns
  can have the following special characters:
- <DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
- <B><TT>*</TT></B><DD CLASS="dd-description"> matches any string including the null string.
- <DT CLASS="dt-description"><B><TT>?</TT></B><DD CLASS="dd-description"> matches any single character.
- <DT CLASS="dt-description"><B><TT>[...]</TT></B><DD CLASS="dd-description"> matches any of the enclosed characters. Character
+ <DL COMPACT=compact><DT>
+ <B><TT>*</TT></B><DD> matches any string including the null string.
+ <DT><B><TT>?</TT></B><DD> matches any single character.
+ <DT><B><TT>[...]</TT></B><DD> matches any of the enclosed characters. Character
  ranges are specified by a pair of characters separated by a <TT>`-'</TT>.
  If the first character after <TT>`['</TT> is a <TT>`!'</TT>, any
  character not enclosed is matched.
  </DL>
 </DL>
 The following ACLs are pre-defined:
-<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
-<B><TT>all</TT></B><DD CLASS="dd-description"> Matches any JID.
-<DT CLASS="dt-description"><B><TT>none</TT></B><DD CLASS="dd-description"> Matches no JID.
+<DL COMPACT=compact><DT>
+<B><TT>all</TT></B><DD> Matches any JID.
+<DT><B><TT>none</TT></B><DD> Matches no JID.
 </DL>
 An entry allowing or denying access to different services looks similar to
 this:
-<PRE CLASS="verbatim">
+<PRE>
   {access, &lt;accessname&gt;, [{allow, &lt;aclname&gt;},
                           {deny, &lt;aclname&gt;},
                           ...
@@ -567,57 +558,57 @@ this:
 </PRE>When a JID is checked to have access to <TT>&lt;accessname&gt;</TT>, 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 &#8220;<TT>deny</TT>&#8221; is returned.<BR>
+the first matched tuple is returned, otherwise ``<TT>deny</TT>'' is returned.<BR>
 <BR>
 Example:
-<PRE CLASS="verbatim">
+<PRE>
   {access, configure, [{allow, admin}]}.
   {access, something, [{deny, badmans},
                        {allow, all}]}.
 </PRE>
 The following access rules are pre-defined:
-<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
-<B><TT>all</TT></B><DD CLASS="dd-description"> Always returns &#8220;<TT>allow</TT>&#8221;
-<DT CLASS="dt-description"><B><TT>none</TT></B><DD CLASS="dd-description"> Always returns &#8220;<TT>deny</TT>&#8221;
+<DL COMPACT=compact><DT>
+<B><TT>all</TT></B><DD> Always returns ``<TT>allow</TT>''
+<DT><B><TT>none</TT></B><DD> Always returns ``<TT>deny</TT>''
 </DL>
 <!--TOC subsubsection Shapers-->
 
-<H4 CLASS="subsubsection"><A NAME="htoc18">3.1.4</A>&nbsp;&nbsp;Shapers</H4><!--SEC END -->
+<H4><A NAME="htoc18">3.1.4</A>&nbsp;&nbsp;Shapers</H4><!--SEC END -->
 
 <A NAME="sec:configshaper"></A>
 
 Shapers enable you to limit connection traffic. The syntax of
 shapers is like this:
-<PRE CLASS="verbatim">
+<PRE>
   {shaper, &lt;shapername&gt;, &lt;kind&gt;}.
 </PRE>Currently only one kind of shaper called <TT>maxrate</TT> is available. It has the
 following syntax:
-<PRE CLASS="verbatim">
+<PRE>
   {maxrate, &lt;rate&gt;}
 </PRE>where <TT>&lt;rate&gt;</TT> stands for the maximum allowed incomig rate in bytes per
 second.<BR>
 <BR>
 Examples:
-<UL CLASS="itemize"><LI CLASS="li-itemize">
-To define a shaper named &#8220;<TT>normal</TT>&#8221; with traffic speed limited to
+<UL><LI>
+To define a shaper named ``<TT>normal</TT>'' with traffic speed limited to
 1,000&nbsp;bytes/second:
-<PRE CLASS="verbatim">
+<PRE>
   {shaper, normal, {maxrate, 1000}}.
-</PRE><LI CLASS="li-itemize">To define a shaper named &#8220;<TT>fast</TT>&#8221; with traffic speed limited to
+</PRE><LI>To define a shaper named ``<TT>fast</TT>'' with traffic speed limited to
 50,000&nbsp;bytes/second:
-<PRE CLASS="verbatim">
+<PRE>
   {shaper, fast, {maxrate, 50000}}.
 </PRE></UL>
 <!--TOC subsubsection Limitation of the number of opened sessions-->
 
-<H4 CLASS="subsubsection"><A NAME="htoc19">3.1.5</A>&nbsp;&nbsp;Limitation of the number of opened sessions</H4><!--SEC END -->
+<H4><A NAME="htoc19">3.1.5</A>&nbsp;&nbsp;Limitation of the number of opened sessions</H4><!--SEC END -->
 
 <A NAME="sec:configmaxsessions"></A>
 
 This option specifies the maximum number of sessions (authenticated
 connections) per user. If a user tries to open more than the maximum number of
 allowed sessions, with different resources, the first opened session will be
-disconnected. The error &#8220;<TT>session replaced</TT>&#8221; is send to the
+disconnected. The error ``<TT>session replaced</TT>'' is send to the
 disconnected session. This value is either a number or <TT>infinity</TT>. For
 example <CODE>{max\_user\_sessions, 10}</CODE>. The default value is <TT>10</TT>.<BR>
 <BR>
@@ -625,21 +616,21 @@ This option can be define per virtual host. See section&nbsp;<A HREF="#sec:confi
 <BR>
 <!--TOC subsubsection Listened Sockets-->
 
-<H4 CLASS="subsubsection"><A NAME="htoc20">3.1.6</A>&nbsp;&nbsp;Listened Sockets</H4><!--SEC END -->
+<H4><A NAME="htoc20">3.1.6</A>&nbsp;&nbsp;Listened Sockets</H4><!--SEC END -->
 
 <A NAME="sec:configlistened"></A>
 
 The option <TT>listen</TT> defines for which addresses and ports <TT>ejabberd</TT>
 will listen and what services will be run on them. Each element of the list is a
 tuple with the following elements:
-<UL CLASS="itemize"><LI CLASS="li-itemize">
+<UL><LI>
 Port number.
-<LI CLASS="li-itemize">Module that serves this port.
-<LI CLASS="li-itemize">Options to this module.
+<LI>Module that serves this port.
+<LI>Options to this module.
 </UL>
 
 Currently next modules are implemented:
-<BLOCKQUOTE CLASS="table"><DIV CLASS="center"><DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV>
+<BLOCKQUOTE><DIV ALIGN=center><DIV ALIGN=center><HR WIDTH="80%" SIZE=2></DIV>
  
  <TABLE BORDER=1 CELLSPACING=0 CELLPADDING=1>
 <TR><TD VALIGN=top ALIGN=left NOWRAP><TT>ejabberd_c2s</TT></TD>
@@ -683,18 +674,18 @@ Currently next modules are implemented:
 <TD VALIGN=top ALIGN=left><TT>certfile</TT>, <TT>http_poll</TT>,
  <TT>inet6</TT>, <TT>ip</TT>, <TT>tls</TT>, <TT>web_admin</TT></TD>
 </TR></TABLE>
-<DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV></DIV></BLOCKQUOTE>
+<DIV ALIGN=center><HR WIDTH="80%" SIZE=2></DIV></DIV></BLOCKQUOTE>
 (*) The mechanism for <A HREF="http://ejabberd.jabber.ru/tutorials-transports">external components</A> is defined in Jabber Component Protocol (<A HREF="http://www.jabber.org/jeps/jep-0114.html">JEP-0114</A>).<BR>
 <BR>
 The following options are available:
-<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
- <B><TT>{access, &lt;access rule&gt;}</TT></B><DD CLASS="dd-description"> This option defines
- access to the port. The default value is &#8220;<TT>all</TT>&#8221;.
- <DT CLASS="dt-description"><B><TT>{certfile, Path}</TT></B><DD CLASS="dd-description"> Path to a file containing the SSL certificate.
- <DT CLASS="dt-description"><B><TT>{hosts, [Hostnames], [HostOptions]}</TT></B><DD CLASS="dd-description"> This option
+<DL COMPACT=compact><DT>
+ <B><TT>{access, &lt;access rule&gt;}</TT></B><DD> This option defines
+ access to the port. The default value is ``<TT>all</TT>''.
+ <DT><B><TT>{certfile, Path}</TT></B><DD> Path to a file containing the SSL certificate.
+ <DT><B><TT>{hosts, [Hostnames], [HostOptions]}</TT></B><DD> This option
  defines one or more hostnames of connected services and enables you to
  specify additional options including <TT>{password, Secret}</TT>.
- <DT CLASS="dt-description"><B><TT>http_poll</TT></B><DD CLASS="dd-description"> 
+ <DT><B><TT>http_poll</TT></B><DD> 
  This option enables HTTP Polling (<A HREF="http://www.jabber.org/jeps/jep-0025.html">JEP-0025</A>) support. HTTP Polling
  enables access via HTTP requests to <TT>ejabberd</TT> from behind firewalls which
  do not allow outgoing sockets on port 5222.<BR>
@@ -706,85 +697,85 @@ If HTTP Polling is enabled, it will be available at
  <A HREF="http://jwchat.sourceforge.net/">JWChat</A> (there is a tutorial to
  <A HREF="http://ejabberd.jabber.ru/jwchat">install JWChat</A> with
  instructions for <TT>ejabberd</TT>).
- <DT CLASS="dt-description"><B><TT>inet6</TT></B><DD CLASS="dd-description"> Set up the socket for IPv6.
- <DT CLASS="dt-description"><B><TT>{ip, IPAddress}</TT></B><DD CLASS="dd-description"> This option specifies which network
+ <DT><B><TT>inet6</TT></B><DD> Set up the socket for IPv6.
+ <DT><B><TT>{ip, IPAddress}</TT></B><DD> This option specifies which network
  interface to listen for. For example <CODE>{ip, {192, 168, 1, 1}}</CODE>.
- <DT CLASS="dt-description"><B><TT>{max_stanza_size, Size}</TT></B><DD CLASS="dd-description"> This
+ <DT><B><TT>{max_stanza_size, Size}</TT></B><DD> This
  option specifies an approximate maximal size in bytes of XML stanzas.
  For example <CODE>{max\_stanza\_size, 65536}</CODE>. The default value
- is &#8220;<TT>infinity</TT>&#8221;.
- <DT CLASS="dt-description"><B><TT>{shaper, &lt;access rule&gt;}</TT></B><DD CLASS="dd-description"> This option defines a
+ is ``<TT>infinity</TT>''.
+ <DT><B><TT>{shaper, &lt;access rule&gt;}</TT></B><DD> This option defines a
  shaper for the port (see section&nbsp;<A HREF="#sec:configshaper">3.1.4</A>). The default value
- is &#8220;<TT>none</TT>&#8221;.
- <DT CLASS="dt-description"><B><TT>ssl</TT></B><DD CLASS="dd-description"> This option specifies that traffic on
+ is ``<TT>none</TT>''.
+ <DT><B><TT>ssl</TT></B><DD> This option specifies that traffic on
  the port will be encrypted using SSL. You should also set the
  <TT>certfile</TT> option. It is recommended to use the <TT>tls</TT> option
  instead.
- <DT CLASS="dt-description"><B><TT>starttls</TT></B><DD CLASS="dd-description"> This option
+ <DT><B><TT>starttls</TT></B><DD> This option
  specifies that STARTTLS encryption is available on connections to the port.
  You should also set the <TT>certfile</TT> option.
- <DT CLASS="dt-description"><B><TT>starttls_required</TT></B><DD CLASS="dd-description"> This option
+ <DT><B><TT>starttls_required</TT></B><DD> This option
  specifies that STARTTLS encryption is required on connections to the port.
  No unencrypted connections will be allowed. You should also set the
  <TT>certfile</TT> option.
- <DT CLASS="dt-description"><B><TT>tls</TT></B><DD CLASS="dd-description"> This option specifies that traffic on
+ <DT><B><TT>tls</TT></B><DD> This option specifies that traffic on
  the port will be encrypted using SSL immediately after connecting. You
  should also set the <TT>certfile</TT> option.
- <DT CLASS="dt-description"><B><TT>zlib</TT></B><DD CLASS="dd-description"> This
+ <DT><B><TT>zlib</TT></B><DD> This
  option specifies that Zlib stream compression (as defined in <A HREF="http://www.jabber.org/jeps/jep-0138.html">JEP-0138</A>)
  is available on connections to the port. Client cannot use stream compression and
  stream encryption simultaneously, so if you specify both <TT>tls</TT> (or <TT>ssl</TT>)
  and <TT>zlib</TT> the latter option will not affect connection at all.
- <DT CLASS="dt-description"><B><TT>web_admin</TT></B><DD CLASS="dd-description"> This option
+ <DT><B><TT>web_admin</TT></B><DD> This option
  enables the web interface for <TT>ejabberd</TT> administration which is available
  at <CODE>http://server:port/admin/</CODE>. Login and password are the username and
  password of one of the registered users who are granted access by the
- &#8220;configure&#8221; access rule.
+ ``configure'' access rule.
 </DL>
 Also the following global options are available for s2s connections:
-<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
- <B><TT>{s2s_use_starttls, true|false}</TT></B><DD CLASS="dd-description">
+<DL COMPACT=compact><DT>
+ <B><TT>{s2s_use_starttls, true|false}</TT></B><DD>
  This option defines whether to use STARTTLS
  for s2s connections.
- <DT CLASS="dt-description"><B><TT>{s2s_certfile, Path}</TT></B><DD CLASS="dd-description"> Path to the
+ <DT><B><TT>{s2s_certfile, Path}</TT></B><DD> Path to the
  file containing the SSL certificate.
- <DT CLASS="dt-description"><B><TT>{domain_certfile, Domain, Path}</TT></B><DD CLASS="dd-description"> Path
+ <DT><B><TT>{domain_certfile, Domain, Path}</TT></B><DD> Path
  to the file containing the SSL certificate for the specified domain.
 </DL>
 For instance, the following configuration defines that:
-<UL CLASS="itemize"><LI CLASS="li-itemize">
+<UL><LI>
 c2s connections are listened for on port 5222 and 5223 (SSL) and denied
- for the user &#8220;<TT>bad</TT>&#8221;
-<LI CLASS="li-itemize">s2s connections are listened for on port 5269 with STARTTLS for secured
+ for the user ``<TT>bad</TT>''
+<LI>s2s connections are listened for on port 5269 with STARTTLS for secured
  traffic enabled.
-<LI CLASS="li-itemize">Port 5280 is serving the web interface and the HTTP Polling service. Note
+<LI>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&nbsp;<A HREF="#sec:webadm">3.4.1</A> shows how exactly this can be done.
-<LI CLASS="li-itemize">All users except for the administrators have a traffic of limit 
+<LI>All users except for the administrators have a traffic of limit 
  1,000&nbsp;Bytes/second
-<LI CLASS="li-itemize">The
+<LI>The
  <A HREF="http://ejabberd.jabber.ru/pyaimt">AIM transport</A>
  <TT>aim.example.org</TT> is connected to port 5233 with password
- &#8220;<TT>aimsecret</TT>&#8221;
-<LI CLASS="li-itemize">The ICQ transport JIT (<TT>icq.example.org</TT> and
+ ``<TT>aimsecret</TT>''
+<LI>The ICQ transport JIT (<TT>icq.example.org</TT> and
  <TT>sms.example.org</TT>) is connected to port 5234 with password
- &#8220;<TT>jitsecret</TT>&#8221;
-<LI CLASS="li-itemize">The
+ ``<TT>jitsecret</TT>''
+<LI>The
  <A HREF="http://ejabberd.jabber.ru/pymsnt">MSN transport</A>
  <TT>msn.example.org</TT> is connected to port 5235 with password
- &#8220;<TT>msnsecret</TT>&#8221;
-<LI CLASS="li-itemize">The
+ ``<TT>msnsecret</TT>''
+<LI>The
  <A HREF="http://ejabberd.jabber.ru/yahoo-transport-2">Yahoo! transport</A>
  <TT>yahoo.example.org</TT> is connected to port 5236 with password
- &#8220;<TT>yahoosecret</TT>&#8221;
-<LI CLASS="li-itemize">The <A HREF="http://ejabberd.jabber.ru/jabber-gg-transport">Gadu-Gadu transport</A> <TT>gg.example.org</TT> is
- connected to port 5237 with password &#8220;<TT>ggsecret</TT>&#8221;
-<LI CLASS="li-itemize">The
+ ``<TT>yahoosecret</TT>''
+<LI>The <A HREF="http://ejabberd.jabber.ru/jabber-gg-transport">Gadu-Gadu transport</A> <TT>gg.example.org</TT> is
+ connected to port 5237 with password ``<TT>ggsecret</TT>''
+<LI>The
  <A HREF="http://ejabberd.jabber.ru/jmc">Jabber Mail Component</A>
  <TT>jmc.example.org</TT> is connected to port 5238 with password
- &#8220;<TT>jmcsecret</TT>&#8221;
+ ``<TT>jmcsecret</TT>''
 </UL>
-<PRE CLASS="verbatim">
+<PRE>
   {acl, blocked, {user, "bad"}}.
   {access, c2s, [{deny, blocked},
                  {allow, all}]}.
@@ -815,7 +806,7 @@ c2s connections are listened for on port 5222 and 5223 (SSL) and denied
   {s2s_certfile, "/path/to/ssl.pem"}.
 </PRE>Note, that for jabberd 1.4- or WPJabber-based
 services you have to make the transports log and do XDB by themselves:
-<PRE CLASS="verbatim">
+<PRE>
   &lt;!--
      You have to add elogger and rlogger entries here when using ejabberd.
      In this case the transport will do the logging.
@@ -847,7 +838,7 @@ services you have to make the transports log and do XDB by themselves:
 </PRE>
 <!--TOC subsubsection Modules-->
 
-<H4 CLASS="subsubsection"><A NAME="htoc21">3.1.7</A>&nbsp;&nbsp;Modules</H4><!--SEC END -->
+<H4><A NAME="htoc21">3.1.7</A>&nbsp;&nbsp;Modules</H4><!--SEC END -->
 
 <A NAME="sec:configmodules"></A>
 
@@ -857,17 +848,17 @@ element is the name of a module and the second is a list of options for that
 module. Read section&nbsp;<A HREF="#sec:modules">A</A> for detailed information about modules.<BR>
 <BR>
 Examples:
-<UL CLASS="itemize"><LI CLASS="li-itemize">
+<UL><LI>
 In this simple example, only the module <TT>mod_echo</TT> is loaded and no
  options are specified between square brackets:
- <PRE CLASS="verbatim">
+ <PRE>
   {modules,
    [{mod_echo,      []}
    ]}.
-</PRE><LI CLASS="li-itemize">The second example is also simple: the modules <TT>mod_echo</TT>, <TT>mod_time</TT>, and
+</PRE><LI>The second example is also simple: the modules <TT>mod_echo</TT>, <TT>mod_time</TT>, and
  <TT>mod_version</TT> are loaded without options. Remark that, besides the last entry,
  all entries end with a comma:
- <PRE CLASS="verbatim">
+ <PRE>
   {modules,
    [{mod_echo,      []},
     {mod_time,      []},
@@ -876,22 +867,22 @@ In this simple example, only the module <TT>mod_echo</TT> is loaded and no
 </PRE></UL>
 <!--TOC subsubsection Virtual Hosting-->
 
-<H4 CLASS="subsubsection"><A NAME="htoc22">3.1.8</A>&nbsp;&nbsp;Virtual Hosting</H4><!--SEC END -->
+<H4><A NAME="htoc22">3.1.8</A>&nbsp;&nbsp;Virtual Hosting</H4><!--SEC END -->
 
 <A NAME="sec:configvirtualhost"></A>
 
 Options can be defined separately for every virtual host using the
 <TT>host_config</TT> option. It has the following
 syntax:
-<PRE CLASS="verbatim">
+<PRE>
   {host_config, &lt;hostname&gt;, [&lt;option&gt;, &lt;option&gt;, ...]}.
 </PRE>
 Examples:
-<UL CLASS="itemize"><LI CLASS="li-itemize">
+<UL><LI>
 Domain <TT>example.net</TT> is using the internal authentication method while
  domain <TT>example.com</TT> is using the LDAP server running on the domain
  <TT>localhost</TT> to perform authentication:
-<PRE CLASS="verbatim">
+<PRE>
 {host_config, "example.net", [{auth_method, internal}]}.
 
 {host_config, "example.com", [{auth_method, ldap},
@@ -900,10 +891,10 @@ Domain <TT>example.net</TT> is using the internal authentication method while
                               {ldap_rootdn, "dc=localdomain"},
                               {ldap_rootdn, "dc=example,dc=com"},
                               {ldap_password, ""}]}.
-</PRE><LI CLASS="li-itemize">Domain <TT>example.net</TT> is using ODBC to perform authentication
+</PRE><LI>Domain <TT>example.net</TT> is using ODBC to perform authentication
  while domain <TT>example.com</TT> is using the LDAP servers running on the domains
  <TT>localhost</TT> and <TT>otherhost</TT>:
-<PRE CLASS="verbatim">
+<PRE>
 {host_config, "example.net", [{auth_method, odbc},
                               {odbc_server, "DSN=ejabberd;UID=ejabberd;PWD=ejabberd"}]}.
 
@@ -916,24 +907,24 @@ Domain <TT>example.net</TT> is using the internal authentication method while
 </PRE></UL>
 <!--TOC subsubsection SASL anonymous and anonymous login-->
 
-<H4 CLASS="subsubsection"><A NAME="htoc23">3.1.9</A>&nbsp;&nbsp;SASL anonymous and anonymous login</H4><!--SEC END -->
+<H4><A NAME="htoc23">3.1.9</A>&nbsp;&nbsp;SASL anonymous and anonymous login</H4><!--SEC END -->
 
 <A NAME="sec:configsaslanonymous"></A>
 
 The configuration of the anonymous mode can be done with three
 <TT>host_config</TT> parameters:
-<UL CLASS="itemize"><LI CLASS="li-itemize"> 
+<UL><LI> 
 <TT>auth_method</TT>: This value is used for defining the authentication method:
 internal, odbc, ldap, external). You now have a special extra option to enable
 anonymous mode: anonymous.<BR>
 <BR>
-<LI CLASS="li-itemize"><TT>allow_multiple_connections</TT>: This option can be either true or false and
+<LI><TT>allow_multiple_connections</TT>: This option can be either true or false and
 is only used when the anonymous mode is enabled. Setting it to true means that
 the same username will be able to be taken several time in anonymous login
 mode if different resource are used to connect. This option is only useful in
 very special cases. It defaults to false.<BR>
 <BR>
-<LI CLASS="li-itemize"><TT>anonymous_protocol</TT>: This option can take three values:
+<LI><TT>anonymous_protocol</TT>: This option can take three values:
  <TT>sasl_anon</TT>, <TT>login_anon</TT> or both. <TT>sasl_anon</TT> means that
  SASL anonymous mode is enabled. <TT>login_anon</TT> means that anonymous
  login mode is enabled. both means that SASL anonymous and login anonymous are
@@ -943,26 +934,26 @@ Those options are defined for each virtual host with the <TT>host_config</TT>
 parameter (see section&nbsp;<A HREF="#sec:configvirtualhost">3.1.8</A>).<BR>
 <BR>
 Examples:
-<UL CLASS="itemize"><LI CLASS="li-itemize">
+<UL><LI>
 To enable anonymous login on a virtual host:
-<PRE CLASS="verbatim">
+<PRE>
 {host_config, "public.example.org", [{auth_method, anonymous},
                                      {anonymous_protocol, login_anon}]}.
-</PRE><LI CLASS="li-itemize">To enable anonymous login and internal authentication on a virtual host:
-<PRE CLASS="verbatim">
+</PRE><LI>To enable anonymous login and internal authentication on a virtual host:
+<PRE>
 {host_config, "public.example.org", [{auth_method, [anonymous,internal]},
                                      {anonymous_protocol, login_anon}]}.
-</PRE><LI CLASS="li-itemize">To enable SASL anonymous on a virtual host:
-<PRE CLASS="verbatim">
+</PRE><LI>To enable SASL anonymous on a virtual host:
+<PRE>
 {host_config, "public.example.org", [{auth_method, [anonymous]},
                                      {anonymous_protocol, sasl_anon}]}.
-</PRE><LI CLASS="li-itemize">To enable SASL anonymous and anonymous login on a virtual host:
-<PRE CLASS="verbatim">
+</PRE><LI>To enable SASL anonymous and anonymous login on a virtual host:
+<PRE>
 {host_config, "public.example.org", [{auth_method, [anonymous]},
                                      {anonymous_protocol, both}]}.
-</PRE><LI CLASS="li-itemize">To enable SASL anonymous, anonymous login and internal authentication on
+</PRE><LI>To enable SASL anonymous, anonymous login and internal authentication on
 a virtual host:
-<PRE CLASS="verbatim">
+<PRE>
 {host_config, "public.example.org", [{auth_method, [anonymous,internal]},
                                      {anonymous_protocol, both}]}.
 </PRE></UL>
@@ -972,12 +963,12 @@ available from:
 <BR>
 <!--TOC subsection Relational Database Support-->
 
-<H3 CLASS="subsection"><A NAME="htoc24">3.2</A>&nbsp;&nbsp;Relational Database Support</H3><!--SEC END -->
+<H3><A NAME="htoc24">3.2</A>&nbsp;&nbsp;Relational Database Support</H3><!--SEC END -->
 
 <A NAME="sec:relationaldatabase"></A>
 <!--TOC subsubsection Preliminary steps-->
 
-<H4 CLASS="subsubsection"><A NAME="htoc25">3.2.1</A>&nbsp;&nbsp;Preliminary steps</H4><!--SEC END -->
+<H4><A NAME="htoc25">3.2.1</A>&nbsp;&nbsp;Preliminary steps</H4><!--SEC END -->
 
 <A NAME="sec:relationaldatabasecompilation"></A>
 If you have installed ejabberd using a binary version, the compilation steps
@@ -987,17 +978,17 @@ Otherwise, to be able to use ejabberd with a relational database you need to
 enable ODBC modules during compilation, even if you want to use ejabberd with
 MySQL or PostgreSQL in native mode. The following <TT>configure</TT> command can
 be used to enable the relational modules:
-<PRE CLASS="verbatim">
+<PRE>
 ./configure --enable-odbc
 </PRE>
 If you are planning to use Microsoft SQL Server with ODBC, you need to specify
 it from the <TT>configure</TT> command before compilation:
-<PRE CLASS="verbatim">
+<PRE>
 ./configure --enable-odbc --enable-mssql
 </PRE>
 <!--TOC subsubsection Authentication against a relational database-->
 
-<H4 CLASS="subsubsection"><A NAME="htoc26">3.2.2</A>&nbsp;&nbsp;Authentication against a relational database</H4><!--SEC END -->
+<H4><A NAME="htoc26">3.2.2</A>&nbsp;&nbsp;Authentication against a relational database</H4><!--SEC END -->
 
 <A NAME="sec:relationaldatabaseauth"></A>
 ejabberd use its internal Mnesia database as a default. It is however possible
@@ -1010,7 +1001,7 @@ system.<BR>
 The option value name be misleading, as the method name is use both for access
 to relational database through ODBC or through the native interface. In any
 case, the first step is to define the odbc <TT>auth_method</TT>. For example:
-<PRE CLASS="verbatim">
+<PRE>
 {host_config, "public.example.org", [{auth_method, [odbc]}]}.
 </PRE>
 The actual database access is defined in the option <TT>odbc_server</TT>. Its
@@ -1019,16 +1010,16 @@ interface available, PostgreSQL or MySQL.<BR>
 <BR>
 To use a relational database through ODBC, you can pass the ODBC connection
 string as <TT>odbc_server</TT> parameter. For example:
-<PRE CLASS="verbatim">
+<PRE>
 {odbc_server, "DSN=database;UID=ejabberd;PWD=password"}.
 </PRE>
 To use the native PostgreSQL interface, you can pass a tuple of the following form as
 parameter:
-<PRE CLASS="verbatim">
+<PRE>
 {pgsql, "Server", "Database", "Username", "Password"}
 </PRE>
 <TT>pgsql</TT> is a keyword that should be kept as is. For example:
-<PRE CLASS="verbatim">
+<PRE>
 {odbc_server, {pgsql, "localhost", "database", "ejabberd", "password"}}.
 </PRE>
 Note that you need to install the Erlang PgSQL library first. This library is
@@ -1037,11 +1028,11 @@ available from Sourceforge: <A HREF="http://cvs.sourceforge.net/viewcvs.py/junge
 To use the native MySQL interface, the same tuple should be passed, except
 that you now have to use the <TT>mysql</TT> keyword instead of the <TT>pgsql</TT>
 keyword:
-<PRE CLASS="verbatim">
+<PRE>
 {mysql, "Server", "Database", "Username", "Password"}
 </PRE>
 <TT>mysql</TT> is a keyword that should be kept as is. For example:
-<PRE CLASS="verbatim">
+<PRE>
 {odbc_server, {mysql, "localhost", "test", "root", "password"}}.
 </PRE>
 Note that you need to install the Erlang MySQL library first. This library is
@@ -1052,61 +1043,61 @@ available from: <A HREF="http://support.process-one.net/doc/display/MESSENGER/Us
 <BR>
 <!--TOC subsubsection Relational database for other modules-->
 
-<H4 CLASS="subsubsection"><A NAME="htoc27">3.2.3</A>&nbsp;&nbsp;Relational database for other modules</H4><!--SEC END -->
+<H4><A NAME="htoc27">3.2.3</A>&nbsp;&nbsp;Relational database for other modules</H4><!--SEC END -->
 
 <A NAME="sec:relationaldatabaseextra"></A>
 It is possible to use a relational database to store pieces of
 information. You can do this by changing the module name to a name with an
 <TT>_odbc</TT> suffix in <TT>ejabberd</TT> config file. You can use a relational
 database for the following data:
-<UL CLASS="itemize"><LI CLASS="li-itemize">
+<UL><LI>
 Last connection date and time: Use <TT>mod_last_odbc</TT> instead of
  <TT>mod_last</TT>.
-<LI CLASS="li-itemize">Offline messages: Use <TT>mod_offline_odbc</TT> instead of
+<LI>Offline messages: Use <TT>mod_offline_odbc</TT> instead of
  <TT>mod_offline</TT>.
-<LI CLASS="li-itemize">Rosters: Use <TT>mod_roster_odbc</TT> instead of <TT>mod_roster</TT>.
-<LI CLASS="li-itemize">Users' VCARD: Use <TT>mod_vcard_odbc</TT> instead of <TT>mod_vcard</TT>.
+<LI>Rosters: Use <TT>mod_roster_odbc</TT> instead of <TT>mod_roster</TT>.
+<LI>Users' VCARD: Use <TT>mod_vcard_odbc</TT> instead of <TT>mod_vcard</TT>.
 </UL>
 <!--TOC subsection Creating an Initial Administrator-->
 
-<H3 CLASS="subsection"><A NAME="htoc28">3.3</A>&nbsp;&nbsp;Creating an Initial Administrator</H3><!--SEC END -->
+<H3><A NAME="htoc28">3.3</A>&nbsp;&nbsp;Creating an Initial Administrator</H3><!--SEC END -->
 
 <A NAME="sec:initialadmin"></A>
 Before the web interface can be entered to perform administration tasks, an
 account with administrator rights is needed on your <TT>ejabberd</TT> deployment.<BR>
 <BR>
 Instructions to create an initial administrator account:
-<OL CLASS="enumerate" type=1><LI CLASS="li-enumerate">
+<OL type=1><LI>
 Register an account on your <TT>ejabberd</TT> deployment. An account can be
  created in two ways:
- <OL CLASS="enumerate" type=a><LI CLASS="li-enumerate">
+ <OL type=a><LI>
  Using the tool <TT>ejabberdctl</TT> (see
  section&nbsp;<A HREF="#sec:ejabberdctl">3.4.2</A>):
- <PRE CLASS="verbatim">
+ <PRE>
 % ejabberdctl node@host register admin example.org password
-</PRE><LI CLASS="li-enumerate">Using In-Band Registration (see section&nbsp;<A HREF="#sec:modregister">A.14</A>): you can
+</PRE><LI>Using In-Band Registration (see section&nbsp;<A HREF="#sec:modregister">A.14</A>): you can
  use a Jabber client to register an account.
  </OL>
-<LI CLASS="li-enumerate">Edit the configuration file to promote the account created in the previous
+<LI>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.
- <PRE CLASS="verbatim">
+ <PRE>
   {acl, admins, {user, "admin", "example.org"}}.
   {access, configure, [{allow, admins}]}.
-</PRE><LI CLASS="li-enumerate">Restart <TT>ejabberd</TT> to load the new configuration.
-<LI CLASS="li-enumerate">Open the web interface (<CODE>http://server:port/admin/</CODE>) in your
+</PRE><LI>Restart <TT>ejabberd</TT> to load the new configuration.
+<LI>Open the web interface (<CODE>http://server:port/admin/</CODE>) in your
  favourite browser. Make sure to enter the <EM>full</EM> JID as username (in this
  example: <TT>admin@example.org</TT>. The reason that you also need to enter the
  suffix, is because <TT>ejabberd</TT>'s virtual hosting support.
 </OL>
 <!--TOC subsection Online Configuration and Monitoring-->
 
-<H3 CLASS="subsection"><A NAME="htoc29">3.4</A>&nbsp;&nbsp;Online Configuration and Monitoring</H3><!--SEC END -->
+<H3><A NAME="htoc29">3.4</A>&nbsp;&nbsp;Online Configuration and Monitoring</H3><!--SEC END -->
 
 <A NAME="sec:onlineconfig"></A>
 <!--TOC subsubsection Web Interface-->
 
-<H4 CLASS="subsubsection"><A NAME="htoc30">3.4.1</A>&nbsp;&nbsp;Web Interface</H4><!--SEC END -->
+<H4><A NAME="htoc30">3.4.1</A>&nbsp;&nbsp;Web Interface</H4><!--SEC END -->
 
 <A NAME="sec:webadm"></A>
 
@@ -1117,24 +1108,22 @@ section&nbsp;<A HREF="#sec:configlistened">3.1.6</A>). Then you can open
 will be asked to enter the username (the <EM>full</EM> Jabber ID) and password
 of an <TT>ejabberd</TT> user with administrator rights. After authentication
 you will see a page similar to figure&nbsp;<A HREF="#fig:webadmmain">1</A>.
-<BLOCKQUOTE CLASS="figure"><DIV CLASS="center"><DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV>
+<BLOCKQUOTE><DIV ALIGN=center><DIV ALIGN=center><HR WIDTH="80%" SIZE=2></DIV>
  
  <IMG SRC="webadmmain.png">
  
 
  <BR>
-<BR>
-<DIV CLASS="center">Figure 1: Top page from the web interface</DIV><BR>
-<BR>
+<DIV ALIGN=center>Figure 1: Top page from the web interface</DIV><BR>
 
  <A NAME="fig:webadmmain"></A>
-<DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV></DIV></BLOCKQUOTE>
+<DIV ALIGN=center><HR WIDTH="80%" SIZE=2></DIV></DIV></BLOCKQUOTE>
 Here you can edit access restrictions, manage users, create backups,
 manage the database, enable/disable ports listened for, view server
 statistics,...<BR>
 <BR>
 Examples:
-<UL CLASS="itemize"><LI CLASS="li-itemize">
+<UL><LI>
 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 <CODE>http://example.org:5280/admin/</CODE> to
@@ -1143,11 +1132,11 @@ You can serve the web interface on the same port as the
  the virtual host <TT>example.com</TT>. 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 <TT>ejabberd</TT>. In this example you can enter as
- username &#8220;<TT>admin@example.net</TT>&#8221; to administer all virtual hosts (first
- URL). If you log in with &#8220;<TT>admin@example.com</TT>&#8221; on<BR>
+ username ``<TT>admin@example.net</TT>'' to administer all virtual hosts (first
+ URL). If you log in with ``<TT>admin@example.com</TT>'' on<BR>
 <CODE>http://example.org:5280/admin/server/example.com/</CODE> you can only
  administer the virtual host <TT>example.com</TT>.
- <PRE CLASS="verbatim">
+ <PRE>
   ...
   {acl, admins, {user, "admin", "example.net"}}.
   {host_config, "example.com", [{acl, admins, {user, "admin", "example.com"}}]}.
@@ -1161,11 +1150,11 @@ You can serve the web interface on the same port as the
     ...
    ]
   }.
-</PRE><LI CLASS="li-itemize">For security reasons, you can serve the web interface on a secured
+</PRE><LI>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 <CODE>https://192.168.1.1:5280/admin/</CODE>:
- <PRE CLASS="verbatim">
+ <PRE>
   ...
   {hosts, ["example.org"]}.
   ...
@@ -1180,13 +1169,13 @@ You can serve the web interface on the same port as the
 </PRE></UL>
 <!--TOC subsubsection <TT>ejabberdctl</TT>-->
 
-<H4 CLASS="subsubsection"><A NAME="htoc31">3.4.2</A>&nbsp;&nbsp;<TT>ejabberdctl</TT></H4><!--SEC END -->
+<H4><A NAME="htoc31">3.4.2</A>&nbsp;&nbsp;<TT>ejabberdctl</TT></H4><!--SEC END -->
 
 <A NAME="sec:ejabberdctl"></A>
 It is possible to do some administration operations using the command
 line tool <TT>ejabberdctl</TT>. You can list all available options by
 running <TT>ejabberdctl</TT> without arguments:
-<PRE CLASS="verbatim">
+<PRE>
 % ejabberdctl
 Usage: ejabberdctl node command
 
@@ -1211,27 +1200,27 @@ Example:
   ejabberdctl ejabberd@host restart
 </PRE>
 Additional information:
-<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
-<B><TT>reopen-log </TT></B><DD CLASS="dd-description"> If you use a tool to rotate logs, you have to configure it
+<DL COMPACT=compact><DT>
+<B><TT>reopen-log </TT></B><DD> If you use a tool to rotate logs, you have to configure it
  so that this command is executed after each rotation.
-<DT CLASS="dt-description"><B><TT>backup, restore, install-fallback, dump, load</TT></B><DD CLASS="dd-description"> You can use these
+<DT><B><TT>backup, restore, install-fallback, dump, load</TT></B><DD> You can use these
  commands to create and restore backups. 
-<DT CLASS="dt-description"><B><TT>import-file, import-dir</TT></B><DD CLASS="dd-description"> 
+<DT><B><TT>import-file, import-dir</TT></B><DD> 
  These options can be used to migrate from other Jabber/XMPP servers. There
  exist tutorials to <A HREF="http://ejabberd.jabber.ru/jabberd1-to-ejabberd">migrate from jabberd 1.4</A>
  and to <A HREF="http://ejabberd.jabber.ru/jabberd2-to-ejabberd">migrate from jabberd2</A>.
-<DT CLASS="dt-description"><B><TT>delete-expired-messages</TT></B><DD CLASS="dd-description"> This option can be used to delete old messages
+<DT><B><TT>delete-expired-messages</TT></B><DD> 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.
 </DL>
 <!--TOC section Firewall Settings-->
 
-<H2 CLASS="section"><A NAME="htoc32">4</A>&nbsp;&nbsp;Firewall Settings</H2><!--SEC END -->
+<H2><A NAME="htoc32">4</A>&nbsp;&nbsp;Firewall Settings</H2><!--SEC END -->
 
 <A NAME="sec:firewall"></A>
 
 You need to take the following TCP ports in mind when configuring your firewall:
-<BLOCKQUOTE CLASS="table"><DIV CLASS="center"><DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV>
+<BLOCKQUOTE><DIV ALIGN=center><DIV ALIGN=center><HR WIDTH="80%" SIZE=2></DIV>
  <TABLE BORDER=1 CELLSPACING=0 CELLPADDING=1>
 <TR><TD ALIGN=left NOWRAP>Port</TD>
 <TD ALIGN=left NOWRAP>Description</TD>
@@ -1252,28 +1241,28 @@ You need to take the following TCP ports in mind when configuring your firewall:
 <TD ALIGN=left NOWRAP>Only for clustring (see&nbsp;<A HREF="#sec:clustering">6</A>). This range
  is configurable (see&nbsp;<A HREF="#sec:starting">2.4</A>).</TD>
 </TR></TABLE>
-<DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV></DIV></BLOCKQUOTE>
+<DIV ALIGN=center><HR WIDTH="80%" SIZE=2></DIV></DIV></BLOCKQUOTE>
 <!--TOC section SRV Records-->
 
-<H2 CLASS="section"><A NAME="htoc33">5</A>&nbsp;&nbsp;SRV Records</H2><!--SEC END -->
+<H2><A NAME="htoc33">5</A>&nbsp;&nbsp;SRV Records</H2><!--SEC END -->
 
 <A NAME="sec:srv"></A>
 
-<UL CLASS="itemize"><LI CLASS="li-itemize">
+<UL><LI>
 General information:
  <A HREF="http://en.wikipedia.org/wiki/SRV_record">SRV record</A>
-<LI CLASS="li-itemize">Practical information:
+<LI>Practical information:
  <A HREF="http://jabberd.jabberstudio.org/2/docs/section05.html#5_7">Setting DNS SRV Records</A>
 </UL>
 <!--TOC section Clustering-->
 
-<H2 CLASS="section"><A NAME="htoc34">6</A>&nbsp;&nbsp;Clustering</H2><!--SEC END -->
+<H2><A NAME="htoc34">6</A>&nbsp;&nbsp;Clustering</H2><!--SEC END -->
 
 <A NAME="sec:clustering"></A>
 
 <!--TOC subsection How it Works-->
 
-<H3 CLASS="subsection"><A NAME="htoc35">6.1</A>&nbsp;&nbsp;How it Works</H3><!--SEC END -->
+<H3><A NAME="htoc35">6.1</A>&nbsp;&nbsp;How it Works</H3><!--SEC END -->
 
 <A NAME="sec:howitworks"></A>
 
@@ -1286,15 +1275,15 @@ needed because all nodes exchange information about connected users, s2s
 connections, registered services, etc...<BR>
 <BR>
 Each <TT>ejabberd</TT> node has the following modules:
-<UL CLASS="itemize"><LI CLASS="li-itemize">
+<UL><LI>
 router,
-<LI CLASS="li-itemize">local router,
-<LI CLASS="li-itemize">session manager,
-<LI CLASS="li-itemize">s2s manager.
+<LI>local router,
+<LI>session manager,
+<LI>s2s manager.
 </UL>
 <!--TOC subsubsection Router-->
 
-<H4 CLASS="subsubsection"><A NAME="htoc36">6.1.1</A>&nbsp;&nbsp;Router</H4><!--SEC END -->
+<H4><A NAME="htoc36">6.1.1</A>&nbsp;&nbsp;Router</H4><!--SEC END -->
 
 
 This module is the main router of Jabber packets on each node. It
@@ -1305,7 +1294,7 @@ appropriate process. If not, it is sent to the s2s manager.<BR>
 <BR>
 <!--TOC subsubsection Local Router-->
 
-<H4 CLASS="subsubsection"><A NAME="htoc37">6.1.2</A>&nbsp;&nbsp;Local Router</H4><!--SEC END -->
+<H4><A NAME="htoc37">6.1.2</A>&nbsp;&nbsp;Local Router</H4><!--SEC END -->
 
 
 This module routes packets which have a destination domain equal to
@@ -1315,7 +1304,7 @@ on its content.<BR>
 <BR>
 <!--TOC subsubsection Session Manager-->
 
-<H4 CLASS="subsubsection"><A NAME="htoc38">6.1.3</A>&nbsp;&nbsp;Session Manager</H4><!--SEC END -->
+<H4><A NAME="htoc38">6.1.3</A>&nbsp;&nbsp;Session Manager</H4><!--SEC END -->
 
 
 This module routes packets to local users. It looks up to which user
@@ -1325,7 +1314,7 @@ storage, or bounced back.<BR>
 <BR>
 <!--TOC subsubsection s2s Manager-->
 
-<H4 CLASS="subsubsection"><A NAME="htoc39">6.1.4</A>&nbsp;&nbsp;s2s Manager</H4><!--SEC END -->
+<H4><A NAME="htoc39">6.1.4</A>&nbsp;&nbsp;s2s Manager</H4><!--SEC END -->
 
 
 This module routes packets to other Jabber servers. First, it
@@ -1336,52 +1325,52 @@ serving this connection, otherwise a new connection is opened.<BR>
 <BR>
 <!--TOC subsection Clustering Setup-->
 
-<H3 CLASS="subsection"><A NAME="htoc40">6.2</A>&nbsp;&nbsp;Clustering Setup</H3><!--SEC END -->
+<H3><A NAME="htoc40">6.2</A>&nbsp;&nbsp;Clustering Setup</H3><!--SEC END -->
 
 <A NAME="sec:cluster"></A>
 
 Suppose you already configured <TT>ejabberd</TT> on one machine named (<TT>first</TT>),
 and you need to setup another one to make an <TT>ejabberd</TT> cluster. Then do
 following steps:
-<OL CLASS="enumerate" type=1><LI CLASS="li-enumerate">
+<OL type=1><LI>
 Copy <CODE>~ejabberd/.erlang.cookie</CODE> file from <TT>first</TT> to
  <TT>second</TT>.<BR>
 <BR>
-(alt) You can also add &#8220;<CODE>-cookie content_of_.erlang.cookie</CODE>&#8221;
- option to all &#8220;<TT>erl</TT>&#8221; commands below.<BR>
+(alt) You can also add ``<CODE>-cookie content_of_.erlang.cookie</CODE>''
+ option to all ``<TT>erl</TT>'' commands below.<BR>
 <BR>
-<LI CLASS="li-enumerate">On <TT>second</TT> run as the `<TT>ejabberd</TT>' user in the directory
+<LI>On <TT>second</TT> run as the `<TT>ejabberd</TT>' user in the directory
  where <TT>ejabberd</TT> will work later the following command:
-<PRE CLASS="verbatim">
+<PRE>
 erl -sname ejabberd \
     -mnesia extra_db_nodes "['ejabberd@first']" \
     -s mnesia
 </PRE>
  This will start Mnesia serving the same database as <TT>ejabberd@first</TT>.
- You can check this by running the command &#8220;<CODE>mnesia:info().</CODE>&#8221;. You
+ You can check this by running the command ``<CODE>mnesia:info().</CODE>''. You
  should see a lot of remote tables and a line like the following:
-<PRE CLASS="verbatim">
+<PRE>
 running db nodes   = [ejabberd@first, ejabberd@second]
 </PRE><BR>
 <BR>
-<LI CLASS="li-enumerate">Now run the following in the same &#8220;<TT>erl</TT>&#8221; session:
-<PRE CLASS="verbatim">
+<LI>Now run the following in the same ``<TT>erl</TT>'' session:
+<PRE>
 mnesia:change_table_copy_type(schema, node(), disc_copies).
 </PRE>
  This will create local disc storage for the database.<BR>
 <BR>
-(alt) Change storage type of `<TT>scheme</TT>' table to &#8220;RAM and disc
- copy&#8221; on the second node via the web interface.<BR>
+(alt) Change storage type of `<TT>scheme</TT>' table to ``RAM and disc
+ copy'' on the second node via the web interface.<BR>
 <BR>
-<LI CLASS="li-enumerate">Now you can add replicas of various tables to this node with
- &#8220;<CODE>mnesia:add_table_copy</CODE>&#8221; or
- &#8220;<CODE>mnesia:change_table_copy_type</CODE>&#8221; as above (just replace
- &#8220;<CODE>schema</CODE>&#8221; with another table name and &#8220;<CODE>disc_copies</CODE>&#8221;
- can be replaced with &#8220;<CODE>ram_copies</CODE>&#8221; or
- &#8220;<CODE>disc_only_copies</CODE>&#8221;).<BR>
+<LI>Now you can add replicas of various tables to this node with
+ ``<CODE>mnesia:add_table_copy</CODE>'' or
+ ``<CODE>mnesia:change_table_copy_type</CODE>'' as above (just replace
+ ``<CODE>schema</CODE>'' with another table name and ``<CODE>disc_copies</CODE>''
+ can be replaced with ``<CODE>ram_copies</CODE>'' or
+ ``<CODE>disc_only_copies</CODE>'').<BR>
 <BR>
 Which tables to replicate is very dependant on your needs, you can get
- some hints from the command &#8220;<CODE>mnesia:info().</CODE>&#8221;, by looking at the
+ some hints from the command ``<CODE>mnesia:info().</CODE>'', by looking at the
  size of tables and the default storage type for each table on 'first'.<BR>
 <BR>
 Replicating a table makes lookups in this table faster on this node.
@@ -1393,13 +1382,13 @@ Also <A HREF="http://www.erlang.se/doc/doc-5.4.9/lib/mnesia-4.2.2/doc/html/Mnesi
 <BR>
  (alt) Same as in previous item, but for other tables.<BR>
 <BR>
-<LI CLASS="li-enumerate">Run &#8220;<CODE>init:stop().</CODE>&#8221; or just &#8220;<CODE>q().</CODE>&#8221; to exit from
+<LI>Run ``<CODE>init:stop().</CODE>'' or just ``<CODE>q().</CODE>'' to exit from
  the Erlang shell. This probably can take some time if Mnesia has not yet
  transfered and processed all data it needed from <TT>first</TT>.<BR>
 <BR>
-<LI CLASS="li-enumerate">Now run <TT>ejabberd</TT> on <TT>second</TT> with almost the same config as
- on <TT>first</TT> (you probably don't need to duplicate &#8220;<CODE>acl</CODE>&#8221;
- and &#8220;<CODE>access</CODE>&#8221; options &mdash; they will be taken from
+<LI>Now run <TT>ejabberd</TT> on <TT>second</TT> with almost the same config as
+ on <TT>first</TT> (you probably don't need to duplicate ``<CODE>acl</CODE>''
+ and ``<CODE>access</CODE>'' options --- they will be taken from
  <TT>first</TT>, and <CODE>mod_muc</CODE> and <CODE>mod_irc</CODE> should be
  enabled only on one machine in the cluster).
 </OL>
@@ -1409,13 +1398,13 @@ domain.<BR>
 
 <!--TOC section Built-in Modules-->
 
-<H2 CLASS="section"><A NAME="htoc41">A</A>&nbsp;&nbsp;Built-in Modules</H2><!--SEC END -->
+<H2><A NAME="htoc41">A</A>&nbsp;&nbsp;Built-in Modules</H2><!--SEC END -->
 
 <A NAME="sec:modules"></A>
 
 <!--TOC subsection Overview-->
 
-<H3 CLASS="subsection"><A NAME="htoc42">A.1</A>&nbsp;&nbsp;Overview</H3><!--SEC END -->
+<H3><A NAME="htoc42">A.1</A>&nbsp;&nbsp;Overview</H3><!--SEC END -->
 
 <A NAME="sec:modoverview"></A>
 
@@ -1427,14 +1416,14 @@ that they can contain severe bugs and security leaks. Therefore, use them at
 your own risk!<BR>
 <BR>
 You can see which database backend each module needs by looking at the suffix:
-<UL CLASS="itemize"><LI CLASS="li-itemize">
-&#8220;_ldap&#8221;, this means that the module needs an LDAP server as backend.
-<LI CLASS="li-itemize">&#8220;_odbc&#8221;, this means that the module needs an ODBC compatible database,
+<UL><LI>
+``_ldap'', this means that the module needs an LDAP server as backend.
+<LI>``_odbc'', this means that the module needs an ODBC compatible database,
  a MySQL database, or a PostgreSQL database as backend.
-<LI CLASS="li-itemize">Nothing, this means that the modules uses Erlang's built-in database
+<LI>Nothing, this means that the modules uses Erlang's built-in database
  Mnesia as backend.
 </UL>
-<BLOCKQUOTE CLASS="table"><DIV CLASS="center"><DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV>
+<BLOCKQUOTE><DIV ALIGN=center><DIV ALIGN=center><HR WIDTH="80%" SIZE=2></DIV>
  <TABLE BORDER=1 CELLSPACING=0 CELLPADDING=1>
 <TR><TD ALIGN=left NOWRAP>Module</TD>
 <TD ALIGN=left NOWRAP>Feature</TD>
@@ -1621,13 +1610,13 @@ You can see which database backend each module needs by looking at the suffix:
 <TD ALIGN=left NOWRAP>&nbsp;</TD>
 <TD ALIGN=left NOWRAP>No</TD>
 </TR></TABLE>
-<DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV></DIV></BLOCKQUOTE>
+<DIV ALIGN=center><HR WIDTH="80%" SIZE=2></DIV></DIV></BLOCKQUOTE>
 (*) This module or a similar one with another database backend is needed for
 XMPP compliancy.<BR>
 <BR>
 <!--TOC subsection Common Options-->
 
-<H3 CLASS="subsection"><A NAME="htoc43">A.2</A>&nbsp;&nbsp;Common Options</H3><!--SEC END -->
+<H3><A NAME="htoc43">A.2</A>&nbsp;&nbsp;Common Options</H3><!--SEC END -->
 
 <A NAME="sec:modcommonopts"></A>
 The following options are used by many modules. Therefore, they are described in
@@ -1635,7 +1624,7 @@ this separate section.<BR>
 <BR>
 <!--TOC subsubsection <TT>iqdisc</TT>-->
 
-<H4 CLASS="subsubsection"><A NAME="htoc44">A.2.1</A>&nbsp;&nbsp;<TT>iqdisc</TT></H4><!--SEC END -->
+<H4><A NAME="htoc44">A.2.1</A>&nbsp;&nbsp;<TT>iqdisc</TT></H4><!--SEC END -->
 
 <A NAME="sec:modiqdiscoption"></A>
 
@@ -1643,23 +1632,23 @@ Many modules define handlers for processing IQ queries of different namespaces
 to this server or to a user (e.&nbsp;g. to <TT>example.org</TT> or to
 <TT>user@example.org</TT>). This option defines processing discipline for
 these queries. Possible values are:
-<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
-<B><TT>no_queue</TT></B><DD CLASS="dd-description"> All queries of a namespace with this processing discipline are
+<DL COMPACT=compact><DT>
+<B><TT>no_queue</TT></B><DD> 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.
-<DT CLASS="dt-description"><B><TT>one_queue</TT></B><DD CLASS="dd-description"> In this case a separate queue is created for the processing
+<DT><B><TT>one_queue</TT></B><DD> 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.
-<DT CLASS="dt-description"><B><TT>parallel</TT></B><DD CLASS="dd-description"> For every packet with this discipline a separate Erlang process
+<DT><B><TT>parallel</TT></B><DD> 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).
 </DL>
 Example:
-<PRE CLASS="verbatim">
+<PRE>
   {modules,
    [
     ...
@@ -1669,7 +1658,7 @@ Example:
 </PRE>
 <!--TOC subsubsection <TT>hosts</TT>-->
 
-<H4 CLASS="subsubsection"><A NAME="htoc45">A.2.2</A>&nbsp;&nbsp;<TT>hosts</TT></H4><!--SEC END -->
+<H4><A NAME="htoc45">A.2.2</A>&nbsp;&nbsp;<TT>hosts</TT></H4><!--SEC END -->
 
 <A NAME="sec:modhostsoption"></A>
 
@@ -1677,19 +1666,19 @@ A module acting as a service can have one or more hostnames. These hostnames
 can be defined with the <TT>hosts</TT> option.<BR>
 <BR>
 Examples:
-<UL CLASS="itemize"><LI CLASS="li-itemize">
+<UL><LI>
 Serving the echo module on one domain:
- <UL CLASS="itemize"><LI CLASS="li-itemize">
- <PRE CLASS="verbatim">
+ <UL><LI>
+ <PRE>
   {modules,
    [
     ...
     {mod_echo, [{hosts, ["echo.example.org"]}]},
     ...
    ]}.
-</PRE><LI CLASS="li-itemize">Backwards compatibility with older ejabberd versions can be retained
+</PRE><LI>Backwards compatibility with older ejabberd versions can be retained
  with:
- <PRE CLASS="verbatim">
+ <PRE>
   {modules,
    [
     ...
@@ -1697,8 +1686,8 @@ Serving the echo module on one domain:
     ...
    ]}.
 </PRE></UL>
- <LI CLASS="li-itemize">Serving the echo module on two domains:
- <PRE CLASS="verbatim">
+ <LI>Serving the echo module on two domains:
+ <PRE>
   {modules,
    [
     ...
@@ -1708,7 +1697,7 @@ Serving the echo module on one domain:
 </PRE></UL>
 <!--TOC subsection <TT>mod_announce</TT>-->
 
-<H3 CLASS="subsection"><A NAME="htoc46">A.3</A>&nbsp;&nbsp;<TT>mod_announce</TT></H3><!--SEC END -->
+<H3><A NAME="htoc46">A.3</A>&nbsp;&nbsp;<TT>mod_announce</TT></H3><!--SEC END -->
 
 <A NAME="sec:modannounce"></A>
 
@@ -1718,36 +1707,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
 <TT>example.org</TT>, while the JID between brackets will apply to all virtual
 hosts:
-<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
-<B><TT>example.org/announce/all (example.org/announce/all-hosts/all)</TT></B><DD CLASS="dd-description"> The
+<DL COMPACT=compact><DT>
+<B><TT>example.org/announce/all (example.org/announce/all-hosts/all)</TT></B><DD> 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&nbsp;<A HREF="#sec:modoffline">A.10</A>) is enabled.
-<DT CLASS="dt-description"><B><TT>example.org/announce/online (example.org/announce/all-hosts/online)</TT></B><DD CLASS="dd-description">The
+<DT><B><TT>example.org/announce/online (example.org/announce/all-hosts/online)</TT></B><DD>The
  message is sent to all connected users. If the user is online and connected
  to several resources, all resources will receive the message.
-<DT CLASS="dt-description"><B><TT>example.org/announce/motd (example.org/announce/all-hosts/motd)</TT></B><DD CLASS="dd-description">The
+<DT><B><TT>example.org/announce/motd (example.org/announce/all-hosts/motd)</TT></B><DD>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
  <TT>announce/online</TT>).
-<DT CLASS="dt-description"><B><TT>example.org/announce/motd/update (example.org/announce/all-hosts/motd/update)</TT></B><DD CLASS="dd-description">
+<DT><B><TT>example.org/announce/motd/update (example.org/announce/all-hosts/motd/update)</TT></B><DD>
  The message is set as message of the day (MOTD) and is sent to users when they
  login. The message is <EM>not sent</EM> to any currently connected user.
-<DT CLASS="dt-description"><B><TT>example.org/announce/motd/delete (example.org/announce/all-hosts/motd/delete)</TT></B><DD CLASS="dd-description">
+<DT><B><TT>example.org/announce/motd/delete (example.org/announce/all-hosts/motd/delete)</TT></B><DD>
  Any message sent to this JID removes the existing message of the day (MOTD).
 </DL>
 Options:
-<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
-<B><TT>access</TT></B><DD CLASS="dd-description"> This option specifies who is allowed to
+<DL COMPACT=compact><DT>
+<B><TT>access</TT></B><DD> 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).
 </DL>
 Examples:
-<UL CLASS="itemize"><LI CLASS="li-itemize">
+<UL><LI>
 Only administrators can send announcements:
- <PRE CLASS="verbatim">
+ <PRE>
   {access, announce, [{allow, admins}]}.
 
   {modules,
@@ -1756,8 +1745,8 @@ Only administrators can send announcements:
     {mod_announce, [{access, announce}]},
     ...
    ]}.
-</PRE><LI CLASS="li-itemize">Administrators as well as the direction can send announcements:
- <PRE CLASS="verbatim">
+</PRE><LI>Administrators as well as the direction can send announcements:
+ <PRE>
   {acl, direction, {user, "big_boss", "example.org"}}.
   {acl, direction, {user, "assistant", "example.org"}}.
   {acl, admins, {user, "admin", "example.org"}}.
@@ -1774,7 +1763,7 @@ Only administrators can send announcements:
 </PRE></UL>
 <!--TOC subsection <TT>mod_disco</TT>-->
 
-<H3 CLASS="subsection"><A NAME="htoc47">A.4</A>&nbsp;&nbsp;<TT>mod_disco</TT></H3><!--SEC END -->
+<H3><A NAME="htoc47">A.4</A>&nbsp;&nbsp;<TT>mod_disco</TT></H3><!--SEC END -->
 
 <A NAME="sec:moddisco"></A>
 
@@ -1787,26 +1776,26 @@ the newer Service Discovery protocol if you want them be able to discover
 the services you offer.<BR>
 <BR>
 Options:
-<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
-<B><TT>iqdisc</TT></B><DD CLASS="dd-description"> This specifies 
+<DL COMPACT=compact><DT>
+<B><TT>iqdisc</TT></B><DD> This specifies 
 the processing discipline for Service Discovery (<TT>http://jabber.org/protocol/disco#items</TT> and
  <TT>http://jabber.org/protocol/disco#info</TT>) IQ queries
 (see section&nbsp;<A HREF="#sec:modiqdiscoption">A.2.1</A>).
-<DT CLASS="dt-description"><B><TT>extra_domains</TT></B><DD CLASS="dd-description"> With this option,
+<DT><B><TT>extra_domains</TT></B><DD> With this option,
  extra domains can be added to the Service Discovery item list.
 </DL>
 Examples:
-<UL CLASS="itemize"><LI CLASS="li-itemize">
+<UL><LI>
 To serve a link to the Jabber User Directory on <TT>jabber.org</TT>:
- <PRE CLASS="verbatim">
+ <PRE>
   {modules,
    [
     ...
     {mod_disco, [{extra_domains, ["users.jabber.org"]}]},
     ...
    ]}.
-</PRE><LI CLASS="li-itemize">To serve a link to the transports on another server:
- <PRE CLASS="verbatim">
+</PRE><LI>To serve a link to the transports on another server:
+ <PRE>
   {modules,
    [
     ...
@@ -1814,8 +1803,8 @@ To serve a link to the Jabber User Directory on <TT>jabber.org</TT>:
                                   "msn.example.com"]}]},
     ...
    ]}.
-</PRE><LI CLASS="li-itemize">To serve a link to a few friendly servers:
- <PRE CLASS="verbatim">
+</PRE><LI>To serve a link to a few friendly servers:
+ <PRE>
   {modules,
    [
     ...
@@ -1826,7 +1815,7 @@ To serve a link to the Jabber User Directory on <TT>jabber.org</TT>:
 </PRE></UL>
 <!--TOC subsection <TT>mod_echo</TT>-->
 
-<H3 CLASS="subsection"><A NAME="htoc48">A.5</A>&nbsp;&nbsp;<TT>mod_echo</TT></H3><!--SEC END -->
+<H3><A NAME="htoc48">A.5</A>&nbsp;&nbsp;<TT>mod_echo</TT></H3><!--SEC END -->
 
 <A NAME="sec:modecho"></A>
 
@@ -1835,31 +1824,31 @@ packet back to the sender. This mirror can be of interest for
 <TT>ejabberd</TT> and Jabber client debugging.<BR>
 <BR>
 Options:
-<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
+<DL COMPACT=compact><DT>
 
- <B><TT>hosts</TT></B><DD CLASS="dd-description">  This option defines the hostnames of the
+ <B><TT>hosts</TT></B><DD>  This option defines the hostnames of the
  service (see section&nbsp;<A HREF="#sec:modhostsoption">A.2.2</A>). If neither <TT>hosts</TT> nor
- the old <TT>host</TT> is present, the prefix &#8220;<TT>echo.</TT>&#8221; is added to all
+ the old <TT>host</TT> is present, the prefix ``<TT>echo.</TT>'' is added to all
  <TT>ejabberd</TT> hostnames.
 
 </DL>
 Examples:
-<UL CLASS="itemize"><LI CLASS="li-itemize">
+<UL><LI>
 Mirror, mirror, on the wall, who is the most beautiful
  of them all?
- <PRE CLASS="verbatim">
+ <PRE>
   {modules,
    [
     ...
     {mod_echo, [{hosts, ["mirror.example.org"]}]},
     ...
    ]}.
-</PRE><LI CLASS="li-itemize">If you still do not understand the inner workings of <TT>mod_echo</TT>,
+</PRE><LI>If you still do not understand the inner workings of <TT>mod_echo</TT>,
  you can find a few more examples in section&nbsp;<A HREF="#sec:modhostsoption">A.2.2</A>.
 </UL>
 <!--TOC subsection <TT>mod_irc</TT>-->
 
-<H3 CLASS="subsection"><A NAME="htoc49">A.6</A>&nbsp;&nbsp;<TT>mod_irc</TT></H3><!--SEC END -->
+<H3><A NAME="htoc49">A.6</A>&nbsp;&nbsp;<TT>mod_irc</TT></H3><!--SEC END -->
 
 <A NAME="sec:modirc"></A>
 
@@ -1868,50 +1857,50 @@ servers.<BR>
 <BR>
 End user information:
 
-<UL CLASS="itemize"><LI CLASS="li-itemize">
-A Jabber client with &#8220;groupchat 1.0&#8221; support or Multi-User
+<UL><LI>
+A Jabber client with ``groupchat 1.0'' support or Multi-User
  Chat support (<A HREF="http://www.jabber.org/jeps/jep-0045.html">JEP-0045</A>) is necessary to join IRC channels.
-<LI CLASS="li-itemize">An IRC channel can be joined in nearly the same way as joining a
+<LI>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 &#8220;channel%<TT>irc.example.org</TT>&#8221; in case <TT>irc.example.org</TT> is
- the IRC server hosting &#8220;channel&#8221;. And of course the host should point
+ be ``channel%<TT>irc.example.org</TT>'' in case <TT>irc.example.org</TT> is
+ the IRC server hosting ``channel''. And of course the host should point
  to the IRC transport instead of the Multi-User Chat service.
-<LI CLASS="li-itemize">You can register your nickame by sending &#8220;IDENTIFY password&#8221; to<BR>
+<LI>You can register your nickame by sending ``IDENTIFY password'' to<BR>
 <TT>nickserver!irc.example.org@irc.jabberserver.org</TT>.
-<LI CLASS="li-itemize">Entering your password is possible by sending &#8220;LOGIN nick password&#8221;<BR>
+<LI>Entering your password is possible by sending ``LOGIN nick password''<BR>
 to <TT>nickserver!irc.example.org@irc.jabberserver.org</TT>.
-<LI CLASS="li-itemize">When using a popular Jabber server, it can occur that no
+<LI>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.
 </UL>
 Options:
-<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
+<DL COMPACT=compact><DT>
 
- <B><TT>hosts</TT></B><DD CLASS="dd-description">  This option defines the hostnames of the
+ <B><TT>hosts</TT></B><DD>  This option defines the hostnames of the
  service (see section&nbsp;<A HREF="#sec:modhostsoption">A.2.2</A>). If neither <TT>hosts</TT> nor
- the old <TT>host</TT> is present, the prefix &#8220;<TT>irc.</TT>&#8221; is added to all
+ the old <TT>host</TT> is present, the prefix ``<TT>irc.</TT>'' is added to all
  <TT>ejabberd</TT> hostnames.
 
-<DT CLASS="dt-description"><B><TT>access</TT></B><DD CLASS="dd-description"> This option can be used to specify who
+<DT><B><TT>access</TT></B><DD> This option can be used to specify who
  may use the IRC transport (default value: <TT>all</TT>).
 </DL>
 Examples:
-<UL CLASS="itemize"><LI CLASS="li-itemize">
+<UL><LI>
 In the first example, the IRC transport is available on (all) your
- virtual host(s) with the prefix &#8220;<TT>irc.</TT>&#8221;. Furthermore, anyone is
+ virtual host(s) with the prefix ``<TT>irc.</TT>''. Furthermore, anyone is
  able to use the transport.
- <PRE CLASS="verbatim">
+ <PRE>
   {modules,
    [
     ...
     {mod_irc, [{access, all}]},
     ...
    ]}.
-</PRE><LI CLASS="li-itemize">In next example the IRC transport is available on the two virtual hosts
+</PRE><LI>In next example the IRC transport is available on the two virtual hosts
  <TT>example.net</TT> and <TT>example.com</TT> with different prefixes on each host.
  Moreover, the transport is only accessible by paying customers registered on
  our domains and on other servers.
- <PRE CLASS="verbatim">
+ <PRE>
   {acl, paying_customers, {user, "customer1", "example.net"}}.
   {acl, paying_customers, {user, "customer2", "example.com"}}.
   {acl, paying_customers, {user, "customer3", "example.org"}}.
@@ -1929,7 +1918,7 @@ In the first example, the IRC transport is available on (all) your
 </PRE></UL>
 <!--TOC subsection <TT>mod_last</TT>-->
 
-<H3 CLASS="subsection"><A NAME="htoc50">A.7</A>&nbsp;&nbsp;<TT>mod_last</TT></H3><!--SEC END -->
+<H3><A NAME="htoc50">A.7</A>&nbsp;&nbsp;<TT>mod_last</TT></H3><!--SEC END -->
 
 <A NAME="sec:modlast"></A>
 
@@ -1939,14 +1928,14 @@ connected user was last active on the server, or to query the uptime of the
 <TT>ejabberd</TT> server.<BR>
 <BR>
 Options:
-<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
-<B><TT>iqdisc</TT></B><DD CLASS="dd-description"> This specifies 
+<DL COMPACT=compact><DT>
+<B><TT>iqdisc</TT></B><DD> This specifies 
 the processing discipline for Last activity (<TT>jabber:iq:last</TT>) IQ queries
 (see section&nbsp;<A HREF="#sec:modiqdiscoption">A.2.1</A>).
 </DL>
 <!--TOC subsection <TT>mod_muc</TT>-->
 
-<H3 CLASS="subsection"><A NAME="htoc51">A.8</A>&nbsp;&nbsp;<TT>mod_muc</TT></H3><!--SEC END -->
+<H3><A NAME="htoc51">A.8</A>&nbsp;&nbsp;<TT>mod_muc</TT></H3><!--SEC END -->
 
 <A NAME="sec:modmuc"></A>
 
@@ -1955,34 +1944,34 @@ With this module enabled, your server will support Multi-User Chat
 that this module is not (yet) clusterable.<BR>
 <BR>
 Some of the features of Multi-User Chat:
-<UL CLASS="itemize"><LI CLASS="li-itemize">
+<UL><LI>
 Sending private messages to room participants.
-<LI CLASS="li-itemize">Inviting users.
-<LI CLASS="li-itemize">Setting a conference topic.
-<LI CLASS="li-itemize">Creating password protected rooms.
-<LI CLASS="li-itemize">Kicking and banning participants.
+<LI>Inviting users.
+<LI>Setting a conference topic.
+<LI>Creating password protected rooms.
+<LI>Kicking and banning participants.
 </UL>
 Options:
-<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
+<DL COMPACT=compact><DT>
 
- <B><TT>hosts</TT></B><DD CLASS="dd-description">  This option defines the hostnames of the
+ <B><TT>hosts</TT></B><DD>  This option defines the hostnames of the
  service (see section&nbsp;<A HREF="#sec:modhostsoption">A.2.2</A>). If neither <TT>hosts</TT> nor
- the old <TT>host</TT> is present, the prefix &#8220;<TT>conference.</TT>&#8221; is added to all
+ the old <TT>host</TT> is present, the prefix ``<TT>conference.</TT>'' is added to all
  <TT>ejabberd</TT> hostnames.
 
-<DT CLASS="dt-description"><B><TT>access</TT></B><DD CLASS="dd-description"> You can specify who is allowed to use
+<DT><B><TT>access</TT></B><DD> You can specify who is allowed to use
  the Multi-User Chat service (by default, everyone is allowed to use it).
-<DT CLASS="dt-description"><B><TT>access_create</TT></B><DD CLASS="dd-description"> To configure who is
+<DT><B><TT>access_create</TT></B><DD> 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).
-<DT CLASS="dt-description"><B><TT>access_admin</TT></B><DD CLASS="dd-description"> This option specifies
+<DT><B><TT>access_admin</TT></B><DD> This option specifies
  who is allowed to administrate the Multi-User Chat service (the default
  value is <TT>none</TT>, which means that only the room creator can
  administer his room). By sending a message to the service JID,
  administrators can send service messages that will be displayed in every
  active room.<BR>
 <BR>
-<DT CLASS="dt-description"><B><TT>history_size</TT></B><DD CLASS="dd-description"> a small history of the
+<DT><B><TT>history_size</TT></B><DD> a small history of the
  current discussion is send to users when they enter the room. This option make
  it possible to define the number of history messages to keep and send to the
  user joining the room. The value is a integer. Setting the value to <TT>0</TT>
@@ -1990,17 +1979,17 @@ Options:
  is <TT>20</TT>. This value is global and affects all MUC rooms on the server.
 </DL>
 Examples:
-<UL CLASS="itemize"><LI CLASS="li-itemize">
+<UL><LI>
 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
  <TT>admin@example.org</TT> is allowed to administrate any room. In this
  example he is also a global administrator. When <TT>admin@example.org</TT>
- sends a message such as &#8220;Tomorrow, the Jabber server will be moved
+ sends a message such as ``Tomorrow, the Jabber server will be moved
  to new hardware. This will involve service breakdowns around 23:00 UMT.
- We apologise for this inconvenience.&#8221; to <TT>conference.example.org</TT>,
+ We apologise for this inconvenience.'' to <TT>conference.example.org</TT>,
  it will be displayed in all active rooms. In this example the history
  feature is disabled.
- <PRE CLASS="verbatim">
+ <PRE>
   {acl, admins, {user, "admin", "example.org"}}.
   ...
   {access, muc_admins, [{allow, admins}]}.
@@ -2014,17 +2003,17 @@ In the first example everyone is allowed to use the Multi-User Chat
                {history_size, 0}]},
     ...
    ]}.
-</PRE><LI CLASS="li-itemize">In the second example the Multi-User Chat service is only accessible by
+</PRE><LI>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. When
- <TT>admin@example.org</TT> sends a message such as &#8220;Tomorrow, the Jabber
+ <TT>admin@example.org</TT> sends a message such as ``Tomorrow, the Jabber
  server will be moved to new hardware. This will involve service breakdowns
- around 23:00 UMT. We apologise for this inconvenience.&#8221; to
+ around 23:00 UMT. We apologise for this inconvenience.'' to
  <TT>conference.example.org</TT>, it will be displayed in all active rooms. No
  <TT>history_size</TT> option is used, this means that the feature is enabled
  and the default value of 20 history messages will be send to the users.
- <PRE CLASS="verbatim">
+ <PRE>
   {acl, paying_customers, {user, "customer1", "example.net"}}.
   {acl, paying_customers, {user, "customer2", "example.com"}}.
   {acl, paying_customers, {user, "customer3", "example.org"}}.
@@ -2047,7 +2036,7 @@ In the first example everyone is allowed to use the Multi-User Chat
 </PRE></UL>
 <!--TOC subsection <TT>mod_muc_log</TT>-->
 
-<H3 CLASS="subsection"><A NAME="htoc52">A.9</A>&nbsp;&nbsp;<TT>mod_muc_log</TT></H3><!--SEC END -->
+<H3><A NAME="htoc52">A.9</A>&nbsp;&nbsp;<TT>mod_muc_log</TT></H3><!--SEC END -->
 
 <A NAME="sec:modmuclog"></A>
 
@@ -2056,53 +2045,53 @@ Once you enable this module, join a chatroom with enought privileges using a MUC
 request the configuration form and there you will have an option to enable chatroom logging.<BR>
 <BR>
 Some of the features of generated logs:
-<UL CLASS="itemize"><LI CLASS="li-itemize">
+<UL><LI>
 A lot of information about chatroom is added on top of the page: Room title, JID, subject author, subject and configuration.
-<LI CLASS="li-itemize">Room title and JID are links to join the chatroom (using XMPP-IRI).
-<LI CLASS="li-itemize">Subject and chatroom configuration changes are tracked and displayed.
-<LI CLASS="li-itemize">Joins, leaves, nick changes, kicks, bans and /me are tracked and displayed, including the reason when available.
-<LI CLASS="li-itemize">Generated HTML files are XHTML 1.0 Transitional and CSS compliant.
-<LI CLASS="li-itemize">Timestamps are self-referencing links.
-<LI CLASS="li-itemize">Links on top for quicker navigation: Previous day, Next day, Up.
-<LI CLASS="li-itemize">CSS is used for style definition, and a custom CSS file can be used.
-<LI CLASS="li-itemize">URLs on messages and subjects are converted to hyperlinks.
-<LI CLASS="li-itemize">Timezone used on timestamps is shown on the log files.
-<LI CLASS="li-itemize">A custom link can be added on top of page.
+<LI>Room title and JID are links to join the chatroom (using XMPP-IRI).
+<LI>Subject and chatroom configuration changes are tracked and displayed.
+<LI>Joins, leaves, nick changes, kicks, bans and /me are tracked and displayed, including the reason when available.
+<LI>Generated HTML files are XHTML 1.0 Transitional and CSS compliant.
+<LI>Timestamps are self-referencing links.
+<LI>Links on top for quicker navigation: Previous day, Next day, Up.
+<LI>CSS is used for style definition, and a custom CSS file can be used.
+<LI>URLs on messages and subjects are converted to hyperlinks.
+<LI>Timezone used on timestamps is shown on the log files.
+<LI>A custom link can be added on top of page.
 </UL>
 Options:
-<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
-<B><TT>access_log</TT></B><DD CLASS="dd-description">
+<DL COMPACT=compact><DT>
+<B><TT>access_log</TT></B><DD>
  Restricts which users are allowed to enable or disable chatroom logging using ACL and ACCESS.
  Default: <TT>muc_admin</TT>.
  If you want to allow any chatroom owner put: <TT>muc</TT>.
-<DT CLASS="dt-description"><B><TT>cssfile</TT></B><DD CLASS="dd-description">
+<DT><B><TT>cssfile</TT></B><DD>
  If HTMLs will use a custom CSS file or the embedded one.
  Allowed values:
  <TT>false</TT>: HTMLs will include the standard CSS code;
  <TT>"CSS-URL"</TT>: the URL of the CSS file (for example: "http://example.com/my.css").
  Default: <TT>false</TT>.
-<DT CLASS="dt-description"><B><TT>dirtype</TT></B><DD CLASS="dd-description">
+<DT><B><TT>dirtype</TT></B><DD>
  Type of directory that will be created.
 	Allowed values: 
 		<TT>subdirs</TT>: creates subdirectories for year and month; 
  <TT>plain</TT>: the filename contains the full date, no subdirs.
  Default: <TT>subdirs</TT>.
-<DT CLASS="dt-description"><B><TT>outdir</TT></B><DD CLASS="dd-description">
+<DT><B><TT>outdir</TT></B><DD>
  Full path to the directory where html will be generated.
  Make sure the system user has write access on that directory. 
  Default: <TT>"www/muc"</TT>.
-<DT CLASS="dt-description"><B><TT>timezone</TT></B><DD CLASS="dd-description">
+<DT><B><TT>timezone</TT></B><DD>
  What timezone should be used.
  Allowed values:
 		<TT>local</TT>: use local time, as reported to Erlang by the operating system;
  <TT>universal</TT>: use GMT/UTC time.
  Default: <TT>local</TT>.
-<DT CLASS="dt-description"><B><TT>top_link</TT></B><DD CLASS="dd-description">
+<DT><B><TT>top_link</TT></B><DD>
  Customizable link on top right corner. Syntax of this option: <TT>{"URL", "Text"}</TT>.
  Default: <TT>{"/", "Home"}</TT>.
 </DL>
 Example configuration:
-<PRE CLASS="verbatim">
+<PRE>
   {modules,
    [
     ...
@@ -2119,7 +2108,7 @@ Example configuration:
 </PRE>
 <!--TOC subsection <TT>mod_offline</TT>-->
 
-<H3 CLASS="subsection"><A NAME="htoc53">A.10</A>&nbsp;&nbsp;<TT>mod_offline</TT></H3><!--SEC END -->
+<H3><A NAME="htoc53">A.10</A>&nbsp;&nbsp;<TT>mod_offline</TT></H3><!--SEC END -->
 
 <A NAME="sec:modoffline"></A>
 
@@ -2131,78 +2120,78 @@ online again. Thus it is very similar to how email works. Note that
 <BR>
 <!--TOC subsection <TT>mod_privacy</TT>-->
 
-<H3 CLASS="subsection"><A NAME="htoc54">A.11</A>&nbsp;&nbsp;<TT>mod_privacy</TT></H3><!--SEC END -->
+<H3><A NAME="htoc54">A.11</A>&nbsp;&nbsp;<TT>mod_privacy</TT></H3><!--SEC END -->
 
 <A NAME="sec:modprivacy"></A>
 
 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:
-<BLOCKQUOTE CLASS="quote">
-<UL CLASS="itemize"><LI CLASS="li-itemize">
+<BLOCKQUOTE>
+<UL><LI>
 Retrieving one's privacy lists. 
-<LI CLASS="li-itemize">Adding, removing, and editing one's privacy lists. 
-<LI CLASS="li-itemize">Setting, changing, or declining active lists. 
-<LI CLASS="li-itemize">Setting, changing, or declining the default list (i.e., the list that
+<LI>Adding, removing, and editing one's privacy lists. 
+<LI>Setting, changing, or declining active lists. 
+<LI>Setting, changing, or declining the default list (i.e., the list that
  is active by default). 
-<LI CLASS="li-itemize">Allowing or blocking messages based on JID, group, or subscription type
+<LI>Allowing or blocking messages based on JID, group, or subscription type
  (or globally). 
-<LI CLASS="li-itemize">Allowing or blocking inbound presence notifications based on JID, group,
+<LI>Allowing or blocking inbound presence notifications based on JID, group,
  or subscription type (or globally). 
-<LI CLASS="li-itemize">Allowing or blocking outbound presence notifications based on JID, group,
+<LI>Allowing or blocking outbound presence notifications based on JID, group,
  or subscription type (or globally). 
-<LI CLASS="li-itemize">Allowing or blocking IQ stanzas based on JID, group, or subscription type
+<LI>Allowing or blocking IQ stanzas based on JID, group, or subscription type
  (or globally). 
-<LI CLASS="li-itemize">Allowing or blocking all communications based on JID, group, or
+<LI>Allowing or blocking all communications based on JID, group, or
  subscription type (or globally).
 </UL>
 (from <A HREF="http://www.xmpp.org/specs/rfc3921.html#privacy"><TT>http://www.xmpp.org/specs/rfc3921.html#privacy</TT></A>)
 </BLOCKQUOTE>
 Options:
-<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
-<B><TT>iqdisc</TT></B><DD CLASS="dd-description"> This specifies 
+<DL COMPACT=compact><DT>
+<B><TT>iqdisc</TT></B><DD> This specifies 
 the processing discipline for Blocking Communication (<TT>jabber:iq:privacy</TT>) IQ queries
 (see section&nbsp;<A HREF="#sec:modiqdiscoption">A.2.1</A>).
 </DL>
 <!--TOC subsection <TT>mod_private</TT>-->
 
-<H3 CLASS="subsection"><A NAME="htoc55">A.12</A>&nbsp;&nbsp;<TT>mod_private</TT></H3><!--SEC END -->
+<H3><A NAME="htoc55">A.12</A>&nbsp;&nbsp;<TT>mod_private</TT></H3><!--SEC END -->
 
 <A NAME="sec:modprivate"></A>
 
 This module adds support for Private XML Storage (<A HREF="http://www.jabber.org/jeps/jep-0049.html">JEP-0049</A>):
-<BLOCKQUOTE CLASS="quote">
+<BLOCKQUOTE>
 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 (<A HREF="http://www.jabber.org/jeps/jep-0048.html">JEP-0048</A>).
 </BLOCKQUOTE>
 Options:
-<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
-<B><TT>iqdisc</TT></B><DD CLASS="dd-description"> This specifies 
+<DL COMPACT=compact><DT>
+<B><TT>iqdisc</TT></B><DD> This specifies 
 the processing discipline for Private XML Storage (<TT>jabber:iq:private</TT>) IQ queries
 (see section&nbsp;<A HREF="#sec:modiqdiscoption">A.2.1</A>).
 </DL>
 <!--TOC subsection <TT>mod_pubsub</TT>-->
 
-<H3 CLASS="subsection"><A NAME="htoc56">A.13</A>&nbsp;&nbsp;<TT>mod_pubsub</TT></H3><!--SEC END -->
+<H3><A NAME="htoc56">A.13</A>&nbsp;&nbsp;<TT>mod_pubsub</TT></H3><!--SEC END -->
 
 <A NAME="sec:modpubsub"></A>
 
 This module offers a Publish-Subscribe Service (<A HREF="http://www.jabber.org/jeps/jep-0060.html">JEP-0060</A>).
 Publish-Subscribe can be used to develop (examples are taken from the JEP):
-<BLOCKQUOTE CLASS="quote">
-<UL CLASS="itemize"><LI CLASS="li-itemize">
+<BLOCKQUOTE>
+<UL><LI>
 news feeds and content syndacation,
-<LI CLASS="li-itemize">avatar management,
-<LI CLASS="li-itemize">shared bookmarks,
-<LI CLASS="li-itemize">auction and trading systems,
-<LI CLASS="li-itemize">online catalogs,
-<LI CLASS="li-itemize">workflow systems,
-<LI CLASS="li-itemize">network management systems,
-<LI CLASS="li-itemize">NNTP gateways,
-<LI CLASS="li-itemize">vCard/profile management,
-<LI CLASS="li-itemize">and weblogs.
+<LI>avatar management,
+<LI>shared bookmarks,
+<LI>auction and trading systems,
+<LI>online catalogs,
+<LI>workflow systems,
+<LI>network management systems,
+<LI>NNTP gateways,
+<LI>vCard/profile management,
+<LI>and weblogs.
 </UL>
 </BLOCKQUOTE> 
 
@@ -2212,21 +2201,21 @@ known as ESB, the Enterprise Service Bus). The J-EAI project builts upon
 <TT>ejabberd</TT>'s codebase and has contributed several features to <TT>mod_pubsub</TT>.<BR>
 <BR>
 Options:
-<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
+<DL COMPACT=compact><DT>
 
- <B><TT>hosts</TT></B><DD CLASS="dd-description">  This option defines the hostnames of the
+ <B><TT>hosts</TT></B><DD>  This option defines the hostnames of the
  service (see section&nbsp;<A HREF="#sec:modhostsoption">A.2.2</A>). If neither <TT>hosts</TT> nor
- the old <TT>host</TT> is present, the prefix &#8220;<TT>pubsub.</TT>&#8221; is added to all
+ the old <TT>host</TT> is present, the prefix ``<TT>pubsub.</TT>'' is added to all
  <TT>ejabberd</TT> hostnames.
 
-<DT CLASS="dt-description"><B><TT>served_hosts</TT></B><DD CLASS="dd-description"> To specify which hosts needs to
+<DT><B><TT>served_hosts</TT></B><DD> To specify which hosts needs to
  be served, you can use this option. If absent, only the main <TT>ejabberd</TT>
- host is served. <DT CLASS="dt-description"><B><TT>access_createnode</TT></B><DD CLASS="dd-description"> 
+ host is served. <DT><B><TT>access_createnode</TT></B><DD> 
  Restricts which users are allowed to create pubsub nodes using ACL and ACCESS.
  Default: <TT>pubsub_createnode</TT>.
 </DL>
 Example:
-<PRE CLASS="verbatim">
+<PRE>
   {modules,
    [
     ...
@@ -2238,38 +2227,37 @@ Example:
 </PRE>
 <!--TOC subsection <TT>mod_register</TT>-->
 
-<H3 CLASS="subsection"><A NAME="htoc57">A.14</A>&nbsp;&nbsp;<TT>mod_register</TT></H3><!--SEC END -->
+<H3><A NAME="htoc57">A.14</A>&nbsp;&nbsp;<TT>mod_register</TT></H3><!--SEC END -->
 
 <A NAME="sec:modregister"></A>
 
 This module adds support for In-Band Registration (<A HREF="http://www.jabber.org/jeps/jep-0077.html">JEP-0077</A>). This protocol
 enables end users to use a Jabber client to:
-<UL CLASS="itemize"><LI CLASS="li-itemize">
+<UL><LI>
 Register a new account on the server.
-<LI CLASS="li-itemize">Change the password from an existing account on the server.
-<LI CLASS="li-itemize">Delete an existing account on the server.
+<LI>Change the password from an existing account on the server.
+<LI>Delete an existing account on the server.
 </UL>
 Options:
-<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
-<B><TT>access</TT></B><DD CLASS="dd-description"> This option can be configured to specify
- rules to restrict registration. If a rule returns &#8220;deny&#8221; on the requested
+<DL COMPACT=compact><DT>
+<B><TT>access</TT></B><DD> 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).
-<DT CLASS="dt-description"><B><TT>iqdisc</TT></B><DD CLASS="dd-description"> This specifies 
+<DT><B><TT>iqdisc</TT></B><DD> This specifies 
 the processing discipline for In-Band Registration (<TT>jabber:iq:register</TT>) IQ queries
 (see section&nbsp;<A HREF="#sec:modiqdiscoption">A.2.1</A>).
 </DL>
 Examples:
-<UL CLASS="itemize"><LI CLASS="li-itemize">
-Next example prohibits the registration of too short account names and of
- account names with exotic characters in it:
- <PRE CLASS="verbatim">
+<UL><LI>
+Next example prohibits the registration of too short account names:
+<PRE>
   {acl, shortname, {user_glob, "?"}}.
   {acl, shortname, {user_glob, "??"}}.
-  {acl, strangename, {user_regexp, "^..?$"}}.
+  % The same using regexp:
+  %{acl, shortname, {user_regexp, "^..?$"}}.
   ...
   {access, register, [{deny, shortname},
-                      {deny, strangename},
                       {allow, all}]}.
   ...
   {modules,
@@ -2278,12 +2266,12 @@ Next example prohibits the registration of too short account names and of
     {mod_register, [{access, register}]},
     ...
    ]}.
-</PRE><LI CLASS="li-itemize">The in-band registration of new accounts can be prohibited by changing the
+</PRE><LI>The in-band registration of new accounts can be prohibited by changing the
  <TT>access</TT> 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 <TT>mod_register</TT> from the modules list. In this
  example all In-Band Registration functionality is disabled:
- <PRE CLASS="verbatim">
+ <PRE>
   {access, register, [{deny, all}]}.
 
   {modules,
@@ -2295,21 +2283,21 @@ Next example prohibits the registration of too short account names and of
 </PRE></UL>
 <!--TOC subsection <TT>mod_roster</TT>-->
 
-<H3 CLASS="subsection"><A NAME="htoc58">A.15</A>&nbsp;&nbsp;<TT>mod_roster</TT></H3><!--SEC END -->
+<H3><A NAME="htoc58">A.15</A>&nbsp;&nbsp;<TT>mod_roster</TT></H3><!--SEC END -->
 
 <A NAME="sec:modroster"></A>
 
 This module implements roster management as defined in <A HREF="http://www.xmpp.org/specs/rfc3921.html#roster">RFC 3921: XMPP IM</A>.<BR>
 <BR>
 Options:
-<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
-<B><TT>iqdisc</TT></B><DD CLASS="dd-description"> This specifies 
+<DL COMPACT=compact><DT>
+<B><TT>iqdisc</TT></B><DD> This specifies 
 the processing discipline for Roster Management (<TT>jabber:iq:roster</TT>) IQ queries
 (see section&nbsp;<A HREF="#sec:modiqdiscoption">A.2.1</A>).
 </DL>
 <!--TOC subsection <TT>mod_service_log</TT>-->
 
-<H3 CLASS="subsection"><A NAME="htoc59">A.16</A>&nbsp;&nbsp;<TT>mod_service_log</TT></H3><!--SEC END -->
+<H3><A NAME="htoc59">A.16</A>&nbsp;&nbsp;<TT>mod_service_log</TT></H3><!--SEC END -->
 
 <A NAME="sec:modservicelog"></A>
 
@@ -2320,25 +2308,25 @@ packets are encapsulated in a <CODE>&lt;route/&gt;</CODE> element and sent to th
 service(s).<BR>
 <BR>
 Options:
-<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
-<B><TT>loggers</TT></B><DD CLASS="dd-description"> With this option a (list of) service(s)
+<DL COMPACT=compact><DT>
+<B><TT>loggers</TT></B><DD> With this option a (list of) service(s)
  that will receive the packets can be specified.
 </DL>
 Examples:
-<UL CLASS="itemize"><LI CLASS="li-itemize">
+<UL><LI>
 To log all end user packets to the Bandersnatch service running on
  <TT>bandersnatch.example.com</TT>:
- <PRE CLASS="verbatim">
+ <PRE>
   {modules,
    [
     ...
     {mod_service_log, [{loggers, ["bandersnatch.example.com"]}]},
     ...
    ]}.
-</PRE><LI CLASS="li-itemize">To log all end user packets to the Bandersnatch service running on
+</PRE><LI>To log all end user packets to the Bandersnatch service running on
  <TT>bandersnatch.example.com</TT> and the backup service on 
  <TT>bandersnatch.example.org</TT>:
- <PRE CLASS="verbatim">
+ <PRE>
   {modules,
    [
     ...
@@ -2349,7 +2337,7 @@ To log all end user packets to the Bandersnatch service running on
 </PRE></UL>
 <!--TOC subsection <TT>mod_shared_roster</TT>-->
 
-<H3 CLASS="subsection"><A NAME="htoc60">A.17</A>&nbsp;&nbsp;<TT>mod_shared_roster</TT></H3><!--SEC END -->
+<H3><A NAME="htoc60">A.17</A>&nbsp;&nbsp;<TT>mod_shared_roster</TT></H3><!--SEC END -->
 
 <A NAME="sec:modsharedroster"></A>
 
@@ -2361,21 +2349,21 @@ users from the shared roster groups.<BR>
 <BR>
 Shared roster groups can be edited <EM>only</EM> via the web interface. Each group
 has a unique identification and the following parameters:
-<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
-<B>Name</B><DD CLASS="dd-description"> The name of the group, which will be displayed in the roster.
-<DT CLASS="dt-description"><B>Description</B><DD CLASS="dd-description"> The description of the group. This parameter doesn't affect
+<DL COMPACT=compact><DT>
+<B>Name</B><DD> The name of the group, which will be displayed in the roster.
+<DT><B>Description</B><DD> The description of the group. This parameter doesn't affect
  anything.
-<DT CLASS="dt-description"><B>Members</B><DD CLASS="dd-description"> A list of full JIDs of group members, entered one per line in
+<DT><B>Members</B><DD> A list of full JIDs of group members, entered one per line in
  the web interface.
-<DT CLASS="dt-description"><B>Displayed groups</B><DD CLASS="dd-description"> A list of groups that will be in the rosters of this
+<DT><B>Displayed groups</B><DD> A list of groups that will be in the rosters of this
  group's members.
 </DL>
 Examples:
-<UL CLASS="itemize"><LI CLASS="li-itemize">
+<UL><LI>
 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:
-<BLOCKQUOTE CLASS="table"><DIV CLASS="center"><DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV>
+<BLOCKQUOTE><DIV ALIGN=center><DIV ALIGN=center><HR WIDTH="80%" SIZE=2></DIV>
  <TABLE BORDER=1 CELLSPACING=0 CELLPADDING=1>
 <TR><TD ALIGN=left NOWRAP>Identification</TD>
 <TD ALIGN=left NOWRAP>Group `<TT>club_members</TT>'</TD>
@@ -2398,14 +2386,14 @@ Take the case of a computer club that wants all its members seeing each
 <TR><TD ALIGN=left NOWRAP>Displayed groups</TD>
 <TD ALIGN=left NOWRAP><TT>club_members</TT></TD>
 </TR></TABLE>
-<DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV></DIV></BLOCKQUOTE>
-<LI CLASS="li-itemize">In another case we have a company which has three divisions: Management,
+<DIV ALIGN=center><HR WIDTH="80%" SIZE=2></DIV></DIV></BLOCKQUOTE>
+<LI>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:
-<BLOCKQUOTE CLASS="table"><DIV CLASS="center"><DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV>
+<BLOCKQUOTE><DIV ALIGN=center><DIV ALIGN=center><HR WIDTH="80%" SIZE=2></DIV>
  <TABLE BORDER=1 CELLSPACING=0 CELLPADDING=1>
 <TR><TD ALIGN=left NOWRAP>Identification</TD>
 <TD ALIGN=left NOWRAP>Group `<TT>management</TT>'</TD>
@@ -2472,25 +2460,25 @@ Take the case of a computer club that wants all its members seeing each
 <TR><TD ALIGN=left NOWRAP><TT>sales</TT></TD>
 </TR></TABLE></TD>
 </TR></TABLE>
-<DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV></DIV></BLOCKQUOTE>
+<DIV ALIGN=center><HR WIDTH="80%" SIZE=2></DIV></DIV></BLOCKQUOTE>
 </UL>
 <!--TOC subsection <TT>mod_stats</TT>-->
 
-<H3 CLASS="subsection"><A NAME="htoc61">A.18</A>&nbsp;&nbsp;<TT>mod_stats</TT></H3><!--SEC END -->
+<H3><A NAME="htoc61">A.18</A>&nbsp;&nbsp;<TT>mod_stats</TT></H3><!--SEC END -->
 
 <A NAME="sec:modstats"></A>
 
 This module adds support for Statistics Gathering (<A HREF="http://www.jabber.org/jeps/jep-0039.html">JEP-0039</A>). This protocol
 allows you to retrieve next statistics from your <TT>ejabberd</TT> deployment:
-<UL CLASS="itemize"><LI CLASS="li-itemize">
+<UL><LI>
 Total number of registered users on the current virtual host (users/total).
-<LI CLASS="li-itemize">Total number of registered users on all virtual hosts (users/all-hosts/total).
-<LI CLASS="li-itemize">Total number of online users on the current virtual host (users/online).
-<LI CLASS="li-itemize">Total number of online users on all virtual hosts (users/all-hosts/online).
+<LI>Total number of registered users on all virtual hosts (users/all-hosts/total).
+<LI>Total number of online users on the current virtual host (users/online).
+<LI>Total number of online users on all virtual hosts (users/all-hosts/online).
 </UL>
 Options:
-<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
-<B><TT>iqdisc</TT></B><DD CLASS="dd-description"> This specifies 
+<DL COMPACT=compact><DT>
+<B><TT>iqdisc</TT></B><DD> This specifies 
 the processing discipline for Statistics Gathering (<TT>http://jabber.org/protocol/stats</TT>) IQ queries
 (see section&nbsp;<A HREF="#sec:modiqdiscoption">A.2.1</A>).
 </DL>
@@ -2498,18 +2486,18 @@ As there are only a small amount of clients (for example
 <A HREF="http://tkabber.jabber.ru/">Tkabber</A>) 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:
-<UL CLASS="itemize"><LI CLASS="li-itemize">
+<UL><LI>
 You can request the number of online users on the current virtual host
  (<TT>example.org</TT>) by sending:
- <PRE CLASS="verbatim">
+ <PRE>
 &lt;iq to='example.org' type='get'&gt;
   &lt;query xmlns='http://jabber.org/protocol/stats'&gt;
     &lt;stat name='users/online'/&gt;
   &lt;/query&gt;
 &lt;/iq&gt;
-</PRE><LI CLASS="li-itemize">You can request the total number of registered users on all virtual hosts
+</PRE><LI>You can request the total number of registered users on all virtual hosts
  by sending:
- <PRE CLASS="verbatim">
+ <PRE>
 &lt;iq to='example.org' type='get'&gt;
   &lt;query xmlns='http://jabber.org/protocol/stats'&gt;
     &lt;stat name='users/all-hosts/total'/&gt;
@@ -2518,7 +2506,7 @@ You can request the number of online users on the current virtual host
 </PRE></UL>
 <!--TOC subsection <TT>mod_time</TT>-->
 
-<H3 CLASS="subsection"><A NAME="htoc62">A.19</A>&nbsp;&nbsp;<TT>mod_time</TT></H3><!--SEC END -->
+<H3><A NAME="htoc62">A.19</A>&nbsp;&nbsp;<TT>mod_time</TT></H3><!--SEC END -->
 
 <A NAME="sec:modtime"></A>
 
@@ -2526,14 +2514,14 @@ This module features support for Entity Time (<A HREF="http://www.jabber.org/jep
 you are able to discover the time at another entity's location.<BR>
 <BR>
 Options:
-<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
-<B><TT>iqdisc</TT></B><DD CLASS="dd-description"> This specifies 
+<DL COMPACT=compact><DT>
+<B><TT>iqdisc</TT></B><DD> This specifies 
 the processing discipline for Entity Time (<TT>jabber:iq:time</TT>) IQ queries
 (see section&nbsp;<A HREF="#sec:modiqdiscoption">A.2.1</A>).
 </DL>
 <!--TOC subsection <TT>mod_vcard</TT>-->
 
-<H3 CLASS="subsection"><A NAME="htoc63">A.20</A>&nbsp;&nbsp;<TT>mod_vcard</TT></H3><!--SEC END -->
+<H3><A NAME="htoc63">A.20</A>&nbsp;&nbsp;<TT>mod_vcard</TT></H3><!--SEC END -->
 
 <A NAME="sec:modvcard"></A>
 
@@ -2543,39 +2531,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.<BR>
 <BR>
 Options:
-<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
+<DL COMPACT=compact><DT>
 
- <B><TT>hosts</TT></B><DD CLASS="dd-description">  This option defines the hostnames of the
+ <B><TT>hosts</TT></B><DD>  This option defines the hostnames of the
  service (see section&nbsp;<A HREF="#sec:modhostsoption">A.2.2</A>). If neither <TT>hosts</TT> nor
- the old <TT>host</TT> is present, the prefix &#8220;<TT>vjud.</TT>&#8221; is added to all
+ the old <TT>host</TT> is present, the prefix ``<TT>vjud.</TT>'' is added to all
  <TT>ejabberd</TT> hostnames.
 
-<DT CLASS="dt-description"><B><TT>iqdisc</TT></B><DD CLASS="dd-description"> This specifies 
+<DT><B><TT>iqdisc</TT></B><DD> This specifies 
 the processing discipline for <TT>vcard-temp</TT> IQ queries
 (see section&nbsp;<A HREF="#sec:modiqdiscoption">A.2.1</A>).
-<DT CLASS="dt-description"><B><TT>search</TT></B><DD CLASS="dd-description"> This option specifies whether the search
+<DT><B><TT>search</TT></B><DD> This option specifies whether the search
  functionality is enabled (value: <TT>true</TT>) or disabled
  (value: <TT>false</TT>). If disabled, the option <TT>hosts</TT> will be
  ignored and the Jabber User Directory service will not appear in the
  Service Discovery item list. The default value is <TT>true</TT>.
-<DT CLASS="dt-description"><B><TT>matches</TT></B><DD CLASS="dd-description"> With this option, the number of reported
+<DT><B><TT>matches</TT></B><DD> With this option, the number of reported
  search results can be limited. If the option's value is set to <TT>infinity</TT>,
  all search results are reported. The default value is <TT>30</TT>.
-<DT CLASS="dt-description"><B><TT>allow_return_all</TT></B><DD CLASS="dd-description"> This option enables
+<DT><B><TT>allow_return_all</TT></B><DD> 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
  <TT>false</TT>.
-<DT CLASS="dt-description"><B><TT>search_all_hosts</TT></B><DD CLASS="dd-description"> If this option is
+<DT><B><TT>search_all_hosts</TT></B><DD> If this option is
  set to <TT>true</TT>, search operations will apply to all virtual hosts.
  Otherwise only the current host will be searched. The default value is
  <TT>true</TT>.
 </DL>
 Examples:
-<UL CLASS="itemize"><LI CLASS="li-itemize">
+<UL><LI>
 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:
- <PRE CLASS="verbatim">
+ <PRE>
   {modules,
    [
     ...
@@ -2585,9 +2573,9 @@ In this first situation, search results are limited to twenty items,
                  {search_all_hosts, false}]},
     ...
    ]}.
-</PRE><LI CLASS="li-itemize">The second situation differs in a way that search results are not limited,
+</PRE><LI>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:
- <PRE CLASS="verbatim">
+ <PRE>
   {modules,
    [
     ...
@@ -2597,9 +2585,338 @@ In this first situation, search results are limited to twenty items,
     ...
    ]}.
 </PRE></UL>
+<!--TOC subsection LDAP and <TT>mod_vcard_ldap</TT>-->
+
+<H3><A NAME="htoc64">A.21</A>&nbsp;&nbsp;LDAP and <TT>mod_vcard_ldap</TT></H3><!--SEC END -->
+
+<A NAME="sec:ldap"></A>
+
+<!--TOC subsubsection Features-->
+
+<H4><A NAME="htoc65">A.21.1</A>&nbsp;&nbsp;Features</H4><!--SEC END -->
+
+<A NAME="sec:ldapfeatures"></A>
+<TT>ejabberd</TT> has built-in LDAP support. You can authenticate users against LDAP
+server and use LDAP directory as vCard storage. Shared rosters are not
+supported yet.<BR>
+<BR>
+<!--TOC subsubsection Connection-->
+
+<H4><A NAME="htoc66">A.21.2</A>&nbsp;&nbsp;Connection</H4><!--SEC END -->
+
+<A NAME="sec:ldapconnection"></A>
+Parameters:
+<DL COMPACT=compact><DT>
+<B><TT>ldap_server</TT></B><DD> IP address or dns name of your
+LDAP server. This option is required.
+<DT><B><TT>ldap_port</TT></B><DD> Port to connect to LDAP server.
+Default is&nbsp;389.
+<DT><B><TT>ldap_rootdn</TT></B><DD> Bind DN. Default is&nbsp;<TT>""</TT>
+which means anonymous connection.
+<DT><B><TT>ldap_password</TT></B><DD> Bind password. Default
+is&nbsp;<TT>""</TT>.
+</DL>
+Example:
+<PRE>
+  {auth_method, ldap}.
+  {ldap_servers, ["ldap.mydomain.org"]}.
+  {ldap_port, 389}.
+  {ldap_rootdn, "cn=Manager,dc=domain,dc=org"}.
+  {ldap_password, "secret"}.
+</PRE>
+Note that current LDAP implementation doesn't support SSL connection and SASL
+authentication.<BR>
+<BR>
+<!--TOC subsubsection Authentication-->
+
+<H4><A NAME="htoc67">A.21.3</A>&nbsp;&nbsp;Authentication</H4><!--SEC END -->
+
+<A NAME="sec:ldapauthentication"></A>
+You can authenticate users against LDAP directory. Available parameters are
+listed below:
+<DL COMPACT=compact><DT>
+<B><TT>ldap_base</TT></B><DD> LDAP base directory which stores users
+accounts. This option is required.
+<DT><B><TT>ldap_uidattr</TT></B><DD> LDAP attribute which holds
+user's part of JID. Default is <TT>"uid"</TT>.
+<DT><B><TT>ldap_uidattr_format</TT></B><DD> Format of the
+<TT>ldap_uidattr</TT> variable. Format MUST contain one and only one pattern
+variable <TT>"%u"</TT> which will be replaced by user's part of JID. For example,
+<TT>"%u@mydomain.org"</TT>. Default value is <TT>"%u"</TT>.
+<DT><B><TT>ldap_filter</TT></B><DD> RFC 2254 LDAP filter. Default is
+<TT>none</TT>. Example: <TT>"(&amp;(objectClass=shadowAccount)(memberOf=Jabber
+ Users))"</TT>. Please, don't forget closing brackets and don't use superfluous
+whitespaces. Also you MUST NOT use <TT>ldap_uidattr</TT> attribute in filter
+because this attribute will be substituted in LDAP filter automatically.
+</DL>
+<!--TOC subsubsection vCards and Search-->
+
+<H4><A NAME="htoc68">A.21.4</A>&nbsp;&nbsp;vCards and Search</H4><!--SEC END -->
+
+<A NAME="sec:modvcardldap"></A>
+<TT>ejabberd</TT> can map LDAP attributes to vCard fields. This behaviour is
+implemented in <TT>mod_vcard_ldap</TT> module. This module doesn't depend on
+authentication method. <TT>mod_vcard_ldap</TT> module has it's own optional
+parameters. The first group of parameters has the same meaning as top-level
+LDAP parameters: <TT>ldap_servers</TT>, <TT>ldap_port</TT>,
+<TT>ldap_rootdn</TT>, <TT>ldap_password</TT>, <TT>ldap_base</TT>,
+<TT>ldap_uidattr</TT>, <TT>ldap_uidattr_format</TT> and
+<TT>ldap_filter</TT>. If one of this option is not set <TT>ejabberd</TT> will look
+for top-level option with the same name. The second group of parameters
+consists of the following options:
+<DL COMPACT=compact><DT>
+
+ <B><TT>hosts</TT></B><DD>  This option defines the hostnames of the
+ service (see section&nbsp;<A HREF="#sec:modhostsoption">A.2.2</A>). If neither <TT>hosts</TT> nor
+ the old <TT>host</TT> is present, the prefix ``<TT>vjud.</TT>'' is added to all
+ <TT>ejabberd</TT> hostnames.
+
+<DT><B><TT>iqdisc</TT></B><DD> This specifies 
+the processing discipline for <TT>vcard-temp</TT> IQ queries
+(see section&nbsp;<A HREF="#sec:modiqdiscoption">A.2.1</A>).
+<DT><B><TT>search</TT></B><DD> This option specifies whether the search
+ functionality is enabled (value: <TT>true</TT>) or disabled
+ (value: <TT>false</TT>). If disabled, the option <TT>hosts</TT> will be
+ ignored and the Jabber User Directory service will not appear in the
+ Service Discovery item list. The default value is <TT>true</TT>.
+<DT><B><TT>ldap_vcard_map</TT></B><DD> the table which defines
+reflection of LDAP attributes to vCard fields.
+	Format is:
+		<TT>[Name_of_vcard_field, Pattern, List_of_LDAP_attributes, ...]</TT>
+	where
+		<TT>Name_of_vcard_field</TT> is the type name of vCard as defined
+ in RFC 2426,
+		Pattern is a string which contains pattern variables <TT>"%u"</TT>, <TT>"%d"</TT> or <TT>"%s"</TT>,
+		<TT>List_of_LDAP_attributes</TT> is the list which contains of LDAP attributes.
+	Pattern variables <TT>"%s"</TT> will be sequentially replaced with the values of
+	LDAP attributes from <TT>List_of_LDAP_attributes</TT>; <TT>"%u"</TT> will be replaced with
+	user's part of JID and <TT>"%d"</TT> will be replaced with domain part of JID.
+	Example:
+<PRE>
+  {ldap_vcard_map,
+   [{"NICKNAME", "%u", []},
+    {"FN", "%s", ["displayName"]},
+    {"CTRY", "Russia", []},
+    {"EMAIL", "%u@%d", []},
+    {"DESC", "%s\n%s", ["title", "description"]}
+   ]},
+</PRE>
+Default is:
+<PRE>
+  [{"NICKNAME", "%u", []},
+   {"FN", "%s", ["displayName"]},
+   {"FAMILY", "%s", ["sn"]},
+   {"GIVEN", "%s", ["givenName"]},
+   {"MIDDLE", "%s", ["initials"]},
+   {"ORGNAME", "%s", ["o"]},
+   {"ORGUNIT", "%s", ["ou"]},
+   {"CTRY", "%s", ["c"]},
+   {"LOCALITY", "%s", ["l"]},
+   {"STREET", "%s", ["street"]},
+   {"REGION", "%s", ["st"]},
+   {"PCODE", "%s", ["postalCode"]},
+   {"TITLE", "%s", ["title"]},
+   {"URL", "%s", ["labeleduri"]},
+   {"DESC", "%s", ["description"]},
+   {"TEL", "%s", ["telephoneNumber"]},
+   {"EMAIL", "%s", ["mail"]},
+   {"BDAY", "%s", ["birthDay"]},
+   {"ROLE", "%s", ["employeeType"]},
+   {"PHOTO", "%s", ["jpegPhoto"]}]
+</PRE><DT><B><TT>ldap_search_fields</TT></B><DD> This option defines
+search form and LDAP attributes to search.
+	Format:
+		<TT>[Name, Attribute, ...]</TT>
+	where
+		<TT>Name</TT> is the name of field in the search form. Will be automatically
+			translated according to definitions in translation files (see
+			<TT>msgs/*.msg</TT> for available words).
+		Attribute is the LDAP attribute or the pattern <TT>"%u"</TT>
+ Example:
+<PRE>
+  {ldap_search_fields,
+   [{"User", "uid"},
+    {"Full Name", "displayName"},
+    {"Email", "mail"}
+   ]},
+</PRE>
+Default is:
+<PRE>
+  [{"User", "%u"},
+   {"Full Name", "displayName"},
+   {"Given Name", "givenName"},
+   {"Middle Name", "initials"},
+   {"Family Name", "sn"},
+   {"Nickname", "%u"},
+   {"Birthday", "birthDay"},
+   {"Country", "c"},
+   {"City", "l"},
+   {"Email", "mail"},
+   {"Organization Name", "o"},
+   {"Organization Unit", "ou"}]
+</PRE><DT><B><TT>ldap_search_reported</TT></B><DD> This option defines search fields to be reported.
+	Format:
+		<TT>[Name, VCard_Name, ...]</TT>
+	where
+		<TT>Name</TT> is the name of field in the search form. Will be automatically
+			translated according to definitions in translation files (see
+			<TT>msgs/*.msg</TT> for available words).
+		<TT>VCard_Name</TT> is the name of vCard field defined in <TT>ldap_vcard_map</TT> option.
+ Example:
+<PRE>
+  {ldap_search_reported,
+   [{"Full Name", "FN"},
+    {"Email", "EMAIL"},
+    {"Birthday", "BDAY"},
+    {"Nickname", "NICKNAME"}
+   ]},
+</PRE>
+Default is:
+<PRE>
+  [{"Full Name", "FN"},
+   {"Given Name", "GIVEN"},
+   {"Middle Name", "MIDDLE"},
+   {"Family Name", "FAMILY"},
+   {"Nickname", "NICKNAME"},
+   {"Birthday", "BDAY"},
+   {"Country", "CTRY"},
+   {"City", "LOCALITY"},
+   {"Email", "EMAIL"},
+   {"Organization Name", "ORGNAME"},
+   {"Organization Unit", "ORGUNIT"}]
+</PRE></DL>
+<!--TOC subsubsection Examples-->
+
+<H4><A NAME="htoc69">A.21.5</A>&nbsp;&nbsp;Examples</H4><!--SEC END -->
+
+<A NAME="sec:ldapexamples"></A>
+<!--TOC paragraph Common example-->
+
+<H5>Common example</H5><!--SEC END -->
+
+Let's say <TT>ldap.mydomain.org</TT> is the name of our LDAP server. We have
+users with their passwords in <TT>"ou=Users,dc=mydomain,dc=org"</TT> directory.
+Also we have addressbook, which contains users emails and their additional
+infos in <TT>"ou=AddressBook,dc=mydomain,dc=org"</TT> directory. Corresponding
+authentication section should looks like this:
+<PRE>
+  %% authentication method
+  {auth_method, ldap}.
+  %% DNS name of our LDAP server
+  {ldap_servers, ["ldap.mydomain.org"]}.
+  %% Bind to LDAP server as "cn=Manager,dc=mydomain,dc=org" with password "secret"
+  {ldap_rootdn, "cn=Manager,dc=mydomain,dc=org"}.
+  {ldap_password, "secret"}.
+  %% define the user's base
+  {ldap_base, "ou=Users,dc=mydomain,dc=org"}.
+  %% We want to authorize users from 'shadowAccount' object class only
+  {ldap_filter, "(objectClass=shadowAccount)"}.
+</PRE>
+Now we want to use users LDAP-info as their vCards. We have four attributes
+defined in our LDAP schema: <TT>"mail"</TT> --- email address, <TT>"givenName"</TT>
+--- first name, <TT>"sn"</TT> --- second name, <TT>"birthDay"</TT> --- birthday.
+Also we want users to search each other. Let's see how we can set it up:
+<PRE>
+  {modules,
+    ...
+    {mod_vcard_ldap,
+     [
+      %% We use the same server and port, but want to bind anonymously because
+      %% our LDAP server accepts anonymous requests to
+      %% "ou=AddressBook,dc=mydomain,dc=org" subtree.
+      {ldap_rootdn, ""},
+      {ldap_password, ""},
+      %% define the addressbook's base
+      {ldap_base, "ou=AddressBook,dc=mydomain,dc=org"},
+      %% user's part of JID is located in the "mail" attribute
+      {ldap_uidattr, "mail"},
+      %% common format for our emails
+      {ldap_uidattr_format, "%u@mail.mydomain.org"},
+      %% We have to define empty filter here, because entries in addressbook doesn't
+      %% belong to shadowAccount object class
+      {ldap_filter, ""},
+      %% Now we want to define vCard pattern
+      {ldap_vcard_map,
+       [{"NICKNAME", "%u", []}, % just use user's part of JID as his nickname
+        {"GIVEN", "%s", ["givenName"]},
+        {"FAMILY", "%s", ["sn"]},
+        {"FN", "%s, %s", ["sn", "givenName"]}, % example: "Smith, John"
+        {"EMAIL", "%s", ["mail"]},
+        {"BDAY", "%s", ["birthDay"]}]},
+      %% Search form
+      {ldap_search_fields,
+       [{"User", "%u"},
+        {"Name", "givenName"},
+        {"Family Name", "sn"},
+        {"Email", "mail"},
+        {"Birthday", "birthDay"}]},
+      %% vCard fields to be reported
+      %% Note that JID is always returned with search results
+      {ldap_search_reported,
+       [{"Full Name", "FN"},
+        {"Nickname", "NICKNAME"},
+        {"Birthday", "BDAY"}]}
+    ]}
+    ...
+  }.
+</PRE>
+Note that <TT>mod_vcard_ldap</TT> module checks an existence of the user before
+searching his info in LDAP.<BR>
+<BR>
+<!--TOC paragraph Active Directory-->
+
+<H5>Active Directory</H5><!--SEC END -->
+
+Active Directory is just an LDAP-server with predefined attributes. Sample
+config file is listed below:
+<PRE>
+  {auth_method, ldap}.
+  {ldap_servers, ["office.org"]}.    % List of LDAP servers
+  {ldap_base, "DC=office,DC=org"}. % Search base of LDAP directory
+  {ldap_rootdn, "CN=Administrator,CN=Users,DC=office,DC=org"}. % LDAP manager
+  {ldap_password, "*******"}. % Password to LDAP manager
+  {ldap_uidattr, "sAMAccountName"}.
+  {ldap_filter, "(memberOf=*)"}.
+  
+  {mod_vcard_ldap,
+   [{ldap_vcard_map,
+     [{"NICKNAME", "%u", []},
+      {"GIVEN", "%s", ["givenName"]},
+      {"MIDDLE", "%s", ["initials"]},
+      {"FAMILY", "%s", ["sn"]},
+      {"FN", "%s", ["displayName"]},
+      {"EMAIL", "%s", ["mail"]},
+      {"ORGNAME", "%s", ["company"]},
+      {"ORGUNIT", "%s", ["department"]},
+      {"CTRY", "%s", ["c"]},
+      {"LOCALITY", "%s", ["l"]},
+      {"STREET", "%s", ["streetAddress"]},
+      {"REGION", "%s", ["st"]},
+      {"PCODE", "%s", ["postalCode"]},
+      {"TITLE", "%s", ["title"]},
+      {"URL", "%s", ["wWWHomePage"]},
+      {"DESC", "%s", ["description"]},
+      {"TEL", "%s", ["telephoneNumber"]}]},
+    {ldap_search_fields,
+     [{"User", "%u"},
+      {"Name", "givenName"},
+      {"Family Name", "sn"},
+      {"Email", "mail"},
+      {"Company", "company"},
+      {"Department", "department"},
+      {"Role", "title"},
+      {"Description", "description"},
+      {"Phone", "telephoneNumber"}]},
+    {ldap_search_reported,
+     [{"Full Name", "FN"},
+      {"Nickname", "NICKNAME"},
+      {"Email", "EMAIL"}]}
+   ]
+  }.
+</PRE>
 <!--TOC subsection <TT>mod_version</TT>-->
 
-<H3 CLASS="subsection"><A NAME="htoc64">A.21</A>&nbsp;&nbsp;<TT>mod_version</TT></H3><!--SEC END -->
+<H3><A NAME="htoc70">A.22</A>&nbsp;&nbsp;<TT>mod_version</TT></H3><!--SEC END -->
 
 <A NAME="sec:modversion"></A>
 
@@ -2607,20 +2924,20 @@ This module implements Software Version (<A HREF="http://www.jabber.org/jeps/jep
 answers <TT>ejabberd</TT>'s version when queried.<BR>
 <BR>
 Options:
-<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
-<B><TT>iqdisc</TT></B><DD CLASS="dd-description"> This specifies 
+<DL COMPACT=compact><DT>
+<B><TT>iqdisc</TT></B><DD> This specifies 
 the processing discipline for Software Version (<TT>jabber:iq:version</TT>) IQ queries
 (see section&nbsp;<A HREF="#sec:modiqdiscoption">A.2.1</A>).
 </DL>
 <!--TOC section Internationalization and Localization-->
 
-<H2 CLASS="section"><A NAME="htoc65">B</A>&nbsp;&nbsp;Internationalization and Localization</H2><!--SEC END -->
+<H2><A NAME="htoc71">B</A>&nbsp;&nbsp;Internationalization and Localization</H2><!--SEC END -->
 
 <A NAME="sec:i18nl10n"></A>
 
 All built-in modules support the <TT>xml:lang</TT> attribute inside IQ queries.
 Figure&nbsp;<A HREF="#fig:discorus">2</A>, for example, shows the reply to the following query:
-<PRE CLASS="verbatim">
+<PRE>
   &lt;iq id='5'
       to='example.org'
       type='get'
@@ -2628,44 +2945,40 @@ Figure&nbsp;<A HREF="#fig:discorus">2</A>, for example, shows the reply to the f
     &lt;query xmlns='http://jabber.org/protocol/disco#items'/&gt;
   &lt;/iq&gt;
 </PRE>
-<BLOCKQUOTE CLASS="figure"><DIV CLASS="center"><DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV>
+<BLOCKQUOTE><DIV ALIGN=center><DIV ALIGN=center><HR WIDTH="80%" SIZE=2></DIV>
  
  <IMG SRC="discorus.png">
  
 
  <BR>
-<BR>
-<DIV CLASS="center">Figure 2: Service Discovery when <TT>xml:lang='ru'</TT></DIV><BR>
-<BR>
+<DIV ALIGN=center>Figure 2: Service Discovery when <TT>xml:lang='ru'</TT></DIV><BR>
 
  <A NAME="fig:discorus"></A>
-<DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV></DIV></BLOCKQUOTE>
+<DIV ALIGN=center><HR WIDTH="80%" SIZE=2></DIV></DIV></BLOCKQUOTE>
 The web interface also supports the <CODE>Accept-Language</CODE> HTTP header (compare
 figure&nbsp;<A HREF="#fig:webadmmainru">3</A> with figure&nbsp;<A HREF="#fig:webadmmain">1</A>)
-<BLOCKQUOTE CLASS="figure"><DIV CLASS="center"><DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV>
+<BLOCKQUOTE><DIV ALIGN=center><DIV ALIGN=center><HR WIDTH="80%" SIZE=2></DIV>
  
  <IMG SRC="webadmmainru.png">
  
 
  <BR>
-<BR>
-<DIV CLASS="center">Figure 3: Top page from the web interface with HTTP header
- &#8220;Accept-Language: ru&#8221;</DIV><BR>
-<BR>
+<DIV ALIGN=center>Figure 3: Top page from the web interface with HTTP header
+ ``Accept-Language: ru''</DIV><BR>
 
  <A NAME="fig:webadmmainru"></A>
-<DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV></DIV></BLOCKQUOTE>
+<DIV ALIGN=center><HR WIDTH="80%" SIZE=2></DIV></DIV></BLOCKQUOTE>
 <!--TOC section Release Notes-->
 
-<H2 CLASS="section"><A NAME="htoc66">C</A>&nbsp;&nbsp;Release Notes</H2><!--SEC END -->
+<H2><A NAME="htoc72">C</A>&nbsp;&nbsp;Release Notes</H2><!--SEC END -->
 
 <A NAME="sec:releasenotes"></A>
 
 <!--TOC subsection ejabberd 0.9-->
 
-<H3 CLASS="subsection"><A NAME="htoc67">C.1</A>&nbsp;&nbsp;ejabberd 0.9</H3><!--SEC END -->
+<H3><A NAME="htoc73">C.1</A>&nbsp;&nbsp;ejabberd 0.9</H3><!--SEC END -->
 
-<PRE CLASS="verbatim">
+<PRE>
        Release notes
         ejabberd 0.9
 
@@ -2757,9 +3070,9 @@ Bugfixes
 </PRE>
 <!--TOC subsection ejabberd 0.9.1-->
 
-<H3 CLASS="subsection"><A NAME="htoc68">C.2</A>&nbsp;&nbsp;ejabberd 0.9.1</H3><!--SEC END -->
+<H3><A NAME="htoc74">C.2</A>&nbsp;&nbsp;ejabberd 0.9.1</H3><!--SEC END -->
 
-<PRE CLASS="verbatim">
+<PRE>
        Release notes
        ejabberd 0.9.1
 
@@ -2825,9 +3138,9 @@ Bugfixes
 </PRE>
 <!--TOC subsection ejabberd 0.9.8-->
 
-<H3 CLASS="subsection"><A NAME="htoc69">C.3</A>&nbsp;&nbsp;ejabberd 0.9.8</H3><!--SEC END -->
+<H3><A NAME="htoc75">C.3</A>&nbsp;&nbsp;ejabberd 0.9.8</H3><!--SEC END -->
 
-<PRE CLASS="verbatim">
+<PRE>
        Release notes
        ejabberd 0.9.8
          2005-08-01
@@ -2930,9 +3243,9 @@ END
 </PRE>
 <!--TOC subsection ejabberd 1.0.0-->
 
-<H3 CLASS="subsection"><A NAME="htoc70">C.4</A>&nbsp;&nbsp;ejabberd 1.0.0</H3><!--SEC END -->
+<H3><A NAME="htoc76">C.4</A>&nbsp;&nbsp;ejabberd 1.0.0</H3><!--SEC END -->
 
-<PRE CLASS="verbatim">
+<PRE>
        Release Notes
        ejabberd 1.0.0
        14 December 2005
@@ -3056,9 +3369,9 @@ END
 </PRE>
 <!--TOC subsection ejabberd 1.1.0-->
 
-<H3 CLASS="subsection"><A NAME="htoc71">C.5</A>&nbsp;&nbsp;ejabberd 1.1.0</H3><!--SEC END -->
+<H3><A NAME="htoc77">C.5</A>&nbsp;&nbsp;ejabberd 1.1.0</H3><!--SEC END -->
 
-<PRE CLASS="verbatim">
+<PRE>
     Release Notes
     ejabberd 1.1.0
     24 April 2006
@@ -3177,9 +3490,9 @@ END
 </PRE>
 <!--TOC subsection ejabberd 1.1.1-->
 
-<H3 CLASS="subsection"><A NAME="htoc72">C.6</A>&nbsp;&nbsp;ejabberd 1.1.1</H3><!--SEC END -->
+<H3><A NAME="htoc78">C.6</A>&nbsp;&nbsp;ejabberd 1.1.1</H3><!--SEC END -->
 
-<PRE CLASS="verbatim">
+<PRE>
     Release Notes
     ejabberd 1.1.1 
     28 April 2006
@@ -3302,23 +3615,26 @@ END
 </PRE>
 <!--TOC section Acknowledgements-->
 
-<H2 CLASS="section"><A NAME="htoc73">D</A>&nbsp;&nbsp;Acknowledgements</H2><!--SEC END -->
+<H2><A NAME="htoc79">D</A>&nbsp;&nbsp;Acknowledgements</H2><!--SEC END -->
 
 <A NAME="sec:acknowledgements"></A>
 
 Thanks to all people who contributed to this guide:
-<UL CLASS="itemize"><LI CLASS="li-itemize">
+<UL><LI>
 Alexey Shchepin (<A HREF="xmpp:aleksey@jabber.ru"><TT>xmpp:aleksey@jabber.ru</TT></A>)
-<LI CLASS="li-itemize">Florian Zumbiehl (<A HREF="xmpp:florz@florz.de"><TT>xmpp:florz@florz.de</TT></A>)
-<LI CLASS="li-itemize">Michael Grigutsch (<A HREF="xmpp:migri@jabber.i-pobox.net"><TT>xmpp:migri@jabber.i-pobox.net</TT></A>)
-<LI CLASS="li-itemize">Mickael Remond (<A HREF="xmpp:mremond@erlang-projects.org"><TT>xmpp:mremond@erlang-projects.org</TT></A>)
-<LI CLASS="li-itemize">Sander Devrieze (<A HREF="xmpp:sander@devrieze.dyndns.org"><TT>xmpp:sander@devrieze.dyndns.org</TT></A>)
-<LI CLASS="li-itemize">Sergei Golovan (<A HREF="xmpp:sgolovan@nes.ru"><TT>xmpp:sgolovan@nes.ru</TT></A>)
-<LI CLASS="li-itemize">Vsevolod Pelipas (<A HREF="xmpp:vsevoload@jabber.ru"><TT>xmpp:vsevoload@jabber.ru</TT></A>)
+<LI>Florian Zumbiehl (<A HREF="xmpp:florz@florz.de"><TT>xmpp:florz@florz.de</TT></A>)
+<LI>Michael Grigutsch (<A HREF="xmpp:migri@jabber.i-pobox.net"><TT>xmpp:migri@jabber.i-pobox.net</TT></A>)
+<LI>Mickael Remond (<A HREF="xmpp:mremond@erlang-projects.org"><TT>xmpp:mremond@erlang-projects.org</TT></A>)
+<LI>Sander Devrieze (<A HREF="xmpp:sander@devrieze.dyndns.org"><TT>xmpp:sander@devrieze.dyndns.org</TT></A>)
+<LI>Sergei Golovan (<A HREF="xmpp:sgolovan@nes.ru"><TT>xmpp:sgolovan@nes.ru</TT></A>)
+<LI>Vsevolod Pelipas (<A HREF="xmpp:vsevoload@jabber.ru"><TT>xmpp:vsevoload@jabber.ru</TT></A>)
 </UL>
 <!--HTMLFOOT-->
 <!--ENDHTML-->
 <!--FOOTER-->
-<HR SIZE=2><BLOCKQUOTE CLASS="quote"><EM>This document was translated from L<sup>A</sup>T<sub>E</sub>X by
-</EM><A HREF="http://pauillac.inria.fr/~maranget/hevea/index.html"><EM>H<FONT SIZE=2><sup>E</sup></FONT>V<FONT SIZE=2><sup>E</sup></FONT>A</EM></A><EM>.</EM></BLOCKQUOTE></BODY>
+<HR SIZE=2>
+<BLOCKQUOTE><EM>This document was translated from L<sup>A</sup>T<sub>E</sub>X by
+</EM><A HREF="http://pauillac.inria.fr/~maranget/hevea/index.html"><EM>H<FONT SIZE=2><sup>E</sup></FONT>V<FONT SIZE=2><sup>E</sup></FONT>A</EM></A><EM>.
+</EM></BLOCKQUOTE>
+</BODY>
 </HTML>
diff --git a/doc/guide.tex b/doc/guide.tex
index 53a07c585..ae37b8d04 100644
--- a/doc/guide.tex
+++ b/doc/guide.tex
@@ -1985,15 +1985,14 @@ Options:
 
 Examples:
 \begin{itemize}
-\item Next example prohibits the registration of too short account names and of
-  account names with exotic characters in it:
-  \begin{verbatim}
+\item Next example prohibits the registration of too short account names:
+\begin{verbatim}
   {acl, shortname, {user_glob, "?"}}.
   {acl, shortname, {user_glob, "??"}}.
-  {acl, strangename, {user_regexp, "^..?$"}}.
+  % The same using regexp:
+  %{acl, shortname, {user_regexp, "^..?$"}}.
   ...
   {access, register, [{deny, shortname},
-                      {deny, strangename},
                       {allow, all}]}.
   ...
   {modules,
@@ -2292,6 +2291,338 @@ Examples:
 \end{verbatim}
 \end{itemize}
 
+\subsection{LDAP and \modvcardldap{}}
+\label{sec:ldap}
+\ind{modules!\modvcardldap{}}\ind{JUD}\ind{Jabber User Directory}\ind{vCard}\ind{protocols!JEP-0054: vcard-temp}
+
+
+\subsubsection{Features}
+\label{sec:ldapfeatures}
+
+\ejabberd{} has built-in LDAP support.  You can authenticate users against LDAP
+server and use LDAP directory as vCard storage. Shared rosters are not
+supported yet.
+
+
+\subsubsection{Connection}
+\label{sec:ldapconnection}
+
+Parameters:
+
+\begin{description}
+\titem{ldap\_server} \ind{options!ldap_server}IP address or dns name of your
+LDAP server. This option is required.
+\titem{ldap\_port} \ind{options!ldap_port}Port to connect to LDAP server.
+Default is~389.
+\titem{ldap\_rootdn} \ind{options!ldap_rootdn}Bind DN.  Default is~\term{""}
+which means anonymous connection.
+\titem{ldap\_password} \ind{options!ldap_password}Bind password. Default
+is~\term{""}.
+\end{description}
+
+Example:
+\begin{verbatim}
+  {auth_method, ldap}.
+  {ldap_servers, ["ldap.mydomain.org"]}.
+  {ldap_port, 389}.
+  {ldap_rootdn, "cn=Manager,dc=domain,dc=org"}.
+  {ldap_password, "secret"}.
+\end{verbatim}
+
+Note that current LDAP implementation doesn't support SSL connection and SASL
+authentication.
+
+
+\subsubsection{Authentication}
+\label{sec:ldapauthentication}
+
+You can authenticate users against LDAP directory.  Available parameters are
+listed below:
+
+\begin{description}
+\titem{ldap\_base} \ind{options!ldap_base}LDAP base directory which stores users
+accounts.  This option is required.
+\titem{ldap\_uidattr} \ind{options!ldap_uidattr}LDAP attribute which holds
+user's part of JID.  Default is \term{"uid"}.
+\titem{ldap\_uidattr\_format} \ind{options!ldap_uidattr_format}Format of the
+\term{ldap\_uidattr} variable.  Format MUST contain one and only one pattern
+variable \term{"\%u"} which will be replaced by user's part of JID. For example,
+\term{"\%u@mydomain.org"}.  Default value is \term{"\%u"}.
+\titem{ldap\_filter} \ind{options!ldap_filter}RFC 2254 LDAP filter.  Default is
+\term{none}.  Example: \term{"(\&(objectClass=shadowAccount)(memberOf=Jabber
+  Users))"}. Please, don't forget closing brackets and don't use superfluous
+whitespaces. Also you MUST NOT use \option{ldap\_uidattr} attribute in filter
+because this attribute will be substituted in LDAP filter automatically.
+\end{description}
+
+
+\subsubsection{vCards and Search}
+\label{sec:modvcardldap}
+
+\ejabberd{} can map LDAP attributes to vCard fields.  This behaviour is
+implemented in \modvcardldap{} module.  This module doesn't depend on
+authentication method.  \modvcardldap{} module has it's own optional
+parameters.  The first group of parameters has the same meaning as top-level
+LDAP parameters: \option{ldap\_servers}, \option{ldap\_port},
+\option{ldap\_rootdn}, \option{ldap\_password}, \option{ldap\_base},
+\option{ldap\_uidattr}, \option{ldap\_uidattr\_format} and
+\option{ldap\_filter}.  If one of this option is not set \ejabberd{} will look
+for top-level option with the same name.  The second group of parameters
+consists of the following options:
+
+\begin{description}
+\hostitem{vjud}
+\iqdiscitem{\ns{vcard-temp}}
+\titem{search} \ind{options!search}This option specifies whether the search
+  functionality is enabled (value: \term{true}) or disabled
+  (value: \term{false}).  If disabled, the option \term{hosts} will be
+  ignored and the \Jabber{} User Directory service will not appear in the
+  Service Discovery item list.  The default value is \term{true}.
+\titem{ldap\_vcard\_map} \ind{options!ldap_vcard_map}the table which defines
+reflection of LDAP attributes to vCard fields.
+	Format is:
+		\term{[{Name\_of\_vcard\_field, Pattern, List\_of\_LDAP\_attributes}, ...]}
+	where
+		\term{Name\_of\_vcard\_field} is the type name of vCard as defined
+                in RFC 2426,
+		Pattern is a string which contains pattern variables \term{"\%u"}, \term{"\%d"} or \term{"\%s"},
+		\term{List\_of\_LDAP\_attributes} is the list which contains of LDAP attributes.
+	Pattern variables \term{"\%s"} will be sequentially replaced with the values of
+	LDAP attributes from \term{List\_of\_LDAP\_attributes}; \term{"\%u"} will be replaced with
+	user's part of JID and \term{"\%d"} will be replaced with domain part of JID.
+	Example:
+\begin{verbatim}
+  {ldap_vcard_map,
+   [{"NICKNAME", "%u", []},
+    {"FN", "%s", ["displayName"]},
+    {"CTRY", "Russia", []},
+    {"EMAIL", "%u@%d", []},
+    {"DESC", "%s\n%s", ["title", "description"]}
+   ]},
+\end{verbatim}
+
+Default is:
+\begin{verbatim}
+  [{"NICKNAME", "%u", []},
+   {"FN", "%s", ["displayName"]},
+   {"FAMILY", "%s", ["sn"]},
+   {"GIVEN", "%s", ["givenName"]},
+   {"MIDDLE", "%s", ["initials"]},
+   {"ORGNAME", "%s", ["o"]},
+   {"ORGUNIT", "%s", ["ou"]},
+   {"CTRY", "%s", ["c"]},
+   {"LOCALITY", "%s", ["l"]},
+   {"STREET", "%s", ["street"]},
+   {"REGION", "%s", ["st"]},
+   {"PCODE", "%s", ["postalCode"]},
+   {"TITLE", "%s", ["title"]},
+   {"URL", "%s", ["labeleduri"]},
+   {"DESC", "%s", ["description"]},
+   {"TEL", "%s", ["telephoneNumber"]},
+   {"EMAIL", "%s", ["mail"]},
+   {"BDAY", "%s", ["birthDay"]},
+   {"ROLE", "%s", ["employeeType"]},
+   {"PHOTO", "%s", ["jpegPhoto"]}]
+\end{verbatim}
+\titem{ldap\_search\_fields} \ind{options!ldap_search_fields}This option defines
+search form and LDAP attributes to search.
+	Format:
+		\term{[{Name, Attribute}, ...]}
+	where
+		\term{Name} is the name of field in the search form.  Will be automatically
+			translated according to definitions in translation files (see
+			\term{msgs/*.msg} for available words).
+		Attribute is the LDAP attribute or the pattern \term{"\%u"}
+                  Example:
+\begin{verbatim}
+  {ldap_search_fields,
+   [{"User", "uid"},
+    {"Full Name", "displayName"},
+    {"Email", "mail"}
+   ]},
+\end{verbatim}
+
+Default is:
+\begin{verbatim}
+  [{"User", "%u"},
+   {"Full Name", "displayName"},
+   {"Given Name", "givenName"},
+   {"Middle Name", "initials"},
+   {"Family Name", "sn"},
+   {"Nickname", "%u"},
+   {"Birthday", "birthDay"},
+   {"Country", "c"},
+   {"City", "l"},
+   {"Email", "mail"},
+   {"Organization Name", "o"},
+   {"Organization Unit", "ou"}]
+\end{verbatim}
+\titem{ldap\_search\_reported} \ind{options!ldap_search_reported}This option defines search fields to be reported.
+	Format:
+		\term{[{Name, VCard\_Name}, ...]}
+	where
+		\term{Name} is the name of field in the search form. Will be automatically
+			translated according to definitions in translation files (see
+			\term{msgs/*.msg} for available words).
+		\term{VCard\_Name} is the name of vCard field defined in \option{ldap\_vcard\_map} option.
+                Example:
+\begin{verbatim}
+  {ldap_search_reported,
+   [{"Full Name", "FN"},
+    {"Email", "EMAIL"},
+    {"Birthday", "BDAY"},
+    {"Nickname", "NICKNAME"}
+   ]},
+\end{verbatim}
+
+Default is:
+\begin{verbatim}
+  [{"Full Name", "FN"},
+   {"Given Name", "GIVEN"},
+   {"Middle Name", "MIDDLE"},
+   {"Family Name", "FAMILY"},
+   {"Nickname", "NICKNAME"},
+   {"Birthday", "BDAY"},
+   {"Country", "CTRY"},
+   {"City", "LOCALITY"},
+   {"Email", "EMAIL"},
+   {"Organization Name", "ORGNAME"},
+   {"Organization Unit", "ORGUNIT"}]
+\end{verbatim}
+\end{description}
+
+
+\subsubsection{Examples}
+\label{sec:ldapexamples}
+
+\paragraph{Common example}
+
+Let's say \term{ldap.mydomain.org} is the name of our LDAP server. We have
+users with their passwords in \term{"ou=Users,dc=mydomain,dc=org"} directory.
+Also we have addressbook, which contains users emails and their additional
+infos in \term{"ou=AddressBook,dc=mydomain,dc=org"} directory.  Corresponding
+authentication section should looks like this:
+
+\begin{verbatim}
+  %% authentication method
+  {auth_method, ldap}.
+  %% DNS name of our LDAP server
+  {ldap_servers, ["ldap.mydomain.org"]}.
+  %% Bind to LDAP server as "cn=Manager,dc=mydomain,dc=org" with password "secret"
+  {ldap_rootdn, "cn=Manager,dc=mydomain,dc=org"}.
+  {ldap_password, "secret"}.
+  %% define the user's base
+  {ldap_base, "ou=Users,dc=mydomain,dc=org"}.
+  %% We want to authorize users from 'shadowAccount' object class only
+  {ldap_filter, "(objectClass=shadowAccount)"}.
+\end{verbatim}
+
+Now we want to use users LDAP-info as their vCards.  We have four attributes
+defined in our LDAP schema: \term{"mail"} --- email address, \term{"givenName"}
+--- first name, \term{"sn"} --- second name, \term{"birthDay"} --- birthday.
+Also we want users to search each other.  Let's see how we can set it up:
+
+\begin{verbatim}
+  {modules,
+    ...
+    {mod_vcard_ldap,
+     [
+      %% We use the same server and port, but want to bind anonymously because
+      %% our LDAP server accepts anonymous requests to
+      %% "ou=AddressBook,dc=mydomain,dc=org" subtree.
+      {ldap_rootdn, ""},
+      {ldap_password, ""},
+      %% define the addressbook's base
+      {ldap_base, "ou=AddressBook,dc=mydomain,dc=org"},
+      %% user's part of JID is located in the "mail" attribute
+      {ldap_uidattr, "mail"},
+      %% common format for our emails
+      {ldap_uidattr_format, "%u@mail.mydomain.org"},
+      %% We have to define empty filter here, because entries in addressbook doesn't
+      %% belong to shadowAccount object class
+      {ldap_filter, ""},
+      %% Now we want to define vCard pattern
+      {ldap_vcard_map,
+       [{"NICKNAME", "%u", []}, % just use user's part of JID as his nickname
+        {"GIVEN", "%s", ["givenName"]},
+        {"FAMILY", "%s", ["sn"]},
+        {"FN", "%s, %s", ["sn", "givenName"]}, % example: "Smith, John"
+        {"EMAIL", "%s", ["mail"]},
+        {"BDAY", "%s", ["birthDay"]}]},
+      %% Search form
+      {ldap_search_fields,
+       [{"User", "%u"},
+        {"Name", "givenName"},
+        {"Family Name", "sn"},
+        {"Email", "mail"},
+        {"Birthday", "birthDay"}]},
+      %% vCard fields to be reported
+      %% Note that JID is always returned with search results
+      {ldap_search_reported,
+       [{"Full Name", "FN"},
+        {"Nickname", "NICKNAME"},
+        {"Birthday", "BDAY"}]}
+    ]}
+    ...
+  }.
+\end{verbatim}
+
+Note that \modvcardldap{} module checks an existence of the user before
+searching his info in LDAP.
+
+
+\paragraph{Active Directory}
+
+Active Directory is just an LDAP-server with predefined attributes.  Sample
+config file is listed below:
+
+\begin{verbatim}
+  {auth_method, ldap}.
+  {ldap_servers, ["office.org"]}.    % List of LDAP servers
+  {ldap_base, "DC=office,DC=org"}. % Search base of LDAP directory
+  {ldap_rootdn, "CN=Administrator,CN=Users,DC=office,DC=org"}. % LDAP manager
+  {ldap_password, "*******"}. % Password to LDAP manager
+  {ldap_uidattr, "sAMAccountName"}.
+  {ldap_filter, "(memberOf=*)"}.
+  
+  {mod_vcard_ldap,
+   [{ldap_vcard_map,
+     [{"NICKNAME", "%u", []},
+      {"GIVEN", "%s", ["givenName"]},
+      {"MIDDLE", "%s", ["initials"]},
+      {"FAMILY", "%s", ["sn"]},
+      {"FN", "%s", ["displayName"]},
+      {"EMAIL", "%s", ["mail"]},
+      {"ORGNAME", "%s", ["company"]},
+      {"ORGUNIT", "%s", ["department"]},
+      {"CTRY", "%s", ["c"]},
+      {"LOCALITY", "%s", ["l"]},
+      {"STREET", "%s", ["streetAddress"]},
+      {"REGION", "%s", ["st"]},
+      {"PCODE", "%s", ["postalCode"]},
+      {"TITLE", "%s", ["title"]},
+      {"URL", "%s", ["wWWHomePage"]},
+      {"DESC", "%s", ["description"]},
+      {"TEL", "%s", ["telephoneNumber"]}]},
+    {ldap_search_fields,
+     [{"User", "%u"},
+      {"Name", "givenName"},
+      {"Family Name", "sn"},
+      {"Email", "mail"},
+      {"Company", "company"},
+      {"Department", "department"},
+      {"Role", "title"},
+      {"Description", "description"},
+      {"Phone", "telephoneNumber"}]},
+    {ldap_search_reported,
+     [{"Full Name", "FN"},
+      {"Nickname", "NICKNAME"},
+      {"Email", "EMAIL"}]}
+   ]
+  }.
+\end{verbatim}
+
+
 \subsection{\modversion{}}
 \label{sec:modversion}
 \ind{modules!\modversion{}}\ind{protocols!JEP-0092: Software Version}
diff --git a/src/ejabberd_auth_ldap.erl b/src/ejabberd_auth_ldap.erl
index 6e454cb80..a1ce74609 100644
--- a/src/ejabberd_auth_ldap.erl
+++ b/src/ejabberd_auth_ldap.erl
@@ -10,8 +10,21 @@
 -author('alexey@sevcom.net').
 -vsn('$Revision$ ').
 
+-behaviour(gen_server).
+
+%% gen_server callbacks
+-export([init/1,
+	 handle_info/2,
+	 handle_call/3,
+	 handle_cast/2,
+	 terminate/2,
+	 code_change/3
+	]).
+
 %% External exports
 -export([start/1,
+	 stop/1,
+	 start_link/1,
 	 set_password/3,
 	 check_password/3,
 	 check_password/5,
@@ -29,39 +42,84 @@
 -include("ejabberd.hrl").
 -include("eldap/eldap.hrl").
 
+-record(state, {host,
+		eldap_id,
+		servers,
+		port,
+		dn,
+		password,
+		base,
+		uidattr,
+		uidattr_format,
+		ufilter,
+		sfilter,
+		dn_filter,
+		dn_filter_attrs
+	       }).
+
+%% Unused callbacks.
+handle_cast(_Request, State) ->
+    {noreply, State}.
+code_change(_OldVsn, State, _Extra) ->
+    {ok, State}.
+handle_info(_Info, State) ->
+    {noreply, State}.
+%% -----
+
 %%%----------------------------------------------------------------------
 %%% API
 %%%----------------------------------------------------------------------
+
 start(Host) ->
-    LDAPServers = ejabberd_config:get_local_option({ldap_servers, Host}),
-    RootDN = ejabberd_config:get_local_option({ldap_rootdn, Host}),
-    Password = ejabberd_config:get_local_option({ldap_password, Host}),
-    eldap:start_link(get_eldap_id(Host, ejabberd),
-		     LDAPServers, 389, RootDN, Password),
-    eldap:start_link(get_eldap_id(Host, ejabberd_bind),
-		     LDAPServers, 389, RootDN, Password),
+    Proc = gen_mod:get_module_proc(Host, ?MODULE),
+    ChildSpec = {
+      Proc, {?MODULE, start_link, [Host]},
+      permanent, 1000, worker, [?MODULE]
+     },
+    supervisor:start_child(ejabberd_sup, ChildSpec).
+
+stop(Host) ->
+    Proc = gen_mod:get_module_proc(Host, ?MODULE),
+    gen_server:call(Proc, stop),
+    supervisor:terminate_child(ejabberd_sup, Proc),
+    supervisor:delete_child(ejabberd_sup, Proc).
+
+start_link(Host) ->
+    Proc = gen_mod:get_module_proc(Host, ?MODULE),
+    gen_server:start_link({local, Proc}, ?MODULE, Host, []).
+
+terminate(_Reason, State) ->
+    ejabberd_ctl:unregister_commands(
+      State#state.host,
+      [{"registered-users", "list all registered users"}],
+      ejabberd_auth, ctl_process_get_registered).
+
+init(Host) ->
+    State = parse_options(Host),
+    eldap:start_link(State#state.eldap_id,
+		     State#state.servers,
+		     State#state.port,
+		     State#state.dn,
+		     State#state.password),
     ejabberd_ctl:register_commands(
       Host,
       [{"registered-users", "list all registered users"}],
       ejabberd_auth, ctl_process_get_registered),
-    ok.
+    {ok, State}.
+
+-define(REPLY_TIMEOUT, 10000).
 
 plain_password_required() ->
     true.
 
 check_password(User, Server, Password) ->
-    case find_user_dn(User, Server) of
-	false ->
+    Proc = gen_mod:get_module_proc(Server, ?MODULE),
+    case catch gen_server:call(Proc,
+			       {check_pass, User, Password}, ?REPLY_TIMEOUT) of
+	{'EXIT', _} ->
 	    false;
-	DN ->
-	    LServer = jlib:nameprep(Server),
-	    case eldap:bind(get_eldap_id(LServer, ejabberd_bind),
-			    DN, Password) of
-		ok ->
-		    true;
-		_ ->
-		    false
-	    end
+	Result ->
+	    Result
     end.
 
 check_password(User, Server, Password, _StreamID, _Digest) ->
@@ -77,31 +135,13 @@ dirty_get_registered_users() ->
     get_vh_registered_users(?MYNAME).
 
 get_vh_registered_users(Server) ->
-    LServer = jlib:nameprep(Server),
-    Attr = ejabberd_config:get_local_option({ldap_uidattr, LServer}),
-    Filter = eldap:present(Attr),
-    Base = ejabberd_config:get_local_option({ldap_base, LServer}),
-    case eldap:search(get_eldap_id(LServer, ejabberd),
-		      [{base, Base},
-		       {filter, Filter},
-		       {attributes, [Attr]}]) of
-	#eldap_search_result{entries = Es} ->
-	    lists:flatmap(
-	      fun(E) ->
-		      case lists:keysearch(Attr, 1, E#eldap_entry.attributes) of
-			  {value, {_, [U]}} ->
-			      case jlib:nodeprep(U) of
-				  error ->
-				      [];
-				  LU ->
-				      [{LU, LServer}]
-			      end;
-			  _ ->
-			      []
-		      end
-	      end, Es);
-	_ ->
-	    []
+    Proc = gen_mod:get_module_proc(Server, ?MODULE),
+    case catch gen_server:call(Proc,
+			       get_vh_registered_users, ?REPLY_TIMEOUT) of
+	{'EXIT', _} ->
+	    [];
+	Result ->
+	    Result
     end.
 
 get_password(_User, _Server) ->
@@ -111,11 +151,13 @@ get_password_s(_User, _Server) ->
     "".
 
 is_user_exists(User, Server) ->
-    case find_user_dn(User, Server) of
-	false ->
+    Proc = gen_mod:get_module_proc(Server, ?MODULE),
+    case catch gen_server:call(Proc,
+			       {is_user_exists, User}, ?REPLY_TIMEOUT) of
+	{'EXIT', _} ->
 	    false;
-	_DN ->
-	    true
+	Result ->
+	    Result
     end.
 
 remove_user(_User, _Server) ->
@@ -124,25 +166,212 @@ remove_user(_User, _Server) ->
 remove_user(_User, _Server, _Password) ->
     not_allowed.
 
-
 %%%----------------------------------------------------------------------
 %%% Internal functions
 %%%----------------------------------------------------------------------
+handle_call({check_pass, User, Password}, _From, State) ->
+    Reply = case find_user_dn(User, State) of
+		false ->
+		    false;
+		DN ->
+		    case eldap:bind(State#state.eldap_id, DN, Password) of
+			ok -> true;
+			_ -> false
+		    end
+	    end,
+    {reply, Reply, State};
+
+handle_call(get_vh_registered_users, _From, State) ->
+    UA = State#state.uidattr,
+    UAF = State#state.uidattr_format,
+    Eldap_ID = State#state.eldap_id,
+    Server = State#state.host,
+    SortedDNAttrs = usort_attrs(State#state.dn_filter_attrs),
+    Reply = case eldap_filter:parse(State#state.sfilter) of
+		{ok, EldapFilter} ->
+		    case eldap:search(Eldap_ID, [{base, State#state.base},
+						 {filter, EldapFilter},
+						 {attributes, SortedDNAttrs}]) of
+			#eldap_search_result{entries = Entries} ->
+			    lists:flatmap(
+			      fun(#eldap_entry{attributes = Attrs,
+					       object_name = DN}) ->
+				      case is_valid_dn(DN, Attrs, State) of
+					  false -> [];
+					  _ ->
+					      case get_ldap_attr(UA, Attrs) of
+						  "" -> [];
+						  User ->
+						      case get_user_part(User, UAF) of
+							  {ok, U} ->
+							      case jlib:nodeprep(U) of
+								  error -> [];
+								  LU -> [{LU, jlib:nameprep(Server)}]
+							      end;
+							  _ -> []
+						      end
+					      end
+				      end
+			      end, Entries);
+			_ ->
+			    []
+		    end;
+		_ ->
+		    []
+	    end,
+    {reply, Reply, State};
+
+handle_call({is_user_exists, User}, _From, State) ->
+    Reply = case find_user_dn(User, State) of
+		false -> false;
+		_DN -> true
+	    end,
+    {reply, Reply, State};
+
+handle_call(stop, _From, State) ->
+    {stop, normal, ok, State};
 
-find_user_dn(User, Server) ->
-    LServer = jlib:nameprep(Server),
-    Attr = ejabberd_config:get_local_option({ldap_uidattr, LServer}),
-    Filter = eldap:equalityMatch(Attr, User),
-    Base = ejabberd_config:get_local_option({ldap_base, LServer}),
-    case eldap:search(get_eldap_id(LServer, ejabberd),
-		      [{base, Base},
-		       {filter, Filter},
-		       {attributes, []}]) of
-	#eldap_search_result{entries = [E | _]} ->
-	    E#eldap_entry.object_name;
+handle_call(_Request, _From, State) ->
+    {reply, bad_request, State}.
+
+find_user_dn(User, State) ->
+    DNAttrs = usort_attrs(State#state.dn_filter_attrs),
+    case eldap_filter:parse(State#state.ufilter, [{"%u", User}]) of
+	{ok, Filter} ->
+	    case eldap:search(State#state.eldap_id, [{base, State#state.base},
+						     {filter, Filter},
+						     {attributes, DNAttrs}]) of
+		#eldap_search_result{entries = [#eldap_entry{attributes = Attrs,
+							     object_name = DN} | _]} ->
+		    is_valid_dn(DN, Attrs, State);
+		_ ->
+		    false
+	    end;
 	_ ->
 	    false
     end.
 
-get_eldap_id(Host, Name) ->
-    atom_to_list(gen_mod:get_module_proc(Host, Name)).
+is_valid_dn(DN, _, #state{dn_filter = undefined}) ->
+    DN;
+
+is_valid_dn(DN, Attrs, State) ->
+    DNAttrs = State#state.dn_filter_attrs,
+    UA = State#state.uidattr,
+    UAF = State#state.uidattr_format,
+    Values = [{"%s", get_ldap_attr(Attr, Attrs), 1} || Attr <- DNAttrs],
+    SubstValues = case get_ldap_attr(UA, Attrs) of
+		      "" -> Values;
+		      S ->
+			  case get_user_part(S, UAF) of
+			      {ok, U} -> [{"%u", U} | Values];
+			      _ -> Values
+			  end
+		  end ++ [{"%d", State#state.host}, {"%D", DN}],
+    case eldap_filter:parse(State#state.dn_filter, SubstValues) of
+	{ok, EldapFilter} ->
+	    case eldap:search(State#state.eldap_id, [
+						     {base, State#state.base},
+						     {filter, EldapFilter},
+						     {attributes, ["dn"]}]) of
+		#eldap_search_result{entries = [_|_]} ->
+		    DN;
+		_ ->
+		    false
+	    end;
+	_ ->
+	    false
+    end.
+
+%%%----------------------------------------------------------------------
+%%% Auxiliary functions
+%%%----------------------------------------------------------------------
+get_user_part(String, Pattern) ->
+    F = fun(S, P) ->
+		First = string:str(P, "%u"),
+		TailLength = length(P) - (First+1),
+		string:sub_string(S, First, length(S) - TailLength)
+	end,
+    case catch F(String, Pattern) of
+	{'EXIT', _} ->
+	    {error, badmatch};
+	Result ->
+	    case regexp:sub(Pattern, "%u", Result) of
+		{ok, String, _} -> {ok, Result};
+		_ -> {error, badmatch}
+	    end
+    end.
+
+case_insensitive_match(X, Y) ->
+    X1 = stringprep:tolower(X),
+    Y1 = stringprep:tolower(Y),
+    if
+	X1 == Y1 -> true;
+	true -> false
+    end.
+
+get_ldap_attr(LDAPAttr, Attributes) ->
+    Res = lists:filter(
+	    fun({Name, _}) ->
+		    case_insensitive_match(Name, LDAPAttr)
+	    end, Attributes),
+    case Res of
+	[{_, [Value|_]}] -> Value;
+	_ -> ""
+    end.
+
+usort_attrs(Attrs) when is_list(Attrs) ->
+    lists:usort(Attrs);
+
+usort_attrs(_) ->
+    [].
+
+parse_options(Host) ->
+    Eldap_ID = atom_to_list(gen_mod:get_module_proc(Host, ?MODULE)),
+    LDAPServers = ejabberd_config:get_local_option({ldap_servers, Host}),
+    LDAPPort = case ejabberd_config:get_local_option({ldap_port, Host}) of
+		   undefined -> 389;
+		   P -> P
+	       end,
+    RootDN = case ejabberd_config:get_local_option({ldap_rootdn, Host}) of
+		 undefined -> "";
+		 RDN -> RDN
+	     end,
+    Password = case ejabberd_config:get_local_option({ldap_password, Host}) of
+		   undefined -> "";
+		   Pass -> Pass
+	       end,
+    UIDAttr = case ejabberd_config:get_local_option({ldap_uidattr, Host}) of
+		  undefined -> "uid";
+		  UA -> UA
+	      end,
+    UIDAttrFormat = case ejabberd_config:get_local_option({ldap_uidattr_format, Host}) of
+			undefined -> "%u";
+			UAF -> UAF
+		    end,
+    SubFilter = "(" ++ UIDAttr ++ "=" ++ UIDAttrFormat ++ ")",
+    UserFilter = case ejabberd_config:get_local_option({ldap_filter, Host}) of
+		     undefined -> SubFilter;
+		     "" -> SubFilter;
+		     F -> "(&" ++ SubFilter ++ F ++ ")"
+		 end,
+    SearchFilter = eldap_filter:do_sub(UserFilter, [{"%u", "*"}]),
+    LDAPBase = ejabberd_config:get_local_option({ldap_base, Host}),
+    {DNFilter, DNFilterAttrs} =
+	case ejabberd_config:get_local_option({ldap_dn_filter, Host}) of
+	    undefined -> {undefined, undefined};
+	    {DNF, DNFA} -> {DNF, DNFA}
+	end,
+    #state{host = Host,
+	   eldap_id = Eldap_ID,
+	   servers = LDAPServers,
+	   port = LDAPPort,
+	   dn = RootDN,
+	   password = Password,
+	   base = LDAPBase,
+	   uidattr = UIDAttr,
+	   uidattr_format = UIDAttrFormat,
+	   ufilter = UserFilter,
+	   sfilter = SearchFilter,
+	   dn_filter = DNFilter,
+	   dn_filter_attrs = DNFilterAttrs
+	  }.
diff --git a/src/eldap/Makefile.in b/src/eldap/Makefile.in
index 91384b328..72e7b4632 100644
--- a/src/eldap/Makefile.in
+++ b/src/eldap/Makefile.in
@@ -12,7 +12,8 @@ OUTDIR = ..
 EFLAGS = -I .. -pz ..
 OBJS   = \
 	$(OUTDIR)/eldap.beam \
-	$(OUTDIR)/ELDAPv3.beam
+	$(OUTDIR)/ELDAPv3.beam \
+	$(OUTDIR)/eldap_filter.beam
 
 all:    $(OBJS)
 
diff --git a/src/eldap/Makefile.win32 b/src/eldap/Makefile.win32
index 6feda635c..5d737d05a 100644
--- a/src/eldap/Makefile.win32
+++ b/src/eldap/Makefile.win32
@@ -6,7 +6,8 @@ EFLAGS = -I .. -pz ..
 
 OBJS = \
 	$(OUTDIR)\eldap.beam \
-	$(OUTDIR)\ELDAPv3.beam
+	$(OUTDIR)\ELDAPv3.beam \
+	$(OUTDIR)\eldap_filter.beam
 
 ALL : $(OBJS)
 
diff --git a/src/mod_vcard_ldap.erl b/src/mod_vcard_ldap.erl
index 68e1fc8a2..4389e4bce 100644
--- a/src/mod_vcard_ldap.erl
+++ b/src/mod_vcard_ldap.erl
@@ -1,8 +1,7 @@
-
 %%%----------------------------------------------------------------------
 %%% File    : mod_vcard_ldap.erl
 %%% Author  : Alexey Shchepin <alexey@sevcom.net>
-%%% Purpose : 
+%%% Purpose : Support for VCards from LDAP storage.
 %%% Created :  2 Jan 2003 by Alexey Shchepin <alexey@sevcom.net>
 %%% Id      : $Id$
 %%%----------------------------------------------------------------------
@@ -11,13 +10,26 @@
 -author('alexey@sevcom.net').
 -vsn('$Revision$ ').
 
+-behaviour(gen_server).
 -behaviour(gen_mod).
 
--export([start/2, init/3, stop/1,
- 	 get_sm_features/5,
+%% gen_server callbacks.
+-export([init/1,
+	 handle_info/2,
+	 handle_call/3,
+	 handle_cast/2,
+	 terminate/2,
+	 code_change/3
+	]).
+
+-export([start/2,
+	 start_link/2,
+	 stop/1,
+	 get_sm_features/5,
 	 process_local_iq/3,
 	 process_sm_iq/3,
-	 remove_user/1]).
+	 remove_user/1
+	]).
 
 -include("ejabberd.hrl").
 -include("eldap/eldap.hrl").
@@ -25,69 +37,164 @@
 
 -define(PROCNAME, ejabberd_mod_vcard_ldap).
 
+-record(state, {serverhost,
+		myhost,
+		eldap_id,
+		search,
+		servers,
+		port,
+		dn,
+		base,
+		password,
+		uid,
+		uid_format,
+		vcard_map,
+		vcard_map_attrs,
+		user_filter,
+		search_filter,
+		search_fields,
+		search_reported,
+		search_reported_attrs
+	       }).
+
+-define(VCARD_MAP,
+	[{"NICKNAME", "%u", []},
+	 {"FN", "%s", ["displayName"]},
+	 {"FAMILY", "%s", ["sn"]},
+	 {"GIVEN", "%s", ["givenName"]},
+	 {"MIDDLE", "%s", ["initials"]},
+	 {"ORGNAME", "%s", ["o"]},
+	 {"ORGUNIT", "%s", ["ou"]},
+	 {"CTRY", "%s", ["c"]},
+	 {"LOCALITY", "%s", ["l"]},
+	 {"STREET", "%s", ["street"]},
+	 {"REGION", "%s", ["st"]},
+	 {"PCODE", "%s", ["postalCode"]},
+	 {"TITLE", "%s", ["title"]},
+	 {"URL", "%s", ["labeleduri"]},
+	 {"DESC", "%s", ["description"]},
+	 {"TEL", "%s", ["telephoneNumber"]},
+	 {"EMAIL", "%s", ["mail"]},
+	 {"BDAY", "%s", ["birthDay"]},
+	 {"ROLE", "%s", ["employeeType"]},
+	 {"PHOTO", "%s", ["jpegPhoto"]}
+	]).
+
+-define(SEARCH_FIELDS,
+	[{"User", "%u"},
+	 {"Full Name", "displayName"},
+	 {"Given Name", "givenName"},
+	 {"Middle Name", "initials"},
+	 {"Family Name", "sn"},
+	 {"Nickname", "%u"},
+	 {"Birthday", "birthDay"},
+	 {"Country", "c"},
+	 {"City", "l"},
+	 {"Email", "mail"},
+	 {"Organization Name", "o"},
+	 {"Organization Unit", "ou"}
+	]).
+
+-define(SEARCH_REPORTED,
+	[{"Full Name", "FN"},
+	 {"Given Name", "GIVEN"},
+	 {"Middle Name", "MIDDLE"},
+	 {"Family Name", "FAMILY"},
+	 {"Nickname", "NICKNAME"},
+	 {"Birthday", "BDAY"},
+	 {"Country", "CTRY"},
+	 {"City", "LOCALITY"},
+	 {"Email", "EMAIL"},
+	 {"Organization Name", "ORGNAME"},
+	 {"Organization Unit", "ORGUNIT"}
+	]).
+
+%% Unused callbacks.
+handle_cast(_Request, State) ->
+    {noreply, State}.
+code_change(_OldVsn, State, _Extra) ->
+    {ok, State}.
+%% -----
+
+
 start(Host, Opts) ->
+    Proc = gen_mod:get_module_proc(Host, ?PROCNAME),
+    ChildSpec = {
+      Proc, {?MODULE, start_link, [Host, Opts]},
+      permanent, 1000, worker, [?MODULE]
+     },
+    supervisor:start_child(ejabberd_sup, ChildSpec).
+
+stop(Host) ->
+    Proc = gen_mod:get_module_proc(Host, ?PROCNAME),
+    gen_server:call(Proc, stop),
+    supervisor:terminate_child(ejabberd_sup, Proc),
+    supervisor:delete_child(ejabberd_sup, Proc).
+
+terminate(_Reason, State) ->
+    Host = State#state.serverhost,
+    gen_iq_handler:remove_iq_handler(ejabberd_local, Host, ?NS_VCARD),
+    gen_iq_handler:remove_iq_handler(ejabberd_sm, Host, ?NS_VCARD),
+    ejabberd_hooks:delete(disco_sm_features, Host, ?MODULE, get_sm_features, 50),
+    case State#state.search of
+	true ->
+	    ejabberd_router:unregister_route(State#state.myhost);
+	_ ->
+	    ok
+    end.
+
+start_link(Host, Opts) ->
+    Proc = gen_mod:get_module_proc(Host, ?PROCNAME),
+    gen_server:start_link({local, Proc}, ?MODULE, [Host, Opts], []).
+
+init([Host, Opts]) ->
+    State = parse_options(Host, Opts),
     IQDisc = gen_mod:get_opt(iqdisc, Opts, one_queue),
     gen_iq_handler:add_iq_handler(ejabberd_local, Host, ?NS_VCARD,
 				  ?MODULE, process_local_iq, IQDisc),
     gen_iq_handler:add_iq_handler(ejabberd_sm, Host, ?NS_VCARD,
 				  ?MODULE, process_sm_iq, IQDisc),
     ejabberd_hooks:add(disco_sm_features, Host, ?MODULE, get_sm_features, 50),
-    LDAPServers = ejabberd_config:get_local_option({ldap_servers, Host}),
-    RootDN = ejabberd_config:get_local_option({ldap_rootdn, Host}),
-    Password = ejabberd_config:get_local_option({ldap_password, Host}),
-    eldap:start_link("mod_vcard_ldap", LDAPServers, 389, RootDN, Password),
-    MyHost = gen_mod:get_opt(host, Opts, "vjud." ++ Host),
-    Search = gen_mod:get_opt(search, Opts, true),
-    register(gen_mod:get_module_proc(Host, ?PROCNAME),
-	     spawn(?MODULE, init, [MyHost, Host, Search])).
-
-init(Host, ServerHost, Search) ->
-    case Search of
-	false ->
-	    loop(Host, ServerHost);
+    eldap:start_link(State#state.eldap_id,
+		     State#state.servers,
+		     State#state.port,
+		     State#state.dn,
+		     State#state.password),
+    case State#state.search of
+	true ->
+	    ejabberd_router:register_route(State#state.myhost);
 	_ ->
-	    ejabberd_router:register_route(Host),
-	    loop(Host, ServerHost)
-    end.
-
-loop(Host, ServerHost) ->
-    receive
-	{route, From, To, Packet} ->
-	    case catch do_route(ServerHost, From, To, Packet) of
-		{'EXIT', Reason} ->
-		    ?ERROR_MSG("~p", [Reason]);
-		_ ->
-		    ok
-	    end,
-	    loop(Host, ServerHost);
-	stop ->
-	    ejabberd_router:unregister_route(Host),
-	    ok;
+	    ok
+    end,
+    {ok, State}.
+
+handle_info({route, From, To, Packet}, State) ->
+    case catch do_route(State, From, To, Packet) of
+	{'EXIT', Reason} ->
+	    Err = jlib:make_error_reply(Packet, ?ERR_INTERNAL_SERVER_ERROR),
+	    ejabberd_router:route(To, From, Err),
+	    %% Fail-Stop. Let the supervisor restarts us
+	    {stop, Reason, State};
 	_ ->
-	    loop(Host, ServerHost)
-    end.
+	    {noreply, State}
+    end;
 
-stop(Host) ->
-    gen_iq_handler:remove_iq_handler(ejabberd_local, Host, ?NS_VCARD),
-    gen_iq_handler:remove_iq_handler(ejabberd_sm, Host, ?NS_VCARD),
-    ejabberd_hooks:delete(disco_sm_features, Host, ?MODULE, get_sm_features, 50),
-    Proc = gen_mod:get_module_proc(Host, ?PROCNAME),
-    Proc ! stop,
-    {wait, Proc}.
+handle_info(_Info, State) ->
+    {noreply, State}.
 
 get_sm_features({error, _Error} = Acc, _From, _To, _Node, _Lang) ->
     Acc;
 get_sm_features(Acc, _From, _To, Node, _Lang) ->
     case Node of
- 	[] ->
- 	    case Acc of
- 		{result, Features} ->
- 		    {result, [?NS_VCARD | Features]};
- 		empty ->
- 		    {result, [?NS_VCARD]}
- 	    end;
-  	_ ->
- 	    Acc
+	[] ->
+	    case Acc of
+		{result, Features} ->
+		    {result, [?NS_VCARD | Features]};
+		empty ->
+		    {result, [?NS_VCARD]}
+	    end;
+	_ ->
+	    Acc
     end.
 
 process_local_iq(_From, _To, #iq{type = Type, lang = Lang, sub_el = SubEl} = IQ) ->
@@ -102,7 +209,7 @@ process_local_iq(_From, _To, #iq{type = Type, lang = Lang, sub_el = SubEl} = IQ)
 			       [{xmlcdata, "ejabberd"}]},
 			      {xmlelement, "URL", [],
 			       [{xmlcdata,
-				 "http://ejabberd.jabberstudio.org/"}]},
+				 "http://ejabberd.jabber.ru/"}]},
 			      {xmlelement, "DESC", [],
 			       [{xmlcdata,
 				 translate:translate(
@@ -114,113 +221,165 @@ process_local_iq(_From, _To, #iq{type = Type, lang = Lang, sub_el = SubEl} = IQ)
 			     ]}]}
     end.
 
-find_ldap_user(Host, User) ->
-    Attr = ejabberd_config:get_local_option({ldap_uidattr, Host}),
-    Filter = eldap:equalityMatch(Attr, User),
-    Base = ejabberd_config:get_local_option({ldap_base, Host}),
-    case eldap:search("mod_vcard_ldap", [{base, Base},
-					 {filter, Filter},
-					 {attributes, []}]) of
-	#eldap_search_result{entries = [E | _]} ->
-	    E;
-	_ ->
-	    false
+-define(SM_IQ_TIMEOUT, 20000).
+
+process_sm_iq(From, #jid{lserver=LServer} = To, #iq{sub_el = SubEl} = IQ) ->
+    Proc = gen_mod:get_module_proc(LServer, ?PROCNAME),
+    case catch gen_server:call(Proc,
+			       {process_sm_iq, From, To, IQ}, ?SM_IQ_TIMEOUT) of
+	{'EXIT', Reason} ->
+	    case Reason of
+		{timeout, _} ->
+		    IQ#iq{type = error,
+			  sub_el = [SubEl, ?ERR_REMOTE_SERVER_TIMEOUT]};
+		_ ->
+		    IQ#iq{type = error,
+			  sub_el = [SubEl, ?ERR_INTERNAL_SERVER_ERROR]}
+	    end;
+	Other ->
+	    Other
     end.
 
-is_attribute_read_allowed(Name,From,To) ->
-    true.
-
-ldap_attribute_to_vcard(Prefix,{Name,Values},From,To) ->
-    case is_attribute_read_allowed(Name,From,To) of 
-	true ->
-	    ldap_lca_to_vcard(Prefix,stringprep:tolower(Name),Values);
+handle_call({process_sm_iq, _From, To, IQ}, _FromPid, State) ->
+    #iq{type = Type, sub_el = SubEl} = IQ,
+    Reply = case Type of
+		set ->
+		    IQ#iq{type = error, sub_el = [SubEl, ?ERR_NOT_ALLOWED]};
+		get ->
+		    #jid{luser = LUser} = To,
+		    LServer = State#state.serverhost,
+		    case ejabberd_auth:is_user_exists(LUser, LServer) of
+			true ->
+			    VCardMap = State#state.vcard_map,
+			    case find_ldap_user(LUser, State) of
+				#eldap_entry{attributes = Attributes} ->
+				    Vcard = ldap_attributes_to_vcard(Attributes, VCardMap, {LUser, LServer}),
+				    IQ#iq{type = result, sub_el = Vcard};
+				_ ->
+				    IQ#iq{type = result, sub_el = []}
+			    end;
+			_ ->
+			    IQ#iq{type = result, sub_el = []}
+		    end
+	    end,
+    {reply, Reply, State};
+
+handle_call(stop, _From, State) ->
+    {stop, normal, ok, State};
+
+handle_call(_Request, _From, State) ->
+    {reply, bad_request, State}.
+
+find_ldap_user(User, State) ->
+    Base = State#state.base,
+    RFC2254_Filter = State#state.user_filter,
+    Eldap_ID = State#state.eldap_id,
+    VCardAttrs = State#state.vcard_map_attrs,
+    case eldap_filter:parse(RFC2254_Filter, [{"%u", User}]) of
+	{ok, EldapFilter} ->
+	    case eldap:search(Eldap_ID, [{base, Base},
+					 {filter, EldapFilter},
+					 {attributes, VCardAttrs}]) of
+		#eldap_search_result{entries = [E | _]} ->
+		    E;
+		_ ->
+		    false
+	    end;
 	_ ->
-	    none
+	    false
     end.
 
-ldap_lca_to_vcard(vCard,"displayname",[Value|_]) ->
+ldap_attributes_to_vcard(Attributes, VCardMap, UD) ->
+    Attrs = lists:map(
+	      fun({VCardName, _, _}) ->
+		      {stringprep:tolower(VCardName),
+		       map_vcard_attr(VCardName, Attributes, VCardMap, UD)}
+	      end, VCardMap),
+    Elts = [ldap_attribute_to_vcard(vCard, Attr) || Attr <- Attrs],
+    NElts = [ldap_attribute_to_vcard(vCardN, Attr) || Attr <- Attrs],
+    OElts = [ldap_attribute_to_vcard(vCardO, Attr) || Attr <- Attrs],
+    AElts = [ldap_attribute_to_vcard(vCardA, Attr) || Attr <- Attrs],
+    [{xmlelement, "vCard", [{"xmlns", ?NS_VCARD}],
+      lists:append([X || X <- Elts, X /= none],
+		   [{xmlelement,"N",[],   [X || X <- NElts, X /= none]},
+		    {xmlelement,"ORG",[], [X || X <- OElts, X /= none]},
+		    {xmlelement,"ADR",[], [X || X <- AElts, X /= none]}])
+     }].
+
+ldap_attribute_to_vcard(vCard, {"fn", Value}) ->
     {xmlelement,"FN",[],[{xmlcdata,Value}]};
 
-ldap_lca_to_vcard(vCard,"uid",[Value|_]) ->
+ldap_attribute_to_vcard(vCard, {"nickname", Value}) ->
     {xmlelement,"NICKNAME",[],[{xmlcdata,Value}]};
 
-ldap_lca_to_vcard(vCard,"title",[Value|_]) ->
+ldap_attribute_to_vcard(vCard, {"title", Value}) ->
     {xmlelement,"TITLE",[],[{xmlcdata,Value}]};
 
-ldap_lca_to_vcard(vCard,"labeleduri",[Value|_]) ->
+ldap_attribute_to_vcard(vCard, {"bday", Value}) ->
+    {xmlelement,"BDAY",[],[{xmlcdata,Value}]};
+
+ldap_attribute_to_vcard(vCard, {"url", Value}) ->
     {xmlelement,"URL",[],[{xmlcdata,Value}]};
 
-ldap_lca_to_vcard(vCard,"description",[Value|_]) ->
+ldap_attribute_to_vcard(vCard, {"desc", Value}) ->
     {xmlelement,"DESC",[],[{xmlcdata,Value}]};
 
-ldap_lca_to_vcard(vCard,"telephonenumber",[Value|_]) ->
+ldap_attribute_to_vcard(vCard, {"role", Value}) ->
+    {xmlelement,"ROLE",[],[{xmlcdata,Value}]};
+
+ldap_attribute_to_vcard(vCard, {"tel", Value}) ->
     {xmlelement,"TEL",[],[{xmlelement,"VOICE",[],[]},
 			  {xmlelement,"WORK",[],[]},
 			  {xmlelement,"NUMBER",[],[{xmlcdata,Value}]}]};
 
-ldap_lca_to_vcard(vCard,"mail",[Value|_]) ->
+ldap_attribute_to_vcard(vCard, {"email", Value}) ->
     {xmlelement,"EMAIL",[],[{xmlelement,"INTERNET",[],[]},
 			    {xmlelement,"PREF",[],[]},
 			    {xmlelement,"USERID",[],[{xmlcdata,Value}]}]};
 
-ldap_lca_to_vcard(vCardN,"sn",[Value|_]) ->
+ldap_attribute_to_vcard(vCard, {"photo", Value}) ->
+    {xmlelement,"PHOTO",[],[
+			    {xmlelement,"BINVAL",[],[{xmlcdata, jlib:encode_base64(Value)}]}]};
+
+ldap_attribute_to_vcard(vCardN, {"family", Value}) ->
     {xmlelement,"FAMILY",[],[{xmlcdata,Value}]};
 
-ldap_lca_to_vcard(vCardN,"givenname",[Value|_]) ->
+ldap_attribute_to_vcard(vCardN, {"given", Value}) ->
     {xmlelement,"GIVEN",[],[{xmlcdata,Value}]};
 
-ldap_lca_to_vcard(vCardN,"initials",[Value|_]) ->
+ldap_attribute_to_vcard(vCardN, {"middle", Value}) ->
     {xmlelement,"MIDDLE",[],[{xmlcdata,Value}]};
 
-ldap_lca_to_vcard(vCardO,"o",[Value|_]) ->
+ldap_attribute_to_vcard(vCardO, {"orgname", Value}) ->
     {xmlelement,"ORGNAME",[],[{xmlcdata,Value}]};
 
-ldap_lca_to_vcard(vCardO,"ou",[Value|_]) ->
+ldap_attribute_to_vcard(vCardO, {"orgunit", Value}) ->
     {xmlelement,"ORGUNIT",[],[{xmlcdata,Value}]};
 
-ldap_lca_to_vcard(_,_,_) -> none.
-
-ldap_attributes_to_vcard(Attributes,From,To) ->
-    Elts = lists:map(fun(Attr) ->
-			     ldap_attribute_to_vcard(vCard,Attr,From,To)
-		     end,Attributes),
-    FElts = [ X || X <- Elts, X /= none ],
-    NElts = lists:map(fun(Attr) ->
-			      ldap_attribute_to_vcard(vCardN,Attr,From,To)
-		      end,Attributes),
-    FNElts = [ X || X <- NElts, X /= none ],
-    OElts = lists:map(fun(Attr) ->
-			      ldap_attribute_to_vcard(vCardO,Attr,From,To)
-		      end,Attributes),
-    FOElts = [ X || X <- OElts, X /= none ],
-    [{xmlelement, "vCard", [{"xmlns", ?NS_VCARD}],
-      lists:append(FElts,
-		   [{xmlelement,"N",[],FNElts},
-		    {xmlelement,"ORG",[],FOElts}])
-     }].
+ldap_attribute_to_vcard(vCardA, {"locality", Value}) ->
+    {xmlelement,"LOCALITY",[],[{xmlcdata,Value}]};
 
-process_sm_iq(From, To, #iq{type = Type, sub_el = SubEl} = IQ) ->
-    case Type of
-	set ->
-	    IQ#iq{type = error, sub_el = [SubEl, ?ERR_NOT_ALLOWED]};
-	get ->
-	    #jid{luser = LUser, lserver = LServer} = To,
-	    case find_ldap_user(LServer, LUser) of
-		#eldap_entry{attributes = Attributes} ->
-		    Vcard = ldap_attributes_to_vcard(Attributes,From,To),
-		    IQ#iq{type = result, sub_el = Vcard};
-		_ ->
-		    IQ#iq{type = result, sub_el = []}
-	    end
-	end.
+ldap_attribute_to_vcard(vCardA, {"street", Value}) ->
+    {xmlelement,"STREET",[],[{xmlcdata,Value}]};
+
+ldap_attribute_to_vcard(vCardA, {"ctry", Value}) ->
+    {xmlelement,"CTRY",[],[{xmlcdata,Value}]};
+
+ldap_attribute_to_vcard(vCardA, {"region", Value}) ->
+    {xmlelement,"REGION",[],[{xmlcdata,Value}]};
+
+ldap_attribute_to_vcard(vCardA, {"pcode", Value}) ->
+    {xmlelement,"PCODE",[],[{xmlcdata,Value}]};
+
+ldap_attribute_to_vcard(_, _) ->
+    none.
 
 -define(TLFIELD(Type, Label, Var),
 	{xmlelement, "field", [{"type", Type},
 			       {"label", translate:translate(Lang, Label)},
 			       {"var", Var}], []}).
 
-
--define(FORM(JID),
+-define(FORM(JID, SearchFields),
 	[{xmlelement, "instructions", [],
 	  [{xmlcdata, translate:translate(Lang, "You need an x:data capable client to search")}]},
 	 {xmlelement, "x", [{"xmlns", ?NS_XDATA}, {"type", "form"}],
@@ -229,30 +388,15 @@ process_sm_iq(From, To, #iq{type = Type, sub_el = SubEl} = IQ) ->
 	      jlib:jid_to_string(JID)}]},
 	   {xmlelement, "instructions", [],
 	    [{xmlcdata, translate:translate(Lang, "Fill in fields to search "
-					    "for any matching Jabber User")}]},
-	   ?TLFIELD("text-single", "User", "user"),
-	   ?TLFIELD("text-single", "Full Name", "fn"),
-	   ?TLFIELD("text-single", "Given Name", "given"),
-	   ?TLFIELD("text-single", "Middle Name", "middle"),
-	   ?TLFIELD("text-single", "Family Name", "family"),
-	   ?TLFIELD("text-single", "Nickname", "nickname"),
-	   ?TLFIELD("text-single", "Birthday", "bday"),
-	   ?TLFIELD("text-single", "Country", "ctry"),
-	   ?TLFIELD("text-single", "City", "locality"),
-	   ?TLFIELD("text-single", "Email", "email"),
-	   ?TLFIELD("text-single", "Organization Name", "orgname"),
-	   ?TLFIELD("text-single", "Organization Unit", "orgunit")
-	  ]}]).
-
+					    "for any matching Jabber User")}]}
+	  ] ++ lists:map(fun({X,Y}) -> ?TLFIELD("text-single", X, Y) end, SearchFields)}]).
 
-
-
-do_route(ServerHost, From, To, Packet) ->
+do_route(State, From, To, Packet) ->
     #jid{user = User, resource = Resource} = To,
     if
 	(User /= "") or (Resource /= "") ->
 	    Err = jlib:make_error_reply(Packet, ?ERR_SERVICE_UNAVAILABLE),
-	    ejabberd_router ! {route, To, From, Err};
+	    ejabberd_router:route(To, From, Err);
 	true ->
 	    IQ = jlib:iq_query_info(Packet),
 	    case IQ of
@@ -285,24 +429,25 @@ do_route(ServerHost, From, To, Packet) ->
 						    [{xmlelement, "x",
 						      [{"xmlns", ?NS_XDATA},
 						       {"type", "result"}],
-						      search_result(Lang, To, ServerHost, XData)
+						      search_result(Lang, To, State, XData)
 						     }]}]},
 					    ejabberd_router:route(
 					      To, From, jlib:iq_to_xml(ResIQ))
 				    end
 			    end;
 			get ->
+			    SearchFields = State#state.search_fields,
 			    ResIQ = IQ#iq{type = result,
 					  sub_el = [{xmlelement,
 						     "query",
 						     [{"xmlns", ?NS_SEARCH}],
-						     ?FORM(To)
+						     ?FORM(To, SearchFields)
 						    }]},
 			    ejabberd_router:route(To,
 						  From,
 						  jlib:iq_to_xml(ResIQ))
 		    end;
-		#iq{type = Type, xmlns = ?NS_DISCO_INFO, sub_el = SubEl} ->
+		#iq{type = Type, xmlns = ?NS_DISCO_INFO} ->
 		    case Type of
 			set ->
 			    Err = jlib:make_error_reply(
@@ -330,7 +475,7 @@ do_route(ServerHost, From, To, Packet) ->
 						  From,
 						  jlib:iq_to_xml(ResIQ))
 		    end;
-		#iq{type = Type, xmlns = ?NS_DISCO_ITEMS, sub_el = SubEl} ->
+		#iq{type = Type, xmlns = ?NS_DISCO_ITEMS} ->
 		    case Type of
 			set ->
 			    Err = jlib:make_error_reply(
@@ -369,223 +514,295 @@ iq_get_vcard(Lang) ->
       [{xmlcdata, "ejabberd/mod_vcard"}]},
      {xmlelement, "URL", [],
       [{xmlcdata,
-        "http://ejabberd.jabberstudio.org/"}]},
+        "http://ejabberd.jabber.ru/"}]},
      {xmlelement, "DESC", [],
       [{xmlcdata, translate:translate(
 		    Lang,
 		    "ejabberd vCard module\n"
 		    "Copyright (c) 2003-2006 Alexey Shchepin")}]}].
 
-find_xdata_el({xmlelement, _Name, _Attrs, SubEls}) ->
-    find_xdata_el1(SubEls).
-
-find_xdata_el1([]) ->
-    false;
-find_xdata_el1([{xmlelement, Name, Attrs, SubEls} | Els]) ->
-    case xml:get_attr_s("xmlns", Attrs) of
-	?NS_XDATA ->
-	    {xmlelement, Name, Attrs, SubEls};
-	_ ->
-	    find_xdata_el1(Els)
-    end;
-find_xdata_el1([_ | Els]) ->
-    find_xdata_el1(Els).
-
 -define(LFIELD(Label, Var),
 	{xmlelement, "field", [{"label", translate:translate(Lang, Label)},
 			       {"var", Var}], []}).
 
-search_result(Lang, JID, ServerHost, Data) ->
-    [{xmlelement, "title", [],
-      [{xmlcdata, translate:translate(Lang, "Search Results for ") ++
-	jlib:jid_to_string(JID)}]},
-     {xmlelement, "reported", [],
-      [?LFIELD("Jabber ID", "jid"),
-       ?LFIELD("Full Name", "fn"),
-       ?LFIELD("Given Name", "given"),
-       ?LFIELD("Middle Name", "middle"),
-       ?LFIELD("Family Name", "family"),
-       ?LFIELD("Nickname", "nickname"),
-       ?LFIELD("Birthday", "bday"),
-       ?LFIELD("Country", "ctry"),
-       ?LFIELD("City", "locality"),
-       ?LFIELD("Email", "email"),
-       ?LFIELD("Organization Name", "orgname"),
-       ?LFIELD("Organization Unit", "orgunit")
-      ]}] ++ lists:map(fun(E) -> 
-			       record_to_item(E#eldap_entry.attributes)
-		       end, search(ServerHost, Data)).
+search_result(Lang, JID, State, Data) ->
+    SearchReported = State#state.search_reported,
+    Header = [{xmlelement, "title", [],
+	       [{xmlcdata, translate:translate(Lang, "Search Results for ") ++
+		 jlib:jid_to_string(JID)}]},
+	      {xmlelement, "reported", [],
+	       [?LFIELD("Jabber ID", "jid")] ++
+	       lists:map(
+		 fun({Name, Value}) -> ?LFIELD(Name, Value) end,
+		 SearchReported)
+	      }],
+    case search(State, Data) of
+	error ->
+	    Header;
+	Result ->
+	    Header ++ Result
+    end.
 
 -define(FIELD(Var, Val),
 	{xmlelement, "field", [{"var", Var}],
 	 [{xmlelement, "value", [],
 	   [{xmlcdata, Val}]}]}).
 
-case_exact_compare(none,_) ->
-    false;
-case_exact_compare(_,none) ->
-    false;
-case_exact_compare(X,Y) ->
-    X > Y.
-
-ldap_sort_entries(L) ->
-    lists:sort(fun(E1,E2) ->
-		       case_exact_compare(ldap_get_value(E1,"cn"),ldap_get_value(E2,"cn"))
-	       end,L).
-
-ldap_get_value(E,Attribute) ->
-    #eldap_entry{attributes = Attributes} = E,
-    case lists:filter(fun({A,_}) ->
-			      string:equal(A,Attribute)
-		      end,Attributes) of
-	[{Attr,[Value|_]}] ->
-	    Value;
-	_ -> 
-	    none
-    end.
-    
-
-ldap_attribute_to_item("uid",Value) ->
-    [
-     ?FIELD("jid",Value ++ "@" ++ ?MYNAME),
-     ?FIELD("uid",Value),
-     ?FIELD("nickname",Value)
-    ];
-
-ldap_attribute_to_item("displayname",Value) ->
-    [
-     ?FIELD("fn",Value)
-    ];
-
-ldap_attribute_to_item("sn",Value) ->
-    [
-     ?FIELD("family",Value)
-    ];
-
-ldap_attribute_to_item("displayname",Value) ->
-    [
-     ?FIELD("fn",Value)
-    ];
-
-ldap_attribute_to_item("givenname",Value) ->
-    [
-     ?FIELD("given",Value)
-    ];
-
-ldap_attribute_to_item("initials",Value) ->
-    [
-     ?FIELD("middle",Value)
-    ];
-
-ldap_attribute_to_item("mail",Value) ->
-    [
-     ?FIELD("email",Value)
-    ];
-
-ldap_attribute_to_item("o",Value) ->
-    [
-     ?FIELD("orgname",Value)
-    ];
-
-ldap_attribute_to_item("ou",Value) ->
-    [
-     ?FIELD("orgunit",Value)
-    ];
-
-ldap_attribute_to_item(_,_) ->
-    [none].
-
-record_to_item(Attributes) ->
-    List = lists:append(lists:map(fun({Attr,[Value|_]}) -> 
-					  ldap_attribute_to_item(stringprep:tolower(Attr),Value)
-				  end,Attributes)),
-    FList = [X || X <- List, X /= none],
-    {xmlelement, "item", [],FList}.
-
-search(LServer, Data) ->
-    Filter = make_filter(Data),
-    Base = ejabberd_config:get_local_option({ldap_base, LServer}),
-    UIDAttr = ejabberd_config:get_local_option({ldap_uidattr, LServer}),
-    case eldap:search("mod_vcard_ldap",[{base, Base},
-					{filter, Filter},
-					{attributes, []}]) of
+search(State, Data) ->
+    Base = State#state.base,
+    SearchFilter = State#state.search_filter,
+    Eldap_ID = State#state.eldap_id,
+    UA = State#state.uid,
+    UAF = State#state.uid_format,
+    ReportedAttrs = State#state.search_reported_attrs,
+    Filter = eldap:'and'([SearchFilter, make_filter(Data, UA, UAF)]),
+    case eldap:search(Eldap_ID, [{base, Base},
+				 {filter, Filter},
+				 {attributes, ReportedAttrs}]) of
 	#eldap_search_result{entries = E} ->
-	    [X || X <- E,
-		  ejabberd_auth:is_user_exists(
-		    ldap_get_value(X, UIDAttr), LServer)];
-	Err ->
-	    ?ERROR_MSG("Bad search: ~p", [[LServer, {base, Base},
-					{filter, Filter},
-					{attributes, []}]])
+	    search_items(E, State);
+	_ ->
+	    error
     end.
 
-
-make_filter(Data) ->
-    Filter = [X || X <- lists:map(fun(R) -> 
-					  make_assertion(R)
-				  end, Data),
-		   X /= none ],
+search_items(Entries, State) ->
+    LServer = State#state.serverhost,
+    SearchReported = State#state.search_reported,
+    VCardMap = State#state.vcard_map,
+    UIDAttr = State#state.uid,
+    UIDAttrFormat = State#state.uid_format,
+    Attributes = lists:map(
+		   fun(E) ->
+			   #eldap_entry{attributes = Attrs} = E,
+			   Attrs
+		   end, Entries),
+    lists:flatmap(
+      fun(Attrs) ->
+	      U = get_ldap_attr(UIDAttr, Attrs),
+	      case get_user_part(U, UIDAttrFormat) of
+		  {ok, Username} ->
+		      case ejabberd_auth:is_user_exists(Username, LServer) of
+			  true ->
+			      RFields = lists:map(
+					  fun({_, VCardName}) ->
+						  {VCardName,
+						   map_vcard_attr(
+						     VCardName,
+						     Attrs,
+						     VCardMap,
+						     {Username, ?MYNAME})}
+					  end, SearchReported),
+			      Result = [?FIELD("jid", Username ++ "@" ++ LServer)] ++
+				  [?FIELD(Name, Value) || {Name, Value} <- RFields],
+			      [{xmlelement, "item", [], Result}];
+			  _ ->
+			      []
+		      end;
+		  _ ->
+		      []
+	      end
+      end, Attributes).
+
+make_filter(Data, UAttr, UAttrFormat) ->
+    Filter = lists:flatmap(
+	       fun({Name, [Value | _]}) ->
+		       case Name of
+			   "%u" when Value /= "" ->
+			       {ok, UAF, _} = regexp:sub(UAttrFormat, "%u", "*%u*"),
+			       case eldap_filter:parse(
+				      "("++UAttr++"="++UAF++")", [{"%u", Value}]) of
+				   {ok, F} -> [F];
+				   _ -> []
+			       end;
+			   _ when Value /= "" ->
+			       [eldap:substrings(Name, [{any, Value}])];
+			   _ ->
+			       []
+		       end
+	       end, Data),
     case Filter of
-	[F] -> 
+	[F] ->
 	    F;
 	_ ->
 	    eldap:'and'(Filter)
     end.
 
+remove_user(_User) ->
+    true.
 
-make_assertion("givenName",Value) ->
-    eldap:substrings("givenName",[{any,Value}]);
-
-make_assertion("cn",Value) ->
-    eldap:substrings("cn",[{any,Value}]);
-
-make_assertion("sn",Value) ->
-    eldap:substrings("sn",[{any,Value}]);
-
-make_assertion(Attr, Value) ->
-    eldap:equalityMatch(Attr,Value).
-
-make_assertion({SVar, [Val]}) ->
-    LAttr = ldap_attribute(SVar),
-    case LAttr of
-	none ->
-	    none;
-	_ ->
-	    if 
-		is_list(Val) and (Val /= "") ->
-		    make_assertion(LAttr,Val);
-		true ->
-		    none
+%%%-----------------------
+%%% Auxiliary functions.
+%%%-----------------------
+
+get_user_part(String, Pattern) ->
+    F = fun(S, P) ->
+		First = string:str(P, "%u"),
+		TailLength = length(P) - (First+1),
+		string:sub_string(S, First, length(S) - TailLength)
+	end,
+    case catch F(String, Pattern) of
+	{'EXIT', _} ->
+	    {error, badmatch};
+	Result ->
+	    case regexp:sub(Pattern, "%u", Result) of
+		{ok, String, _} -> {ok, Result};
+		_ -> {error, badmatch}
 	    end
     end.
 
-ldap_attribute("user") ->
-    "uid";
-
-ldap_attribute("fn") ->
-    "cn";
-
-ldap_attribute("family") ->
-    "sn";
-
-ldap_attribute("given") ->
-    "givenName";
-
-ldap_attribute("middle") ->
-    "initials";
-
-ldap_attribute("email") ->
-    "mail";
+case_insensitive_match(X, Y) ->
+    X1 = stringprep:tolower(X),
+    Y1 = stringprep:tolower(Y),
+    if
+	X1 == Y1 -> true;
+	true -> false
+    end.
 
-ldap_attribute("orgname") ->
-    "o";
+map_vcard_attr(VCardName, Attributes, Pattern, UD) ->
+    Res = lists:filter(
+	    fun({Name, _, _}) ->
+		    case_insensitive_match(Name, VCardName)
+	    end, Pattern),
+    case Res of
+	[{_, Str, Attrs}] ->
+	    process_pattern(Str, UD,
+			    [get_ldap_attr(X, Attributes) || X<-Attrs]);
+	_ -> ""
+    end.
 
-ldap_attribute("orgunit") ->
-    "ou";
+process_pattern(Str, {User, Domain}, Attrs) ->
+    Res = lists:foldl(
+	    fun(X, Acc) ->
+		    {ok, NewStr, _} = regexp:sub(Acc, "%s", X),
+		    NewStr
+	    end,
+	    Str, Attrs),
+    eldap_filter:do_sub(Res, [{"%u", User},{"%d", Domain}]).
+
+get_ldap_attr(LDAPAttr, Attributes) ->
+    Res = lists:filter(
+	    fun({Name, _}) ->
+		    case_insensitive_match(Name, LDAPAttr)
+	    end, Attributes),
+    case Res of
+	[{_, [Value|_]}] -> Value;
+	_ -> ""
+    end.
 
-ldap_attribute(_) ->
-    none.
+find_xdata_el({xmlelement, _Name, _Attrs, SubEls}) ->
+    find_xdata_el1(SubEls).
 
-remove_user(User) ->
-    true.
+find_xdata_el1([]) ->
+    false;
+find_xdata_el1([{xmlelement, Name, Attrs, SubEls} | Els]) ->
+    case xml:get_attr_s("xmlns", Attrs) of
+	?NS_XDATA ->
+	    {xmlelement, Name, Attrs, SubEls};
+	_ ->
+	    find_xdata_el1(Els)
+    end;
+find_xdata_el1([_ | Els]) ->
+    find_xdata_el1(Els).
 
+parse_options(Host, Opts) ->
+    MyHost = gen_mod:get_opt(host, Opts, "vjud." ++ Host),
+    Search = gen_mod:get_opt(search, Opts, true),
+    Eldap_ID = atom_to_list(gen_mod:get_module_proc(Host, ?PROCNAME)),
+    LDAPServers = case gen_mod:get_opt(ldap_servers, Opts, undefined) of
+		      undefined ->
+			  ejabberd_config:get_local_option({ldap_servers, Host});
+		      S -> S
+		  end,
+    LDAPPort = case gen_mod:get_opt(ldap_port, Opts, undefined) of
+		   undefined ->
+		       case ejabberd_config:get_local_option({ldap_port, Host}) of
+			   undefined -> 389;
+			   P -> P
+		       end;
+		   P -> P
+	       end,
+    LDAPBase = case gen_mod:get_opt(ldap_base, Opts, undefined) of
+		   undefined ->
+		       ejabberd_config:get_local_option({ldap_base, Host});
+		   B -> B
+	       end,
+    UIDAttr = case gen_mod:get_opt(ldap_uidattr, Opts, undefined) of
+		  undefined ->
+		      case ejabberd_config:get_local_option({ldap_uidattr, Host}) of
+			  undefined -> "uid";
+			  UA -> UA
+		      end;
+		  UA -> UA
+	      end,
+    UIDAttrFormat = case gen_mod:get_opt(ldap_uidattr_format, Opts, undefined) of
+			undefined ->
+			    case ejabberd_config:get_local_option({ldap_uidattr_format, Host}) of
+				undefined -> "%u";
+				UAF -> UAF
+			    end;
+			UAF -> UAF
+		    end,
+    RootDN = case gen_mod:get_opt(ldap_rootdn, Opts, undefined) of
+		 undefined ->
+		     case ejabberd_config:get_local_option({ldap_rootdn, Host}) of
+			 undefined -> "";
+			 RDN -> RDN
+		     end;
+		 RDN -> RDN
+	     end,
+    Password = case gen_mod:get_opt(ldap_password, Opts, undefined) of
+		   undefined ->
+		       case ejabberd_config:get_local_option({ldap_password, Host}) of
+			   undefined -> "";
+			   Pass -> Pass
+		       end;
+		   Pass -> Pass
+	       end,
+    SubFilter = "("++UIDAttr++"="++UIDAttrFormat++")",
+    UserFilter = case gen_mod:get_opt(ldap_filter, Opts, undefined) of
+		     undefined ->
+			 case ejabberd_config:get_local_option({ldap_filter, Host}) of
+			     undefined -> SubFilter;
+			     "" -> SubFilter;
+			     F -> "(&" ++ SubFilter ++ F ++ ")"
+			 end;
+		     "" -> SubFilter;
+		     F -> "(&" ++ SubFilter ++ F ++ ")"
+		 end,
+    {ok, SearchFilter} = eldap_filter:parse(
+			   eldap_filter:do_sub(UserFilter, [{"%u","*"}])),
+    VCardMap = gen_mod:get_opt(ldap_vcard_map, Opts, ?VCARD_MAP),
+    SearchFields = gen_mod:get_opt(ldap_search_fields, Opts, ?SEARCH_FIELDS),
+    SearchReported = gen_mod:get_opt(ldap_search_reported, Opts, ?SEARCH_REPORTED),
+    %% In search requests we need to fetch only attributes defined
+    %% in vcard-map and search-reported. In some cases,
+    %% this will essentially reduce network traffic from an LDAP server.
+    VCardMapAttrs = lists:usort(
+		      lists:append([A || {_, _, A} <- VCardMap]) ++ [UIDAttr]),
+    SearchReportedAttrs =
+	lists:usort(lists:flatmap(
+		      fun({_, N}) ->
+			      case lists:keysearch(N, 1, VCardMap) of
+				  {value, {_, _, L}} -> L;
+				  _ -> []
+			      end
+		      end, SearchReported) ++ [UIDAttr]),
+    #state{serverhost = Host,
+	   myhost = MyHost,
+	   eldap_id = Eldap_ID,
+	   search = Search,
+	   servers = LDAPServers,
+	   port = LDAPPort,
+	   dn = RootDN,
+	   base = LDAPBase,
+	   password = Password,
+	   uid = UIDAttr,
+	   uid_format = UIDAttrFormat,
+	   vcard_map = VCardMap,
+	   vcard_map_attrs = VCardMapAttrs,
+	   user_filter = UserFilter,
+	   search_filter = SearchFilter,
+	   search_fields = SearchFields,
+	   search_reported = SearchReported,
+	   search_reported_attrs = SearchReportedAttrs
+	  }.
-- 
cgit v1.2.3


From 8583e3f9be0ef2f7b7c66550b3028241a7574670 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20R=C3=A9mond?=
 <mickael.remond@process-one.net>
Date: Fri, 22 Sep 2006 08:42:41 +0000
Subject: Bugfixes coming from trunk (SVN #607): * doc/guide.tex: Minor fix on
 index generation.

SVN Revision: 616
---
 ChangeLog      |    4 +
 doc/guide.html | 1404 ++++++++++++++++++++++++++++----------------------------
 doc/guide.tex  |   22 +-
 3 files changed, 727 insertions(+), 703 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2771d1a3c..85f31d187 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-09-14  Mickael Remond  <mickael.remond@process-one.net>
+
+	* doc/guide.tex: Minor fix on index generation.
+
 2006-09-14  Alexey Shchepin  <alexey@sevcom.net>
 
 	* doc/guide.tex: Updated (thanks to Evgeniy Khramtsov)
diff --git a/doc/guide.html b/doc/guide.html
index 3c8a473e0..cf4f4382f 100644
--- a/doc/guide.html
+++ b/doc/guide.html
@@ -1,29 +1,46 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
             "http://www.w3.org/TR/REC-html40/loose.dtd">
 <HTML>
-<HEAD><TITLE>Ejabberd 1.1.1 Installation and Operation Guide</TITLE>
 
-<META http-equiv="Content-Type" content="text/html; charset=KOI8-R">
-<META name="GENERATOR" content="hevea 1.07">
+<HEAD>
+
+<TITLE>Ejabberd 1.1.1 Installation and Operation Guide</TITLE>
+
+<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<META name="GENERATOR" content="hevea 1.08">
+<STYLE type="text/css">
+.toc{list-style:none;}
+.title{margin:auto;text-align:center}
+.center{text-align:center;margin-left:auto;margin-right:auto;}
+.flushleft{text-align:left;margin-left:0ex;margin-right:auto;}
+.flushright{text-align:right;margin-left:auto;margin-right:0ex;}
+DIV TABLE{margin-left:inherit;margin-right:inherit;}
+PRE{text-align:left;margin-left:0ex;margin-right:auto;}
+BLOCKQUOTE{margin-left:4ex;margin-right:4ex;text-align:left;}
+.part{margin:auto;text-align:center}
+</STYLE>
 </HEAD>
+
 <BODY >
-<!--HEVEA command line is: /usr/bin/hevea guide.tex -->
+<!--HEVEA command line is: hevea guide.tex -->
 <!--HTMLHEAD-->
 <!--ENDHTML-->
 <!--PREFIX <ARG ></ARG>-->
 <!--CUT DEF section 1 -->
+
 <BR>
 <BR>
 <A NAME="sec:titlepage"></A>
 
- 
-<H1 ALIGN=center>Ejabberd 1.1.1 Installation and Operation Guide</H1>
-
-<H3 ALIGN=center>Alexey Shchepin<BR>
+ <TABLE CLASS="title">
+<TR><TD>
+<H1 CLASS="titlemain">Ejabberd 1.1.1 Installation and Operation Guide</H1>
+<H3 CLASS="titlerest">Alexey Shchepin<BR>
 <A HREF="mailto:alexey@sevcom.net"><TT>mailto:alexey@sevcom.net</TT></A><BR>
-<A HREF="xmpp:aleksey@jabber.ru"><TT>xmpp:aleksey@jabber.ru</TT></A></H3>
+<A HREF="xmpp:aleksey@jabber.ru"><TT>xmpp:aleksey@jabber.ru</TT></A></H3></TD>
+</TR></TABLE><BR>
 <BR>
-<DIV ALIGN=center>
+<DIV CLASS="center">
  
  <IMG SRC="logo.png">
  
@@ -32,125 +49,125 @@
 <BR>
 
  </DIV>
-<BLOCKQUOTE><I>I can thoroughly recommend ejabberd for ease of setup --
+<BLOCKQUOTE CLASS="quotation"><I>I can thoroughly recommend ejabberd for ease of setup &ndash;
  Kevin Smith, Current maintainer of the Psi project</I></BLOCKQUOTE>
-<!--TOC section Table of Contents-->
+<!--TOC section Contents-->
 
-<H2>Table of Contents</H2><!--SEC END -->
+<H2 CLASS="section">Contents</H2><!--SEC END -->
 
-<UL><LI>
+<UL CLASS="toc"><LI CLASS="li-toc">
 <A HREF="#htoc1">1&nbsp;&nbsp;Introduction</A>
-<UL><LI>
+<UL CLASS="toc"><LI CLASS="li-toc">
 <A HREF="#htoc2">1.1&nbsp;&nbsp;Key Features</A>
-<LI><A HREF="#htoc3">1.2&nbsp;&nbsp;Additional Features</A>
+<LI CLASS="li-toc"><A HREF="#htoc3">1.2&nbsp;&nbsp;Additional Features</A>
 </UL>
-<LI><A HREF="#htoc4">2&nbsp;&nbsp;Installation from Source</A>
-<UL><LI>
+<LI CLASS="li-toc"><A HREF="#htoc4">2&nbsp;&nbsp;Installation from Source</A>
+<UL CLASS="toc"><LI CLASS="li-toc">
 <A HREF="#htoc5">2.1&nbsp;&nbsp;Installation Requirements</A>
-<UL><LI>
-<A HREF="#htoc6">2.1.1&nbsp;&nbsp;``Unix-like'' operating systems</A>
-<LI><A HREF="#htoc7">2.1.2&nbsp;&nbsp;Windows</A>
+<UL CLASS="toc"><LI CLASS="li-toc">
+<A HREF="#htoc6">2.1.1&nbsp;&nbsp;&#8220;Unix-like&#8221; operating systems</A>
+<LI CLASS="li-toc"><A HREF="#htoc7">2.1.2&nbsp;&nbsp;Windows</A>
 </UL>
-<LI><A HREF="#htoc8">2.2&nbsp;&nbsp;Obtaining <TT>ejabberd</TT></A>
-<LI><A HREF="#htoc9">2.3&nbsp;&nbsp;Compilation</A>
-<UL><LI>
-<A HREF="#htoc10">2.3.1&nbsp;&nbsp;``Unix-like'' operating systems</A>
-<LI><A HREF="#htoc11">2.3.2&nbsp;&nbsp;Windows</A>
+<LI CLASS="li-toc"><A HREF="#htoc8">2.2&nbsp;&nbsp;Obtaining <TT>ejabberd</TT></A>
+<LI CLASS="li-toc"><A HREF="#htoc9">2.3&nbsp;&nbsp;Compilation</A>
+<UL CLASS="toc"><LI CLASS="li-toc">
+<A HREF="#htoc10">2.3.1&nbsp;&nbsp;&#8220;Unix-like&#8221; operating systems</A>
+<LI CLASS="li-toc"><A HREF="#htoc11">2.3.2&nbsp;&nbsp;Windows</A>
 </UL>
-<LI><A HREF="#htoc12">2.4&nbsp;&nbsp;Starting</A>
+<LI CLASS="li-toc"><A HREF="#htoc12">2.4&nbsp;&nbsp;Starting</A>
 </UL>
-<LI><A HREF="#htoc13">3&nbsp;&nbsp;Configuration</A>
-<UL><LI>
+<LI CLASS="li-toc"><A HREF="#htoc13">3&nbsp;&nbsp;Configuration</A>
+<UL CLASS="toc"><LI CLASS="li-toc">
 <A HREF="#htoc14">3.1&nbsp;&nbsp;Initial Configuration</A>
-<UL><LI>
+<UL CLASS="toc"><LI CLASS="li-toc">
 <A HREF="#htoc15">3.1.1&nbsp;&nbsp;Host Names</A>
-<LI><A HREF="#htoc16">3.1.2&nbsp;&nbsp;Default Language</A>
-<LI><A HREF="#htoc17">3.1.3&nbsp;&nbsp;Access Rules</A>
-<LI><A HREF="#htoc18">3.1.4&nbsp;&nbsp;Shapers</A>
-<LI><A HREF="#htoc19">3.1.5&nbsp;&nbsp;Limitation of the number of opened sessions</A>
-<LI><A HREF="#htoc20">3.1.6&nbsp;&nbsp;Listened Sockets</A>
-<LI><A HREF="#htoc21">3.1.7&nbsp;&nbsp;Modules</A>
-<LI><A HREF="#htoc22">3.1.8&nbsp;&nbsp;Virtual Hosting</A>
-<LI><A HREF="#htoc23">3.1.9&nbsp;&nbsp;SASL anonymous and anonymous login</A>
+<LI CLASS="li-toc"><A HREF="#htoc16">3.1.2&nbsp;&nbsp;Default Language</A>
+<LI CLASS="li-toc"><A HREF="#htoc17">3.1.3&nbsp;&nbsp;Access Rules</A>
+<LI CLASS="li-toc"><A HREF="#htoc18">3.1.4&nbsp;&nbsp;Shapers</A>
+<LI CLASS="li-toc"><A HREF="#htoc19">3.1.5&nbsp;&nbsp;Limitation of the number of opened sessions</A>
+<LI CLASS="li-toc"><A HREF="#htoc20">3.1.6&nbsp;&nbsp;Listened Sockets</A>
+<LI CLASS="li-toc"><A HREF="#htoc21">3.1.7&nbsp;&nbsp;Modules</A>
+<LI CLASS="li-toc"><A HREF="#htoc22">3.1.8&nbsp;&nbsp;Virtual Hosting</A>
+<LI CLASS="li-toc"><A HREF="#htoc23">3.1.9&nbsp;&nbsp;SASL anonymous and anonymous login</A>
 </UL>
-<LI><A HREF="#htoc24">3.2&nbsp;&nbsp;Relational Database Support</A>
-<UL><LI>
+<LI CLASS="li-toc"><A HREF="#htoc24">3.2&nbsp;&nbsp;Relational Database Support</A>
+<UL CLASS="toc"><LI CLASS="li-toc">
 <A HREF="#htoc25">3.2.1&nbsp;&nbsp;Preliminary steps</A>
-<LI><A HREF="#htoc26">3.2.2&nbsp;&nbsp;Authentication against a relational database</A>
-<LI><A HREF="#htoc27">3.2.3&nbsp;&nbsp;Relational database for other modules</A>
+<LI CLASS="li-toc"><A HREF="#htoc26">3.2.2&nbsp;&nbsp;Authentication against a relational database</A>
+<LI CLASS="li-toc"><A HREF="#htoc27">3.2.3&nbsp;&nbsp;Relational database for other modules</A>
 </UL>
-<LI><A HREF="#htoc28">3.3&nbsp;&nbsp;Creating an Initial Administrator</A>
-<LI><A HREF="#htoc29">3.4&nbsp;&nbsp;Online Configuration and Monitoring</A>
-<UL><LI>
+<LI CLASS="li-toc"><A HREF="#htoc28">3.3&nbsp;&nbsp;Creating an Initial Administrator</A>
+<LI CLASS="li-toc"><A HREF="#htoc29">3.4&nbsp;&nbsp;Online Configuration and Monitoring</A>
+<UL CLASS="toc"><LI CLASS="li-toc">
 <A HREF="#htoc30">3.4.1&nbsp;&nbsp;Web Interface</A>
-<LI><A HREF="#htoc31">3.4.2&nbsp;&nbsp;<TT>ejabberdctl</TT></A>
+<LI CLASS="li-toc"><A HREF="#htoc31">3.4.2&nbsp;&nbsp;<TT>ejabberdctl</TT></A>
 </UL>
 </UL>
-<LI><A HREF="#htoc32">4&nbsp;&nbsp;Firewall Settings</A>
-<LI><A HREF="#htoc33">5&nbsp;&nbsp;SRV Records</A>
-<LI><A HREF="#htoc34">6&nbsp;&nbsp;Clustering</A>
-<UL><LI>
+<LI CLASS="li-toc"><A HREF="#htoc32">4&nbsp;&nbsp;Firewall Settings</A>
+<LI CLASS="li-toc"><A HREF="#htoc33">5&nbsp;&nbsp;SRV Records</A>
+<LI CLASS="li-toc"><A HREF="#htoc34">6&nbsp;&nbsp;Clustering</A>
+<UL CLASS="toc"><LI CLASS="li-toc">
 <A HREF="#htoc35">6.1&nbsp;&nbsp;How it Works</A>
-<UL><LI>
+<UL CLASS="toc"><LI CLASS="li-toc">
 <A HREF="#htoc36">6.1.1&nbsp;&nbsp;Router</A>
-<LI><A HREF="#htoc37">6.1.2&nbsp;&nbsp;Local Router</A>
-<LI><A HREF="#htoc38">6.1.3&nbsp;&nbsp;Session Manager</A>
-<LI><A HREF="#htoc39">6.1.4&nbsp;&nbsp;s2s Manager</A>
+<LI CLASS="li-toc"><A HREF="#htoc37">6.1.2&nbsp;&nbsp;Local Router</A>
+<LI CLASS="li-toc"><A HREF="#htoc38">6.1.3&nbsp;&nbsp;Session Manager</A>
+<LI CLASS="li-toc"><A HREF="#htoc39">6.1.4&nbsp;&nbsp;s2s Manager</A>
 </UL>
-<LI><A HREF="#htoc40">6.2&nbsp;&nbsp;Clustering Setup</A>
+<LI CLASS="li-toc"><A HREF="#htoc40">6.2&nbsp;&nbsp;Clustering Setup</A>
 </UL>
-<LI><A HREF="#htoc41">A&nbsp;&nbsp;Built-in Modules</A>
-<UL><LI>
+<LI CLASS="li-toc"><A HREF="#htoc41">A&nbsp;&nbsp;Built-in Modules</A>
+<UL CLASS="toc"><LI CLASS="li-toc">
 <A HREF="#htoc42">A.1&nbsp;&nbsp;Overview</A>
-<LI><A HREF="#htoc43">A.2&nbsp;&nbsp;Common Options</A>
-<UL><LI>
+<LI CLASS="li-toc"><A HREF="#htoc43">A.2&nbsp;&nbsp;Common Options</A>
+<UL CLASS="toc"><LI CLASS="li-toc">
 <A HREF="#htoc44">A.2.1&nbsp;&nbsp;<TT>iqdisc</TT></A>
-<LI><A HREF="#htoc45">A.2.2&nbsp;&nbsp;<TT>hosts</TT></A>
+<LI CLASS="li-toc"><A HREF="#htoc45">A.2.2&nbsp;&nbsp;<TT>hosts</TT></A>
 </UL>
-<LI><A HREF="#htoc46">A.3&nbsp;&nbsp;<TT>mod_announce</TT></A>
-<LI><A HREF="#htoc47">A.4&nbsp;&nbsp;<TT>mod_disco</TT></A>
-<LI><A HREF="#htoc48">A.5&nbsp;&nbsp;<TT>mod_echo</TT></A>
-<LI><A HREF="#htoc49">A.6&nbsp;&nbsp;<TT>mod_irc</TT></A>
-<LI><A HREF="#htoc50">A.7&nbsp;&nbsp;<TT>mod_last</TT></A>
-<LI><A HREF="#htoc51">A.8&nbsp;&nbsp;<TT>mod_muc</TT></A>
-<LI><A HREF="#htoc52">A.9&nbsp;&nbsp;<TT>mod_muc_log</TT></A>
-<LI><A HREF="#htoc53">A.10&nbsp;&nbsp;<TT>mod_offline</TT></A>
-<LI><A HREF="#htoc54">A.11&nbsp;&nbsp;<TT>mod_privacy</TT></A>
-<LI><A HREF="#htoc55">A.12&nbsp;&nbsp;<TT>mod_private</TT></A>
-<LI><A HREF="#htoc56">A.13&nbsp;&nbsp;<TT>mod_pubsub</TT></A>
-<LI><A HREF="#htoc57">A.14&nbsp;&nbsp;<TT>mod_register</TT></A>
-<LI><A HREF="#htoc58">A.15&nbsp;&nbsp;<TT>mod_roster</TT></A>
-<LI><A HREF="#htoc59">A.16&nbsp;&nbsp;<TT>mod_service_log</TT></A>
-<LI><A HREF="#htoc60">A.17&nbsp;&nbsp;<TT>mod_shared_roster</TT></A>
-<LI><A HREF="#htoc61">A.18&nbsp;&nbsp;<TT>mod_stats</TT></A>
-<LI><A HREF="#htoc62">A.19&nbsp;&nbsp;<TT>mod_time</TT></A>
-<LI><A HREF="#htoc63">A.20&nbsp;&nbsp;<TT>mod_vcard</TT></A>
-<LI><A HREF="#htoc64">A.21&nbsp;&nbsp;LDAP and <TT>mod_vcard_ldap</TT></A>
-<UL><LI>
+<LI CLASS="li-toc"><A HREF="#htoc46">A.3&nbsp;&nbsp;<TT>mod_announce</TT></A>
+<LI CLASS="li-toc"><A HREF="#htoc47">A.4&nbsp;&nbsp;<TT>mod_disco</TT></A>
+<LI CLASS="li-toc"><A HREF="#htoc48">A.5&nbsp;&nbsp;<TT>mod_echo</TT></A>
+<LI CLASS="li-toc"><A HREF="#htoc49">A.6&nbsp;&nbsp;<TT>mod_irc</TT></A>
+<LI CLASS="li-toc"><A HREF="#htoc50">A.7&nbsp;&nbsp;<TT>mod_last</TT></A>
+<LI CLASS="li-toc"><A HREF="#htoc51">A.8&nbsp;&nbsp;<TT>mod_muc</TT></A>
+<LI CLASS="li-toc"><A HREF="#htoc52">A.9&nbsp;&nbsp;<TT>mod_muc_log</TT></A>
+<LI CLASS="li-toc"><A HREF="#htoc53">A.10&nbsp;&nbsp;<TT>mod_offline</TT></A>
+<LI CLASS="li-toc"><A HREF="#htoc54">A.11&nbsp;&nbsp;<TT>mod_privacy</TT></A>
+<LI CLASS="li-toc"><A HREF="#htoc55">A.12&nbsp;&nbsp;<TT>mod_private</TT></A>
+<LI CLASS="li-toc"><A HREF="#htoc56">A.13&nbsp;&nbsp;<TT>mod_pubsub</TT></A>
+<LI CLASS="li-toc"><A HREF="#htoc57">A.14&nbsp;&nbsp;<TT>mod_register</TT></A>
+<LI CLASS="li-toc"><A HREF="#htoc58">A.15&nbsp;&nbsp;<TT>mod_roster</TT></A>
+<LI CLASS="li-toc"><A HREF="#htoc59">A.16&nbsp;&nbsp;<TT>mod_service_log</TT></A>
+<LI CLASS="li-toc"><A HREF="#htoc60">A.17&nbsp;&nbsp;<TT>mod_shared_roster</TT></A>
+<LI CLASS="li-toc"><A HREF="#htoc61">A.18&nbsp;&nbsp;<TT>mod_stats</TT></A>
+<LI CLASS="li-toc"><A HREF="#htoc62">A.19&nbsp;&nbsp;<TT>mod_time</TT></A>
+<LI CLASS="li-toc"><A HREF="#htoc63">A.20&nbsp;&nbsp;<TT>mod_vcard</TT></A>
+<LI CLASS="li-toc"><A HREF="#htoc64">A.21&nbsp;&nbsp;LDAP and <TT>mod_vcard_ldap</TT></A>
+<UL CLASS="toc"><LI CLASS="li-toc">
 <A HREF="#htoc65">A.21.1&nbsp;&nbsp;Features</A>
-<LI><A HREF="#htoc66">A.21.2&nbsp;&nbsp;Connection</A>
-<LI><A HREF="#htoc67">A.21.3&nbsp;&nbsp;Authentication</A>
-<LI><A HREF="#htoc68">A.21.4&nbsp;&nbsp;vCards and Search</A>
-<LI><A HREF="#htoc69">A.21.5&nbsp;&nbsp;Examples</A>
+<LI CLASS="li-toc"><A HREF="#htoc66">A.21.2&nbsp;&nbsp;Connection</A>
+<LI CLASS="li-toc"><A HREF="#htoc67">A.21.3&nbsp;&nbsp;Authentication</A>
+<LI CLASS="li-toc"><A HREF="#htoc68">A.21.4&nbsp;&nbsp;vCards and Search</A>
+<LI CLASS="li-toc"><A HREF="#htoc69">A.21.5&nbsp;&nbsp;Examples</A>
 </UL>
-<LI><A HREF="#htoc70">A.22&nbsp;&nbsp;<TT>mod_version</TT></A>
+<LI CLASS="li-toc"><A HREF="#htoc70">A.22&nbsp;&nbsp;<TT>mod_version</TT></A>
 </UL>
-<LI><A HREF="#htoc71">B&nbsp;&nbsp;Internationalization and Localization</A>
-<LI><A HREF="#htoc72">C&nbsp;&nbsp;Release Notes</A>
-<UL><LI>
+<LI CLASS="li-toc"><A HREF="#htoc71">B&nbsp;&nbsp;Internationalization and Localization</A>
+<LI CLASS="li-toc"><A HREF="#htoc72">C&nbsp;&nbsp;Release Notes</A>
+<UL CLASS="toc"><LI CLASS="li-toc">
 <A HREF="#htoc73">C.1&nbsp;&nbsp;ejabberd 0.9</A>
-<LI><A HREF="#htoc74">C.2&nbsp;&nbsp;ejabberd 0.9.1</A>
-<LI><A HREF="#htoc75">C.3&nbsp;&nbsp;ejabberd 0.9.8</A>
-<LI><A HREF="#htoc76">C.4&nbsp;&nbsp;ejabberd 1.0.0</A>
-<LI><A HREF="#htoc77">C.5&nbsp;&nbsp;ejabberd 1.1.0</A>
-<LI><A HREF="#htoc78">C.6&nbsp;&nbsp;ejabberd 1.1.1</A>
+<LI CLASS="li-toc"><A HREF="#htoc74">C.2&nbsp;&nbsp;ejabberd 0.9.1</A>
+<LI CLASS="li-toc"><A HREF="#htoc75">C.3&nbsp;&nbsp;ejabberd 0.9.8</A>
+<LI CLASS="li-toc"><A HREF="#htoc76">C.4&nbsp;&nbsp;ejabberd 1.0.0</A>
+<LI CLASS="li-toc"><A HREF="#htoc77">C.5&nbsp;&nbsp;ejabberd 1.1.0</A>
+<LI CLASS="li-toc"><A HREF="#htoc78">C.6&nbsp;&nbsp;ejabberd 1.1.1</A>
 </UL>
-<LI><A HREF="#htoc79">D&nbsp;&nbsp;Acknowledgements</A>
+<LI CLASS="li-toc"><A HREF="#htoc79">D&nbsp;&nbsp;Acknowledgements</A>
 </UL>
 
 <!--TOC section Introduction-->
 
-<H2><A NAME="htoc1">1</A>&nbsp;&nbsp;Introduction</H2><!--SEC END -->
+<H2 CLASS="section"><A NAME="htoc1">1</A>&nbsp;&nbsp;Introduction</H2><!--SEC END -->
 
 <A NAME="sec:intr"></A>
  
@@ -162,135 +179,135 @@
 <BR>
 <!--TOC subsection Key Features-->
 
-<H3><A NAME="htoc2">1.1</A>&nbsp;&nbsp;Key Features</H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc2">1.1</A>&nbsp;&nbsp;Key Features</H3><!--SEC END -->
 
 <A NAME="sec:keyfeatures"></A>
 
 <TT>ejabberd</TT> is:
-<UL><LI>
+<UL CLASS="itemize"><LI CLASS="li-itemize">
 Multiplatform: <TT>ejabberd</TT> runs under Microsoft Windows and Unix derived systems such as Linux, FreeBSD and NetBSD.<BR>
 <BR>
-<LI>Distributed: You can run <TT>ejabberd</TT> on a cluster of machines and all of them will serve the same Jabber domain(s). 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.<BR>
+<LI CLASS="li-itemize">Distributed: You can run <TT>ejabberd</TT> on a cluster of machines and all of them will serve the same Jabber domain(s). 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.<BR>
 <BR>
-<LI>Fault-tolerant: You can deploy an <TT>ejabberd</TT> 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''.<BR>
+<LI CLASS="li-itemize">Fault-tolerant: You can deploy an <TT>ejabberd</TT> 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 &#8220;on the fly&#8221;.<BR>
 <BR>
-<LI>Administrator Friendly: <TT>ejabberd</TT> 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:
-<UL><LI>
+<LI CLASS="li-itemize">Administrator Friendly: <TT>ejabberd</TT> 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:
+<UL CLASS="itemize"><LI CLASS="li-itemize">
 Comprehensive documentation.
-<LI>Straightforward installers for Linux, Mac OS X, and Windows.
-<LI>Web interface for administration tasks.
-<LI>Shared Roster Groups.
-<LI>Command line administration tool.
-<LI>Can integrate with existing authentication mechanisms.
-<LI>Capability to send announce messages.
+<LI CLASS="li-itemize">Straightforward installers for Linux, Mac OS X, and Windows.
+<LI CLASS="li-itemize">Web interface for administration tasks.
+<LI CLASS="li-itemize">Shared Roster Groups.
+<LI CLASS="li-itemize">Command line administration tool.
+<LI CLASS="li-itemize">Can integrate with existing authentication mechanisms.
+<LI CLASS="li-itemize">Capability to send announce messages.
 </UL><BR>
 <BR>
-<LI>Internationalized: <TT>ejabberd</TT> leads in internationalization. Hence it is very well suited in a globalized world. Related features are:
-<UL><LI>
+<LI CLASS="li-itemize">Internationalized: <TT>ejabberd</TT> leads in internationalization. Hence it is very well suited in a globalized world. Related features are:
+<UL CLASS="itemize"><LI CLASS="li-itemize">
 Translated in 11 languages.
-<LI>Support for <A HREF="http://www.ietf.org/rfc/rfc3490.txt">IDNA</A>.
+<LI CLASS="li-itemize">Support for <A HREF="http://www.ietf.org/rfc/rfc3490.txt">IDNA</A>.
 </UL><BR>
 <BR>
-<LI>Open Standards: <TT>ejabberd</TT> is the first Open Source Jabber server claiming to fully comply to the XMPP standard.
-<UL><LI>
+<LI CLASS="li-itemize">Open Standards: <TT>ejabberd</TT> is the first Open Source Jabber server claiming to fully comply to the XMPP standard.
+<UL CLASS="itemize"><LI CLASS="li-itemize">
 Fully XMPP compliant 
-<LI>XML-based protocol
-<LI><A HREF="http://ejabberd.jabber.ru/protocols">Many JEPs supported</A>.
+<LI CLASS="li-itemize">XML-based protocol
+<LI CLASS="li-itemize"><A HREF="http://ejabberd.jabber.ru/protocols">Many JEPs supported</A>.
 </UL></UL>
 <!--TOC subsection Additional Features-->
 
-<H3><A NAME="htoc3">1.2</A>&nbsp;&nbsp;Additional Features</H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc3">1.2</A>&nbsp;&nbsp;Additional Features</H3><!--SEC END -->
 
 <A NAME="sec:addfeatures"></A>
 
 Besides common Jabber server features, <TT>ejabberd</TT> comes with a wide range of other features:
-<UL><LI>
+<UL CLASS="itemize"><LI CLASS="li-itemize">
 Modular
-<UL><LI>
+<UL CLASS="itemize"><LI CLASS="li-itemize">
 Load only the modules you want.
-<LI>Extend <TT>ejabberd</TT> with your own custom modules.
+<LI CLASS="li-itemize">Extend <TT>ejabberd</TT> with your own custom modules.
 </UL>
-<LI>Security
-<UL><LI>
+<LI CLASS="li-itemize">Security
+<UL CLASS="itemize"><LI CLASS="li-itemize">
 SASL and STARTTLS for c2s and s2s connections.
-<LI>STARTTLS and Dialback s2s connections.
-<LI>Web interface accessible via HTTPS secure access.
+<LI CLASS="li-itemize">STARTTLS and Dialback s2s connections.
+<LI CLASS="li-itemize">Web interface accessible via HTTPS secure access.
 </UL>
-<LI>Databases
-<UL><LI>
+<LI CLASS="li-itemize">Databases
+<UL CLASS="itemize"><LI CLASS="li-itemize">
 Native MySQL support.
-<LI>Native PostgreSQL support.
-<LI>Mnesia.
-<LI>ODBC data storage support. 
-<LI>Microsoft SQL Server support (via ODBC).
+<LI CLASS="li-itemize">Native PostgreSQL support.
+<LI CLASS="li-itemize">Mnesia.
+<LI CLASS="li-itemize">ODBC data storage support. 
+<LI CLASS="li-itemize">Microsoft SQL Server support (via ODBC).
 </UL>
-<LI>Authentication
-<UL><LI>
+<LI CLASS="li-itemize">Authentication
+<UL CLASS="itemize"><LI CLASS="li-itemize">
 LDAP and ODBC. 
-<LI>External Authentication script.
-<LI>Internal Authentication.
+<LI CLASS="li-itemize">External Authentication script.
+<LI CLASS="li-itemize">Internal Authentication.
 </UL>
-<LI>Others
-<UL><LI>
+<LI CLASS="li-itemize">Others
+<UL CLASS="itemize"><LI CLASS="li-itemize">
 Compressing XML streams with Stream Compression (<A HREF="http://www.jabber.org/jeps/jep-0138.html">JEP-0138</A>).
-<LI>Interface with networks such as AIM, ICQ and MSN.
-<LI>Statistics via Statistics Gathering (<A HREF="http://www.jabber.org/jeps/jep-0039.html">JEP-0039</A>).
-<LI>IPv6 support both for c2s and s2s connections.
-<LI><A HREF="http://www.jabber.org/jeps/jep-0045.html">Multi-User Chat</A> module with logging.
-<LI>Users Directory based on users vCards.
-<LI><A HREF="http://www.jabber.org/jeps/jep-0060.html">Publish-Subscribe</A> component.
-<LI>Support for virtual hosting. 
-<LI><A HREF="http://www.jabber.org/jeps/jep-0025.html">HTTP Polling</A> service.
-<LI>IRC transport.
+<LI CLASS="li-itemize">Interface with networks such as AIM, ICQ and MSN.
+<LI CLASS="li-itemize">Statistics via Statistics Gathering (<A HREF="http://www.jabber.org/jeps/jep-0039.html">JEP-0039</A>).
+<LI CLASS="li-itemize">IPv6 support both for c2s and s2s connections.
+<LI CLASS="li-itemize"><A HREF="http://www.jabber.org/jeps/jep-0045.html">Multi-User Chat</A> module with logging.
+<LI CLASS="li-itemize">Users Directory based on users vCards.
+<LI CLASS="li-itemize"><A HREF="http://www.jabber.org/jeps/jep-0060.html">Publish-Subscribe</A> component.
+<LI CLASS="li-itemize">Support for virtual hosting. 
+<LI CLASS="li-itemize"><A HREF="http://www.jabber.org/jeps/jep-0025.html">HTTP Polling</A> service.
+<LI CLASS="li-itemize">IRC transport.
 </UL>
 </UL>
 <!--TOC section Installation from Source-->
 
-<H2><A NAME="htoc4">2</A>&nbsp;&nbsp;Installation from Source</H2><!--SEC END -->
+<H2 CLASS="section"><A NAME="htoc4">2</A>&nbsp;&nbsp;Installation from Source</H2><!--SEC END -->
 
 <A NAME="sec:installation"></A>
 
 <!--TOC subsection Installation Requirements-->
 
-<H3><A NAME="htoc5">2.1</A>&nbsp;&nbsp;Installation Requirements</H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc5">2.1</A>&nbsp;&nbsp;Installation Requirements</H3><!--SEC END -->
 
 <A NAME="sec:installreq"></A>
-<!--TOC subsubsection ``Unix-like'' operating systems-->
+<!--TOC subsubsection &#8220;Unix-like&#8221; operating systems-->
 
-<H4><A NAME="htoc6">2.1.1</A>&nbsp;&nbsp;``Unix-like'' operating systems</H4><!--SEC END -->
+<H4 CLASS="subsubsection"><A NAME="htoc6">2.1.1</A>&nbsp;&nbsp;&#8220;Unix-like&#8221; operating systems</H4><!--SEC END -->
 
 <A NAME="sec:installrequnix"></A>
 
-To compile <TT>ejabberd</TT> on a ``Unix-like'' operating system, you need:
-<UL><LI>
+To compile <TT>ejabberd</TT> on a &#8220;Unix-like&#8221; operating system, you need:
+<UL CLASS="itemize"><LI CLASS="li-itemize">
 GNU Make;
-<LI>GCC;
-<LI>libexpat 1.95 or higher;
-<LI>Erlang/OTP R9C-2 or higher;
-<LI>OpenSSL 0.9.6 or higher (optional).
-<LI>Zlib 1.2.3 or higher (optional).
-<LI>GNU Iconv 1.8 or higher (optional, not needed at all on systems with GNU libc).
+<LI CLASS="li-itemize">GCC;
+<LI CLASS="li-itemize">libexpat 1.95 or higher;
+<LI CLASS="li-itemize">Erlang/OTP R9C-2 or higher;
+<LI CLASS="li-itemize">OpenSSL 0.9.6 or higher (optional).
+<LI CLASS="li-itemize">Zlib 1.2.3 or higher (optional).
+<LI CLASS="li-itemize">GNU Iconv 1.8 or higher (optional, not needed at all on systems with GNU libc).
 </UL>
 <!--TOC subsubsection Windows-->
 
-<H4><A NAME="htoc7">2.1.2</A>&nbsp;&nbsp;Windows</H4><!--SEC END -->
+<H4 CLASS="subsubsection"><A NAME="htoc7">2.1.2</A>&nbsp;&nbsp;Windows</H4><!--SEC END -->
 
 <A NAME="sec:installreqwin"></A>
 
 To compile <TT>ejabberd</TT> on a Windows flavour, you need:
-<UL><LI>
+<UL CLASS="itemize"><LI CLASS="li-itemize">
 MS Visual C++ 6.0 Compiler
-<LI><A HREF="http://erlang.org/download.html">Erlang/OTP R9C-2 or higher</A>
-<LI><A HREF="http://sourceforge.net/project/showfiles.php?group_id=10127&package_id=11277">Expat 1.95.7 or higher</A>
-<LI><A HREF="http://www.gnu.org/software/libiconv/">GNU Iconv 1.9.1</A>
+<LI CLASS="li-itemize"><A HREF="http://erlang.org/download.html">Erlang/OTP R9C-2 or higher</A>
+<LI CLASS="li-itemize"><A HREF="http://sourceforge.net/project/showfiles.php?group_id=10127&package_id=11277">Expat 1.95.7 or higher</A>
+<LI CLASS="li-itemize"><A HREF="http://www.gnu.org/software/libiconv/">GNU Iconv 1.9.1</A>
 (optional)
-<LI><A HREF="http://www.slproweb.com/products/Win32OpenSSL.html">Shining Light OpenSSL</A>
+<LI CLASS="li-itemize"><A HREF="http://www.slproweb.com/products/Win32OpenSSL.html">Shining Light OpenSSL</A>
 (to enable SSL connections)
-<LI><A HREF="http://www.zlib.net/">Zlib 1.2.3 or higher</A>
+<LI CLASS="li-itemize"><A HREF="http://www.zlib.net/">Zlib 1.2.3 or higher</A>
 </UL>
 <!--TOC subsection Obtaining <TT>ejabberd</TT>-->
 
-<H3><A NAME="htoc8">2.2</A>&nbsp;&nbsp;Obtaining <TT>ejabberd</TT></H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc8">2.2</A>&nbsp;&nbsp;Obtaining <TT>ejabberd</TT></H3><!--SEC END -->
 
 <A NAME="sec:obtaining"></A>
 
@@ -299,49 +316,49 @@ Released versions of <TT>ejabberd</TT> can be obtained from <BR>
 <BR>
 
 The latest development version can be retrieved from the Subversion repository.
-<PRE>
+<PRE CLASS="verbatim">
   svn co http://svn.process-one.net/ejabberd/trunk ejabberd
 </PRE>
 <!--TOC subsection Compilation-->
 
-<H3><A NAME="htoc9">2.3</A>&nbsp;&nbsp;Compilation</H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc9">2.3</A>&nbsp;&nbsp;Compilation</H3><!--SEC END -->
 
 <A NAME="sec:compilation"></A>
 
-<!--TOC subsubsection ``Unix-like'' operating systems-->
+<!--TOC subsubsection &#8220;Unix-like&#8221; operating systems-->
 
-<H4><A NAME="htoc10">2.3.1</A>&nbsp;&nbsp;``Unix-like'' operating systems</H4><!--SEC END -->
+<H4 CLASS="subsubsection"><A NAME="htoc10">2.3.1</A>&nbsp;&nbsp;&#8220;Unix-like&#8221; operating systems</H4><!--SEC END -->
 
 <A NAME="sec:compilationunix"></A>
 
-Compile <TT>ejabberd</TT> on a ``Unix-like'' operating system by executing:
-<PRE>
+Compile <TT>ejabberd</TT> on a &#8220;Unix-like&#8221; operating system by executing:
+<PRE CLASS="verbatim">
   ./configure
   make
   su
   make install
 </PRE>
 These commands will:
-<UL><LI>
+<UL CLASS="itemize"><LI CLASS="li-itemize">
 install <TT>ejabberd</TT> into the directory <CODE>/var/lib/ejabberd</CODE>,
-<LI>install the configuration file into <CODE>/etc/ejabberd</CODE>,
-<LI>create a directory called <CODE>/var/log/ejabberd</CODE> to store log files.
+<LI CLASS="li-itemize">install the configuration file into <CODE>/etc/ejabberd</CODE>,
+<LI CLASS="li-itemize">create a directory called <CODE>/var/log/ejabberd</CODE> to store log files.
 </UL>
 <!--TOC subsubsection Windows-->
 
-<H4><A NAME="htoc11">2.3.2</A>&nbsp;&nbsp;Windows</H4><!--SEC END -->
+<H4 CLASS="subsubsection"><A NAME="htoc11">2.3.2</A>&nbsp;&nbsp;Windows</H4><!--SEC END -->
 
 <A NAME="sec:compilationwin"></A>
 
-<UL><LI>
+<UL CLASS="itemize"><LI CLASS="li-itemize">
 Install Erlang emulator (for example, into <CODE>C:\Program Files\erl5.3</CODE>).
-<LI>Install Expat library into <CODE>C:\Program Files\Expat-1.95.7</CODE>
+<LI CLASS="li-itemize">Install Expat library into <CODE>C:\Program Files\Expat-1.95.7</CODE>
  directory.<BR>
 <BR>
 Copy file <CODE>C:\Program Files\Expat-1.95.7\Libs\libexpat.dll</CODE>
  to your Windows system directory (for example, <CODE>C:\WINNT</CODE> or
  <CODE>C:\WINNT\System32</CODE>)
-<LI>Build and install the Iconv library into the directory
+<LI CLASS="li-itemize">Build and install the Iconv library into the directory
  <CODE>C:\Program Files\iconv-1.9.1</CODE>.<BR>
 <BR>
 Copy file <CODE>C:\Program Files\iconv-1.9.1\bin\iconv.dll</CODE> to your
@@ -353,25 +370,25 @@ Note: instead of copying libexpat.dll and iconv.dll to the Windows
  <CODE>C:\Program Files\Expat-1.95.7\Libs</CODE> and
  <CODE>C:\Program Files\iconv-1.9.1\bin</CODE> to the <CODE>PATH</CODE> environment
  variable.
-<LI>While in the directory <CODE>ejabberd\src</CODE> run:
-<PRE>
+<LI CLASS="li-itemize">While in the directory <CODE>ejabberd\src</CODE> run:
+<PRE CLASS="verbatim">
 configure.bat
 nmake -f Makefile.win32
-</PRE><LI>Edit the file <CODE>ejabberd\src\ejabberd.cfg</CODE> and run
-<PRE>
+</PRE><LI CLASS="li-itemize">Edit the file <CODE>ejabberd\src\ejabberd.cfg</CODE> and run
+<PRE CLASS="verbatim">
 werl -s ejabberd -name ejabberd
 </PRE></UL>
 <!--TOC subsection Starting-->
 
-<H3><A NAME="htoc12">2.4</A>&nbsp;&nbsp;Starting</H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc12">2.4</A>&nbsp;&nbsp;Starting</H3><!--SEC END -->
 
 <A NAME="sec:starting"></A>
 
 Execute the following command to start <TT>ejabberd</TT>:
-<PRE>
+<PRE CLASS="verbatim">
   erl -pa /var/lib/ejabberd/ebin -name ejabberd -s ejabberd
 </PRE>or
-<PRE>
+<PRE CLASS="verbatim">
   erl -pa /var/lib/ejabberd/ebin -sname ejabberd -s ejabberd
 </PRE>In the latter case the Erlang node will be identified using only the first part
 of the host name, i.&nbsp;e. other Erlang nodes outside this domain can't contact
@@ -383,7 +400,7 @@ for storing its user database and for logging.<BR>
 <BR>
 To specify the path to the configuration file, the log files and the Mnesia
 database directory, you may use the following command:
-<PRE>
+<PRE CLASS="verbatim">
   erl -pa /var/lib/ejabberd/ebin \
       -sname ejabberd \
       -s ejabberd \
@@ -397,25 +414,25 @@ You can find other useful options in the Erlang manual page
 <BR>
 To use more than 1024 connections, you should set the environment variable
 <CODE>ERL_MAX_PORTS</CODE>:
-<PRE>
+<PRE CLASS="verbatim">
   export ERL_MAX_PORTS=32000
 </PRE>Note that with this value, <TT>ejabberd</TT> will use more memory (approximately 6&nbsp;MB
 more).<BR>
 <BR>
 To reduce memory usage, you may set the environment variable
 <CODE>ERL_FULLSWEEP_AFTER</CODE>:
-<PRE>
+<PRE CLASS="verbatim">
   export ERL_FULLSWEEP_AFTER=0
 </PRE>But in this case <TT>ejabberd</TT> can start to work slower.<BR>
 <BR>
 <!--TOC section Configuration-->
 
-<H2><A NAME="htoc13">3</A>&nbsp;&nbsp;Configuration</H2><!--SEC END -->
+<H2 CLASS="section"><A NAME="htoc13">3</A>&nbsp;&nbsp;Configuration</H2><!--SEC END -->
 
 <A NAME="sec:configuration"></A>
 <!--TOC subsection Initial Configuration-->
 
-<H3><A NAME="htoc14">3.1</A>&nbsp;&nbsp;Initial Configuration</H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc14">3.1</A>&nbsp;&nbsp;Initial Configuration</H3><!--SEC END -->
 
 <A NAME="sec:initconfig"></A>
 
@@ -426,12 +443,12 @@ configuration file are appended to the entries in the database. The
 configuration file contains a sequence of Erlang terms. Lines beginning with a
 <TT>`%'</TT> 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 &#8220;hosts&#8221; option, the old
 host name(s) stored in the database will be used.<BR>
 <BR>
 You can override the old values stored in the database by adding next lines to
 the configuration file:
-<PRE>
+<PRE CLASS="verbatim">
   override_global.
   override_local.
   override_acls.
@@ -440,7 +457,7 @@ before new ones are added.<BR>
 <BR>
 <!--TOC subsubsection Host Names-->
 
-<H4><A NAME="htoc15">3.1.1</A>&nbsp;&nbsp;Host Names</H4><!--SEC END -->
+<H4 CLASS="subsubsection"><A NAME="htoc15">3.1.1</A>&nbsp;&nbsp;Host Names</H4><!--SEC END -->
 
 <A NAME="sec:confighostname"></A>
 
@@ -448,23 +465,23 @@ The option <TT>hosts</TT> defines a list containing one or more domains that
 <TT>ejabberd</TT> will serve.<BR>
 <BR>
 Examples:
-<UL><LI>
+<UL CLASS="itemize"><LI CLASS="li-itemize">
 Serving one domain:
-<UL><LI>
-<PRE>
+<UL CLASS="itemize"><LI CLASS="li-itemize">
+<PRE CLASS="verbatim">
   {hosts, ["example.org"]}.
-</PRE><LI>Backwards compatibility with older <TT>ejabberd</TT> versions can be retained
+</PRE><LI CLASS="li-itemize">Backwards compatibility with older <TT>ejabberd</TT> versions can be retained
  with:
- <PRE>
+ <PRE CLASS="verbatim">
   {host, "example.org"}.
 </PRE></UL>
-<LI>Serving two domains:
-<PRE>
+<LI CLASS="li-itemize">Serving two domains:
+<PRE CLASS="verbatim">
   {hosts, ["example.net", "example.com"]}.
 </PRE></UL>
 <!--TOC subsubsection Default Language-->
 
-<H4><A NAME="htoc16">3.1.2</A>&nbsp;&nbsp;Default Language</H4><!--SEC END -->
+<H4 CLASS="subsubsection"><A NAME="htoc16">3.1.2</A>&nbsp;&nbsp;Default Language</H4><!--SEC END -->
 
 <A NAME="sec:configlanguage"></A>
 
@@ -475,82 +492,82 @@ option <TT>language</TT> is <TT>"en"</TT>. In order to take effect there must be
 translation file <TT>&lt;language&gt;.msg</TT> in <TT>ejabberd</TT>'s <TT>msgs</TT> directory.<BR>
 <BR>
 Examples:
-<UL><LI>
+<UL CLASS="itemize"><LI CLASS="li-itemize">
 To set Russian as default language:
-<PRE>
+<PRE CLASS="verbatim">
   {language, "ru"}.
-</PRE><LI>To set Spanish as default language:
-<PRE>
+</PRE><LI CLASS="li-itemize">To set Spanish as default language:
+<PRE CLASS="verbatim">
   {language, "es"}.
 </PRE></UL>
 <!--TOC subsubsection Access Rules-->
 
-<H4><A NAME="htoc17">3.1.3</A>&nbsp;&nbsp;Access Rules</H4><!--SEC END -->
+<H4 CLASS="subsubsection"><A NAME="htoc17">3.1.3</A>&nbsp;&nbsp;Access Rules</H4><!--SEC END -->
 
 <A NAME="sec:configaccess"></A>
 
 Access control in <TT>ejabberd</TT> is performed via Access Control Lists (ACLs). The
 declarations of ACLs in the configuration file have the following syntax:
-<PRE>
+<PRE CLASS="verbatim">
   {acl, &lt;aclname&gt;, {&lt;acltype&gt;, ...}}.
 </PRE>
 <TT>&lt;acltype&gt;</TT> can be one of the following:
-<DL COMPACT=compact><DT>
-<B><TT>all</TT></B><DD> Matches all JIDs. Example:
-<PRE>
+<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
+<B><TT>all</TT></B><DD CLASS="dd-description"> Matches all JIDs. Example:
+<PRE CLASS="verbatim">
 {acl, all, all}.
-</PRE><DT><B><TT>{user, &lt;username&gt;}</TT></B><DD> Matches the user with the name
+</PRE><DT CLASS="dt-description"><B><TT>{user, &lt;username&gt;}</TT></B><DD CLASS="dd-description"> Matches the user with the name
  <TT>&lt;username&gt;</TT> at the first virtual host. Example:
-<PRE>
+<PRE CLASS="verbatim">
 {acl, admin, {user, "yozhik"}}.
-</PRE><DT><B><TT>{user, &lt;username&gt;, &lt;server&gt;}</TT></B><DD> Matches the user with the JID
+</PRE><DT CLASS="dt-description"><B><TT>{user, &lt;username&gt;, &lt;server&gt;}</TT></B><DD CLASS="dd-description"> Matches the user with the JID
  <TT>&lt;username&gt;@&lt;server&gt;</TT> and any resource. Example:
-<PRE>
+<PRE CLASS="verbatim">
 {acl, admin, {user, "yozhik", "example.org"}}.
-</PRE><DT><B><TT>{server, &lt;server&gt;}</TT></B><DD> Matches any JID from server
+</PRE><DT CLASS="dt-description"><B><TT>{server, &lt;server&gt;}</TT></B><DD CLASS="dd-description"> Matches any JID from server
  <TT>&lt;server&gt;</TT>. Example:
-<PRE>
+<PRE CLASS="verbatim">
 {acl, exampleorg, {server, "example.org"}}.
-</PRE><DT><B><TT>{user_regexp, &lt;regexp&gt;}</TT></B><DD> Matches any local user with a name that
+</PRE><DT CLASS="dt-description"><B><TT>{user_regexp, &lt;regexp&gt;}</TT></B><DD CLASS="dd-description"> Matches any local user with a name that
  matches <TT>&lt;regexp&gt;</TT> at the first virtual host. Example:
-<PRE>
+<PRE CLASS="verbatim">
 {acl, tests, {user, "^test[0-9]*$"}}.
-</PRE><DT><B><TT>{user_regexp, &lt;regexp&gt;, &lt;server&gt;}</TT></B><DD> Matches any user with a name
+</PRE><DT CLASS="dt-description"><B><TT>{user_regexp, &lt;regexp&gt;, &lt;server&gt;}</TT></B><DD CLASS="dd-description"> Matches any user with a name
  that matches <TT>&lt;regexp&gt;</TT> at server <TT>&lt;server&gt;</TT>. Example:
-<PRE>
+<PRE CLASS="verbatim">
 {acl, tests, {user, "^test", "example.org"}}.
-</PRE><DT><B><TT>{server_regexp, &lt;regexp&gt;}</TT></B><DD> Matches any JID from the server that
+</PRE><DT CLASS="dt-description"><B><TT>{server_regexp, &lt;regexp&gt;}</TT></B><DD CLASS="dd-description"> Matches any JID from the server that
  matches <TT>&lt;regexp&gt;</TT>. Example:
-<PRE>
+<PRE CLASS="verbatim">
 {acl, icq, {server, "^icq\\."}}.
-</PRE><DT><B><TT>{node_regexp, &lt;user_regexp&gt;, &lt;server_regexp&gt;}</TT></B><DD> Matches any user
+</PRE><DT CLASS="dt-description"><B><TT>{node_regexp, &lt;user_regexp&gt;, &lt;server_regexp&gt;}</TT></B><DD CLASS="dd-description"> Matches any user
  with a name that matches <TT>&lt;user_regexp&gt;</TT> at any server that matches
  <TT>&lt;server_regexp&gt;</TT>. Example:
-<PRE>
+<PRE CLASS="verbatim">
 {acl, yohzik, {node_regexp, "^yohzik$", "^example.(com|org)$"}}.
-</PRE><DT><B><TT>{user_glob, &lt;glob&gt;}</TT></B><DD>
-<DT><B><TT>{user_glob, &lt;glob&gt;, &lt;server&gt;}</TT></B><DD>
-<DT><B><TT>{server_glob, &lt;glob&gt;}</TT></B><DD>
-<DT><B><TT>{node_glob, &lt;user_glob&gt;, &lt;server_glob&gt;}</TT></B><DD> This is the same as
+</PRE><DT CLASS="dt-description"><B><TT>{user_glob, &lt;glob&gt;}</TT></B><DD CLASS="dd-description">
+<DT CLASS="dt-description"><B><TT>{user_glob, &lt;glob&gt;, &lt;server&gt;}</TT></B><DD CLASS="dd-description">
+<DT CLASS="dt-description"><B><TT>{server_glob, &lt;glob&gt;}</TT></B><DD CLASS="dd-description">
+<DT CLASS="dt-description"><B><TT>{node_glob, &lt;user_glob&gt;, &lt;server_glob&gt;}</TT></B><DD CLASS="dd-description"> This is the same as
  above. However, it uses shell glob patterns instead of regexp. These patterns
  can have the following special characters:
- <DL COMPACT=compact><DT>
- <B><TT>*</TT></B><DD> matches any string including the null string.
- <DT><B><TT>?</TT></B><DD> matches any single character.
- <DT><B><TT>[...]</TT></B><DD> matches any of the enclosed characters. Character
+ <DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
+ <B><TT>*</TT></B><DD CLASS="dd-description"> matches any string including the null string.
+ <DT CLASS="dt-description"><B><TT>?</TT></B><DD CLASS="dd-description"> matches any single character.
+ <DT CLASS="dt-description"><B><TT>[...]</TT></B><DD CLASS="dd-description"> matches any of the enclosed characters. Character
  ranges are specified by a pair of characters separated by a <TT>`-'</TT>.
  If the first character after <TT>`['</TT> is a <TT>`!'</TT>, any
  character not enclosed is matched.
  </DL>
 </DL>
 The following ACLs are pre-defined:
-<DL COMPACT=compact><DT>
-<B><TT>all</TT></B><DD> Matches any JID.
-<DT><B><TT>none</TT></B><DD> Matches no JID.
+<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
+<B><TT>all</TT></B><DD CLASS="dd-description"> Matches any JID.
+<DT CLASS="dt-description"><B><TT>none</TT></B><DD CLASS="dd-description"> Matches no JID.
 </DL>
 An entry allowing or denying access to different services looks similar to
 this:
-<PRE>
+<PRE CLASS="verbatim">
   {access, &lt;accessname&gt;, [{allow, &lt;aclname&gt;},
                           {deny, &lt;aclname&gt;},
                           ...
@@ -558,57 +575,57 @@ this:
 </PRE>When a JID is checked to have access to <TT>&lt;accessname&gt;</TT>, 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 ``<TT>deny</TT>'' is returned.<BR>
+the first matched tuple is returned, otherwise &#8220;<TT>deny</TT>&#8221; is returned.<BR>
 <BR>
 Example:
-<PRE>
+<PRE CLASS="verbatim">
   {access, configure, [{allow, admin}]}.
   {access, something, [{deny, badmans},
                        {allow, all}]}.
 </PRE>
 The following access rules are pre-defined:
-<DL COMPACT=compact><DT>
-<B><TT>all</TT></B><DD> Always returns ``<TT>allow</TT>''
-<DT><B><TT>none</TT></B><DD> Always returns ``<TT>deny</TT>''
+<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
+<B><TT>all</TT></B><DD CLASS="dd-description"> Always returns &#8220;<TT>allow</TT>&#8221;
+<DT CLASS="dt-description"><B><TT>none</TT></B><DD CLASS="dd-description"> Always returns &#8220;<TT>deny</TT>&#8221;
 </DL>
 <!--TOC subsubsection Shapers-->
 
-<H4><A NAME="htoc18">3.1.4</A>&nbsp;&nbsp;Shapers</H4><!--SEC END -->
+<H4 CLASS="subsubsection"><A NAME="htoc18">3.1.4</A>&nbsp;&nbsp;Shapers</H4><!--SEC END -->
 
 <A NAME="sec:configshaper"></A>
 
 Shapers enable you to limit connection traffic. The syntax of
 shapers is like this:
-<PRE>
+<PRE CLASS="verbatim">
   {shaper, &lt;shapername&gt;, &lt;kind&gt;}.
 </PRE>Currently only one kind of shaper called <TT>maxrate</TT> is available. It has the
 following syntax:
-<PRE>
+<PRE CLASS="verbatim">
   {maxrate, &lt;rate&gt;}
 </PRE>where <TT>&lt;rate&gt;</TT> stands for the maximum allowed incomig rate in bytes per
 second.<BR>
 <BR>
 Examples:
-<UL><LI>
-To define a shaper named ``<TT>normal</TT>'' with traffic speed limited to
+<UL CLASS="itemize"><LI CLASS="li-itemize">
+To define a shaper named &#8220;<TT>normal</TT>&#8221; with traffic speed limited to
 1,000&nbsp;bytes/second:
-<PRE>
+<PRE CLASS="verbatim">
   {shaper, normal, {maxrate, 1000}}.
-</PRE><LI>To define a shaper named ``<TT>fast</TT>'' with traffic speed limited to
+</PRE><LI CLASS="li-itemize">To define a shaper named &#8220;<TT>fast</TT>&#8221; with traffic speed limited to
 50,000&nbsp;bytes/second:
-<PRE>
+<PRE CLASS="verbatim">
   {shaper, fast, {maxrate, 50000}}.
 </PRE></UL>
 <!--TOC subsubsection Limitation of the number of opened sessions-->
 
-<H4><A NAME="htoc19">3.1.5</A>&nbsp;&nbsp;Limitation of the number of opened sessions</H4><!--SEC END -->
+<H4 CLASS="subsubsection"><A NAME="htoc19">3.1.5</A>&nbsp;&nbsp;Limitation of the number of opened sessions</H4><!--SEC END -->
 
 <A NAME="sec:configmaxsessions"></A>
 
 This option specifies the maximum number of sessions (authenticated
 connections) per user. If a user tries to open more than the maximum number of
 allowed sessions, with different resources, the first opened session will be
-disconnected. The error ``<TT>session replaced</TT>'' is send to the
+disconnected. The error &#8220;<TT>session replaced</TT>&#8221; is send to the
 disconnected session. This value is either a number or <TT>infinity</TT>. For
 example <CODE>{max\_user\_sessions, 10}</CODE>. The default value is <TT>10</TT>.<BR>
 <BR>
@@ -616,21 +633,21 @@ This option can be define per virtual host. See section&nbsp;<A HREF="#sec:confi
 <BR>
 <!--TOC subsubsection Listened Sockets-->
 
-<H4><A NAME="htoc20">3.1.6</A>&nbsp;&nbsp;Listened Sockets</H4><!--SEC END -->
+<H4 CLASS="subsubsection"><A NAME="htoc20">3.1.6</A>&nbsp;&nbsp;Listened Sockets</H4><!--SEC END -->
 
 <A NAME="sec:configlistened"></A>
 
 The option <TT>listen</TT> defines for which addresses and ports <TT>ejabberd</TT>
 will listen and what services will be run on them. Each element of the list is a
 tuple with the following elements:
-<UL><LI>
+<UL CLASS="itemize"><LI CLASS="li-itemize">
 Port number.
-<LI>Module that serves this port.
-<LI>Options to this module.
+<LI CLASS="li-itemize">Module that serves this port.
+<LI CLASS="li-itemize">Options to this module.
 </UL>
 
 Currently next modules are implemented:
-<BLOCKQUOTE><DIV ALIGN=center><DIV ALIGN=center><HR WIDTH="80%" SIZE=2></DIV>
+<BLOCKQUOTE CLASS="table"><DIV CLASS="center"><DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV>
  
  <TABLE BORDER=1 CELLSPACING=0 CELLPADDING=1>
 <TR><TD VALIGN=top ALIGN=left NOWRAP><TT>ejabberd_c2s</TT></TD>
@@ -674,18 +691,18 @@ Currently next modules are implemented:
 <TD VALIGN=top ALIGN=left><TT>certfile</TT>, <TT>http_poll</TT>,
  <TT>inet6</TT>, <TT>ip</TT>, <TT>tls</TT>, <TT>web_admin</TT></TD>
 </TR></TABLE>
-<DIV ALIGN=center><HR WIDTH="80%" SIZE=2></DIV></DIV></BLOCKQUOTE>
+<DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV></DIV></BLOCKQUOTE>
 (*) The mechanism for <A HREF="http://ejabberd.jabber.ru/tutorials-transports">external components</A> is defined in Jabber Component Protocol (<A HREF="http://www.jabber.org/jeps/jep-0114.html">JEP-0114</A>).<BR>
 <BR>
 The following options are available:
-<DL COMPACT=compact><DT>
- <B><TT>{access, &lt;access rule&gt;}</TT></B><DD> This option defines
- access to the port. The default value is ``<TT>all</TT>''.
- <DT><B><TT>{certfile, Path}</TT></B><DD> Path to a file containing the SSL certificate.
- <DT><B><TT>{hosts, [Hostnames], [HostOptions]}</TT></B><DD> This option
+<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
+ <B><TT>{access, &lt;access rule&gt;}</TT></B><DD CLASS="dd-description"> This option defines
+ access to the port. The default value is &#8220;<TT>all</TT>&#8221;.
+ <DT CLASS="dt-description"><B><TT>{certfile, Path}</TT></B><DD CLASS="dd-description"> Path to a file containing the SSL certificate.
+ <DT CLASS="dt-description"><B><TT>{hosts, [Hostnames], [HostOptions]}</TT></B><DD CLASS="dd-description"> This option
  defines one or more hostnames of connected services and enables you to
  specify additional options including <TT>{password, Secret}</TT>.
- <DT><B><TT>http_poll</TT></B><DD> 
+ <DT CLASS="dt-description"><B><TT>http_poll</TT></B><DD CLASS="dd-description"> 
  This option enables HTTP Polling (<A HREF="http://www.jabber.org/jeps/jep-0025.html">JEP-0025</A>) support. HTTP Polling
  enables access via HTTP requests to <TT>ejabberd</TT> from behind firewalls which
  do not allow outgoing sockets on port 5222.<BR>
@@ -697,85 +714,85 @@ If HTTP Polling is enabled, it will be available at
  <A HREF="http://jwchat.sourceforge.net/">JWChat</A> (there is a tutorial to
  <A HREF="http://ejabberd.jabber.ru/jwchat">install JWChat</A> with
  instructions for <TT>ejabberd</TT>).
- <DT><B><TT>inet6</TT></B><DD> Set up the socket for IPv6.
- <DT><B><TT>{ip, IPAddress}</TT></B><DD> This option specifies which network
+ <DT CLASS="dt-description"><B><TT>inet6</TT></B><DD CLASS="dd-description"> Set up the socket for IPv6.
+ <DT CLASS="dt-description"><B><TT>{ip, IPAddress}</TT></B><DD CLASS="dd-description"> This option specifies which network
  interface to listen for. For example <CODE>{ip, {192, 168, 1, 1}}</CODE>.
- <DT><B><TT>{max_stanza_size, Size}</TT></B><DD> This
+ <DT CLASS="dt-description"><B><TT>{max_stanza_size, Size}</TT></B><DD CLASS="dd-description"> This
  option specifies an approximate maximal size in bytes of XML stanzas.
  For example <CODE>{max\_stanza\_size, 65536}</CODE>. The default value
- is ``<TT>infinity</TT>''.
- <DT><B><TT>{shaper, &lt;access rule&gt;}</TT></B><DD> This option defines a
+ is &#8220;<TT>infinity</TT>&#8221;.
+ <DT CLASS="dt-description"><B><TT>{shaper, &lt;access rule&gt;}</TT></B><DD CLASS="dd-description"> This option defines a
  shaper for the port (see section&nbsp;<A HREF="#sec:configshaper">3.1.4</A>). The default value
- is ``<TT>none</TT>''.
- <DT><B><TT>ssl</TT></B><DD> This option specifies that traffic on
+ is &#8220;<TT>none</TT>&#8221;.
+ <DT CLASS="dt-description"><B><TT>ssl</TT></B><DD CLASS="dd-description"> This option specifies that traffic on
  the port will be encrypted using SSL. You should also set the
  <TT>certfile</TT> option. It is recommended to use the <TT>tls</TT> option
  instead.
- <DT><B><TT>starttls</TT></B><DD> This option
+ <DT CLASS="dt-description"><B><TT>starttls</TT></B><DD CLASS="dd-description"> This option
  specifies that STARTTLS encryption is available on connections to the port.
  You should also set the <TT>certfile</TT> option.
- <DT><B><TT>starttls_required</TT></B><DD> This option
+ <DT CLASS="dt-description"><B><TT>starttls_required</TT></B><DD CLASS="dd-description"> This option
  specifies that STARTTLS encryption is required on connections to the port.
  No unencrypted connections will be allowed. You should also set the
  <TT>certfile</TT> option.
- <DT><B><TT>tls</TT></B><DD> This option specifies that traffic on
+ <DT CLASS="dt-description"><B><TT>tls</TT></B><DD CLASS="dd-description"> This option specifies that traffic on
  the port will be encrypted using SSL immediately after connecting. You
  should also set the <TT>certfile</TT> option.
- <DT><B><TT>zlib</TT></B><DD> This
+ <DT CLASS="dt-description"><B><TT>zlib</TT></B><DD CLASS="dd-description"> This
  option specifies that Zlib stream compression (as defined in <A HREF="http://www.jabber.org/jeps/jep-0138.html">JEP-0138</A>)
  is available on connections to the port. Client cannot use stream compression and
  stream encryption simultaneously, so if you specify both <TT>tls</TT> (or <TT>ssl</TT>)
  and <TT>zlib</TT> the latter option will not affect connection at all.
- <DT><B><TT>web_admin</TT></B><DD> This option
+ <DT CLASS="dt-description"><B><TT>web_admin</TT></B><DD CLASS="dd-description"> This option
  enables the web interface for <TT>ejabberd</TT> administration which is available
  at <CODE>http://server:port/admin/</CODE>. Login and password are the username and
  password of one of the registered users who are granted access by the
- ``configure'' access rule.
+ &#8220;configure&#8221; access rule.
 </DL>
 Also the following global options are available for s2s connections:
-<DL COMPACT=compact><DT>
- <B><TT>{s2s_use_starttls, true|false}</TT></B><DD>
+<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
+ <B><TT>{s2s_use_starttls, true|false}</TT></B><DD CLASS="dd-description">
  This option defines whether to use STARTTLS
  for s2s connections.
- <DT><B><TT>{s2s_certfile, Path}</TT></B><DD> Path to the
+ <DT CLASS="dt-description"><B><TT>{s2s_certfile, Path}</TT></B><DD CLASS="dd-description"> Path to the
  file containing the SSL certificate.
- <DT><B><TT>{domain_certfile, Domain, Path}</TT></B><DD> Path
+ <DT CLASS="dt-description"><B><TT>{domain_certfile, Domain, Path}</TT></B><DD CLASS="dd-description"> Path
  to the file containing the SSL certificate for the specified domain.
 </DL>
 For instance, the following configuration defines that:
-<UL><LI>
+<UL CLASS="itemize"><LI CLASS="li-itemize">
 c2s connections are listened for on port 5222 and 5223 (SSL) and denied
- for the user ``<TT>bad</TT>''
-<LI>s2s connections are listened for on port 5269 with STARTTLS for secured
+ for the user &#8220;<TT>bad</TT>&#8221;
+<LI CLASS="li-itemize">s2s connections are listened for on port 5269 with STARTTLS for secured
  traffic enabled.
-<LI>Port 5280 is serving the web interface and the HTTP Polling service. Note
+<LI CLASS="li-itemize">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&nbsp;<A HREF="#sec:webadm">3.4.1</A> shows how exactly this can be done.
-<LI>All users except for the administrators have a traffic of limit 
+<LI CLASS="li-itemize">All users except for the administrators have a traffic of limit 
  1,000&nbsp;Bytes/second
-<LI>The
+<LI CLASS="li-itemize">The
  <A HREF="http://ejabberd.jabber.ru/pyaimt">AIM transport</A>
  <TT>aim.example.org</TT> is connected to port 5233 with password
- ``<TT>aimsecret</TT>''
-<LI>The ICQ transport JIT (<TT>icq.example.org</TT> and
+ &#8220;<TT>aimsecret</TT>&#8221;
+<LI CLASS="li-itemize">The ICQ transport JIT (<TT>icq.example.org</TT> and
  <TT>sms.example.org</TT>) is connected to port 5234 with password
- ``<TT>jitsecret</TT>''
-<LI>The
+ &#8220;<TT>jitsecret</TT>&#8221;
+<LI CLASS="li-itemize">The
  <A HREF="http://ejabberd.jabber.ru/pymsnt">MSN transport</A>
  <TT>msn.example.org</TT> is connected to port 5235 with password
- ``<TT>msnsecret</TT>''
-<LI>The
+ &#8220;<TT>msnsecret</TT>&#8221;
+<LI CLASS="li-itemize">The
  <A HREF="http://ejabberd.jabber.ru/yahoo-transport-2">Yahoo! transport</A>
  <TT>yahoo.example.org</TT> is connected to port 5236 with password
- ``<TT>yahoosecret</TT>''
-<LI>The <A HREF="http://ejabberd.jabber.ru/jabber-gg-transport">Gadu-Gadu transport</A> <TT>gg.example.org</TT> is
- connected to port 5237 with password ``<TT>ggsecret</TT>''
-<LI>The
+ &#8220;<TT>yahoosecret</TT>&#8221;
+<LI CLASS="li-itemize">The <A HREF="http://ejabberd.jabber.ru/jabber-gg-transport">Gadu-Gadu transport</A> <TT>gg.example.org</TT> is
+ connected to port 5237 with password &#8220;<TT>ggsecret</TT>&#8221;
+<LI CLASS="li-itemize">The
  <A HREF="http://ejabberd.jabber.ru/jmc">Jabber Mail Component</A>
  <TT>jmc.example.org</TT> is connected to port 5238 with password
- ``<TT>jmcsecret</TT>''
+ &#8220;<TT>jmcsecret</TT>&#8221;
 </UL>
-<PRE>
+<PRE CLASS="verbatim">
   {acl, blocked, {user, "bad"}}.
   {access, c2s, [{deny, blocked},
                  {allow, all}]}.
@@ -806,7 +823,7 @@ c2s connections are listened for on port 5222 and 5223 (SSL) and denied
   {s2s_certfile, "/path/to/ssl.pem"}.
 </PRE>Note, that for jabberd 1.4- or WPJabber-based
 services you have to make the transports log and do XDB by themselves:
-<PRE>
+<PRE CLASS="verbatim">
   &lt;!--
      You have to add elogger and rlogger entries here when using ejabberd.
      In this case the transport will do the logging.
@@ -838,7 +855,7 @@ services you have to make the transports log and do XDB by themselves:
 </PRE>
 <!--TOC subsubsection Modules-->
 
-<H4><A NAME="htoc21">3.1.7</A>&nbsp;&nbsp;Modules</H4><!--SEC END -->
+<H4 CLASS="subsubsection"><A NAME="htoc21">3.1.7</A>&nbsp;&nbsp;Modules</H4><!--SEC END -->
 
 <A NAME="sec:configmodules"></A>
 
@@ -848,17 +865,17 @@ element is the name of a module and the second is a list of options for that
 module. Read section&nbsp;<A HREF="#sec:modules">A</A> for detailed information about modules.<BR>
 <BR>
 Examples:
-<UL><LI>
+<UL CLASS="itemize"><LI CLASS="li-itemize">
 In this simple example, only the module <TT>mod_echo</TT> is loaded and no
  options are specified between square brackets:
- <PRE>
+ <PRE CLASS="verbatim">
   {modules,
    [{mod_echo,      []}
    ]}.
-</PRE><LI>The second example is also simple: the modules <TT>mod_echo</TT>, <TT>mod_time</TT>, and
+</PRE><LI CLASS="li-itemize">The second example is also simple: the modules <TT>mod_echo</TT>, <TT>mod_time</TT>, and
  <TT>mod_version</TT> are loaded without options. Remark that, besides the last entry,
  all entries end with a comma:
- <PRE>
+ <PRE CLASS="verbatim">
   {modules,
    [{mod_echo,      []},
     {mod_time,      []},
@@ -867,22 +884,22 @@ In this simple example, only the module <TT>mod_echo</TT> is loaded and no
 </PRE></UL>
 <!--TOC subsubsection Virtual Hosting-->
 
-<H4><A NAME="htoc22">3.1.8</A>&nbsp;&nbsp;Virtual Hosting</H4><!--SEC END -->
+<H4 CLASS="subsubsection"><A NAME="htoc22">3.1.8</A>&nbsp;&nbsp;Virtual Hosting</H4><!--SEC END -->
 
 <A NAME="sec:configvirtualhost"></A>
 
 Options can be defined separately for every virtual host using the
 <TT>host_config</TT> option. It has the following
 syntax:
-<PRE>
+<PRE CLASS="verbatim">
   {host_config, &lt;hostname&gt;, [&lt;option&gt;, &lt;option&gt;, ...]}.
 </PRE>
 Examples:
-<UL><LI>
+<UL CLASS="itemize"><LI CLASS="li-itemize">
 Domain <TT>example.net</TT> is using the internal authentication method while
  domain <TT>example.com</TT> is using the LDAP server running on the domain
  <TT>localhost</TT> to perform authentication:
-<PRE>
+<PRE CLASS="verbatim">
 {host_config, "example.net", [{auth_method, internal}]}.
 
 {host_config, "example.com", [{auth_method, ldap},
@@ -891,10 +908,10 @@ Domain <TT>example.net</TT> is using the internal authentication method while
                               {ldap_rootdn, "dc=localdomain"},
                               {ldap_rootdn, "dc=example,dc=com"},
                               {ldap_password, ""}]}.
-</PRE><LI>Domain <TT>example.net</TT> is using ODBC to perform authentication
+</PRE><LI CLASS="li-itemize">Domain <TT>example.net</TT> is using ODBC to perform authentication
  while domain <TT>example.com</TT> is using the LDAP servers running on the domains
  <TT>localhost</TT> and <TT>otherhost</TT>:
-<PRE>
+<PRE CLASS="verbatim">
 {host_config, "example.net", [{auth_method, odbc},
                               {odbc_server, "DSN=ejabberd;UID=ejabberd;PWD=ejabberd"}]}.
 
@@ -907,24 +924,24 @@ Domain <TT>example.net</TT> is using the internal authentication method while
 </PRE></UL>
 <!--TOC subsubsection SASL anonymous and anonymous login-->
 
-<H4><A NAME="htoc23">3.1.9</A>&nbsp;&nbsp;SASL anonymous and anonymous login</H4><!--SEC END -->
+<H4 CLASS="subsubsection"><A NAME="htoc23">3.1.9</A>&nbsp;&nbsp;SASL anonymous and anonymous login</H4><!--SEC END -->
 
 <A NAME="sec:configsaslanonymous"></A>
 
 The configuration of the anonymous mode can be done with three
 <TT>host_config</TT> parameters:
-<UL><LI> 
+<UL CLASS="itemize"><LI CLASS="li-itemize"> 
 <TT>auth_method</TT>: This value is used for defining the authentication method:
 internal, odbc, ldap, external). You now have a special extra option to enable
 anonymous mode: anonymous.<BR>
 <BR>
-<LI><TT>allow_multiple_connections</TT>: This option can be either true or false and
+<LI CLASS="li-itemize"><TT>allow_multiple_connections</TT>: This option can be either true or false and
 is only used when the anonymous mode is enabled. Setting it to true means that
 the same username will be able to be taken several time in anonymous login
 mode if different resource are used to connect. This option is only useful in
 very special cases. It defaults to false.<BR>
 <BR>
-<LI><TT>anonymous_protocol</TT>: This option can take three values:
+<LI CLASS="li-itemize"><TT>anonymous_protocol</TT>: This option can take three values:
  <TT>sasl_anon</TT>, <TT>login_anon</TT> or both. <TT>sasl_anon</TT> means that
  SASL anonymous mode is enabled. <TT>login_anon</TT> means that anonymous
  login mode is enabled. both means that SASL anonymous and login anonymous are
@@ -934,26 +951,26 @@ Those options are defined for each virtual host with the <TT>host_config</TT>
 parameter (see section&nbsp;<A HREF="#sec:configvirtualhost">3.1.8</A>).<BR>
 <BR>
 Examples:
-<UL><LI>
+<UL CLASS="itemize"><LI CLASS="li-itemize">
 To enable anonymous login on a virtual host:
-<PRE>
+<PRE CLASS="verbatim">
 {host_config, "public.example.org", [{auth_method, anonymous},
                                      {anonymous_protocol, login_anon}]}.
-</PRE><LI>To enable anonymous login and internal authentication on a virtual host:
-<PRE>
+</PRE><LI CLASS="li-itemize">To enable anonymous login and internal authentication on a virtual host:
+<PRE CLASS="verbatim">
 {host_config, "public.example.org", [{auth_method, [anonymous,internal]},
                                      {anonymous_protocol, login_anon}]}.
-</PRE><LI>To enable SASL anonymous on a virtual host:
-<PRE>
+</PRE><LI CLASS="li-itemize">To enable SASL anonymous on a virtual host:
+<PRE CLASS="verbatim">
 {host_config, "public.example.org", [{auth_method, [anonymous]},
                                      {anonymous_protocol, sasl_anon}]}.
-</PRE><LI>To enable SASL anonymous and anonymous login on a virtual host:
-<PRE>
+</PRE><LI CLASS="li-itemize">To enable SASL anonymous and anonymous login on a virtual host:
+<PRE CLASS="verbatim">
 {host_config, "public.example.org", [{auth_method, [anonymous]},
                                      {anonymous_protocol, both}]}.
-</PRE><LI>To enable SASL anonymous, anonymous login and internal authentication on
+</PRE><LI CLASS="li-itemize">To enable SASL anonymous, anonymous login and internal authentication on
 a virtual host:
-<PRE>
+<PRE CLASS="verbatim">
 {host_config, "public.example.org", [{auth_method, [anonymous,internal]},
                                      {anonymous_protocol, both}]}.
 </PRE></UL>
@@ -963,12 +980,12 @@ available from:
 <BR>
 <!--TOC subsection Relational Database Support-->
 
-<H3><A NAME="htoc24">3.2</A>&nbsp;&nbsp;Relational Database Support</H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc24">3.2</A>&nbsp;&nbsp;Relational Database Support</H3><!--SEC END -->
 
 <A NAME="sec:relationaldatabase"></A>
 <!--TOC subsubsection Preliminary steps-->
 
-<H4><A NAME="htoc25">3.2.1</A>&nbsp;&nbsp;Preliminary steps</H4><!--SEC END -->
+<H4 CLASS="subsubsection"><A NAME="htoc25">3.2.1</A>&nbsp;&nbsp;Preliminary steps</H4><!--SEC END -->
 
 <A NAME="sec:relationaldatabasecompilation"></A>
 If you have installed ejabberd using a binary version, the compilation steps
@@ -978,17 +995,17 @@ Otherwise, to be able to use ejabberd with a relational database you need to
 enable ODBC modules during compilation, even if you want to use ejabberd with
 MySQL or PostgreSQL in native mode. The following <TT>configure</TT> command can
 be used to enable the relational modules:
-<PRE>
+<PRE CLASS="verbatim">
 ./configure --enable-odbc
 </PRE>
 If you are planning to use Microsoft SQL Server with ODBC, you need to specify
 it from the <TT>configure</TT> command before compilation:
-<PRE>
+<PRE CLASS="verbatim">
 ./configure --enable-odbc --enable-mssql
 </PRE>
 <!--TOC subsubsection Authentication against a relational database-->
 
-<H4><A NAME="htoc26">3.2.2</A>&nbsp;&nbsp;Authentication against a relational database</H4><!--SEC END -->
+<H4 CLASS="subsubsection"><A NAME="htoc26">3.2.2</A>&nbsp;&nbsp;Authentication against a relational database</H4><!--SEC END -->
 
 <A NAME="sec:relationaldatabaseauth"></A>
 ejabberd use its internal Mnesia database as a default. It is however possible
@@ -1001,7 +1018,7 @@ system.<BR>
 The option value name be misleading, as the method name is use both for access
 to relational database through ODBC or through the native interface. In any
 case, the first step is to define the odbc <TT>auth_method</TT>. For example:
-<PRE>
+<PRE CLASS="verbatim">
 {host_config, "public.example.org", [{auth_method, [odbc]}]}.
 </PRE>
 The actual database access is defined in the option <TT>odbc_server</TT>. Its
@@ -1010,16 +1027,16 @@ interface available, PostgreSQL or MySQL.<BR>
 <BR>
 To use a relational database through ODBC, you can pass the ODBC connection
 string as <TT>odbc_server</TT> parameter. For example:
-<PRE>
+<PRE CLASS="verbatim">
 {odbc_server, "DSN=database;UID=ejabberd;PWD=password"}.
 </PRE>
 To use the native PostgreSQL interface, you can pass a tuple of the following form as
 parameter:
-<PRE>
+<PRE CLASS="verbatim">
 {pgsql, "Server", "Database", "Username", "Password"}
 </PRE>
 <TT>pgsql</TT> is a keyword that should be kept as is. For example:
-<PRE>
+<PRE CLASS="verbatim">
 {odbc_server, {pgsql, "localhost", "database", "ejabberd", "password"}}.
 </PRE>
 Note that you need to install the Erlang PgSQL library first. This library is
@@ -1028,11 +1045,11 @@ available from Sourceforge: <A HREF="http://cvs.sourceforge.net/viewcvs.py/junge
 To use the native MySQL interface, the same tuple should be passed, except
 that you now have to use the <TT>mysql</TT> keyword instead of the <TT>pgsql</TT>
 keyword:
-<PRE>
+<PRE CLASS="verbatim">
 {mysql, "Server", "Database", "Username", "Password"}
 </PRE>
 <TT>mysql</TT> is a keyword that should be kept as is. For example:
-<PRE>
+<PRE CLASS="verbatim">
 {odbc_server, {mysql, "localhost", "test", "root", "password"}}.
 </PRE>
 Note that you need to install the Erlang MySQL library first. This library is
@@ -1043,61 +1060,61 @@ available from: <A HREF="http://support.process-one.net/doc/display/MESSENGER/Us
 <BR>
 <!--TOC subsubsection Relational database for other modules-->
 
-<H4><A NAME="htoc27">3.2.3</A>&nbsp;&nbsp;Relational database for other modules</H4><!--SEC END -->
+<H4 CLASS="subsubsection"><A NAME="htoc27">3.2.3</A>&nbsp;&nbsp;Relational database for other modules</H4><!--SEC END -->
 
 <A NAME="sec:relationaldatabaseextra"></A>
 It is possible to use a relational database to store pieces of
 information. You can do this by changing the module name to a name with an
 <TT>_odbc</TT> suffix in <TT>ejabberd</TT> config file. You can use a relational
 database for the following data:
-<UL><LI>
+<UL CLASS="itemize"><LI CLASS="li-itemize">
 Last connection date and time: Use <TT>mod_last_odbc</TT> instead of
  <TT>mod_last</TT>.
-<LI>Offline messages: Use <TT>mod_offline_odbc</TT> instead of
+<LI CLASS="li-itemize">Offline messages: Use <TT>mod_offline_odbc</TT> instead of
  <TT>mod_offline</TT>.
-<LI>Rosters: Use <TT>mod_roster_odbc</TT> instead of <TT>mod_roster</TT>.
-<LI>Users' VCARD: Use <TT>mod_vcard_odbc</TT> instead of <TT>mod_vcard</TT>.
+<LI CLASS="li-itemize">Rosters: Use <TT>mod_roster_odbc</TT> instead of <TT>mod_roster</TT>.
+<LI CLASS="li-itemize">Users' VCARD: Use <TT>mod_vcard_odbc</TT> instead of <TT>mod_vcard</TT>.
 </UL>
 <!--TOC subsection Creating an Initial Administrator-->
 
-<H3><A NAME="htoc28">3.3</A>&nbsp;&nbsp;Creating an Initial Administrator</H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc28">3.3</A>&nbsp;&nbsp;Creating an Initial Administrator</H3><!--SEC END -->
 
 <A NAME="sec:initialadmin"></A>
 Before the web interface can be entered to perform administration tasks, an
 account with administrator rights is needed on your <TT>ejabberd</TT> deployment.<BR>
 <BR>
 Instructions to create an initial administrator account:
-<OL type=1><LI>
+<OL CLASS="enumerate" type=1><LI CLASS="li-enumerate">
 Register an account on your <TT>ejabberd</TT> deployment. An account can be
  created in two ways:
- <OL type=a><LI>
+ <OL CLASS="enumerate" type=a><LI CLASS="li-enumerate">
  Using the tool <TT>ejabberdctl</TT> (see
  section&nbsp;<A HREF="#sec:ejabberdctl">3.4.2</A>):
- <PRE>
+ <PRE CLASS="verbatim">
 % ejabberdctl node@host register admin example.org password
-</PRE><LI>Using In-Band Registration (see section&nbsp;<A HREF="#sec:modregister">A.14</A>): you can
+</PRE><LI CLASS="li-enumerate">Using In-Band Registration (see section&nbsp;<A HREF="#sec:modregister">A.14</A>): you can
  use a Jabber client to register an account.
  </OL>
-<LI>Edit the configuration file to promote the account created in the previous
+<LI CLASS="li-enumerate">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.
- <PRE>
+ <PRE CLASS="verbatim">
   {acl, admins, {user, "admin", "example.org"}}.
   {access, configure, [{allow, admins}]}.
-</PRE><LI>Restart <TT>ejabberd</TT> to load the new configuration.
-<LI>Open the web interface (<CODE>http://server:port/admin/</CODE>) in your
+</PRE><LI CLASS="li-enumerate">Restart <TT>ejabberd</TT> to load the new configuration.
+<LI CLASS="li-enumerate">Open the web interface (<CODE>http://server:port/admin/</CODE>) in your
  favourite browser. Make sure to enter the <EM>full</EM> JID as username (in this
  example: <TT>admin@example.org</TT>. The reason that you also need to enter the
  suffix, is because <TT>ejabberd</TT>'s virtual hosting support.
 </OL>
 <!--TOC subsection Online Configuration and Monitoring-->
 
-<H3><A NAME="htoc29">3.4</A>&nbsp;&nbsp;Online Configuration and Monitoring</H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc29">3.4</A>&nbsp;&nbsp;Online Configuration and Monitoring</H3><!--SEC END -->
 
 <A NAME="sec:onlineconfig"></A>
 <!--TOC subsubsection Web Interface-->
 
-<H4><A NAME="htoc30">3.4.1</A>&nbsp;&nbsp;Web Interface</H4><!--SEC END -->
+<H4 CLASS="subsubsection"><A NAME="htoc30">3.4.1</A>&nbsp;&nbsp;Web Interface</H4><!--SEC END -->
 
 <A NAME="sec:webadm"></A>
 
@@ -1108,22 +1125,24 @@ section&nbsp;<A HREF="#sec:configlistened">3.1.6</A>). Then you can open
 will be asked to enter the username (the <EM>full</EM> Jabber ID) and password
 of an <TT>ejabberd</TT> user with administrator rights. After authentication
 you will see a page similar to figure&nbsp;<A HREF="#fig:webadmmain">1</A>.
-<BLOCKQUOTE><DIV ALIGN=center><DIV ALIGN=center><HR WIDTH="80%" SIZE=2></DIV>
+<BLOCKQUOTE CLASS="figure"><DIV CLASS="center"><DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV>
  
  <IMG SRC="webadmmain.png">
  
 
  <BR>
-<DIV ALIGN=center>Figure 1: Top page from the web interface</DIV><BR>
+<BR>
+<DIV CLASS="center">Figure 1: Top page from the web interface</DIV><BR>
+<BR>
 
  <A NAME="fig:webadmmain"></A>
-<DIV ALIGN=center><HR WIDTH="80%" SIZE=2></DIV></DIV></BLOCKQUOTE>
+<DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV></DIV></BLOCKQUOTE>
 Here you can edit access restrictions, manage users, create backups,
 manage the database, enable/disable ports listened for, view server
 statistics,...<BR>
 <BR>
 Examples:
-<UL><LI>
+<UL CLASS="itemize"><LI CLASS="li-itemize">
 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 <CODE>http://example.org:5280/admin/</CODE> to
@@ -1132,11 +1151,11 @@ You can serve the web interface on the same port as the
  the virtual host <TT>example.com</TT>. 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 <TT>ejabberd</TT>. In this example you can enter as
- username ``<TT>admin@example.net</TT>'' to administer all virtual hosts (first
- URL). If you log in with ``<TT>admin@example.com</TT>'' on<BR>
+ username &#8220;<TT>admin@example.net</TT>&#8221; to administer all virtual hosts (first
+ URL). If you log in with &#8220;<TT>admin@example.com</TT>&#8221; on<BR>
 <CODE>http://example.org:5280/admin/server/example.com/</CODE> you can only
  administer the virtual host <TT>example.com</TT>.
- <PRE>
+ <PRE CLASS="verbatim">
   ...
   {acl, admins, {user, "admin", "example.net"}}.
   {host_config, "example.com", [{acl, admins, {user, "admin", "example.com"}}]}.
@@ -1150,11 +1169,11 @@ You can serve the web interface on the same port as the
     ...
    ]
   }.
-</PRE><LI>For security reasons, you can serve the web interface on a secured
+</PRE><LI CLASS="li-itemize">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 <CODE>https://192.168.1.1:5280/admin/</CODE>:
- <PRE>
+ <PRE CLASS="verbatim">
   ...
   {hosts, ["example.org"]}.
   ...
@@ -1169,13 +1188,13 @@ You can serve the web interface on the same port as the
 </PRE></UL>
 <!--TOC subsubsection <TT>ejabberdctl</TT>-->
 
-<H4><A NAME="htoc31">3.4.2</A>&nbsp;&nbsp;<TT>ejabberdctl</TT></H4><!--SEC END -->
+<H4 CLASS="subsubsection"><A NAME="htoc31">3.4.2</A>&nbsp;&nbsp;<TT>ejabberdctl</TT></H4><!--SEC END -->
 
 <A NAME="sec:ejabberdctl"></A>
 It is possible to do some administration operations using the command
 line tool <TT>ejabberdctl</TT>. You can list all available options by
 running <TT>ejabberdctl</TT> without arguments:
-<PRE>
+<PRE CLASS="verbatim">
 % ejabberdctl
 Usage: ejabberdctl node command
 
@@ -1200,27 +1219,27 @@ Example:
   ejabberdctl ejabberd@host restart
 </PRE>
 Additional information:
-<DL COMPACT=compact><DT>
-<B><TT>reopen-log </TT></B><DD> If you use a tool to rotate logs, you have to configure it
+<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
+<B><TT>reopen-log </TT></B><DD CLASS="dd-description"> If you use a tool to rotate logs, you have to configure it
  so that this command is executed after each rotation.
-<DT><B><TT>backup, restore, install-fallback, dump, load</TT></B><DD> You can use these
+<DT CLASS="dt-description"><B><TT>backup, restore, install-fallback, dump, load</TT></B><DD CLASS="dd-description"> You can use these
  commands to create and restore backups. 
-<DT><B><TT>import-file, import-dir</TT></B><DD> 
+<DT CLASS="dt-description"><B><TT>import-file, import-dir</TT></B><DD CLASS="dd-description"> 
  These options can be used to migrate from other Jabber/XMPP servers. There
  exist tutorials to <A HREF="http://ejabberd.jabber.ru/jabberd1-to-ejabberd">migrate from jabberd 1.4</A>
  and to <A HREF="http://ejabberd.jabber.ru/jabberd2-to-ejabberd">migrate from jabberd2</A>.
-<DT><B><TT>delete-expired-messages</TT></B><DD> This option can be used to delete old messages
+<DT CLASS="dt-description"><B><TT>delete-expired-messages</TT></B><DD CLASS="dd-description"> 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.
 </DL>
 <!--TOC section Firewall Settings-->
 
-<H2><A NAME="htoc32">4</A>&nbsp;&nbsp;Firewall Settings</H2><!--SEC END -->
+<H2 CLASS="section"><A NAME="htoc32">4</A>&nbsp;&nbsp;Firewall Settings</H2><!--SEC END -->
 
 <A NAME="sec:firewall"></A>
 
 You need to take the following TCP ports in mind when configuring your firewall:
-<BLOCKQUOTE><DIV ALIGN=center><DIV ALIGN=center><HR WIDTH="80%" SIZE=2></DIV>
+<BLOCKQUOTE CLASS="table"><DIV CLASS="center"><DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV>
  <TABLE BORDER=1 CELLSPACING=0 CELLPADDING=1>
 <TR><TD ALIGN=left NOWRAP>Port</TD>
 <TD ALIGN=left NOWRAP>Description</TD>
@@ -1241,28 +1260,28 @@ You need to take the following TCP ports in mind when configuring your firewall:
 <TD ALIGN=left NOWRAP>Only for clustring (see&nbsp;<A HREF="#sec:clustering">6</A>). This range
  is configurable (see&nbsp;<A HREF="#sec:starting">2.4</A>).</TD>
 </TR></TABLE>
-<DIV ALIGN=center><HR WIDTH="80%" SIZE=2></DIV></DIV></BLOCKQUOTE>
+<DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV></DIV></BLOCKQUOTE>
 <!--TOC section SRV Records-->
 
-<H2><A NAME="htoc33">5</A>&nbsp;&nbsp;SRV Records</H2><!--SEC END -->
+<H2 CLASS="section"><A NAME="htoc33">5</A>&nbsp;&nbsp;SRV Records</H2><!--SEC END -->
 
 <A NAME="sec:srv"></A>
 
-<UL><LI>
+<UL CLASS="itemize"><LI CLASS="li-itemize">
 General information:
  <A HREF="http://en.wikipedia.org/wiki/SRV_record">SRV record</A>
-<LI>Practical information:
+<LI CLASS="li-itemize">Practical information:
  <A HREF="http://jabberd.jabberstudio.org/2/docs/section05.html#5_7">Setting DNS SRV Records</A>
 </UL>
 <!--TOC section Clustering-->
 
-<H2><A NAME="htoc34">6</A>&nbsp;&nbsp;Clustering</H2><!--SEC END -->
+<H2 CLASS="section"><A NAME="htoc34">6</A>&nbsp;&nbsp;Clustering</H2><!--SEC END -->
 
 <A NAME="sec:clustering"></A>
 
 <!--TOC subsection How it Works-->
 
-<H3><A NAME="htoc35">6.1</A>&nbsp;&nbsp;How it Works</H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc35">6.1</A>&nbsp;&nbsp;How it Works</H3><!--SEC END -->
 
 <A NAME="sec:howitworks"></A>
 
@@ -1275,15 +1294,15 @@ needed because all nodes exchange information about connected users, s2s
 connections, registered services, etc...<BR>
 <BR>
 Each <TT>ejabberd</TT> node has the following modules:
-<UL><LI>
+<UL CLASS="itemize"><LI CLASS="li-itemize">
 router,
-<LI>local router,
-<LI>session manager,
-<LI>s2s manager.
+<LI CLASS="li-itemize">local router,
+<LI CLASS="li-itemize">session manager,
+<LI CLASS="li-itemize">s2s manager.
 </UL>
 <!--TOC subsubsection Router-->
 
-<H4><A NAME="htoc36">6.1.1</A>&nbsp;&nbsp;Router</H4><!--SEC END -->
+<H4 CLASS="subsubsection"><A NAME="htoc36">6.1.1</A>&nbsp;&nbsp;Router</H4><!--SEC END -->
 
 
 This module is the main router of Jabber packets on each node. It
@@ -1294,7 +1313,7 @@ appropriate process. If not, it is sent to the s2s manager.<BR>
 <BR>
 <!--TOC subsubsection Local Router-->
 
-<H4><A NAME="htoc37">6.1.2</A>&nbsp;&nbsp;Local Router</H4><!--SEC END -->
+<H4 CLASS="subsubsection"><A NAME="htoc37">6.1.2</A>&nbsp;&nbsp;Local Router</H4><!--SEC END -->
 
 
 This module routes packets which have a destination domain equal to
@@ -1304,7 +1323,7 @@ on its content.<BR>
 <BR>
 <!--TOC subsubsection Session Manager-->
 
-<H4><A NAME="htoc38">6.1.3</A>&nbsp;&nbsp;Session Manager</H4><!--SEC END -->
+<H4 CLASS="subsubsection"><A NAME="htoc38">6.1.3</A>&nbsp;&nbsp;Session Manager</H4><!--SEC END -->
 
 
 This module routes packets to local users. It looks up to which user
@@ -1314,7 +1333,7 @@ storage, or bounced back.<BR>
 <BR>
 <!--TOC subsubsection s2s Manager-->
 
-<H4><A NAME="htoc39">6.1.4</A>&nbsp;&nbsp;s2s Manager</H4><!--SEC END -->
+<H4 CLASS="subsubsection"><A NAME="htoc39">6.1.4</A>&nbsp;&nbsp;s2s Manager</H4><!--SEC END -->
 
 
 This module routes packets to other Jabber servers. First, it
@@ -1325,52 +1344,52 @@ serving this connection, otherwise a new connection is opened.<BR>
 <BR>
 <!--TOC subsection Clustering Setup-->
 
-<H3><A NAME="htoc40">6.2</A>&nbsp;&nbsp;Clustering Setup</H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc40">6.2</A>&nbsp;&nbsp;Clustering Setup</H3><!--SEC END -->
 
 <A NAME="sec:cluster"></A>
 
 Suppose you already configured <TT>ejabberd</TT> on one machine named (<TT>first</TT>),
 and you need to setup another one to make an <TT>ejabberd</TT> cluster. Then do
 following steps:
-<OL type=1><LI>
+<OL CLASS="enumerate" type=1><LI CLASS="li-enumerate">
 Copy <CODE>~ejabberd/.erlang.cookie</CODE> file from <TT>first</TT> to
  <TT>second</TT>.<BR>
 <BR>
-(alt) You can also add ``<CODE>-cookie content_of_.erlang.cookie</CODE>''
- option to all ``<TT>erl</TT>'' commands below.<BR>
+(alt) You can also add &#8220;<CODE>-cookie content_of_.erlang.cookie</CODE>&#8221;
+ option to all &#8220;<TT>erl</TT>&#8221; commands below.<BR>
 <BR>
-<LI>On <TT>second</TT> run as the `<TT>ejabberd</TT>' user in the directory
+<LI CLASS="li-enumerate">On <TT>second</TT> run as the `<TT>ejabberd</TT>' user in the directory
  where <TT>ejabberd</TT> will work later the following command:
-<PRE>
+<PRE CLASS="verbatim">
 erl -sname ejabberd \
     -mnesia extra_db_nodes "['ejabberd@first']" \
     -s mnesia
 </PRE>
  This will start Mnesia serving the same database as <TT>ejabberd@first</TT>.
- You can check this by running the command ``<CODE>mnesia:info().</CODE>''. You
+ You can check this by running the command &#8220;<CODE>mnesia:info().</CODE>&#8221;. You
  should see a lot of remote tables and a line like the following:
-<PRE>
+<PRE CLASS="verbatim">
 running db nodes   = [ejabberd@first, ejabberd@second]
 </PRE><BR>
 <BR>
-<LI>Now run the following in the same ``<TT>erl</TT>'' session:
-<PRE>
+<LI CLASS="li-enumerate">Now run the following in the same &#8220;<TT>erl</TT>&#8221; session:
+<PRE CLASS="verbatim">
 mnesia:change_table_copy_type(schema, node(), disc_copies).
 </PRE>
  This will create local disc storage for the database.<BR>
 <BR>
-(alt) Change storage type of `<TT>scheme</TT>' table to ``RAM and disc
- copy'' on the second node via the web interface.<BR>
+(alt) Change storage type of `<TT>scheme</TT>' table to &#8220;RAM and disc
+ copy&#8221; on the second node via the web interface.<BR>
 <BR>
-<LI>Now you can add replicas of various tables to this node with
- ``<CODE>mnesia:add_table_copy</CODE>'' or
- ``<CODE>mnesia:change_table_copy_type</CODE>'' as above (just replace
- ``<CODE>schema</CODE>'' with another table name and ``<CODE>disc_copies</CODE>''
- can be replaced with ``<CODE>ram_copies</CODE>'' or
- ``<CODE>disc_only_copies</CODE>'').<BR>
+<LI CLASS="li-enumerate">Now you can add replicas of various tables to this node with
+ &#8220;<CODE>mnesia:add_table_copy</CODE>&#8221; or
+ &#8220;<CODE>mnesia:change_table_copy_type</CODE>&#8221; as above (just replace
+ &#8220;<CODE>schema</CODE>&#8221; with another table name and &#8220;<CODE>disc_copies</CODE>&#8221;
+ can be replaced with &#8220;<CODE>ram_copies</CODE>&#8221; or
+ &#8220;<CODE>disc_only_copies</CODE>&#8221;).<BR>
 <BR>
 Which tables to replicate is very dependant on your needs, you can get
- some hints from the command ``<CODE>mnesia:info().</CODE>'', by looking at the
+ some hints from the command &#8220;<CODE>mnesia:info().</CODE>&#8221;, by looking at the
  size of tables and the default storage type for each table on 'first'.<BR>
 <BR>
 Replicating a table makes lookups in this table faster on this node.
@@ -1382,13 +1401,13 @@ Also <A HREF="http://www.erlang.se/doc/doc-5.4.9/lib/mnesia-4.2.2/doc/html/Mnesi
 <BR>
  (alt) Same as in previous item, but for other tables.<BR>
 <BR>
-<LI>Run ``<CODE>init:stop().</CODE>'' or just ``<CODE>q().</CODE>'' to exit from
+<LI CLASS="li-enumerate">Run &#8220;<CODE>init:stop().</CODE>&#8221; or just &#8220;<CODE>q().</CODE>&#8221; to exit from
  the Erlang shell. This probably can take some time if Mnesia has not yet
  transfered and processed all data it needed from <TT>first</TT>.<BR>
 <BR>
-<LI>Now run <TT>ejabberd</TT> on <TT>second</TT> with almost the same config as
- on <TT>first</TT> (you probably don't need to duplicate ``<CODE>acl</CODE>''
- and ``<CODE>access</CODE>'' options --- they will be taken from
+<LI CLASS="li-enumerate">Now run <TT>ejabberd</TT> on <TT>second</TT> with almost the same config as
+ on <TT>first</TT> (you probably don't need to duplicate &#8220;<CODE>acl</CODE>&#8221;
+ and &#8220;<CODE>access</CODE>&#8221; options &mdash; they will be taken from
  <TT>first</TT>, and <CODE>mod_muc</CODE> and <CODE>mod_irc</CODE> should be
  enabled only on one machine in the cluster).
 </OL>
@@ -1398,13 +1417,13 @@ domain.<BR>
 
 <!--TOC section Built-in Modules-->
 
-<H2><A NAME="htoc41">A</A>&nbsp;&nbsp;Built-in Modules</H2><!--SEC END -->
+<H2 CLASS="section"><A NAME="htoc41">A</A>&nbsp;&nbsp;Built-in Modules</H2><!--SEC END -->
 
 <A NAME="sec:modules"></A>
 
 <!--TOC subsection Overview-->
 
-<H3><A NAME="htoc42">A.1</A>&nbsp;&nbsp;Overview</H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc42">A.1</A>&nbsp;&nbsp;Overview</H3><!--SEC END -->
 
 <A NAME="sec:modoverview"></A>
 
@@ -1416,14 +1435,14 @@ that they can contain severe bugs and security leaks. Therefore, use them at
 your own risk!<BR>
 <BR>
 You can see which database backend each module needs by looking at the suffix:
-<UL><LI>
-``_ldap'', this means that the module needs an LDAP server as backend.
-<LI>``_odbc'', this means that the module needs an ODBC compatible database,
+<UL CLASS="itemize"><LI CLASS="li-itemize">
+&#8220;_ldap&#8221;, this means that the module needs an LDAP server as backend.
+<LI CLASS="li-itemize">&#8220;_odbc&#8221;, this means that the module needs an ODBC compatible database,
  a MySQL database, or a PostgreSQL database as backend.
-<LI>Nothing, this means that the modules uses Erlang's built-in database
+<LI CLASS="li-itemize">Nothing, this means that the modules uses Erlang's built-in database
  Mnesia as backend.
 </UL>
-<BLOCKQUOTE><DIV ALIGN=center><DIV ALIGN=center><HR WIDTH="80%" SIZE=2></DIV>
+<BLOCKQUOTE CLASS="table"><DIV CLASS="center"><DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV>
  <TABLE BORDER=1 CELLSPACING=0 CELLPADDING=1>
 <TR><TD ALIGN=left NOWRAP>Module</TD>
 <TD ALIGN=left NOWRAP>Feature</TD>
@@ -1610,13 +1629,13 @@ You can see which database backend each module needs by looking at the suffix:
 <TD ALIGN=left NOWRAP>&nbsp;</TD>
 <TD ALIGN=left NOWRAP>No</TD>
 </TR></TABLE>
-<DIV ALIGN=center><HR WIDTH="80%" SIZE=2></DIV></DIV></BLOCKQUOTE>
+<DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV></DIV></BLOCKQUOTE>
 (*) This module or a similar one with another database backend is needed for
 XMPP compliancy.<BR>
 <BR>
 <!--TOC subsection Common Options-->
 
-<H3><A NAME="htoc43">A.2</A>&nbsp;&nbsp;Common Options</H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc43">A.2</A>&nbsp;&nbsp;Common Options</H3><!--SEC END -->
 
 <A NAME="sec:modcommonopts"></A>
 The following options are used by many modules. Therefore, they are described in
@@ -1624,7 +1643,7 @@ this separate section.<BR>
 <BR>
 <!--TOC subsubsection <TT>iqdisc</TT>-->
 
-<H4><A NAME="htoc44">A.2.1</A>&nbsp;&nbsp;<TT>iqdisc</TT></H4><!--SEC END -->
+<H4 CLASS="subsubsection"><A NAME="htoc44">A.2.1</A>&nbsp;&nbsp;<TT>iqdisc</TT></H4><!--SEC END -->
 
 <A NAME="sec:modiqdiscoption"></A>
 
@@ -1632,23 +1651,23 @@ Many modules define handlers for processing IQ queries of different namespaces
 to this server or to a user (e.&nbsp;g. to <TT>example.org</TT> or to
 <TT>user@example.org</TT>). This option defines processing discipline for
 these queries. Possible values are:
-<DL COMPACT=compact><DT>
-<B><TT>no_queue</TT></B><DD> All queries of a namespace with this processing discipline are
+<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
+<B><TT>no_queue</TT></B><DD CLASS="dd-description"> 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.
-<DT><B><TT>one_queue</TT></B><DD> In this case a separate queue is created for the processing
+<DT CLASS="dt-description"><B><TT>one_queue</TT></B><DD CLASS="dd-description"> 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.
-<DT><B><TT>parallel</TT></B><DD> For every packet with this discipline a separate Erlang process
+<DT CLASS="dt-description"><B><TT>parallel</TT></B><DD CLASS="dd-description"> 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).
 </DL>
 Example:
-<PRE>
+<PRE CLASS="verbatim">
   {modules,
    [
     ...
@@ -1658,7 +1677,7 @@ Example:
 </PRE>
 <!--TOC subsubsection <TT>hosts</TT>-->
 
-<H4><A NAME="htoc45">A.2.2</A>&nbsp;&nbsp;<TT>hosts</TT></H4><!--SEC END -->
+<H4 CLASS="subsubsection"><A NAME="htoc45">A.2.2</A>&nbsp;&nbsp;<TT>hosts</TT></H4><!--SEC END -->
 
 <A NAME="sec:modhostsoption"></A>
 
@@ -1666,19 +1685,19 @@ A module acting as a service can have one or more hostnames. These hostnames
 can be defined with the <TT>hosts</TT> option.<BR>
 <BR>
 Examples:
-<UL><LI>
+<UL CLASS="itemize"><LI CLASS="li-itemize">
 Serving the echo module on one domain:
- <UL><LI>
- <PRE>
+ <UL CLASS="itemize"><LI CLASS="li-itemize">
+ <PRE CLASS="verbatim">
   {modules,
    [
     ...
     {mod_echo, [{hosts, ["echo.example.org"]}]},
     ...
    ]}.
-</PRE><LI>Backwards compatibility with older ejabberd versions can be retained
+</PRE><LI CLASS="li-itemize">Backwards compatibility with older ejabberd versions can be retained
  with:
- <PRE>
+ <PRE CLASS="verbatim">
   {modules,
    [
     ...
@@ -1686,8 +1705,8 @@ Serving the echo module on one domain:
     ...
    ]}.
 </PRE></UL>
- <LI>Serving the echo module on two domains:
- <PRE>
+ <LI CLASS="li-itemize">Serving the echo module on two domains:
+ <PRE CLASS="verbatim">
   {modules,
    [
     ...
@@ -1697,7 +1716,7 @@ Serving the echo module on one domain:
 </PRE></UL>
 <!--TOC subsection <TT>mod_announce</TT>-->
 
-<H3><A NAME="htoc46">A.3</A>&nbsp;&nbsp;<TT>mod_announce</TT></H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc46">A.3</A>&nbsp;&nbsp;<TT>mod_announce</TT></H3><!--SEC END -->
 
 <A NAME="sec:modannounce"></A>
 
@@ -1707,36 +1726,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
 <TT>example.org</TT>, while the JID between brackets will apply to all virtual
 hosts:
-<DL COMPACT=compact><DT>
-<B><TT>example.org/announce/all (example.org/announce/all-hosts/all)</TT></B><DD> The
+<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
+<B><TT>example.org/announce/all (example.org/announce/all-hosts/all)</TT></B><DD CLASS="dd-description"> 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&nbsp;<A HREF="#sec:modoffline">A.10</A>) is enabled.
-<DT><B><TT>example.org/announce/online (example.org/announce/all-hosts/online)</TT></B><DD>The
+<DT CLASS="dt-description"><B><TT>example.org/announce/online (example.org/announce/all-hosts/online)</TT></B><DD CLASS="dd-description">The
  message is sent to all connected users. If the user is online and connected
  to several resources, all resources will receive the message.
-<DT><B><TT>example.org/announce/motd (example.org/announce/all-hosts/motd)</TT></B><DD>The
+<DT CLASS="dt-description"><B><TT>example.org/announce/motd (example.org/announce/all-hosts/motd)</TT></B><DD CLASS="dd-description">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
  <TT>announce/online</TT>).
-<DT><B><TT>example.org/announce/motd/update (example.org/announce/all-hosts/motd/update)</TT></B><DD>
+<DT CLASS="dt-description"><B><TT>example.org/announce/motd/update (example.org/announce/all-hosts/motd/update)</TT></B><DD CLASS="dd-description">
  The message is set as message of the day (MOTD) and is sent to users when they
  login. The message is <EM>not sent</EM> to any currently connected user.
-<DT><B><TT>example.org/announce/motd/delete (example.org/announce/all-hosts/motd/delete)</TT></B><DD>
+<DT CLASS="dt-description"><B><TT>example.org/announce/motd/delete (example.org/announce/all-hosts/motd/delete)</TT></B><DD CLASS="dd-description">
  Any message sent to this JID removes the existing message of the day (MOTD).
 </DL>
 Options:
-<DL COMPACT=compact><DT>
-<B><TT>access</TT></B><DD> This option specifies who is allowed to
+<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
+<B><TT>access</TT></B><DD CLASS="dd-description"> 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).
 </DL>
 Examples:
-<UL><LI>
+<UL CLASS="itemize"><LI CLASS="li-itemize">
 Only administrators can send announcements:
- <PRE>
+ <PRE CLASS="verbatim">
   {access, announce, [{allow, admins}]}.
 
   {modules,
@@ -1745,8 +1764,8 @@ Only administrators can send announcements:
     {mod_announce, [{access, announce}]},
     ...
    ]}.
-</PRE><LI>Administrators as well as the direction can send announcements:
- <PRE>
+</PRE><LI CLASS="li-itemize">Administrators as well as the direction can send announcements:
+ <PRE CLASS="verbatim">
   {acl, direction, {user, "big_boss", "example.org"}}.
   {acl, direction, {user, "assistant", "example.org"}}.
   {acl, admins, {user, "admin", "example.org"}}.
@@ -1763,7 +1782,7 @@ Only administrators can send announcements:
 </PRE></UL>
 <!--TOC subsection <TT>mod_disco</TT>-->
 
-<H3><A NAME="htoc47">A.4</A>&nbsp;&nbsp;<TT>mod_disco</TT></H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc47">A.4</A>&nbsp;&nbsp;<TT>mod_disco</TT></H3><!--SEC END -->
 
 <A NAME="sec:moddisco"></A>
 
@@ -1776,26 +1795,26 @@ the newer Service Discovery protocol if you want them be able to discover
 the services you offer.<BR>
 <BR>
 Options:
-<DL COMPACT=compact><DT>
-<B><TT>iqdisc</TT></B><DD> This specifies 
+<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
+<B><TT>iqdisc</TT></B><DD CLASS="dd-description"> This specifies 
 the processing discipline for Service Discovery (<TT>http://jabber.org/protocol/disco#items</TT> and
  <TT>http://jabber.org/protocol/disco#info</TT>) IQ queries
 (see section&nbsp;<A HREF="#sec:modiqdiscoption">A.2.1</A>).
-<DT><B><TT>extra_domains</TT></B><DD> With this option,
+<DT CLASS="dt-description"><B><TT>extra_domains</TT></B><DD CLASS="dd-description"> With this option,
  extra domains can be added to the Service Discovery item list.
 </DL>
 Examples:
-<UL><LI>
+<UL CLASS="itemize"><LI CLASS="li-itemize">
 To serve a link to the Jabber User Directory on <TT>jabber.org</TT>:
- <PRE>
+ <PRE CLASS="verbatim">
   {modules,
    [
     ...
     {mod_disco, [{extra_domains, ["users.jabber.org"]}]},
     ...
    ]}.
-</PRE><LI>To serve a link to the transports on another server:
- <PRE>
+</PRE><LI CLASS="li-itemize">To serve a link to the transports on another server:
+ <PRE CLASS="verbatim">
   {modules,
    [
     ...
@@ -1803,8 +1822,8 @@ To serve a link to the Jabber User Directory on <TT>jabber.org</TT>:
                                   "msn.example.com"]}]},
     ...
    ]}.
-</PRE><LI>To serve a link to a few friendly servers:
- <PRE>
+</PRE><LI CLASS="li-itemize">To serve a link to a few friendly servers:
+ <PRE CLASS="verbatim">
   {modules,
    [
     ...
@@ -1815,7 +1834,7 @@ To serve a link to the Jabber User Directory on <TT>jabber.org</TT>:
 </PRE></UL>
 <!--TOC subsection <TT>mod_echo</TT>-->
 
-<H3><A NAME="htoc48">A.5</A>&nbsp;&nbsp;<TT>mod_echo</TT></H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc48">A.5</A>&nbsp;&nbsp;<TT>mod_echo</TT></H3><!--SEC END -->
 
 <A NAME="sec:modecho"></A>
 
@@ -1824,31 +1843,31 @@ packet back to the sender. This mirror can be of interest for
 <TT>ejabberd</TT> and Jabber client debugging.<BR>
 <BR>
 Options:
-<DL COMPACT=compact><DT>
+<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
 
- <B><TT>hosts</TT></B><DD>  This option defines the hostnames of the
+ <B><TT>hosts</TT></B><DD CLASS="dd-description">  This option defines the hostnames of the
  service (see section&nbsp;<A HREF="#sec:modhostsoption">A.2.2</A>). If neither <TT>hosts</TT> nor
- the old <TT>host</TT> is present, the prefix ``<TT>echo.</TT>'' is added to all
+ the old <TT>host</TT> is present, the prefix &#8220;<TT>echo.</TT>&#8221; is added to all
  <TT>ejabberd</TT> hostnames.
 
 </DL>
 Examples:
-<UL><LI>
+<UL CLASS="itemize"><LI CLASS="li-itemize">
 Mirror, mirror, on the wall, who is the most beautiful
  of them all?
- <PRE>
+ <PRE CLASS="verbatim">
   {modules,
    [
     ...
     {mod_echo, [{hosts, ["mirror.example.org"]}]},
     ...
    ]}.
-</PRE><LI>If you still do not understand the inner workings of <TT>mod_echo</TT>,
+</PRE><LI CLASS="li-itemize">If you still do not understand the inner workings of <TT>mod_echo</TT>,
  you can find a few more examples in section&nbsp;<A HREF="#sec:modhostsoption">A.2.2</A>.
 </UL>
 <!--TOC subsection <TT>mod_irc</TT>-->
 
-<H3><A NAME="htoc49">A.6</A>&nbsp;&nbsp;<TT>mod_irc</TT></H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc49">A.6</A>&nbsp;&nbsp;<TT>mod_irc</TT></H3><!--SEC END -->
 
 <A NAME="sec:modirc"></A>
 
@@ -1857,50 +1876,50 @@ servers.<BR>
 <BR>
 End user information:
 
-<UL><LI>
-A Jabber client with ``groupchat 1.0'' support or Multi-User
+<UL CLASS="itemize"><LI CLASS="li-itemize">
+A Jabber client with &#8220;groupchat 1.0&#8221; support or Multi-User
  Chat support (<A HREF="http://www.jabber.org/jeps/jep-0045.html">JEP-0045</A>) is necessary to join IRC channels.
-<LI>An IRC channel can be joined in nearly the same way as joining a
+<LI CLASS="li-itemize">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%<TT>irc.example.org</TT>'' in case <TT>irc.example.org</TT> is
- the IRC server hosting ``channel''. And of course the host should point
+ be &#8220;channel%<TT>irc.example.org</TT>&#8221; in case <TT>irc.example.org</TT> is
+ the IRC server hosting &#8220;channel&#8221;. And of course the host should point
  to the IRC transport instead of the Multi-User Chat service.
-<LI>You can register your nickame by sending ``IDENTIFY password'' to<BR>
+<LI CLASS="li-itemize">You can register your nickame by sending &#8220;IDENTIFY password&#8221; to<BR>
 <TT>nickserver!irc.example.org@irc.jabberserver.org</TT>.
-<LI>Entering your password is possible by sending ``LOGIN nick password''<BR>
+<LI CLASS="li-itemize">Entering your password is possible by sending &#8220;LOGIN nick password&#8221;<BR>
 to <TT>nickserver!irc.example.org@irc.jabberserver.org</TT>.
-<LI>When using a popular Jabber server, it can occur that no
+<LI CLASS="li-itemize">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.
 </UL>
 Options:
-<DL COMPACT=compact><DT>
+<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
 
- <B><TT>hosts</TT></B><DD>  This option defines the hostnames of the
+ <B><TT>hosts</TT></B><DD CLASS="dd-description">  This option defines the hostnames of the
  service (see section&nbsp;<A HREF="#sec:modhostsoption">A.2.2</A>). If neither <TT>hosts</TT> nor
- the old <TT>host</TT> is present, the prefix ``<TT>irc.</TT>'' is added to all
+ the old <TT>host</TT> is present, the prefix &#8220;<TT>irc.</TT>&#8221; is added to all
  <TT>ejabberd</TT> hostnames.
 
-<DT><B><TT>access</TT></B><DD> This option can be used to specify who
+<DT CLASS="dt-description"><B><TT>access</TT></B><DD CLASS="dd-description"> This option can be used to specify who
  may use the IRC transport (default value: <TT>all</TT>).
 </DL>
 Examples:
-<UL><LI>
+<UL CLASS="itemize"><LI CLASS="li-itemize">
 In the first example, the IRC transport is available on (all) your
- virtual host(s) with the prefix ``<TT>irc.</TT>''. Furthermore, anyone is
+ virtual host(s) with the prefix &#8220;<TT>irc.</TT>&#8221;. Furthermore, anyone is
  able to use the transport.
- <PRE>
+ <PRE CLASS="verbatim">
   {modules,
    [
     ...
     {mod_irc, [{access, all}]},
     ...
    ]}.
-</PRE><LI>In next example the IRC transport is available on the two virtual hosts
+</PRE><LI CLASS="li-itemize">In next example the IRC transport is available on the two virtual hosts
  <TT>example.net</TT> and <TT>example.com</TT> with different prefixes on each host.
  Moreover, the transport is only accessible by paying customers registered on
  our domains and on other servers.
- <PRE>
+ <PRE CLASS="verbatim">
   {acl, paying_customers, {user, "customer1", "example.net"}}.
   {acl, paying_customers, {user, "customer2", "example.com"}}.
   {acl, paying_customers, {user, "customer3", "example.org"}}.
@@ -1918,7 +1937,7 @@ In the first example, the IRC transport is available on (all) your
 </PRE></UL>
 <!--TOC subsection <TT>mod_last</TT>-->
 
-<H3><A NAME="htoc50">A.7</A>&nbsp;&nbsp;<TT>mod_last</TT></H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc50">A.7</A>&nbsp;&nbsp;<TT>mod_last</TT></H3><!--SEC END -->
 
 <A NAME="sec:modlast"></A>
 
@@ -1928,14 +1947,14 @@ connected user was last active on the server, or to query the uptime of the
 <TT>ejabberd</TT> server.<BR>
 <BR>
 Options:
-<DL COMPACT=compact><DT>
-<B><TT>iqdisc</TT></B><DD> This specifies 
+<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
+<B><TT>iqdisc</TT></B><DD CLASS="dd-description"> This specifies 
 the processing discipline for Last activity (<TT>jabber:iq:last</TT>) IQ queries
 (see section&nbsp;<A HREF="#sec:modiqdiscoption">A.2.1</A>).
 </DL>
 <!--TOC subsection <TT>mod_muc</TT>-->
 
-<H3><A NAME="htoc51">A.8</A>&nbsp;&nbsp;<TT>mod_muc</TT></H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc51">A.8</A>&nbsp;&nbsp;<TT>mod_muc</TT></H3><!--SEC END -->
 
 <A NAME="sec:modmuc"></A>
 
@@ -1944,34 +1963,34 @@ With this module enabled, your server will support Multi-User Chat
 that this module is not (yet) clusterable.<BR>
 <BR>
 Some of the features of Multi-User Chat:
-<UL><LI>
+<UL CLASS="itemize"><LI CLASS="li-itemize">
 Sending private messages to room participants.
-<LI>Inviting users.
-<LI>Setting a conference topic.
-<LI>Creating password protected rooms.
-<LI>Kicking and banning participants.
+<LI CLASS="li-itemize">Inviting users.
+<LI CLASS="li-itemize">Setting a conference topic.
+<LI CLASS="li-itemize">Creating password protected rooms.
+<LI CLASS="li-itemize">Kicking and banning participants.
 </UL>
 Options:
-<DL COMPACT=compact><DT>
+<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
 
- <B><TT>hosts</TT></B><DD>  This option defines the hostnames of the
+ <B><TT>hosts</TT></B><DD CLASS="dd-description">  This option defines the hostnames of the
  service (see section&nbsp;<A HREF="#sec:modhostsoption">A.2.2</A>). If neither <TT>hosts</TT> nor
- the old <TT>host</TT> is present, the prefix ``<TT>conference.</TT>'' is added to all
+ the old <TT>host</TT> is present, the prefix &#8220;<TT>conference.</TT>&#8221; is added to all
  <TT>ejabberd</TT> hostnames.
 
-<DT><B><TT>access</TT></B><DD> You can specify who is allowed to use
+<DT CLASS="dt-description"><B><TT>access</TT></B><DD CLASS="dd-description"> You can specify who is allowed to use
  the Multi-User Chat service (by default, everyone is allowed to use it).
-<DT><B><TT>access_create</TT></B><DD> To configure who is
+<DT CLASS="dt-description"><B><TT>access_create</TT></B><DD CLASS="dd-description"> 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).
-<DT><B><TT>access_admin</TT></B><DD> This option specifies
+<DT CLASS="dt-description"><B><TT>access_admin</TT></B><DD CLASS="dd-description"> This option specifies
  who is allowed to administrate the Multi-User Chat service (the default
  value is <TT>none</TT>, which means that only the room creator can
  administer his room). By sending a message to the service JID,
  administrators can send service messages that will be displayed in every
  active room.<BR>
 <BR>
-<DT><B><TT>history_size</TT></B><DD> a small history of the
+<DT CLASS="dt-description"><B><TT>history_size</TT></B><DD CLASS="dd-description"> a small history of the
  current discussion is send to users when they enter the room. This option make
  it possible to define the number of history messages to keep and send to the
  user joining the room. The value is a integer. Setting the value to <TT>0</TT>
@@ -1979,17 +1998,17 @@ Options:
  is <TT>20</TT>. This value is global and affects all MUC rooms on the server.
 </DL>
 Examples:
-<UL><LI>
+<UL CLASS="itemize"><LI CLASS="li-itemize">
 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
  <TT>admin@example.org</TT> is allowed to administrate any room. In this
  example he is also a global administrator. When <TT>admin@example.org</TT>
- sends a message such as ``Tomorrow, the Jabber server will be moved
+ sends a message such as &#8220;Tomorrow, the Jabber server will be moved
  to new hardware. This will involve service breakdowns around 23:00 UMT.
- We apologise for this inconvenience.'' to <TT>conference.example.org</TT>,
+ We apologise for this inconvenience.&#8221; to <TT>conference.example.org</TT>,
  it will be displayed in all active rooms. In this example the history
  feature is disabled.
- <PRE>
+ <PRE CLASS="verbatim">
   {acl, admins, {user, "admin", "example.org"}}.
   ...
   {access, muc_admins, [{allow, admins}]}.
@@ -2003,17 +2022,17 @@ In the first example everyone is allowed to use the Multi-User Chat
                {history_size, 0}]},
     ...
    ]}.
-</PRE><LI>In the second example the Multi-User Chat service is only accessible by
+</PRE><LI CLASS="li-itemize">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. When
- <TT>admin@example.org</TT> sends a message such as ``Tomorrow, the Jabber
+ <TT>admin@example.org</TT> sends a message such as &#8220;Tomorrow, the Jabber
  server will be moved to new hardware. This will involve service breakdowns
- around 23:00 UMT. We apologise for this inconvenience.'' to
+ around 23:00 UMT. We apologise for this inconvenience.&#8221; to
  <TT>conference.example.org</TT>, it will be displayed in all active rooms. No
  <TT>history_size</TT> option is used, this means that the feature is enabled
  and the default value of 20 history messages will be send to the users.
- <PRE>
+ <PRE CLASS="verbatim">
   {acl, paying_customers, {user, "customer1", "example.net"}}.
   {acl, paying_customers, {user, "customer2", "example.com"}}.
   {acl, paying_customers, {user, "customer3", "example.org"}}.
@@ -2036,7 +2055,7 @@ In the first example everyone is allowed to use the Multi-User Chat
 </PRE></UL>
 <!--TOC subsection <TT>mod_muc_log</TT>-->
 
-<H3><A NAME="htoc52">A.9</A>&nbsp;&nbsp;<TT>mod_muc_log</TT></H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc52">A.9</A>&nbsp;&nbsp;<TT>mod_muc_log</TT></H3><!--SEC END -->
 
 <A NAME="sec:modmuclog"></A>
 
@@ -2045,53 +2064,53 @@ Once you enable this module, join a chatroom with enought privileges using a MUC
 request the configuration form and there you will have an option to enable chatroom logging.<BR>
 <BR>
 Some of the features of generated logs:
-<UL><LI>
+<UL CLASS="itemize"><LI CLASS="li-itemize">
 A lot of information about chatroom is added on top of the page: Room title, JID, subject author, subject and configuration.
-<LI>Room title and JID are links to join the chatroom (using XMPP-IRI).
-<LI>Subject and chatroom configuration changes are tracked and displayed.
-<LI>Joins, leaves, nick changes, kicks, bans and /me are tracked and displayed, including the reason when available.
-<LI>Generated HTML files are XHTML 1.0 Transitional and CSS compliant.
-<LI>Timestamps are self-referencing links.
-<LI>Links on top for quicker navigation: Previous day, Next day, Up.
-<LI>CSS is used for style definition, and a custom CSS file can be used.
-<LI>URLs on messages and subjects are converted to hyperlinks.
-<LI>Timezone used on timestamps is shown on the log files.
-<LI>A custom link can be added on top of page.
+<LI CLASS="li-itemize">Room title and JID are links to join the chatroom (using XMPP-IRI).
+<LI CLASS="li-itemize">Subject and chatroom configuration changes are tracked and displayed.
+<LI CLASS="li-itemize">Joins, leaves, nick changes, kicks, bans and /me are tracked and displayed, including the reason when available.
+<LI CLASS="li-itemize">Generated HTML files are XHTML 1.0 Transitional and CSS compliant.
+<LI CLASS="li-itemize">Timestamps are self-referencing links.
+<LI CLASS="li-itemize">Links on top for quicker navigation: Previous day, Next day, Up.
+<LI CLASS="li-itemize">CSS is used for style definition, and a custom CSS file can be used.
+<LI CLASS="li-itemize">URLs on messages and subjects are converted to hyperlinks.
+<LI CLASS="li-itemize">Timezone used on timestamps is shown on the log files.
+<LI CLASS="li-itemize">A custom link can be added on top of page.
 </UL>
 Options:
-<DL COMPACT=compact><DT>
-<B><TT>access_log</TT></B><DD>
+<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
+<B><TT>access_log</TT></B><DD CLASS="dd-description">
  Restricts which users are allowed to enable or disable chatroom logging using ACL and ACCESS.
  Default: <TT>muc_admin</TT>.
  If you want to allow any chatroom owner put: <TT>muc</TT>.
-<DT><B><TT>cssfile</TT></B><DD>
+<DT CLASS="dt-description"><B><TT>cssfile</TT></B><DD CLASS="dd-description">
  If HTMLs will use a custom CSS file or the embedded one.
  Allowed values:
  <TT>false</TT>: HTMLs will include the standard CSS code;
  <TT>"CSS-URL"</TT>: the URL of the CSS file (for example: "http://example.com/my.css").
  Default: <TT>false</TT>.
-<DT><B><TT>dirtype</TT></B><DD>
+<DT CLASS="dt-description"><B><TT>dirtype</TT></B><DD CLASS="dd-description">
  Type of directory that will be created.
 	Allowed values: 
 		<TT>subdirs</TT>: creates subdirectories for year and month; 
  <TT>plain</TT>: the filename contains the full date, no subdirs.
  Default: <TT>subdirs</TT>.
-<DT><B><TT>outdir</TT></B><DD>
+<DT CLASS="dt-description"><B><TT>outdir</TT></B><DD CLASS="dd-description">
  Full path to the directory where html will be generated.
  Make sure the system user has write access on that directory. 
  Default: <TT>"www/muc"</TT>.
-<DT><B><TT>timezone</TT></B><DD>
+<DT CLASS="dt-description"><B><TT>timezone</TT></B><DD CLASS="dd-description">
  What timezone should be used.
  Allowed values:
 		<TT>local</TT>: use local time, as reported to Erlang by the operating system;
  <TT>universal</TT>: use GMT/UTC time.
  Default: <TT>local</TT>.
-<DT><B><TT>top_link</TT></B><DD>
+<DT CLASS="dt-description"><B><TT>top_link</TT></B><DD CLASS="dd-description">
  Customizable link on top right corner. Syntax of this option: <TT>{"URL", "Text"}</TT>.
  Default: <TT>{"/", "Home"}</TT>.
 </DL>
 Example configuration:
-<PRE>
+<PRE CLASS="verbatim">
   {modules,
    [
     ...
@@ -2108,7 +2127,7 @@ Example configuration:
 </PRE>
 <!--TOC subsection <TT>mod_offline</TT>-->
 
-<H3><A NAME="htoc53">A.10</A>&nbsp;&nbsp;<TT>mod_offline</TT></H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc53">A.10</A>&nbsp;&nbsp;<TT>mod_offline</TT></H3><!--SEC END -->
 
 <A NAME="sec:modoffline"></A>
 
@@ -2120,78 +2139,78 @@ online again. Thus it is very similar to how email works. Note that
 <BR>
 <!--TOC subsection <TT>mod_privacy</TT>-->
 
-<H3><A NAME="htoc54">A.11</A>&nbsp;&nbsp;<TT>mod_privacy</TT></H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc54">A.11</A>&nbsp;&nbsp;<TT>mod_privacy</TT></H3><!--SEC END -->
 
 <A NAME="sec:modprivacy"></A>
 
 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:
-<BLOCKQUOTE>
-<UL><LI>
+<BLOCKQUOTE CLASS="quote">
+<UL CLASS="itemize"><LI CLASS="li-itemize">
 Retrieving one's privacy lists. 
-<LI>Adding, removing, and editing one's privacy lists. 
-<LI>Setting, changing, or declining active lists. 
-<LI>Setting, changing, or declining the default list (i.e., the list that
+<LI CLASS="li-itemize">Adding, removing, and editing one's privacy lists. 
+<LI CLASS="li-itemize">Setting, changing, or declining active lists. 
+<LI CLASS="li-itemize">Setting, changing, or declining the default list (i.e., the list that
  is active by default). 
-<LI>Allowing or blocking messages based on JID, group, or subscription type
+<LI CLASS="li-itemize">Allowing or blocking messages based on JID, group, or subscription type
  (or globally). 
-<LI>Allowing or blocking inbound presence notifications based on JID, group,
+<LI CLASS="li-itemize">Allowing or blocking inbound presence notifications based on JID, group,
  or subscription type (or globally). 
-<LI>Allowing or blocking outbound presence notifications based on JID, group,
+<LI CLASS="li-itemize">Allowing or blocking outbound presence notifications based on JID, group,
  or subscription type (or globally). 
-<LI>Allowing or blocking IQ stanzas based on JID, group, or subscription type
+<LI CLASS="li-itemize">Allowing or blocking IQ stanzas based on JID, group, or subscription type
  (or globally). 
-<LI>Allowing or blocking all communications based on JID, group, or
+<LI CLASS="li-itemize">Allowing or blocking all communications based on JID, group, or
  subscription type (or globally).
 </UL>
 (from <A HREF="http://www.xmpp.org/specs/rfc3921.html#privacy"><TT>http://www.xmpp.org/specs/rfc3921.html#privacy</TT></A>)
 </BLOCKQUOTE>
 Options:
-<DL COMPACT=compact><DT>
-<B><TT>iqdisc</TT></B><DD> This specifies 
+<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
+<B><TT>iqdisc</TT></B><DD CLASS="dd-description"> This specifies 
 the processing discipline for Blocking Communication (<TT>jabber:iq:privacy</TT>) IQ queries
 (see section&nbsp;<A HREF="#sec:modiqdiscoption">A.2.1</A>).
 </DL>
 <!--TOC subsection <TT>mod_private</TT>-->
 
-<H3><A NAME="htoc55">A.12</A>&nbsp;&nbsp;<TT>mod_private</TT></H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc55">A.12</A>&nbsp;&nbsp;<TT>mod_private</TT></H3><!--SEC END -->
 
 <A NAME="sec:modprivate"></A>
 
 This module adds support for Private XML Storage (<A HREF="http://www.jabber.org/jeps/jep-0049.html">JEP-0049</A>):
-<BLOCKQUOTE>
+<BLOCKQUOTE CLASS="quote">
 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 (<A HREF="http://www.jabber.org/jeps/jep-0048.html">JEP-0048</A>).
 </BLOCKQUOTE>
 Options:
-<DL COMPACT=compact><DT>
-<B><TT>iqdisc</TT></B><DD> This specifies 
+<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
+<B><TT>iqdisc</TT></B><DD CLASS="dd-description"> This specifies 
 the processing discipline for Private XML Storage (<TT>jabber:iq:private</TT>) IQ queries
 (see section&nbsp;<A HREF="#sec:modiqdiscoption">A.2.1</A>).
 </DL>
 <!--TOC subsection <TT>mod_pubsub</TT>-->
 
-<H3><A NAME="htoc56">A.13</A>&nbsp;&nbsp;<TT>mod_pubsub</TT></H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc56">A.13</A>&nbsp;&nbsp;<TT>mod_pubsub</TT></H3><!--SEC END -->
 
 <A NAME="sec:modpubsub"></A>
 
 This module offers a Publish-Subscribe Service (<A HREF="http://www.jabber.org/jeps/jep-0060.html">JEP-0060</A>).
 Publish-Subscribe can be used to develop (examples are taken from the JEP):
-<BLOCKQUOTE>
-<UL><LI>
+<BLOCKQUOTE CLASS="quote">
+<UL CLASS="itemize"><LI CLASS="li-itemize">
 news feeds and content syndacation,
-<LI>avatar management,
-<LI>shared bookmarks,
-<LI>auction and trading systems,
-<LI>online catalogs,
-<LI>workflow systems,
-<LI>network management systems,
-<LI>NNTP gateways,
-<LI>vCard/profile management,
-<LI>and weblogs.
+<LI CLASS="li-itemize">avatar management,
+<LI CLASS="li-itemize">shared bookmarks,
+<LI CLASS="li-itemize">auction and trading systems,
+<LI CLASS="li-itemize">online catalogs,
+<LI CLASS="li-itemize">workflow systems,
+<LI CLASS="li-itemize">network management systems,
+<LI CLASS="li-itemize">NNTP gateways,
+<LI CLASS="li-itemize">vCard/profile management,
+<LI CLASS="li-itemize">and weblogs.
 </UL>
 </BLOCKQUOTE> 
 
@@ -2201,21 +2220,21 @@ known as ESB, the Enterprise Service Bus). The J-EAI project builts upon
 <TT>ejabberd</TT>'s codebase and has contributed several features to <TT>mod_pubsub</TT>.<BR>
 <BR>
 Options:
-<DL COMPACT=compact><DT>
+<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
 
- <B><TT>hosts</TT></B><DD>  This option defines the hostnames of the
+ <B><TT>hosts</TT></B><DD CLASS="dd-description">  This option defines the hostnames of the
  service (see section&nbsp;<A HREF="#sec:modhostsoption">A.2.2</A>). If neither <TT>hosts</TT> nor
- the old <TT>host</TT> is present, the prefix ``<TT>pubsub.</TT>'' is added to all
+ the old <TT>host</TT> is present, the prefix &#8220;<TT>pubsub.</TT>&#8221; is added to all
  <TT>ejabberd</TT> hostnames.
 
-<DT><B><TT>served_hosts</TT></B><DD> To specify which hosts needs to
+<DT CLASS="dt-description"><B><TT>served_hosts</TT></B><DD CLASS="dd-description"> To specify which hosts needs to
  be served, you can use this option. If absent, only the main <TT>ejabberd</TT>
- host is served. <DT><B><TT>access_createnode</TT></B><DD> 
+ host is served. <DT CLASS="dt-description"><B><TT>access_createnode</TT></B><DD CLASS="dd-description"> 
  Restricts which users are allowed to create pubsub nodes using ACL and ACCESS.
  Default: <TT>pubsub_createnode</TT>.
 </DL>
 Example:
-<PRE>
+<PRE CLASS="verbatim">
   {modules,
    [
     ...
@@ -2227,31 +2246,31 @@ Example:
 </PRE>
 <!--TOC subsection <TT>mod_register</TT>-->
 
-<H3><A NAME="htoc57">A.14</A>&nbsp;&nbsp;<TT>mod_register</TT></H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc57">A.14</A>&nbsp;&nbsp;<TT>mod_register</TT></H3><!--SEC END -->
 
 <A NAME="sec:modregister"></A>
 
 This module adds support for In-Band Registration (<A HREF="http://www.jabber.org/jeps/jep-0077.html">JEP-0077</A>). This protocol
 enables end users to use a Jabber client to:
-<UL><LI>
+<UL CLASS="itemize"><LI CLASS="li-itemize">
 Register a new account on the server.
-<LI>Change the password from an existing account on the server.
-<LI>Delete an existing account on the server.
+<LI CLASS="li-itemize">Change the password from an existing account on the server.
+<LI CLASS="li-itemize">Delete an existing account on the server.
 </UL>
 Options:
-<DL COMPACT=compact><DT>
-<B><TT>access</TT></B><DD> This option can be configured to specify
- rules to restrict registration. If a rule returns ``deny'' on the requested
+<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
+<B><TT>access</TT></B><DD CLASS="dd-description"> This option can be configured to specify
+ rules to restrict registration. If a rule returns &#8220;deny&#8221; on the requested
  user name, registration for that user name is dennied. (there are no
  restrictions by default).
-<DT><B><TT>iqdisc</TT></B><DD> This specifies 
+<DT CLASS="dt-description"><B><TT>iqdisc</TT></B><DD CLASS="dd-description"> This specifies 
 the processing discipline for In-Band Registration (<TT>jabber:iq:register</TT>) IQ queries
 (see section&nbsp;<A HREF="#sec:modiqdiscoption">A.2.1</A>).
 </DL>
 Examples:
-<UL><LI>
+<UL CLASS="itemize"><LI CLASS="li-itemize">
 Next example prohibits the registration of too short account names:
-<PRE>
+<PRE CLASS="verbatim">
   {acl, shortname, {user_glob, "?"}}.
   {acl, shortname, {user_glob, "??"}}.
   % The same using regexp:
@@ -2266,12 +2285,12 @@ Next example prohibits the registration of too short account names:
     {mod_register, [{access, register}]},
     ...
    ]}.
-</PRE><LI>The in-band registration of new accounts can be prohibited by changing the
+</PRE><LI CLASS="li-itemize">The in-band registration of new accounts can be prohibited by changing the
  <TT>access</TT> 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 <TT>mod_register</TT> from the modules list. In this
  example all In-Band Registration functionality is disabled:
- <PRE>
+ <PRE CLASS="verbatim">
   {access, register, [{deny, all}]}.
 
   {modules,
@@ -2283,21 +2302,21 @@ Next example prohibits the registration of too short account names:
 </PRE></UL>
 <!--TOC subsection <TT>mod_roster</TT>-->
 
-<H3><A NAME="htoc58">A.15</A>&nbsp;&nbsp;<TT>mod_roster</TT></H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc58">A.15</A>&nbsp;&nbsp;<TT>mod_roster</TT></H3><!--SEC END -->
 
 <A NAME="sec:modroster"></A>
 
 This module implements roster management as defined in <A HREF="http://www.xmpp.org/specs/rfc3921.html#roster">RFC 3921: XMPP IM</A>.<BR>
 <BR>
 Options:
-<DL COMPACT=compact><DT>
-<B><TT>iqdisc</TT></B><DD> This specifies 
+<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
+<B><TT>iqdisc</TT></B><DD CLASS="dd-description"> This specifies 
 the processing discipline for Roster Management (<TT>jabber:iq:roster</TT>) IQ queries
 (see section&nbsp;<A HREF="#sec:modiqdiscoption">A.2.1</A>).
 </DL>
 <!--TOC subsection <TT>mod_service_log</TT>-->
 
-<H3><A NAME="htoc59">A.16</A>&nbsp;&nbsp;<TT>mod_service_log</TT></H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc59">A.16</A>&nbsp;&nbsp;<TT>mod_service_log</TT></H3><!--SEC END -->
 
 <A NAME="sec:modservicelog"></A>
 
@@ -2308,25 +2327,25 @@ packets are encapsulated in a <CODE>&lt;route/&gt;</CODE> element and sent to th
 service(s).<BR>
 <BR>
 Options:
-<DL COMPACT=compact><DT>
-<B><TT>loggers</TT></B><DD> With this option a (list of) service(s)
+<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
+<B><TT>loggers</TT></B><DD CLASS="dd-description"> With this option a (list of) service(s)
  that will receive the packets can be specified.
 </DL>
 Examples:
-<UL><LI>
+<UL CLASS="itemize"><LI CLASS="li-itemize">
 To log all end user packets to the Bandersnatch service running on
  <TT>bandersnatch.example.com</TT>:
- <PRE>
+ <PRE CLASS="verbatim">
   {modules,
    [
     ...
     {mod_service_log, [{loggers, ["bandersnatch.example.com"]}]},
     ...
    ]}.
-</PRE><LI>To log all end user packets to the Bandersnatch service running on
+</PRE><LI CLASS="li-itemize">To log all end user packets to the Bandersnatch service running on
  <TT>bandersnatch.example.com</TT> and the backup service on 
  <TT>bandersnatch.example.org</TT>:
- <PRE>
+ <PRE CLASS="verbatim">
   {modules,
    [
     ...
@@ -2337,7 +2356,7 @@ To log all end user packets to the Bandersnatch service running on
 </PRE></UL>
 <!--TOC subsection <TT>mod_shared_roster</TT>-->
 
-<H3><A NAME="htoc60">A.17</A>&nbsp;&nbsp;<TT>mod_shared_roster</TT></H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc60">A.17</A>&nbsp;&nbsp;<TT>mod_shared_roster</TT></H3><!--SEC END -->
 
 <A NAME="sec:modsharedroster"></A>
 
@@ -2349,21 +2368,21 @@ users from the shared roster groups.<BR>
 <BR>
 Shared roster groups can be edited <EM>only</EM> via the web interface. Each group
 has a unique identification and the following parameters:
-<DL COMPACT=compact><DT>
-<B>Name</B><DD> The name of the group, which will be displayed in the roster.
-<DT><B>Description</B><DD> The description of the group. This parameter doesn't affect
+<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
+<B>Name</B><DD CLASS="dd-description"> The name of the group, which will be displayed in the roster.
+<DT CLASS="dt-description"><B>Description</B><DD CLASS="dd-description"> The description of the group. This parameter doesn't affect
  anything.
-<DT><B>Members</B><DD> A list of full JIDs of group members, entered one per line in
+<DT CLASS="dt-description"><B>Members</B><DD CLASS="dd-description"> A list of full JIDs of group members, entered one per line in
  the web interface.
-<DT><B>Displayed groups</B><DD> A list of groups that will be in the rosters of this
+<DT CLASS="dt-description"><B>Displayed groups</B><DD CLASS="dd-description"> A list of groups that will be in the rosters of this
  group's members.
 </DL>
 Examples:
-<UL><LI>
+<UL CLASS="itemize"><LI CLASS="li-itemize">
 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:
-<BLOCKQUOTE><DIV ALIGN=center><DIV ALIGN=center><HR WIDTH="80%" SIZE=2></DIV>
+<BLOCKQUOTE CLASS="table"><DIV CLASS="center"><DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV>
  <TABLE BORDER=1 CELLSPACING=0 CELLPADDING=1>
 <TR><TD ALIGN=left NOWRAP>Identification</TD>
 <TD ALIGN=left NOWRAP>Group `<TT>club_members</TT>'</TD>
@@ -2386,14 +2405,14 @@ Take the case of a computer club that wants all its members seeing each
 <TR><TD ALIGN=left NOWRAP>Displayed groups</TD>
 <TD ALIGN=left NOWRAP><TT>club_members</TT></TD>
 </TR></TABLE>
-<DIV ALIGN=center><HR WIDTH="80%" SIZE=2></DIV></DIV></BLOCKQUOTE>
-<LI>In another case we have a company which has three divisions: Management,
+<DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV></DIV></BLOCKQUOTE>
+<LI CLASS="li-itemize">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:
-<BLOCKQUOTE><DIV ALIGN=center><DIV ALIGN=center><HR WIDTH="80%" SIZE=2></DIV>
+<BLOCKQUOTE CLASS="table"><DIV CLASS="center"><DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV>
  <TABLE BORDER=1 CELLSPACING=0 CELLPADDING=1>
 <TR><TD ALIGN=left NOWRAP>Identification</TD>
 <TD ALIGN=left NOWRAP>Group `<TT>management</TT>'</TD>
@@ -2460,25 +2479,25 @@ Take the case of a computer club that wants all its members seeing each
 <TR><TD ALIGN=left NOWRAP><TT>sales</TT></TD>
 </TR></TABLE></TD>
 </TR></TABLE>
-<DIV ALIGN=center><HR WIDTH="80%" SIZE=2></DIV></DIV></BLOCKQUOTE>
+<DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV></DIV></BLOCKQUOTE>
 </UL>
 <!--TOC subsection <TT>mod_stats</TT>-->
 
-<H3><A NAME="htoc61">A.18</A>&nbsp;&nbsp;<TT>mod_stats</TT></H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc61">A.18</A>&nbsp;&nbsp;<TT>mod_stats</TT></H3><!--SEC END -->
 
 <A NAME="sec:modstats"></A>
 
 This module adds support for Statistics Gathering (<A HREF="http://www.jabber.org/jeps/jep-0039.html">JEP-0039</A>). This protocol
 allows you to retrieve next statistics from your <TT>ejabberd</TT> deployment:
-<UL><LI>
+<UL CLASS="itemize"><LI CLASS="li-itemize">
 Total number of registered users on the current virtual host (users/total).
-<LI>Total number of registered users on all virtual hosts (users/all-hosts/total).
-<LI>Total number of online users on the current virtual host (users/online).
-<LI>Total number of online users on all virtual hosts (users/all-hosts/online).
+<LI CLASS="li-itemize">Total number of registered users on all virtual hosts (users/all-hosts/total).
+<LI CLASS="li-itemize">Total number of online users on the current virtual host (users/online).
+<LI CLASS="li-itemize">Total number of online users on all virtual hosts (users/all-hosts/online).
 </UL>
 Options:
-<DL COMPACT=compact><DT>
-<B><TT>iqdisc</TT></B><DD> This specifies 
+<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
+<B><TT>iqdisc</TT></B><DD CLASS="dd-description"> This specifies 
 the processing discipline for Statistics Gathering (<TT>http://jabber.org/protocol/stats</TT>) IQ queries
 (see section&nbsp;<A HREF="#sec:modiqdiscoption">A.2.1</A>).
 </DL>
@@ -2486,18 +2505,18 @@ As there are only a small amount of clients (for example
 <A HREF="http://tkabber.jabber.ru/">Tkabber</A>) 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:
-<UL><LI>
+<UL CLASS="itemize"><LI CLASS="li-itemize">
 You can request the number of online users on the current virtual host
  (<TT>example.org</TT>) by sending:
- <PRE>
+ <PRE CLASS="verbatim">
 &lt;iq to='example.org' type='get'&gt;
   &lt;query xmlns='http://jabber.org/protocol/stats'&gt;
     &lt;stat name='users/online'/&gt;
   &lt;/query&gt;
 &lt;/iq&gt;
-</PRE><LI>You can request the total number of registered users on all virtual hosts
+</PRE><LI CLASS="li-itemize">You can request the total number of registered users on all virtual hosts
  by sending:
- <PRE>
+ <PRE CLASS="verbatim">
 &lt;iq to='example.org' type='get'&gt;
   &lt;query xmlns='http://jabber.org/protocol/stats'&gt;
     &lt;stat name='users/all-hosts/total'/&gt;
@@ -2506,7 +2525,7 @@ You can request the number of online users on the current virtual host
 </PRE></UL>
 <!--TOC subsection <TT>mod_time</TT>-->
 
-<H3><A NAME="htoc62">A.19</A>&nbsp;&nbsp;<TT>mod_time</TT></H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc62">A.19</A>&nbsp;&nbsp;<TT>mod_time</TT></H3><!--SEC END -->
 
 <A NAME="sec:modtime"></A>
 
@@ -2514,14 +2533,14 @@ This module features support for Entity Time (<A HREF="http://www.jabber.org/jep
 you are able to discover the time at another entity's location.<BR>
 <BR>
 Options:
-<DL COMPACT=compact><DT>
-<B><TT>iqdisc</TT></B><DD> This specifies 
+<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
+<B><TT>iqdisc</TT></B><DD CLASS="dd-description"> This specifies 
 the processing discipline for Entity Time (<TT>jabber:iq:time</TT>) IQ queries
 (see section&nbsp;<A HREF="#sec:modiqdiscoption">A.2.1</A>).
 </DL>
 <!--TOC subsection <TT>mod_vcard</TT>-->
 
-<H3><A NAME="htoc63">A.20</A>&nbsp;&nbsp;<TT>mod_vcard</TT></H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc63">A.20</A>&nbsp;&nbsp;<TT>mod_vcard</TT></H3><!--SEC END -->
 
 <A NAME="sec:modvcard"></A>
 
@@ -2531,39 +2550,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.<BR>
 <BR>
 Options:
-<DL COMPACT=compact><DT>
+<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
 
- <B><TT>hosts</TT></B><DD>  This option defines the hostnames of the
+ <B><TT>hosts</TT></B><DD CLASS="dd-description">  This option defines the hostnames of the
  service (see section&nbsp;<A HREF="#sec:modhostsoption">A.2.2</A>). If neither <TT>hosts</TT> nor
- the old <TT>host</TT> is present, the prefix ``<TT>vjud.</TT>'' is added to all
+ the old <TT>host</TT> is present, the prefix &#8220;<TT>vjud.</TT>&#8221; is added to all
  <TT>ejabberd</TT> hostnames.
 
-<DT><B><TT>iqdisc</TT></B><DD> This specifies 
+<DT CLASS="dt-description"><B><TT>iqdisc</TT></B><DD CLASS="dd-description"> This specifies 
 the processing discipline for <TT>vcard-temp</TT> IQ queries
 (see section&nbsp;<A HREF="#sec:modiqdiscoption">A.2.1</A>).
-<DT><B><TT>search</TT></B><DD> This option specifies whether the search
+<DT CLASS="dt-description"><B><TT>search</TT></B><DD CLASS="dd-description"> This option specifies whether the search
  functionality is enabled (value: <TT>true</TT>) or disabled
  (value: <TT>false</TT>). If disabled, the option <TT>hosts</TT> will be
  ignored and the Jabber User Directory service will not appear in the
  Service Discovery item list. The default value is <TT>true</TT>.
-<DT><B><TT>matches</TT></B><DD> With this option, the number of reported
+<DT CLASS="dt-description"><B><TT>matches</TT></B><DD CLASS="dd-description"> With this option, the number of reported
  search results can be limited. If the option's value is set to <TT>infinity</TT>,
  all search results are reported. The default value is <TT>30</TT>.
-<DT><B><TT>allow_return_all</TT></B><DD> This option enables
+<DT CLASS="dt-description"><B><TT>allow_return_all</TT></B><DD CLASS="dd-description"> 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
  <TT>false</TT>.
-<DT><B><TT>search_all_hosts</TT></B><DD> If this option is
+<DT CLASS="dt-description"><B><TT>search_all_hosts</TT></B><DD CLASS="dd-description"> If this option is
  set to <TT>true</TT>, search operations will apply to all virtual hosts.
  Otherwise only the current host will be searched. The default value is
  <TT>true</TT>.
 </DL>
 Examples:
-<UL><LI>
+<UL CLASS="itemize"><LI CLASS="li-itemize">
 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:
- <PRE>
+ <PRE CLASS="verbatim">
   {modules,
    [
     ...
@@ -2573,9 +2592,9 @@ In this first situation, search results are limited to twenty items,
                  {search_all_hosts, false}]},
     ...
    ]}.
-</PRE><LI>The second situation differs in a way that search results are not limited,
+</PRE><LI CLASS="li-itemize">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:
- <PRE>
+ <PRE CLASS="verbatim">
   {modules,
    [
     ...
@@ -2587,13 +2606,13 @@ In this first situation, search results are limited to twenty items,
 </PRE></UL>
 <!--TOC subsection LDAP and <TT>mod_vcard_ldap</TT>-->
 
-<H3><A NAME="htoc64">A.21</A>&nbsp;&nbsp;LDAP and <TT>mod_vcard_ldap</TT></H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc64">A.21</A>&nbsp;&nbsp;LDAP and <TT>mod_vcard_ldap</TT></H3><!--SEC END -->
 
 <A NAME="sec:ldap"></A>
 
 <!--TOC subsubsection Features-->
 
-<H4><A NAME="htoc65">A.21.1</A>&nbsp;&nbsp;Features</H4><!--SEC END -->
+<H4 CLASS="subsubsection"><A NAME="htoc65">A.21.1</A>&nbsp;&nbsp;Features</H4><!--SEC END -->
 
 <A NAME="sec:ldapfeatures"></A>
 <TT>ejabberd</TT> has built-in LDAP support. You can authenticate users against LDAP
@@ -2602,22 +2621,22 @@ supported yet.<BR>
 <BR>
 <!--TOC subsubsection Connection-->
 
-<H4><A NAME="htoc66">A.21.2</A>&nbsp;&nbsp;Connection</H4><!--SEC END -->
+<H4 CLASS="subsubsection"><A NAME="htoc66">A.21.2</A>&nbsp;&nbsp;Connection</H4><!--SEC END -->
 
 <A NAME="sec:ldapconnection"></A>
 Parameters:
-<DL COMPACT=compact><DT>
-<B><TT>ldap_server</TT></B><DD> IP address or dns name of your
+<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
+<B><TT>ldap_server</TT></B><DD CLASS="dd-description"> IP address or dns name of your
 LDAP server. This option is required.
-<DT><B><TT>ldap_port</TT></B><DD> Port to connect to LDAP server.
+<DT CLASS="dt-description"><B><TT>ldap_port</TT></B><DD CLASS="dd-description"> Port to connect to LDAP server.
 Default is&nbsp;389.
-<DT><B><TT>ldap_rootdn</TT></B><DD> Bind DN. Default is&nbsp;<TT>""</TT>
+<DT CLASS="dt-description"><B><TT>ldap_rootdn</TT></B><DD CLASS="dd-description"> Bind DN. Default is&nbsp;<TT>""</TT>
 which means anonymous connection.
-<DT><B><TT>ldap_password</TT></B><DD> Bind password. Default
+<DT CLASS="dt-description"><B><TT>ldap_password</TT></B><DD CLASS="dd-description"> Bind password. Default
 is&nbsp;<TT>""</TT>.
 </DL>
 Example:
-<PRE>
+<PRE CLASS="verbatim">
   {auth_method, ldap}.
   {ldap_servers, ["ldap.mydomain.org"]}.
   {ldap_port, 389}.
@@ -2629,21 +2648,21 @@ authentication.<BR>
 <BR>
 <!--TOC subsubsection Authentication-->
 
-<H4><A NAME="htoc67">A.21.3</A>&nbsp;&nbsp;Authentication</H4><!--SEC END -->
+<H4 CLASS="subsubsection"><A NAME="htoc67">A.21.3</A>&nbsp;&nbsp;Authentication</H4><!--SEC END -->
 
 <A NAME="sec:ldapauthentication"></A>
 You can authenticate users against LDAP directory. Available parameters are
 listed below:
-<DL COMPACT=compact><DT>
-<B><TT>ldap_base</TT></B><DD> LDAP base directory which stores users
+<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
+<B><TT>ldap_base</TT></B><DD CLASS="dd-description"> LDAP base directory which stores users
 accounts. This option is required.
-<DT><B><TT>ldap_uidattr</TT></B><DD> LDAP attribute which holds
+<DT CLASS="dt-description"><B><TT>ldap_uidattr</TT></B><DD CLASS="dd-description"> LDAP attribute which holds
 user's part of JID. Default is <TT>"uid"</TT>.
-<DT><B><TT>ldap_uidattr_format</TT></B><DD> Format of the
+<DT CLASS="dt-description"><B><TT>ldap_uidattr_format</TT></B><DD CLASS="dd-description"> Format of the
 <TT>ldap_uidattr</TT> variable. Format MUST contain one and only one pattern
 variable <TT>"%u"</TT> which will be replaced by user's part of JID. For example,
 <TT>"%u@mydomain.org"</TT>. Default value is <TT>"%u"</TT>.
-<DT><B><TT>ldap_filter</TT></B><DD> RFC 2254 LDAP filter. Default is
+<DT CLASS="dt-description"><B><TT>ldap_filter</TT></B><DD CLASS="dd-description"> RFC 2254 LDAP filter. Default is
 <TT>none</TT>. Example: <TT>"(&amp;(objectClass=shadowAccount)(memberOf=Jabber
  Users))"</TT>. Please, don't forget closing brackets and don't use superfluous
 whitespaces. Also you MUST NOT use <TT>ldap_uidattr</TT> attribute in filter
@@ -2651,7 +2670,7 @@ because this attribute will be substituted in LDAP filter automatically.
 </DL>
 <!--TOC subsubsection vCards and Search-->
 
-<H4><A NAME="htoc68">A.21.4</A>&nbsp;&nbsp;vCards and Search</H4><!--SEC END -->
+<H4 CLASS="subsubsection"><A NAME="htoc68">A.21.4</A>&nbsp;&nbsp;vCards and Search</H4><!--SEC END -->
 
 <A NAME="sec:modvcardldap"></A>
 <TT>ejabberd</TT> can map LDAP attributes to vCard fields. This behaviour is
@@ -2664,22 +2683,22 @@ LDAP parameters: <TT>ldap_servers</TT>, <TT>ldap_port</TT>,
 <TT>ldap_filter</TT>. If one of this option is not set <TT>ejabberd</TT> will look
 for top-level option with the same name. The second group of parameters
 consists of the following options:
-<DL COMPACT=compact><DT>
+<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
 
- <B><TT>hosts</TT></B><DD>  This option defines the hostnames of the
+ <B><TT>hosts</TT></B><DD CLASS="dd-description">  This option defines the hostnames of the
  service (see section&nbsp;<A HREF="#sec:modhostsoption">A.2.2</A>). If neither <TT>hosts</TT> nor
- the old <TT>host</TT> is present, the prefix ``<TT>vjud.</TT>'' is added to all
+ the old <TT>host</TT> is present, the prefix &#8220;<TT>vjud.</TT>&#8221; is added to all
  <TT>ejabberd</TT> hostnames.
 
-<DT><B><TT>iqdisc</TT></B><DD> This specifies 
+<DT CLASS="dt-description"><B><TT>iqdisc</TT></B><DD CLASS="dd-description"> This specifies 
 the processing discipline for <TT>vcard-temp</TT> IQ queries
 (see section&nbsp;<A HREF="#sec:modiqdiscoption">A.2.1</A>).
-<DT><B><TT>search</TT></B><DD> This option specifies whether the search
+<DT CLASS="dt-description"><B><TT>search</TT></B><DD CLASS="dd-description"> This option specifies whether the search
  functionality is enabled (value: <TT>true</TT>) or disabled
  (value: <TT>false</TT>). If disabled, the option <TT>hosts</TT> will be
  ignored and the Jabber User Directory service will not appear in the
  Service Discovery item list. The default value is <TT>true</TT>.
-<DT><B><TT>ldap_vcard_map</TT></B><DD> the table which defines
+<DT CLASS="dt-description"><B><TT>ldap_vcard_map</TT></B><DD CLASS="dd-description"> the table which defines
 reflection of LDAP attributes to vCard fields.
 	Format is:
 		<TT>[Name_of_vcard_field, Pattern, List_of_LDAP_attributes, ...]</TT>
@@ -2692,7 +2711,7 @@ reflection of LDAP attributes to vCard fields.
 	LDAP attributes from <TT>List_of_LDAP_attributes</TT>; <TT>"%u"</TT> will be replaced with
 	user's part of JID and <TT>"%d"</TT> will be replaced with domain part of JID.
 	Example:
-<PRE>
+<PRE CLASS="verbatim">
   {ldap_vcard_map,
    [{"NICKNAME", "%u", []},
     {"FN", "%s", ["displayName"]},
@@ -2702,7 +2721,7 @@ reflection of LDAP attributes to vCard fields.
    ]},
 </PRE>
 Default is:
-<PRE>
+<PRE CLASS="verbatim">
   [{"NICKNAME", "%u", []},
    {"FN", "%s", ["displayName"]},
    {"FAMILY", "%s", ["sn"]},
@@ -2723,7 +2742,7 @@ Default is:
    {"BDAY", "%s", ["birthDay"]},
    {"ROLE", "%s", ["employeeType"]},
    {"PHOTO", "%s", ["jpegPhoto"]}]
-</PRE><DT><B><TT>ldap_search_fields</TT></B><DD> This option defines
+</PRE><DT CLASS="dt-description"><B><TT>ldap_search_fields</TT></B><DD CLASS="dd-description"> This option defines
 search form and LDAP attributes to search.
 	Format:
 		<TT>[Name, Attribute, ...]</TT>
@@ -2733,7 +2752,7 @@ search form and LDAP attributes to search.
 			<TT>msgs/*.msg</TT> for available words).
 		Attribute is the LDAP attribute or the pattern <TT>"%u"</TT>
  Example:
-<PRE>
+<PRE CLASS="verbatim">
   {ldap_search_fields,
    [{"User", "uid"},
     {"Full Name", "displayName"},
@@ -2741,7 +2760,7 @@ search form and LDAP attributes to search.
    ]},
 </PRE>
 Default is:
-<PRE>
+<PRE CLASS="verbatim">
   [{"User", "%u"},
    {"Full Name", "displayName"},
    {"Given Name", "givenName"},
@@ -2754,7 +2773,7 @@ Default is:
    {"Email", "mail"},
    {"Organization Name", "o"},
    {"Organization Unit", "ou"}]
-</PRE><DT><B><TT>ldap_search_reported</TT></B><DD> This option defines search fields to be reported.
+</PRE><DT CLASS="dt-description"><B><TT>ldap_search_reported</TT></B><DD CLASS="dd-description"> This option defines search fields to be reported.
 	Format:
 		<TT>[Name, VCard_Name, ...]</TT>
 	where
@@ -2763,7 +2782,7 @@ Default is:
 			<TT>msgs/*.msg</TT> for available words).
 		<TT>VCard_Name</TT> is the name of vCard field defined in <TT>ldap_vcard_map</TT> option.
  Example:
-<PRE>
+<PRE CLASS="verbatim">
   {ldap_search_reported,
    [{"Full Name", "FN"},
     {"Email", "EMAIL"},
@@ -2772,7 +2791,7 @@ Default is:
    ]},
 </PRE>
 Default is:
-<PRE>
+<PRE CLASS="verbatim">
   [{"Full Name", "FN"},
    {"Given Name", "GIVEN"},
    {"Middle Name", "MIDDLE"},
@@ -2787,19 +2806,19 @@ Default is:
 </PRE></DL>
 <!--TOC subsubsection Examples-->
 
-<H4><A NAME="htoc69">A.21.5</A>&nbsp;&nbsp;Examples</H4><!--SEC END -->
+<H4 CLASS="subsubsection"><A NAME="htoc69">A.21.5</A>&nbsp;&nbsp;Examples</H4><!--SEC END -->
 
 <A NAME="sec:ldapexamples"></A>
 <!--TOC paragraph Common example-->
 
-<H5>Common example</H5><!--SEC END -->
+<H5 CLASS="paragraph">Common example</H5><!--SEC END -->
 
 Let's say <TT>ldap.mydomain.org</TT> is the name of our LDAP server. We have
 users with their passwords in <TT>"ou=Users,dc=mydomain,dc=org"</TT> directory.
 Also we have addressbook, which contains users emails and their additional
 infos in <TT>"ou=AddressBook,dc=mydomain,dc=org"</TT> directory. Corresponding
 authentication section should looks like this:
-<PRE>
+<PRE CLASS="verbatim">
   %% authentication method
   {auth_method, ldap}.
   %% DNS name of our LDAP server
@@ -2813,10 +2832,10 @@ authentication section should looks like this:
   {ldap_filter, "(objectClass=shadowAccount)"}.
 </PRE>
 Now we want to use users LDAP-info as their vCards. We have four attributes
-defined in our LDAP schema: <TT>"mail"</TT> --- email address, <TT>"givenName"</TT>
---- first name, <TT>"sn"</TT> --- second name, <TT>"birthDay"</TT> --- birthday.
+defined in our LDAP schema: <TT>"mail"</TT> &mdash; email address, <TT>"givenName"</TT>
+&mdash; first name, <TT>"sn"</TT> &mdash; second name, <TT>"birthDay"</TT> &mdash; birthday.
 Also we want users to search each other. Let's see how we can set it up:
-<PRE>
+<PRE CLASS="verbatim">
   {modules,
     ...
     {mod_vcard_ldap,
@@ -2865,11 +2884,11 @@ searching his info in LDAP.<BR>
 <BR>
 <!--TOC paragraph Active Directory-->
 
-<H5>Active Directory</H5><!--SEC END -->
+<H5 CLASS="paragraph">Active Directory</H5><!--SEC END -->
 
 Active Directory is just an LDAP-server with predefined attributes. Sample
 config file is listed below:
-<PRE>
+<PRE CLASS="verbatim">
   {auth_method, ldap}.
   {ldap_servers, ["office.org"]}.    % List of LDAP servers
   {ldap_base, "DC=office,DC=org"}. % Search base of LDAP directory
@@ -2916,7 +2935,7 @@ config file is listed below:
 </PRE>
 <!--TOC subsection <TT>mod_version</TT>-->
 
-<H3><A NAME="htoc70">A.22</A>&nbsp;&nbsp;<TT>mod_version</TT></H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc70">A.22</A>&nbsp;&nbsp;<TT>mod_version</TT></H3><!--SEC END -->
 
 <A NAME="sec:modversion"></A>
 
@@ -2924,20 +2943,20 @@ This module implements Software Version (<A HREF="http://www.jabber.org/jeps/jep
 answers <TT>ejabberd</TT>'s version when queried.<BR>
 <BR>
 Options:
-<DL COMPACT=compact><DT>
-<B><TT>iqdisc</TT></B><DD> This specifies 
+<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
+<B><TT>iqdisc</TT></B><DD CLASS="dd-description"> This specifies 
 the processing discipline for Software Version (<TT>jabber:iq:version</TT>) IQ queries
 (see section&nbsp;<A HREF="#sec:modiqdiscoption">A.2.1</A>).
 </DL>
 <!--TOC section Internationalization and Localization-->
 
-<H2><A NAME="htoc71">B</A>&nbsp;&nbsp;Internationalization and Localization</H2><!--SEC END -->
+<H2 CLASS="section"><A NAME="htoc71">B</A>&nbsp;&nbsp;Internationalization and Localization</H2><!--SEC END -->
 
 <A NAME="sec:i18nl10n"></A>
 
 All built-in modules support the <TT>xml:lang</TT> attribute inside IQ queries.
 Figure&nbsp;<A HREF="#fig:discorus">2</A>, for example, shows the reply to the following query:
-<PRE>
+<PRE CLASS="verbatim">
   &lt;iq id='5'
       to='example.org'
       type='get'
@@ -2945,40 +2964,44 @@ Figure&nbsp;<A HREF="#fig:discorus">2</A>, for example, shows the reply to the f
     &lt;query xmlns='http://jabber.org/protocol/disco#items'/&gt;
   &lt;/iq&gt;
 </PRE>
-<BLOCKQUOTE><DIV ALIGN=center><DIV ALIGN=center><HR WIDTH="80%" SIZE=2></DIV>
+<BLOCKQUOTE CLASS="figure"><DIV CLASS="center"><DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV>
  
  <IMG SRC="discorus.png">
  
 
  <BR>
-<DIV ALIGN=center>Figure 2: Service Discovery when <TT>xml:lang='ru'</TT></DIV><BR>
+<BR>
+<DIV CLASS="center">Figure 2: Service Discovery when <TT>xml:lang='ru'</TT></DIV><BR>
+<BR>
 
  <A NAME="fig:discorus"></A>
-<DIV ALIGN=center><HR WIDTH="80%" SIZE=2></DIV></DIV></BLOCKQUOTE>
+<DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV></DIV></BLOCKQUOTE>
 The web interface also supports the <CODE>Accept-Language</CODE> HTTP header (compare
 figure&nbsp;<A HREF="#fig:webadmmainru">3</A> with figure&nbsp;<A HREF="#fig:webadmmain">1</A>)
-<BLOCKQUOTE><DIV ALIGN=center><DIV ALIGN=center><HR WIDTH="80%" SIZE=2></DIV>
+<BLOCKQUOTE CLASS="figure"><DIV CLASS="center"><DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV>
  
  <IMG SRC="webadmmainru.png">
  
 
  <BR>
-<DIV ALIGN=center>Figure 3: Top page from the web interface with HTTP header
- ``Accept-Language: ru''</DIV><BR>
+<BR>
+<DIV CLASS="center">Figure 3: Top page from the web interface with HTTP header
+ &#8220;Accept-Language: ru&#8221;</DIV><BR>
+<BR>
 
  <A NAME="fig:webadmmainru"></A>
-<DIV ALIGN=center><HR WIDTH="80%" SIZE=2></DIV></DIV></BLOCKQUOTE>
+<DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV></DIV></BLOCKQUOTE>
 <!--TOC section Release Notes-->
 
-<H2><A NAME="htoc72">C</A>&nbsp;&nbsp;Release Notes</H2><!--SEC END -->
+<H2 CLASS="section"><A NAME="htoc72">C</A>&nbsp;&nbsp;Release Notes</H2><!--SEC END -->
 
 <A NAME="sec:releasenotes"></A>
 
 <!--TOC subsection ejabberd 0.9-->
 
-<H3><A NAME="htoc73">C.1</A>&nbsp;&nbsp;ejabberd 0.9</H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc73">C.1</A>&nbsp;&nbsp;ejabberd 0.9</H3><!--SEC END -->
 
-<PRE>
+<PRE CLASS="verbatim">
        Release notes
         ejabberd 0.9
 
@@ -3070,9 +3093,9 @@ Bugfixes
 </PRE>
 <!--TOC subsection ejabberd 0.9.1-->
 
-<H3><A NAME="htoc74">C.2</A>&nbsp;&nbsp;ejabberd 0.9.1</H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc74">C.2</A>&nbsp;&nbsp;ejabberd 0.9.1</H3><!--SEC END -->
 
-<PRE>
+<PRE CLASS="verbatim">
        Release notes
        ejabberd 0.9.1
 
@@ -3138,9 +3161,9 @@ Bugfixes
 </PRE>
 <!--TOC subsection ejabberd 0.9.8-->
 
-<H3><A NAME="htoc75">C.3</A>&nbsp;&nbsp;ejabberd 0.9.8</H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc75">C.3</A>&nbsp;&nbsp;ejabberd 0.9.8</H3><!--SEC END -->
 
-<PRE>
+<PRE CLASS="verbatim">
        Release notes
        ejabberd 0.9.8
          2005-08-01
@@ -3243,9 +3266,9 @@ END
 </PRE>
 <!--TOC subsection ejabberd 1.0.0-->
 
-<H3><A NAME="htoc76">C.4</A>&nbsp;&nbsp;ejabberd 1.0.0</H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc76">C.4</A>&nbsp;&nbsp;ejabberd 1.0.0</H3><!--SEC END -->
 
-<PRE>
+<PRE CLASS="verbatim">
        Release Notes
        ejabberd 1.0.0
        14 December 2005
@@ -3369,9 +3392,9 @@ END
 </PRE>
 <!--TOC subsection ejabberd 1.1.0-->
 
-<H3><A NAME="htoc77">C.5</A>&nbsp;&nbsp;ejabberd 1.1.0</H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc77">C.5</A>&nbsp;&nbsp;ejabberd 1.1.0</H3><!--SEC END -->
 
-<PRE>
+<PRE CLASS="verbatim">
     Release Notes
     ejabberd 1.1.0
     24 April 2006
@@ -3490,9 +3513,9 @@ END
 </PRE>
 <!--TOC subsection ejabberd 1.1.1-->
 
-<H3><A NAME="htoc78">C.6</A>&nbsp;&nbsp;ejabberd 1.1.1</H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc78">C.6</A>&nbsp;&nbsp;ejabberd 1.1.1</H3><!--SEC END -->
 
-<PRE>
+<PRE CLASS="verbatim">
     Release Notes
     ejabberd 1.1.1 
     28 April 2006
@@ -3615,26 +3638,23 @@ END
 </PRE>
 <!--TOC section Acknowledgements-->
 
-<H2><A NAME="htoc79">D</A>&nbsp;&nbsp;Acknowledgements</H2><!--SEC END -->
+<H2 CLASS="section"><A NAME="htoc79">D</A>&nbsp;&nbsp;Acknowledgements</H2><!--SEC END -->
 
 <A NAME="sec:acknowledgements"></A>
 
 Thanks to all people who contributed to this guide:
-<UL><LI>
+<UL CLASS="itemize"><LI CLASS="li-itemize">
 Alexey Shchepin (<A HREF="xmpp:aleksey@jabber.ru"><TT>xmpp:aleksey@jabber.ru</TT></A>)
-<LI>Florian Zumbiehl (<A HREF="xmpp:florz@florz.de"><TT>xmpp:florz@florz.de</TT></A>)
-<LI>Michael Grigutsch (<A HREF="xmpp:migri@jabber.i-pobox.net"><TT>xmpp:migri@jabber.i-pobox.net</TT></A>)
-<LI>Mickael Remond (<A HREF="xmpp:mremond@erlang-projects.org"><TT>xmpp:mremond@erlang-projects.org</TT></A>)
-<LI>Sander Devrieze (<A HREF="xmpp:sander@devrieze.dyndns.org"><TT>xmpp:sander@devrieze.dyndns.org</TT></A>)
-<LI>Sergei Golovan (<A HREF="xmpp:sgolovan@nes.ru"><TT>xmpp:sgolovan@nes.ru</TT></A>)
-<LI>Vsevolod Pelipas (<A HREF="xmpp:vsevoload@jabber.ru"><TT>xmpp:vsevoload@jabber.ru</TT></A>)
+<LI CLASS="li-itemize">Florian Zumbiehl (<A HREF="xmpp:florz@florz.de"><TT>xmpp:florz@florz.de</TT></A>)
+<LI CLASS="li-itemize">Michael Grigutsch (<A HREF="xmpp:migri@jabber.i-pobox.net"><TT>xmpp:migri@jabber.i-pobox.net</TT></A>)
+<LI CLASS="li-itemize">Mickael Remond (<A HREF="xmpp:mremond@erlang-projects.org"><TT>xmpp:mremond@erlang-projects.org</TT></A>)
+<LI CLASS="li-itemize">Sander Devrieze (<A HREF="xmpp:sander@devrieze.dyndns.org"><TT>xmpp:sander@devrieze.dyndns.org</TT></A>)
+<LI CLASS="li-itemize">Sergei Golovan (<A HREF="xmpp:sgolovan@nes.ru"><TT>xmpp:sgolovan@nes.ru</TT></A>)
+<LI CLASS="li-itemize">Vsevolod Pelipas (<A HREF="xmpp:vsevoload@jabber.ru"><TT>xmpp:vsevoload@jabber.ru</TT></A>)
 </UL>
 <!--HTMLFOOT-->
 <!--ENDHTML-->
 <!--FOOTER-->
-<HR SIZE=2>
-<BLOCKQUOTE><EM>This document was translated from L<sup>A</sup>T<sub>E</sub>X by
-</EM><A HREF="http://pauillac.inria.fr/~maranget/hevea/index.html"><EM>H<FONT SIZE=2><sup>E</sup></FONT>V<FONT SIZE=2><sup>E</sup></FONT>A</EM></A><EM>.
-</EM></BLOCKQUOTE>
-</BODY>
+<HR SIZE=2><BLOCKQUOTE CLASS="quote"><EM>This document was translated from L<sup>A</sup>T<sub>E</sub>X by
+</EM><A HREF="http://pauillac.inria.fr/~maranget/hevea/index.html"><EM>H<FONT SIZE=2><sup>E</sup></FONT>V<FONT SIZE=2><sup>E</sup></FONT>A</EM></A><EM>.</EM></BLOCKQUOTE></BODY>
 </HTML>
diff --git a/doc/guide.tex b/doc/guide.tex
index ae37b8d04..c9443da5c 100644
--- a/doc/guide.tex
+++ b/doc/guide.tex
@@ -2310,13 +2310,13 @@ supported yet.
 Parameters:
 
 \begin{description}
-\titem{ldap\_server} \ind{options!ldap_server}IP address or dns name of your
+\titem{ldap\_server} \ind{options!ldap\_server}IP address or dns name of your
 LDAP server. This option is required.
-\titem{ldap\_port} \ind{options!ldap_port}Port to connect to LDAP server.
+\titem{ldap\_port} \ind{options!ldap\_port}Port to connect to LDAP server.
 Default is~389.
-\titem{ldap\_rootdn} \ind{options!ldap_rootdn}Bind DN.  Default is~\term{""}
+\titem{ldap\_rootdn} \ind{options!ldap\_rootdn}Bind DN.  Default is~\term{""}
 which means anonymous connection.
-\titem{ldap\_password} \ind{options!ldap_password}Bind password. Default
+\titem{ldap\_password} \ind{options!ldap\_password}Bind password. Default
 is~\term{""}.
 \end{description}
 
@@ -2340,15 +2340,15 @@ You can authenticate users against LDAP directory.  Available parameters are
 listed below:
 
 \begin{description}
-\titem{ldap\_base} \ind{options!ldap_base}LDAP base directory which stores users
+\titem{ldap\_base} \ind{options!ldap\_base}LDAP base directory which stores users
 accounts.  This option is required.
-\titem{ldap\_uidattr} \ind{options!ldap_uidattr}LDAP attribute which holds
+\titem{ldap\_uidattr} \ind{options!ldap\_uidattr}LDAP attribute which holds
 user's part of JID.  Default is \term{"uid"}.
-\titem{ldap\_uidattr\_format} \ind{options!ldap_uidattr_format}Format of the
+\titem{ldap\_uidattr\_format} \ind{options!ldap\_uidattr\_format}Format of the
 \term{ldap\_uidattr} variable.  Format MUST contain one and only one pattern
 variable \term{"\%u"} which will be replaced by user's part of JID. For example,
 \term{"\%u@mydomain.org"}.  Default value is \term{"\%u"}.
-\titem{ldap\_filter} \ind{options!ldap_filter}RFC 2254 LDAP filter.  Default is
+\titem{ldap\_filter} \ind{options!ldap\_filter}RFC 2254 LDAP filter.  Default is
 \term{none}.  Example: \term{"(\&(objectClass=shadowAccount)(memberOf=Jabber
   Users))"}. Please, don't forget closing brackets and don't use superfluous
 whitespaces. Also you MUST NOT use \option{ldap\_uidattr} attribute in filter
@@ -2378,7 +2378,7 @@ consists of the following options:
   (value: \term{false}).  If disabled, the option \term{hosts} will be
   ignored and the \Jabber{} User Directory service will not appear in the
   Service Discovery item list.  The default value is \term{true}.
-\titem{ldap\_vcard\_map} \ind{options!ldap_vcard_map}the table which defines
+\titem{ldap\_vcard\_map} \ind{options!ldap\_vcard\_map}the table which defines
 reflection of LDAP attributes to vCard fields.
 	Format is:
 		\term{[{Name\_of\_vcard\_field, Pattern, List\_of\_LDAP\_attributes}, ...]}
@@ -2424,7 +2424,7 @@ Default is:
    {"ROLE", "%s", ["employeeType"]},
    {"PHOTO", "%s", ["jpegPhoto"]}]
 \end{verbatim}
-\titem{ldap\_search\_fields} \ind{options!ldap_search_fields}This option defines
+\titem{ldap\_search\_fields} \ind{options!ldap\_search\_fields}This option defines
 search form and LDAP attributes to search.
 	Format:
 		\term{[{Name, Attribute}, ...]}
@@ -2457,7 +2457,7 @@ Default is:
    {"Organization Name", "o"},
    {"Organization Unit", "ou"}]
 \end{verbatim}
-\titem{ldap\_search\_reported} \ind{options!ldap_search_reported}This option defines search fields to be reported.
+\titem{ldap\_search\_reported} \ind{options!ldap\_search\_reported}This option defines search fields to be reported.
 	Format:
 		\term{[{Name, VCard\_Name}, ...]}
 	where
-- 
cgit v1.2.3


From 1632aec61e84630085268d26f5bc39e34c2465fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20R=C3=A9mond?=
 <mickael.remond@process-one.net>
Date: Fri, 22 Sep 2006 09:16:31 +0000
Subject: Improvement coming from trunk (SVN #617): * doc/guide.tex: Large
 improvements for ejabberd 1.1.2 (thanks to Sander Devrieze) *
 doc/version.tex: Likewise. * doc/features.tex: Likewise. * doc/Makefile:
 Likewise. * doc/dev.tex: Likewise.

SVN Revision: 618
---
 ChangeLog            |    9 +
 doc/Makefile         |   11 +-
 doc/dev.html         |   79 +-
 doc/dev.tex          |   25 +-
 doc/features.tex     |   18 +-
 doc/guide.html       | 3116 ++++++++++++++++++++++++++++----------------------
 doc/guide.tex        | 2622 ++++++++++++++++++++++++------------------
 doc/introduction.tex |   75 +-
 doc/version.tex      |    2 +-
 9 files changed, 3374 insertions(+), 2583 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 85f31d187..077cce022 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-09-22  Mickael Remond  <mickael.remond@process-one.net>
+
+	* doc/guide.tex: Large improvements for ejabberd 1.1.2 (thanks to
+	Sander Devrieze)
+	* doc/version.tex: Likewise.
+	* doc/features.tex: Likewise.
+	* doc/Makefile: Likewise.
+	* doc/dev.tex: Likewise.
+	
 2006-09-14  Mickael Remond  <mickael.remond@process-one.net>
 
 	* doc/guide.tex: Minor fix on index generation.
diff --git a/doc/Makefile b/doc/Makefile
index cc8b4d1b3..7736855f3 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -27,16 +27,13 @@ clean:
 	rm -f *.toc
 
 guide.html:	guide.tex
-		hevea guide.tex
-		hevea guide.tex
-
+		hevea -fix -noiso -pedantic guide.tex
+		
 dev.html:	dev.tex
-		hevea dev.tex
-		hevea dev.tex
+		hevea -fix -noiso -pedantic dev.tex
 
 features.html:	features.tex
-		hevea features.tex
-		hevea features.tex
+		hevea -fix -noiso -pedantic features.tex
 
 guide.pdf:	guide.tex
 		pdflatex guide.tex
diff --git a/doc/dev.html b/doc/dev.html
index 8681b1521..6cb4d2a46 100644
--- a/doc/dev.html
+++ b/doc/dev.html
@@ -4,7 +4,7 @@
 
 <HEAD>
 
-<TITLE>Ejabberd 1.1.1 Developers Guide</TITLE>
+<TITLE>Ejabberd 1.1.2 Developers Guide</TITLE>
 
 <META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <META name="GENERATOR" content="hevea 1.08">
@@ -22,7 +22,7 @@ BLOCKQUOTE{margin-left:4ex;margin-right:4ex;text-align:left;}
 </HEAD>
 
 <BODY >
-<!--HEVEA command line is: hevea dev.tex -->
+<!--HEVEA command line is: hevea -fix -noiso -pedantic dev.tex -->
 <!--HTMLHEAD-->
 <!--ENDHTML-->
 <!--PREFIX <ARG ></ARG>-->
@@ -34,7 +34,7 @@ BLOCKQUOTE{margin-left:4ex;margin-right:4ex;text-align:left;}
 
  <TABLE CLASS="title">
 <TR><TD>
-<H1 CLASS="titlemain">Ejabberd 1.1.1 Developers Guide</H1>
+<H1 CLASS="titlemain">Ejabberd 1.1.2 Developers Guide</H1>
 <H3 CLASS="titlerest">Alexey Shchepin<BR>
 <A HREF="mailto:alexey@sevcom.net"><TT>mailto:alexey@sevcom.net</TT></A><BR>
 <A HREF="xmpp:aleksey@jabber.ru"><TT>xmpp:aleksey@jabber.ru</TT></A></H3></TD>
@@ -42,7 +42,7 @@ BLOCKQUOTE{margin-left:4ex;margin-right:4ex;text-align:left;}
 <BR>
 <DIV CLASS="center">
  
- <IMG SRC="logo.png">
+ <IMG SRC="logo.png" ALT="logo.png">
  
 
  <BR>
@@ -61,49 +61,50 @@ BLOCKQUOTE{margin-left:4ex;margin-right:4ex;text-align:left;}
 <A HREF="#htoc2">1.1&nbsp;&nbsp;Key Features</A>
 <LI CLASS="li-toc"><A HREF="#htoc3">1.2&nbsp;&nbsp;Additional Features</A>
 </UL>
-<LI CLASS="li-toc"><A HREF="#htoc4">2&nbsp;&nbsp;How it works</A>
+<LI CLASS="li-toc"><A HREF="#htoc4">2&nbsp;&nbsp;How it Works</A>
 <UL CLASS="toc"><LI CLASS="li-toc">
 <A HREF="#htoc5">2.1&nbsp;&nbsp;Router</A>
 <LI CLASS="li-toc"><A HREF="#htoc6">2.2&nbsp;&nbsp;Local Router</A>
 <LI CLASS="li-toc"><A HREF="#htoc7">2.3&nbsp;&nbsp;Session Manager</A>
 <LI CLASS="li-toc"><A HREF="#htoc8">2.4&nbsp;&nbsp;S2S Manager</A>
 </UL>
-<LI CLASS="li-toc"><A HREF="#htoc9">3&nbsp;&nbsp;XML representation</A>
+<LI CLASS="li-toc"><A HREF="#htoc9">3&nbsp;&nbsp;XML Representation</A>
 <LI CLASS="li-toc"><A HREF="#htoc10">4&nbsp;&nbsp;Module <TT>xml</TT></A>
 <LI CLASS="li-toc"><A HREF="#htoc11">5&nbsp;&nbsp;Module <TT>xml_stream</TT></A>
-<LI CLASS="li-toc"><A HREF="#htoc12">6&nbsp;&nbsp;<TT>ejabberd</TT> modules</A>
+<LI CLASS="li-toc"><A HREF="#htoc12">6&nbsp;&nbsp;Modules</A>
 <UL CLASS="toc"><LI CLASS="li-toc">
-<A HREF="#htoc13">6.1&nbsp;&nbsp;gen_mod behaviour</A>
-<LI CLASS="li-toc"><A HREF="#htoc14">6.2&nbsp;&nbsp;Module gen_iq_handler</A>
-<LI CLASS="li-toc"><A HREF="#htoc15">6.3&nbsp;&nbsp;Services</A>
+<A HREF="#htoc13">6.1&nbsp;&nbsp;Module gen_iq_handler</A>
+<LI CLASS="li-toc"><A HREF="#htoc14">6.2&nbsp;&nbsp;Services</A>
 </UL>
 </UL>
 
 <!--TOC section Introduction-->
 
-<H2 CLASS="section"><A NAME="htoc1">1</A>&nbsp;&nbsp;Introduction</H2><!--SEC END -->
+<H2 CLASS="section"><A NAME="htoc1">1</A>&nbsp;&nbsp;<A NAME="intro">Introduction</A></H2><!--SEC END -->
 
-<A NAME="sec:intr"></A>
+<A NAME="sec:intro"></A>
  
-<TT>ejabberd</TT> is a free (GPL) distributed fault-tolerant Jabber/XMPP server and is mainly written in <A HREF="http://www.erlang.org/">Erlang</A>.<BR>
+<TT>ejabberd</TT> is a free and open source instant messaging server written in <A HREF="http://www.erlang.org/">Erlang</A>.<BR>
 <BR>
-<TT>ejabberd</TT> is designed to be a stable, standards compliant, and feature rich Jabber/XMPP server.<BR>
+<TT>ejabberd</TT> is cross-platform, distributed, fault-tolerant, and based on open standards to achieve real-time communication.<BR>
 <BR>
-<TT>ejabberd</TT> is suitable for small servers, whether they need to be scalable or not, as well as extremely big servers.<BR>
+<TT>ejabberd</TT> is designed to be a rock-solid and feature rich XMPP server.<BR>
+<BR>
+<TT>ejabberd</TT> is suitable for small deployments, whether they need to be scalable or not, as well as extremely big deployments.<BR>
 <BR>
 <!--TOC subsection Key Features-->
 
-<H3 CLASS="subsection"><A NAME="htoc2">1.1</A>&nbsp;&nbsp;Key Features</H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc2">1.1</A>&nbsp;&nbsp;<A NAME="keyfeatures">Key Features</A></H3><!--SEC END -->
 
 <A NAME="sec:keyfeatures"></A>
 
 <TT>ejabberd</TT> is:
 <UL CLASS="itemize"><LI CLASS="li-itemize">
-Multiplatform: <TT>ejabberd</TT> runs under Microsoft Windows and Unix derived systems such as Linux, FreeBSD and NetBSD.<BR>
+Cross-platform: <TT>ejabberd</TT> runs under Microsoft Windows and Unix derived systems such as Linux, FreeBSD and NetBSD.<BR>
 <BR>
 <LI CLASS="li-itemize">Distributed: You can run <TT>ejabberd</TT> on a cluster of machines and all of them will serve the same Jabber domain(s). 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.<BR>
 <BR>
-<LI CLASS="li-itemize">Fault-tolerant: You can deploy an <TT>ejabberd</TT> 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 &#8220;on the fly&#8221;.<BR>
+<LI CLASS="li-itemize">Fault-tolerant: You can deploy an <TT>ejabberd</TT> 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'.<BR>
 <BR>
 <LI CLASS="li-itemize">Administrator Friendly: <TT>ejabberd</TT> 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:
 <UL CLASS="itemize"><LI CLASS="li-itemize">
@@ -124,17 +125,17 @@ Translated in 11 languages.
 <BR>
 <LI CLASS="li-itemize">Open Standards: <TT>ejabberd</TT> is the first Open Source Jabber server claiming to fully comply to the XMPP standard.
 <UL CLASS="itemize"><LI CLASS="li-itemize">
-Fully XMPP compliant 
-<LI CLASS="li-itemize">XML-based protocol
+Fully XMPP compliant.
+<LI CLASS="li-itemize">XML-based protocol.
 <LI CLASS="li-itemize"><A HREF="http://ejabberd.jabber.ru/protocols">Many JEPs supported</A>.
 </UL></UL>
 <!--TOC subsection Additional Features-->
 
-<H3 CLASS="subsection"><A NAME="htoc3">1.2</A>&nbsp;&nbsp;Additional Features</H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc3">1.2</A>&nbsp;&nbsp;<A NAME="addfeatures">Additional Features</A></H3><!--SEC END -->
 
 <A NAME="sec:addfeatures"></A>
 
-Besides common Jabber server features, <TT>ejabberd</TT> comes with a wide range of other features:
+Moreover, <TT>ejabberd</TT> comes with a wide range of other state-of-the-art features:
 <UL CLASS="itemize"><LI CLASS="li-itemize">
 Modular
 <UL CLASS="itemize"><LI CLASS="li-itemize">
@@ -152,12 +153,12 @@ SASL and STARTTLS for c2s and s2s connections.
 Native MySQL support.
 <LI CLASS="li-itemize">Native PostgreSQL support.
 <LI CLASS="li-itemize">Mnesia.
-<LI CLASS="li-itemize">ODBC data storage support. 
-<LI CLASS="li-itemize">Microsoft SQL Server support (via ODBC).
+<LI CLASS="li-itemize">ODBC data storage support.
+<LI CLASS="li-itemize">Microsoft SQL Server support.
 </UL>
 <LI CLASS="li-itemize">Authentication
 <UL CLASS="itemize"><LI CLASS="li-itemize">
-LDAP and ODBC. 
+LDAP and ODBC.
 <LI CLASS="li-itemize">External Authentication script.
 <LI CLASS="li-itemize">Internal Authentication.
 </UL>
@@ -170,14 +171,14 @@ Compressing XML streams with Stream Compression (<A HREF="http://www.jabber.org/
 <LI CLASS="li-itemize"><A HREF="http://www.jabber.org/jeps/jep-0045.html">Multi-User Chat</A> module with logging.
 <LI CLASS="li-itemize">Users Directory based on users vCards.
 <LI CLASS="li-itemize"><A HREF="http://www.jabber.org/jeps/jep-0060.html">Publish-Subscribe</A> component.
-<LI CLASS="li-itemize">Support for virtual hosting. 
+<LI CLASS="li-itemize">Support for virtual hosting.
 <LI CLASS="li-itemize"><A HREF="http://www.jabber.org/jeps/jep-0025.html">HTTP Polling</A> service.
 <LI CLASS="li-itemize">IRC transport.
 </UL>
 </UL>
-<!--TOC section How it works-->
+<!--TOC section How it Works-->
 
-<H2 CLASS="section"><A NAME="htoc4">2</A>&nbsp;&nbsp;How it works</H2><!--SEC END -->
+<H2 CLASS="section"><A NAME="htoc4">2</A>&nbsp;&nbsp;How it Works</H2><!--SEC END -->
 
 <A NAME="sec:howitworks"></A>
 A Jabber domain is served by one or more <TT>ejabberd</TT> nodes. These nodes can
@@ -235,9 +236,9 @@ routes the packet to S2S manager on that node, if it is open on this node, then
 it is routed to the process that serves this connection, and if a connection
 does not exist, then it is opened and registered.<BR>
 <BR>
-<!--TOC section XML representation-->
+<!--TOC section XML Representation-->
 
-<H2 CLASS="section"><A NAME="htoc9">3</A>&nbsp;&nbsp;XML representation</H2><!--SEC END -->
+<H2 CLASS="section"><A NAME="htoc9">3</A>&nbsp;&nbsp;XML Representation</H2><!--SEC END -->
 
 <A NAME="sec:xmlrepr"></A>
 Each XML stanza is represented as the following tuple:
@@ -325,21 +326,14 @@ Err = term()
 </PRE>Parses <TT>Str</TT> using XML parser, returns either parsed element or error
  tuple.
 </DL>
-<!--TOC section <TT>ejabberd</TT> modules-->
+<!--TOC section Modules-->
 
-<H2 CLASS="section"><A NAME="htoc12">6</A>&nbsp;&nbsp;<TT>ejabberd</TT> modules</H2><!--SEC END -->
+<H2 CLASS="section"><A NAME="htoc12">6</A>&nbsp;&nbsp;Modules</H2><!--SEC END -->
 
 <A NAME="sec:emods"></A>
-<!--TOC subsection gen_mod behaviour-->
-
-<H3 CLASS="subsection"><A NAME="htoc13">6.1</A>&nbsp;&nbsp;gen_mod behaviour</H3><!--SEC END -->
-
-<A NAME="sec:genmod"></A>
-TBD<BR>
-<BR>
 <!--TOC subsection Module gen_iq_handler-->
 
-<H3 CLASS="subsection"><A NAME="htoc14">6.2</A>&nbsp;&nbsp;Module gen_iq_handler</H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc13">6.1</A>&nbsp;&nbsp;Module gen_iq_handler</H3><!--SEC END -->
 
 <A NAME="sec:geniqhandl"></A>
 The module <CODE>gen_iq_handler</CODE> allows to easily write handlers for IQ packets
@@ -408,12 +402,9 @@ process_local_iq(From, To, {iq, ID, Type, XMLNS, SubEl}) -&gt;
 </PRE>
 <!--TOC subsection Services-->
 
-<H3 CLASS="subsection"><A NAME="htoc15">6.3</A>&nbsp;&nbsp;Services</H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc14">6.2</A>&nbsp;&nbsp;Services</H3><!--SEC END -->
 
 <A NAME="sec:services"></A>
-TBD<BR>
-<BR>
-TODO: use <CODE>proc_lib</CODE>
 <PRE CLASS="verbatim">
 -module(mod_echo).
 
diff --git a/doc/dev.tex b/doc/dev.tex
index 9aa3b820a..3b0764311 100644
--- a/doc/dev.tex
+++ b/doc/dev.tex
@@ -29,24 +29,31 @@
 
 %% Modules
 \newcommand{\module}[1]{\texttt{#1}}
+\newcommand{\modadhoc}{\module{mod\_adhoc}}
 \newcommand{\modannounce}{\module{mod\_announce}}
 \newcommand{\modconfigure}{\module{mod\_configure}}
 \newcommand{\moddisco}{\module{mod\_disco}}
+\newcommand{\modecho}{\module{mod\_echo}}
 \newcommand{\modirc}{\module{mod\_irc}}
 \newcommand{\modlast}{\module{mod\_last}}
+\newcommand{\modlastodbc}{\module{mod\_last\_odbc}}
 \newcommand{\modmuc}{\module{mod\_muc}}
-\newcommand{\modecho}{\module{mod\_echo}}
+\newcommand{\modmuclog}{\module{mod\_muc\_log}}
 \newcommand{\modoffline}{\module{mod\_offline}}
+\newcommand{\modofflineodbc}{\module{mod\_offline\_odbc}}
 \newcommand{\modprivacy}{\module{mod\_privacy}}
 \newcommand{\modprivate}{\module{mod\_private}}
 \newcommand{\modpubsub}{\module{mod\_pubsub}}
 \newcommand{\modregister}{\module{mod\_register}}
 \newcommand{\modroster}{\module{mod\_roster}}
+\newcommand{\modrosterodbc}{\module{mod\_roster\_odbc}}
 \newcommand{\modservicelog}{\module{mod\_service\_log}}
 \newcommand{\modsharedroster}{\module{mod\_shared\_roster}}
 \newcommand{\modstats}{\module{mod\_stats}}
 \newcommand{\modtime}{\module{mod\_time}}
 \newcommand{\modvcard}{\module{mod\_vcard}}
+\newcommand{\modvcardldap}{\module{mod\_vcard\_ldap}}
+\newcommand{\modvcardodbc}{\module{mod\_vcard\_odbc}}
 \newcommand{\modversion}{\module{mod\_version}}
 
 %% Title page
@@ -89,7 +96,7 @@
 % Input introduction.tex
 \input{introduction}
 
-\section{How it works}
+\section{How it Works}
 \label{sec:howitworks}
 
 
@@ -150,7 +157,7 @@ does not exist, then it is opened and registered.
 
 
 
-\section{XML representation}
+\section{XML Representation}
 \label{sec:xmlrepr}
 
 Each XML stanza is represented as the following tuple:
@@ -254,14 +261,14 @@ Err = term()
 \end{description}
 
 
-\section{\ejabberd{} modules}
+\section{Modules}
 \label{sec:emods}
 
 
-\subsection{gen\_mod behaviour}
-\label{sec:genmod}
+%\subsection{gen\_mod behaviour}
+%\label{sec:genmod}
 
-TBD
+%TBD
 
 \subsection{Module gen\_iq\_handler}
 \label{sec:geniqhandl}
@@ -345,10 +352,10 @@ process_local_iq(From, To, {iq, ID, Type, XMLNS, SubEl}) ->
 \subsection{Services}
 \label{sec:services}
 
-TBD
+%TBD
 
 
-TODO: use \verb|proc_lib|
+%TODO: use \verb|proc_lib|
 \begin{verbatim}
 -module(mod_echo).
 
diff --git a/doc/features.tex b/doc/features.tex
index d64b0fafb..f5579cf42 100644
--- a/doc/features.tex
+++ b/doc/features.tex
@@ -9,7 +9,7 @@
         Feature\ Sheet,pdfauthor=Sander\
         Devrieze,pdfsubject=ejabberd,pdfkeywords=ejabberd]{hyperref}
 \usepackage{verbatim}
-\usepackage{xcolor}
+\usepackage{color}
 
 %% Index
 % Remove the index anchors from the HTML version to save size and bandwith.
@@ -49,11 +49,14 @@
 % Options
 \newcommand{\marking}[1]{\textbf{\begin{large}\textcolor{ejblue}{#1}\end{large}}} % Marking enabled
 \newcommand{\quoting}[2][yozhik]{\begin{quotation}\textcolor{#1}{\textit{#2}}\end{quotation}} % Quotes enabled
-\newcommand{\new}{\begin{latexonly}\marginpar{\textcolor{red}{\textsc{new}}}\end{latexonly}} % Highlight new features
-\newcommand{\improved}{\begin{latexonly}\marginpar{\textcolor{orange}{\textsc{improved}}}\end{latexonly}} % Highlight improved features
-\newcommand{\moreinfo}[1]{} % Hide details
+\newcommand{\new}{\marginpar{\textcolor{red}{\textsc{new}}}} % Highlight new features
+\newcommand{\improved}{\marginpar{\textcolor{orange}{\textsc{improved}}}} % Highlight improved features
 \setcounter{secnumdepth}{-1} % Disable section numbering
 
+%% To by-pass errors in the HTML version.
+\newstyle{SPAN}{width:20\%; float:right; text-align:left; margin-left:auto;}
+\definecolor{orange}       {cmyk}{0.000,0.333,1.000,0.000}
+
 %% Footnotes
 \begin{latexonly}
 \global\parskip=9pt plus 3pt minus 1pt
@@ -67,7 +70,7 @@
 %% Fancy header
 \fancyhf{}
 \pagestyle{fancy}
-\rhead{\textcolor{ejblue}{The expandable Jabber daemon.}}
+\rhead{\textcolor{ejblue}{The Expandable Jabber Daemon.}}
 \renewcommand{\headrule}{{\color{ejblue}%
 \hrule width\headwidth height\headrulewidth \vskip-\headrulewidth}}
 \lhead{\setlength{\unitlength}{-6mm}
@@ -85,7 +88,7 @@
 
 \begin{document}
 
-\label{sec:titlepage}
+\label{titlepage}
 \begin{titlepage}
   \maketitle{}
 
@@ -107,9 +110,8 @@
 % the same identifier".
 \begin{latexonly}
 \setcounter{page}{2}
-\end{latexonly}
-
 \pagecolor{ejgreenwhite}
+\end{latexonly}
 
 % Input introduction.tex
 \input{introduction}
diff --git a/doc/guide.html b/doc/guide.html
index cf4f4382f..130a9c128 100644
--- a/doc/guide.html
+++ b/doc/guide.html
@@ -4,7 +4,7 @@
 
 <HEAD>
 
-<TITLE>Ejabberd 1.1.1 Installation and Operation Guide</TITLE>
+<TITLE>Ejabberd 1.1.2 Installation and Operation Guide</TITLE>
 
 <META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <META name="GENERATOR" content="hevea 1.08">
@@ -18,11 +18,12 @@ DIV TABLE{margin-left:inherit;margin-right:inherit;}
 PRE{text-align:left;margin-left:0ex;margin-right:auto;}
 BLOCKQUOTE{margin-left:4ex;margin-right:4ex;text-align:left;}
 .part{margin:auto;text-align:center}
+SPAN{width:20%; float:right; text-align:left; margin-left:auto;}
 </STYLE>
 </HEAD>
 
 <BODY >
-<!--HEVEA command line is: hevea guide.tex -->
+<!--HEVEA command line is: hevea -fix -noiso -pedantic guide.tex -->
 <!--HTMLHEAD-->
 <!--ENDHTML-->
 <!--PREFIX <ARG ></ARG>-->
@@ -30,11 +31,11 @@ BLOCKQUOTE{margin-left:4ex;margin-right:4ex;text-align:left;}
 
 <BR>
 <BR>
-<A NAME="sec:titlepage"></A>
+<A NAME="titlepage"></A>
 
  <TABLE CLASS="title">
 <TR><TD>
-<H1 CLASS="titlemain">Ejabberd 1.1.1 Installation and Operation Guide</H1>
+<H1 CLASS="titlemain">Ejabberd 1.1.2 Installation and Operation Guide</H1>
 <H3 CLASS="titlerest">Alexey Shchepin<BR>
 <A HREF="mailto:alexey@sevcom.net"><TT>mailto:alexey@sevcom.net</TT></A><BR>
 <A HREF="xmpp:aleksey@jabber.ru"><TT>xmpp:aleksey@jabber.ru</TT></A></H3></TD>
@@ -42,14 +43,14 @@ BLOCKQUOTE{margin-left:4ex;margin-right:4ex;text-align:left;}
 <BR>
 <DIV CLASS="center">
  
- <IMG SRC="logo.png">
+ <IMG SRC="logo.png" ALT="logo.png">
  
 
  <BR>
 <BR>
 
  </DIV>
-<BLOCKQUOTE CLASS="quotation"><I>I can thoroughly recommend ejabberd for ease of setup &ndash;
+<BLOCKQUOTE CLASS="quotation"><I>I can thoroughly recommend ejabberd for ease of setup &mdash;
  Kevin Smith, Current maintainer of the Psi project</I></BLOCKQUOTE>
 <!--TOC section Contents-->
 
@@ -65,136 +66,159 @@ BLOCKQUOTE{margin-left:4ex;margin-right:4ex;text-align:left;}
 <UL CLASS="toc"><LI CLASS="li-toc">
 <A HREF="#htoc5">2.1&nbsp;&nbsp;Installation Requirements</A>
 <UL CLASS="toc"><LI CLASS="li-toc">
-<A HREF="#htoc6">2.1.1&nbsp;&nbsp;&#8220;Unix-like&#8221; operating systems</A>
+<A HREF="#htoc6">2.1.1&nbsp;&nbsp;`Unix-like' operating systems</A>
 <LI CLASS="li-toc"><A HREF="#htoc7">2.1.2&nbsp;&nbsp;Windows</A>
 </UL>
 <LI CLASS="li-toc"><A HREF="#htoc8">2.2&nbsp;&nbsp;Obtaining <TT>ejabberd</TT></A>
 <LI CLASS="li-toc"><A HREF="#htoc9">2.3&nbsp;&nbsp;Compilation</A>
 <UL CLASS="toc"><LI CLASS="li-toc">
-<A HREF="#htoc10">2.3.1&nbsp;&nbsp;&#8220;Unix-like&#8221; operating systems</A>
+<A HREF="#htoc10">2.3.1&nbsp;&nbsp;`Unix-like' operating systems</A>
 <LI CLASS="li-toc"><A HREF="#htoc11">2.3.2&nbsp;&nbsp;Windows</A>
 </UL>
 <LI CLASS="li-toc"><A HREF="#htoc12">2.4&nbsp;&nbsp;Starting</A>
 </UL>
-<LI CLASS="li-toc"><A HREF="#htoc13">3&nbsp;&nbsp;Configuration</A>
+<LI CLASS="li-toc"><A HREF="#htoc13">3&nbsp;&nbsp;Basic Configuration</A>
 <UL CLASS="toc"><LI CLASS="li-toc">
-<A HREF="#htoc14">3.1&nbsp;&nbsp;Initial Configuration</A>
+<A HREF="#htoc14">3.1&nbsp;&nbsp;Host Names</A>
+<LI CLASS="li-toc"><A HREF="#htoc15">3.2&nbsp;&nbsp;Virtual Hosting</A>
+<LI CLASS="li-toc"><A HREF="#htoc16">3.3&nbsp;&nbsp;Listened Sockets</A>
+<LI CLASS="li-toc"><A HREF="#htoc17">3.4&nbsp;&nbsp;Authentication</A>
 <UL CLASS="toc"><LI CLASS="li-toc">
-<A HREF="#htoc15">3.1.1&nbsp;&nbsp;Host Names</A>
-<LI CLASS="li-toc"><A HREF="#htoc16">3.1.2&nbsp;&nbsp;Default Language</A>
-<LI CLASS="li-toc"><A HREF="#htoc17">3.1.3&nbsp;&nbsp;Access Rules</A>
-<LI CLASS="li-toc"><A HREF="#htoc18">3.1.4&nbsp;&nbsp;Shapers</A>
-<LI CLASS="li-toc"><A HREF="#htoc19">3.1.5&nbsp;&nbsp;Limitation of the number of opened sessions</A>
-<LI CLASS="li-toc"><A HREF="#htoc20">3.1.6&nbsp;&nbsp;Listened Sockets</A>
-<LI CLASS="li-toc"><A HREF="#htoc21">3.1.7&nbsp;&nbsp;Modules</A>
-<LI CLASS="li-toc"><A HREF="#htoc22">3.1.8&nbsp;&nbsp;Virtual Hosting</A>
-<LI CLASS="li-toc"><A HREF="#htoc23">3.1.9&nbsp;&nbsp;SASL anonymous and anonymous login</A>
+<A HREF="#htoc18">3.4.1&nbsp;&nbsp;Internal</A>
+<LI CLASS="li-toc"><A HREF="#htoc19">3.4.2&nbsp;&nbsp;SASL Anonymous and Anonymous Login</A>
 </UL>
-<LI CLASS="li-toc"><A HREF="#htoc24">3.2&nbsp;&nbsp;Relational Database Support</A>
+<LI CLASS="li-toc"><A HREF="#htoc20">3.5&nbsp;&nbsp;Access Rules</A>
+<LI CLASS="li-toc"><A HREF="#htoc21">3.6&nbsp;&nbsp;Shapers</A>
+<LI CLASS="li-toc"><A HREF="#htoc22">3.7&nbsp;&nbsp;Limiting Opened Sessions</A>
+<LI CLASS="li-toc"><A HREF="#htoc23">3.8&nbsp;&nbsp;Default Language</A>
+</UL>
+<LI CLASS="li-toc"><A HREF="#htoc24">4&nbsp;&nbsp;Database Configuration</A>
+<UL CLASS="toc"><LI CLASS="li-toc">
+<A HREF="#htoc25">4.1&nbsp;&nbsp;MySQL</A>
 <UL CLASS="toc"><LI CLASS="li-toc">
-<A HREF="#htoc25">3.2.1&nbsp;&nbsp;Preliminary steps</A>
-<LI CLASS="li-toc"><A HREF="#htoc26">3.2.2&nbsp;&nbsp;Authentication against a relational database</A>
-<LI CLASS="li-toc"><A HREF="#htoc27">3.2.3&nbsp;&nbsp;Relational database for other modules</A>
+<A HREF="#htoc26">4.1.1&nbsp;&nbsp;Driver Compilation</A>
+<LI CLASS="li-toc"><A HREF="#htoc27">4.1.2&nbsp;&nbsp;Authentication</A>
+<LI CLASS="li-toc"><A HREF="#htoc28">4.1.3&nbsp;&nbsp;Storage</A>
 </UL>
-<LI CLASS="li-toc"><A HREF="#htoc28">3.3&nbsp;&nbsp;Creating an Initial Administrator</A>
-<LI CLASS="li-toc"><A HREF="#htoc29">3.4&nbsp;&nbsp;Online Configuration and Monitoring</A>
+<LI CLASS="li-toc"><A HREF="#htoc29">4.2&nbsp;&nbsp;Microsoft SQL Server</A>
 <UL CLASS="toc"><LI CLASS="li-toc">
-<A HREF="#htoc30">3.4.1&nbsp;&nbsp;Web Interface</A>
-<LI CLASS="li-toc"><A HREF="#htoc31">3.4.2&nbsp;&nbsp;<TT>ejabberdctl</TT></A>
+<A HREF="#htoc30">4.2.1&nbsp;&nbsp;Driver Compilation</A>
+<LI CLASS="li-toc"><A HREF="#htoc31">4.2.2&nbsp;&nbsp;Authentication</A>
+<LI CLASS="li-toc"><A HREF="#htoc32">4.2.3&nbsp;&nbsp;Storage</A>
 </UL>
+<LI CLASS="li-toc"><A HREF="#htoc33">4.3&nbsp;&nbsp;PostgreSQL</A>
+<UL CLASS="toc"><LI CLASS="li-toc">
+<A HREF="#htoc34">4.3.1&nbsp;&nbsp;Driver Compilation</A>
+<LI CLASS="li-toc"><A HREF="#htoc35">4.3.2&nbsp;&nbsp;Authentication</A>
+<LI CLASS="li-toc"><A HREF="#htoc36">4.3.3&nbsp;&nbsp;Storage</A>
 </UL>
-<LI CLASS="li-toc"><A HREF="#htoc32">4&nbsp;&nbsp;Firewall Settings</A>
-<LI CLASS="li-toc"><A HREF="#htoc33">5&nbsp;&nbsp;SRV Records</A>
-<LI CLASS="li-toc"><A HREF="#htoc34">6&nbsp;&nbsp;Clustering</A>
+<LI CLASS="li-toc"><A HREF="#htoc37">4.4&nbsp;&nbsp;ODBC Compatible</A>
 <UL CLASS="toc"><LI CLASS="li-toc">
-<A HREF="#htoc35">6.1&nbsp;&nbsp;How it Works</A>
+<A HREF="#htoc38">4.4.1&nbsp;&nbsp;Compilation</A>
+<LI CLASS="li-toc"><A HREF="#htoc39">4.4.2&nbsp;&nbsp;Authentication</A>
+<LI CLASS="li-toc"><A HREF="#htoc40">4.4.3&nbsp;&nbsp;Storage</A>
+</UL>
+<LI CLASS="li-toc"><A HREF="#htoc41">4.5&nbsp;&nbsp;LDAP</A>
 <UL CLASS="toc"><LI CLASS="li-toc">
-<A HREF="#htoc36">6.1.1&nbsp;&nbsp;Router</A>
-<LI CLASS="li-toc"><A HREF="#htoc37">6.1.2&nbsp;&nbsp;Local Router</A>
-<LI CLASS="li-toc"><A HREF="#htoc38">6.1.3&nbsp;&nbsp;Session Manager</A>
-<LI CLASS="li-toc"><A HREF="#htoc39">6.1.4&nbsp;&nbsp;s2s Manager</A>
+<A HREF="#htoc42">4.5.1&nbsp;&nbsp;Connection</A>
+<LI CLASS="li-toc"><A HREF="#htoc43">4.5.2&nbsp;&nbsp;Authentication</A>
+<LI CLASS="li-toc"><A HREF="#htoc44">4.5.3&nbsp;&nbsp;Examples</A>
 </UL>
-<LI CLASS="li-toc"><A HREF="#htoc40">6.2&nbsp;&nbsp;Clustering Setup</A>
 </UL>
-<LI CLASS="li-toc"><A HREF="#htoc41">A&nbsp;&nbsp;Built-in Modules</A>
+<LI CLASS="li-toc"><A HREF="#htoc45">5&nbsp;&nbsp;Modules Configuration</A>
 <UL CLASS="toc"><LI CLASS="li-toc">
-<A HREF="#htoc42">A.1&nbsp;&nbsp;Overview</A>
-<LI CLASS="li-toc"><A HREF="#htoc43">A.2&nbsp;&nbsp;Common Options</A>
+<A HREF="#htoc46">5.1&nbsp;&nbsp;Overview</A>
+<LI CLASS="li-toc"><A HREF="#htoc47">5.2&nbsp;&nbsp;Common Options</A>
 <UL CLASS="toc"><LI CLASS="li-toc">
-<A HREF="#htoc44">A.2.1&nbsp;&nbsp;<TT>iqdisc</TT></A>
-<LI CLASS="li-toc"><A HREF="#htoc45">A.2.2&nbsp;&nbsp;<TT>hosts</TT></A>
+<A HREF="#htoc48">5.2.1&nbsp;&nbsp;<TT>iqdisc</TT></A>
+<LI CLASS="li-toc"><A HREF="#htoc49">5.2.2&nbsp;&nbsp;<TT>hosts</TT></A>
 </UL>
-<LI CLASS="li-toc"><A HREF="#htoc46">A.3&nbsp;&nbsp;<TT>mod_announce</TT></A>
-<LI CLASS="li-toc"><A HREF="#htoc47">A.4&nbsp;&nbsp;<TT>mod_disco</TT></A>
-<LI CLASS="li-toc"><A HREF="#htoc48">A.5&nbsp;&nbsp;<TT>mod_echo</TT></A>
-<LI CLASS="li-toc"><A HREF="#htoc49">A.6&nbsp;&nbsp;<TT>mod_irc</TT></A>
-<LI CLASS="li-toc"><A HREF="#htoc50">A.7&nbsp;&nbsp;<TT>mod_last</TT></A>
-<LI CLASS="li-toc"><A HREF="#htoc51">A.8&nbsp;&nbsp;<TT>mod_muc</TT></A>
-<LI CLASS="li-toc"><A HREF="#htoc52">A.9&nbsp;&nbsp;<TT>mod_muc_log</TT></A>
-<LI CLASS="li-toc"><A HREF="#htoc53">A.10&nbsp;&nbsp;<TT>mod_offline</TT></A>
-<LI CLASS="li-toc"><A HREF="#htoc54">A.11&nbsp;&nbsp;<TT>mod_privacy</TT></A>
-<LI CLASS="li-toc"><A HREF="#htoc55">A.12&nbsp;&nbsp;<TT>mod_private</TT></A>
-<LI CLASS="li-toc"><A HREF="#htoc56">A.13&nbsp;&nbsp;<TT>mod_pubsub</TT></A>
-<LI CLASS="li-toc"><A HREF="#htoc57">A.14&nbsp;&nbsp;<TT>mod_register</TT></A>
-<LI CLASS="li-toc"><A HREF="#htoc58">A.15&nbsp;&nbsp;<TT>mod_roster</TT></A>
-<LI CLASS="li-toc"><A HREF="#htoc59">A.16&nbsp;&nbsp;<TT>mod_service_log</TT></A>
-<LI CLASS="li-toc"><A HREF="#htoc60">A.17&nbsp;&nbsp;<TT>mod_shared_roster</TT></A>
-<LI CLASS="li-toc"><A HREF="#htoc61">A.18&nbsp;&nbsp;<TT>mod_stats</TT></A>
-<LI CLASS="li-toc"><A HREF="#htoc62">A.19&nbsp;&nbsp;<TT>mod_time</TT></A>
-<LI CLASS="li-toc"><A HREF="#htoc63">A.20&nbsp;&nbsp;<TT>mod_vcard</TT></A>
-<LI CLASS="li-toc"><A HREF="#htoc64">A.21&nbsp;&nbsp;LDAP and <TT>mod_vcard_ldap</TT></A>
+<LI CLASS="li-toc"><A HREF="#htoc50">5.3&nbsp;&nbsp;<TT>mod_announce</TT></A>
+<LI CLASS="li-toc"><A HREF="#htoc51">5.4&nbsp;&nbsp;<TT>mod_disco</TT></A>
+<LI CLASS="li-toc"><A HREF="#htoc52">5.5&nbsp;&nbsp;<TT>mod_echo</TT></A>
+<LI CLASS="li-toc"><A HREF="#htoc53">5.6&nbsp;&nbsp;<TT>mod_irc</TT></A>
+<LI CLASS="li-toc"><A HREF="#htoc54">5.7&nbsp;&nbsp;<TT>mod_last</TT></A>
+<LI CLASS="li-toc"><A HREF="#htoc55">5.8&nbsp;&nbsp;<TT>mod_muc</TT></A>
+<LI CLASS="li-toc"><A HREF="#htoc56">5.9&nbsp;&nbsp;<TT>mod_muc_log</TT></A>
+<LI CLASS="li-toc"><A HREF="#htoc57">5.10&nbsp;&nbsp;<TT>mod_offline</TT></A>
+<LI CLASS="li-toc"><A HREF="#htoc58">5.11&nbsp;&nbsp;<TT>mod_privacy</TT></A>
+<LI CLASS="li-toc"><A HREF="#htoc59">5.12&nbsp;&nbsp;<TT>mod_private</TT></A>
+<LI CLASS="li-toc"><A HREF="#htoc60">5.13&nbsp;&nbsp;<TT>mod_pubsub</TT></A>
+<LI CLASS="li-toc"><A HREF="#htoc61">5.14&nbsp;&nbsp;<TT>mod_register</TT></A>
+<LI CLASS="li-toc"><A HREF="#htoc62">5.15&nbsp;&nbsp;<TT>mod_roster</TT></A>
+<LI CLASS="li-toc"><A HREF="#htoc63">5.16&nbsp;&nbsp;<TT>mod_service_log</TT></A>
+<LI CLASS="li-toc"><A HREF="#htoc64">5.17&nbsp;&nbsp;<TT>mod_shared_roster</TT></A>
+<LI CLASS="li-toc"><A HREF="#htoc65">5.18&nbsp;&nbsp;<TT>mod_stats</TT></A>
+<LI CLASS="li-toc"><A HREF="#htoc66">5.19&nbsp;&nbsp;<TT>mod_time</TT></A>
+<LI CLASS="li-toc"><A HREF="#htoc67">5.20&nbsp;&nbsp;<TT>mod_vcard</TT></A>
+<LI CLASS="li-toc"><A HREF="#htoc68">5.21&nbsp;&nbsp;<TT>mod_vcard_ldap</TT></A>
+<LI CLASS="li-toc"><A HREF="#htoc69">5.22&nbsp;&nbsp;<TT>mod_version</TT></A>
+</UL>
+<LI CLASS="li-toc"><A HREF="#htoc70">6&nbsp;&nbsp;Creating an Initial Administrator</A>
+<LI CLASS="li-toc"><A HREF="#htoc71">7&nbsp;&nbsp;Online Configuration and Monitoring</A>
+<UL CLASS="toc"><LI CLASS="li-toc">
+<A HREF="#htoc72">7.1&nbsp;&nbsp;Web Interface</A>
+<LI CLASS="li-toc"><A HREF="#htoc73">7.2&nbsp;&nbsp;<TT>ejabberdctl</TT></A>
+</UL>
+<LI CLASS="li-toc"><A HREF="#htoc74">8&nbsp;&nbsp;Firewall Settings</A>
+<LI CLASS="li-toc"><A HREF="#htoc75">9&nbsp;&nbsp;SRV Records</A>
+<LI CLASS="li-toc"><A HREF="#htoc76">10&nbsp;&nbsp;Clustering</A>
+<UL CLASS="toc"><LI CLASS="li-toc">
+<A HREF="#htoc77">10.1&nbsp;&nbsp;How it Works</A>
 <UL CLASS="toc"><LI CLASS="li-toc">
-<A HREF="#htoc65">A.21.1&nbsp;&nbsp;Features</A>
-<LI CLASS="li-toc"><A HREF="#htoc66">A.21.2&nbsp;&nbsp;Connection</A>
-<LI CLASS="li-toc"><A HREF="#htoc67">A.21.3&nbsp;&nbsp;Authentication</A>
-<LI CLASS="li-toc"><A HREF="#htoc68">A.21.4&nbsp;&nbsp;vCards and Search</A>
-<LI CLASS="li-toc"><A HREF="#htoc69">A.21.5&nbsp;&nbsp;Examples</A>
+<A HREF="#htoc78">10.1.1&nbsp;&nbsp;Router</A>
+<LI CLASS="li-toc"><A HREF="#htoc79">10.1.2&nbsp;&nbsp;Local Router</A>
+<LI CLASS="li-toc"><A HREF="#htoc80">10.1.3&nbsp;&nbsp;Session Manager</A>
+<LI CLASS="li-toc"><A HREF="#htoc81">10.1.4&nbsp;&nbsp;s2s Manager</A>
 </UL>
-<LI CLASS="li-toc"><A HREF="#htoc70">A.22&nbsp;&nbsp;<TT>mod_version</TT></A>
+<LI CLASS="li-toc"><A HREF="#htoc82">10.2&nbsp;&nbsp;Clustering Setup</A>
 </UL>
-<LI CLASS="li-toc"><A HREF="#htoc71">B&nbsp;&nbsp;Internationalization and Localization</A>
-<LI CLASS="li-toc"><A HREF="#htoc72">C&nbsp;&nbsp;Release Notes</A>
+<LI CLASS="li-toc"><A HREF="#htoc83">A&nbsp;&nbsp;Internationalization and Localization</A>
+<LI CLASS="li-toc"><A HREF="#htoc84">B&nbsp;&nbsp;Release Notes</A>
 <UL CLASS="toc"><LI CLASS="li-toc">
-<A HREF="#htoc73">C.1&nbsp;&nbsp;ejabberd 0.9</A>
-<LI CLASS="li-toc"><A HREF="#htoc74">C.2&nbsp;&nbsp;ejabberd 0.9.1</A>
-<LI CLASS="li-toc"><A HREF="#htoc75">C.3&nbsp;&nbsp;ejabberd 0.9.8</A>
-<LI CLASS="li-toc"><A HREF="#htoc76">C.4&nbsp;&nbsp;ejabberd 1.0.0</A>
-<LI CLASS="li-toc"><A HREF="#htoc77">C.5&nbsp;&nbsp;ejabberd 1.1.0</A>
-<LI CLASS="li-toc"><A HREF="#htoc78">C.6&nbsp;&nbsp;ejabberd 1.1.1</A>
+<A HREF="#htoc85">B.1&nbsp;&nbsp;ejabberd 0.9</A>
+<LI CLASS="li-toc"><A HREF="#htoc86">B.2&nbsp;&nbsp;ejabberd 0.9.1</A>
+<LI CLASS="li-toc"><A HREF="#htoc87">B.3&nbsp;&nbsp;ejabberd 0.9.8</A>
+<LI CLASS="li-toc"><A HREF="#htoc88">B.4&nbsp;&nbsp;ejabberd 1.0.0</A>
+<LI CLASS="li-toc"><A HREF="#htoc89">B.5&nbsp;&nbsp;ejabberd 1.1.0</A>
+<LI CLASS="li-toc"><A HREF="#htoc90">B.6&nbsp;&nbsp;ejabberd 1.1.1</A>
 </UL>
-<LI CLASS="li-toc"><A HREF="#htoc79">D&nbsp;&nbsp;Acknowledgements</A>
+<LI CLASS="li-toc"><A HREF="#htoc91">C&nbsp;&nbsp;Acknowledgements</A>
+<LI CLASS="li-toc"><A HREF="#htoc92">D&nbsp;&nbsp;Copyright Information</A>
 </UL>
 
 <!--TOC section Introduction-->
 
-<H2 CLASS="section"><A NAME="htoc1">1</A>&nbsp;&nbsp;Introduction</H2><!--SEC END -->
+<H2 CLASS="section"><A NAME="htoc1">1</A>&nbsp;&nbsp;<A NAME="intro">Introduction</A></H2><!--SEC END -->
 
-<A NAME="sec:intr"></A>
+<A NAME="sec:intro"></A>
  
-<TT>ejabberd</TT> is a free (GPL) distributed fault-tolerant Jabber/XMPP server and is mainly written in <A HREF="http://www.erlang.org/">Erlang</A>.<BR>
+<TT>ejabberd</TT> is a free and open source instant messaging server written in <A HREF="http://www.erlang.org/">Erlang</A>.<BR>
 <BR>
-<TT>ejabberd</TT> is designed to be a stable, standards compliant, and feature rich Jabber/XMPP server.<BR>
+<TT>ejabberd</TT> is cross-platform, distributed, fault-tolerant, and based on open standards to achieve real-time communication.<BR>
 <BR>
-<TT>ejabberd</TT> is suitable for small servers, whether they need to be scalable or not, as well as extremely big servers.<BR>
+<TT>ejabberd</TT> is designed to be a rock-solid and feature rich XMPP server.<BR>
+<BR>
+<TT>ejabberd</TT> is suitable for small deployments, whether they need to be scalable or not, as well as extremely big deployments.<BR>
 <BR>
 <!--TOC subsection Key Features-->
 
-<H3 CLASS="subsection"><A NAME="htoc2">1.1</A>&nbsp;&nbsp;Key Features</H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc2">1.1</A>&nbsp;&nbsp;<A NAME="keyfeatures">Key Features</A></H3><!--SEC END -->
 
 <A NAME="sec:keyfeatures"></A>
 
 <TT>ejabberd</TT> is:
 <UL CLASS="itemize"><LI CLASS="li-itemize">
-Multiplatform: <TT>ejabberd</TT> runs under Microsoft Windows and Unix derived systems such as Linux, FreeBSD and NetBSD.<BR>
+Cross-platform: <TT>ejabberd</TT> runs under Microsoft Windows and Unix derived systems such as Linux, FreeBSD and NetBSD.<BR>
 <BR>
 <LI CLASS="li-itemize">Distributed: You can run <TT>ejabberd</TT> on a cluster of machines and all of them will serve the same Jabber domain(s). 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.<BR>
 <BR>
-<LI CLASS="li-itemize">Fault-tolerant: You can deploy an <TT>ejabberd</TT> 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 &#8220;on the fly&#8221;.<BR>
+<LI CLASS="li-itemize">Fault-tolerant: You can deploy an <TT>ejabberd</TT> 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'.<BR>
 <BR>
 <LI CLASS="li-itemize">Administrator Friendly: <TT>ejabberd</TT> 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:
 <UL CLASS="itemize"><LI CLASS="li-itemize">
 Comprehensive documentation.
-<LI CLASS="li-itemize">Straightforward installers for Linux, Mac OS X, and Windows.
+<LI CLASS="li-itemize">Straightforward installers for Linux, Mac OS X, and Windows.<SPAN STYLE="font-variant:small-caps">improved</SPAN>
 <LI CLASS="li-itemize">Web interface for administration tasks.
 <LI CLASS="li-itemize">Shared Roster Groups.
 <LI CLASS="li-itemize">Command line administration tool.
@@ -210,17 +234,17 @@ Translated in 11 languages.
 <BR>
 <LI CLASS="li-itemize">Open Standards: <TT>ejabberd</TT> is the first Open Source Jabber server claiming to fully comply to the XMPP standard.
 <UL CLASS="itemize"><LI CLASS="li-itemize">
-Fully XMPP compliant 
-<LI CLASS="li-itemize">XML-based protocol
+Fully XMPP compliant.
+<LI CLASS="li-itemize">XML-based protocol.
 <LI CLASS="li-itemize"><A HREF="http://ejabberd.jabber.ru/protocols">Many JEPs supported</A>.
 </UL></UL>
 <!--TOC subsection Additional Features-->
 
-<H3 CLASS="subsection"><A NAME="htoc3">1.2</A>&nbsp;&nbsp;Additional Features</H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc3">1.2</A>&nbsp;&nbsp;<A NAME="addfeatures">Additional Features</A></H3><!--SEC END -->
 
 <A NAME="sec:addfeatures"></A>
 
-Besides common Jabber server features, <TT>ejabberd</TT> comes with a wide range of other features:
+Moreover, <TT>ejabberd</TT> comes with a wide range of other state-of-the-art features:
 <UL CLASS="itemize"><LI CLASS="li-itemize">
 Modular
 <UL CLASS="itemize"><LI CLASS="li-itemize">
@@ -238,12 +262,12 @@ SASL and STARTTLS for c2s and s2s connections.
 Native MySQL support.
 <LI CLASS="li-itemize">Native PostgreSQL support.
 <LI CLASS="li-itemize">Mnesia.
-<LI CLASS="li-itemize">ODBC data storage support. 
-<LI CLASS="li-itemize">Microsoft SQL Server support (via ODBC).
+<LI CLASS="li-itemize">ODBC data storage support.
+<LI CLASS="li-itemize">Microsoft SQL Server support.<SPAN STYLE="font-variant:small-caps">new</SPAN>
 </UL>
 <LI CLASS="li-itemize">Authentication
 <UL CLASS="itemize"><LI CLASS="li-itemize">
-LDAP and ODBC. 
+LDAP and ODBC.
 <LI CLASS="li-itemize">External Authentication script.
 <LI CLASS="li-itemize">Internal Authentication.
 </UL>
@@ -253,47 +277,46 @@ Compressing XML streams with Stream Compression (<A HREF="http://www.jabber.org/
 <LI CLASS="li-itemize">Interface with networks such as AIM, ICQ and MSN.
 <LI CLASS="li-itemize">Statistics via Statistics Gathering (<A HREF="http://www.jabber.org/jeps/jep-0039.html">JEP-0039</A>).
 <LI CLASS="li-itemize">IPv6 support both for c2s and s2s connections.
-<LI CLASS="li-itemize"><A HREF="http://www.jabber.org/jeps/jep-0045.html">Multi-User Chat</A> module with logging.
+<LI CLASS="li-itemize"><A HREF="http://www.jabber.org/jeps/jep-0045.html">Multi-User Chat</A> module with logging.<SPAN STYLE="font-variant:small-caps">improved</SPAN>
 <LI CLASS="li-itemize">Users Directory based on users vCards.
 <LI CLASS="li-itemize"><A HREF="http://www.jabber.org/jeps/jep-0060.html">Publish-Subscribe</A> component.
-<LI CLASS="li-itemize">Support for virtual hosting. 
+<LI CLASS="li-itemize">Support for virtual hosting.
 <LI CLASS="li-itemize"><A HREF="http://www.jabber.org/jeps/jep-0025.html">HTTP Polling</A> service.
 <LI CLASS="li-itemize">IRC transport.
 </UL>
 </UL>
 <!--TOC section Installation from Source-->
 
-<H2 CLASS="section"><A NAME="htoc4">2</A>&nbsp;&nbsp;Installation from Source</H2><!--SEC END -->
+<H2 CLASS="section"><A NAME="htoc4">2</A>&nbsp;&nbsp;<A NAME="installsource">Installation from Source</A></H2><!--SEC END -->
 
-<A NAME="sec:installation"></A>
+<A NAME="sec:installsource"></A>
 
 <!--TOC subsection Installation Requirements-->
 
-<H3 CLASS="subsection"><A NAME="htoc5">2.1</A>&nbsp;&nbsp;Installation Requirements</H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc5">2.1</A>&nbsp;&nbsp;<A NAME="installreq">Installation Requirements</A></H3><!--SEC END -->
 
 <A NAME="sec:installreq"></A>
-<!--TOC subsubsection &#8220;Unix-like&#8221; operating systems-->
 
-<H4 CLASS="subsubsection"><A NAME="htoc6">2.1.1</A>&nbsp;&nbsp;&#8220;Unix-like&#8221; operating systems</H4><!--SEC END -->
+<!--TOC subsubsection `Unix-like' operating systems-->
 
-<A NAME="sec:installrequnix"></A>
+<H4 CLASS="subsubsection"><A NAME="htoc6">2.1.1</A>&nbsp;&nbsp;<A NAME="installrequnix">`Unix-like' operating systems</A></H4><!--SEC END -->
 
-To compile <TT>ejabberd</TT> on a &#8220;Unix-like&#8221; operating system, you need:
+<A NAME="sec:installrequnix"></A>
+To compile <TT>ejabberd</TT> on a `Unix-like' operating system, you need:
 <UL CLASS="itemize"><LI CLASS="li-itemize">
-GNU Make;
-<LI CLASS="li-itemize">GCC;
-<LI CLASS="li-itemize">libexpat 1.95 or higher;
-<LI CLASS="li-itemize">Erlang/OTP R9C-2 or higher;
-<LI CLASS="li-itemize">OpenSSL 0.9.6 or higher (optional).
-<LI CLASS="li-itemize">Zlib 1.2.3 or higher (optional).
-<LI CLASS="li-itemize">GNU Iconv 1.8 or higher (optional, not needed at all on systems with GNU libc).
+GNU Make
+<LI CLASS="li-itemize">GCC
+<LI CLASS="li-itemize">libexpat 1.95 or higher
+<LI CLASS="li-itemize">Erlang/OTP R9C-2 or higher
+<LI CLASS="li-itemize">OpenSSL 0.9.6 or higher (optional)
+<LI CLASS="li-itemize">Zlib 1.2.3 or higher (optional)
+<LI CLASS="li-itemize">GNU Iconv 1.8 or higher (optional, not needed on systems with GNU libc)
 </UL>
 <!--TOC subsubsection Windows-->
 
-<H4 CLASS="subsubsection"><A NAME="htoc7">2.1.2</A>&nbsp;&nbsp;Windows</H4><!--SEC END -->
+<H4 CLASS="subsubsection"><A NAME="htoc7">2.1.2</A>&nbsp;&nbsp;<A NAME="installreqwin">Windows</A></H4><!--SEC END -->
 
 <A NAME="sec:installreqwin"></A>
-
 To compile <TT>ejabberd</TT> on a Windows flavour, you need:
 <UL CLASS="itemize"><LI CLASS="li-itemize">
 MS Visual C++ 6.0 Compiler
@@ -307,7 +330,7 @@ MS Visual C++ 6.0 Compiler
 </UL>
 <!--TOC subsection Obtaining <TT>ejabberd</TT>-->
 
-<H3 CLASS="subsection"><A NAME="htoc8">2.2</A>&nbsp;&nbsp;Obtaining <TT>ejabberd</TT></H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc8">2.2</A>&nbsp;&nbsp;<A NAME="obtaining">Obtaining <TT>ejabberd</TT></A></H3><!--SEC END -->
 
 <A NAME="sec:obtaining"></A>
 
@@ -321,17 +344,16 @@ The latest development version can be retrieved from the Subversion repository.
 </PRE>
 <!--TOC subsection Compilation-->
 
-<H3 CLASS="subsection"><A NAME="htoc9">2.3</A>&nbsp;&nbsp;Compilation</H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc9">2.3</A>&nbsp;&nbsp;<A NAME="compile">Compilation</A></H3><!--SEC END -->
 
-<A NAME="sec:compilation"></A>
+<A NAME="sec:compile"></A>
 
-<!--TOC subsubsection &#8220;Unix-like&#8221; operating systems-->
+<!--TOC subsubsection `Unix-like' operating systems-->
 
-<H4 CLASS="subsubsection"><A NAME="htoc10">2.3.1</A>&nbsp;&nbsp;&#8220;Unix-like&#8221; operating systems</H4><!--SEC END -->
+<H4 CLASS="subsubsection"><A NAME="htoc10">2.3.1</A>&nbsp;&nbsp;<A NAME="compileunix">`Unix-like' operating systems</A></H4><!--SEC END -->
 
-<A NAME="sec:compilationunix"></A>
-
-Compile <TT>ejabberd</TT> on a &#8220;Unix-like&#8221; operating system by executing:
+<A NAME="sec:compileunix"></A>
+Compile <TT>ejabberd</TT> on a `Unix-like' operating system by executing:
 <PRE CLASS="verbatim">
   ./configure
   make
@@ -344,12 +366,15 @@ install <TT>ejabberd</TT> into the directory <CODE>/var/lib/ejabberd</CODE>,
 <LI CLASS="li-itemize">install the configuration file into <CODE>/etc/ejabberd</CODE>,
 <LI CLASS="li-itemize">create a directory called <CODE>/var/log/ejabberd</CODE> to store log files.
 </UL>
+Note: if you want to use an external database, you need to execute the configure
+script with the option(s) <TT>&ndash;enable-odbc</TT> or <TT>&ndash;enable-odbc
+&ndash;enable-mssql</TT>. See section&nbsp;<A HREF="#sec:database">4</A> for more information.<BR>
+<BR>
 <!--TOC subsubsection Windows-->
 
-<H4 CLASS="subsubsection"><A NAME="htoc11">2.3.2</A>&nbsp;&nbsp;Windows</H4><!--SEC END -->
-
-<A NAME="sec:compilationwin"></A>
+<H4 CLASS="subsubsection"><A NAME="htoc11">2.3.2</A>&nbsp;&nbsp;<A NAME="compilewin">Windows</A></H4><!--SEC END -->
 
+<A NAME="sec:compilewin"></A>
 <UL CLASS="itemize"><LI CLASS="li-itemize">
 Install Erlang emulator (for example, into <CODE>C:\Program Files\erl5.3</CODE>).
 <LI CLASS="li-itemize">Install Expat library into <CODE>C:\Program Files\Expat-1.95.7</CODE>
@@ -380,9 +405,10 @@ werl -s ejabberd -name ejabberd
 </PRE></UL>
 <!--TOC subsection Starting-->
 
-<H3 CLASS="subsection"><A NAME="htoc12">2.4</A>&nbsp;&nbsp;Starting</H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc12">2.4</A>&nbsp;&nbsp;<A NAME="start">Starting</A></H3><!--SEC END -->
+
+<A NAME="sec:start"></A>
 
-<A NAME="sec:starting"></A>
 
 Execute the following command to start <TT>ejabberd</TT>:
 <PRE CLASS="verbatim">
@@ -391,7 +417,7 @@ Execute the following command to start <TT>ejabberd</TT>:
 <PRE CLASS="verbatim">
   erl -pa /var/lib/ejabberd/ebin -sname ejabberd -s ejabberd
 </PRE>In the latter case the Erlang node will be identified using only the first part
-of the host name, i.&nbsp;e. other Erlang nodes outside this domain can't contact
+of the host name, i.&nbsp;e. other Erlang nodes outside this domain cannot contact
 this node.<BR>
 <BR>
 Note that when using the above command, <TT>ejabberd</TT> will search for the
@@ -425,16 +451,11 @@ To reduce memory usage, you may set the environment variable
   export ERL_FULLSWEEP_AFTER=0
 </PRE>But in this case <TT>ejabberd</TT> can start to work slower.<BR>
 <BR>
-<!--TOC section Configuration-->
+<!--TOC section Basic Configuration-->
 
-<H2 CLASS="section"><A NAME="htoc13">3</A>&nbsp;&nbsp;Configuration</H2><!--SEC END -->
+<H2 CLASS="section"><A NAME="htoc13">3</A>&nbsp;&nbsp;<A NAME="basicconfig">Basic Configuration</A></H2><!--SEC END -->
 
-<A NAME="sec:configuration"></A>
-<!--TOC subsection Initial Configuration-->
-
-<H3 CLASS="subsection"><A NAME="htoc14">3.1</A>&nbsp;&nbsp;Initial Configuration</H3><!--SEC END -->
-
-<A NAME="sec:initconfig"></A>
+<A NAME="sec:basicconfig"></A>
 
 The configuration file will be loaded the first time you start <TT>ejabberd</TT>. The
 content from this file will be parsed and stored in a database. Subsequently the
@@ -443,7 +464,7 @@ configuration file are appended to the entries in the database. The
 configuration file contains a sequence of Erlang terms. Lines beginning with a
 <TT>`%'</TT> 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 &#8220;hosts&#8221; 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.<BR>
 <BR>
 You can override the old values stored in the database by adding next lines to
@@ -455,11 +476,11 @@ the configuration file:
 </PRE>With these lines the old global options, local options and ACLs will be removed
 before new ones are added.<BR>
 <BR>
-<!--TOC subsubsection Host Names-->
+<!--TOC subsection Host Names-->
 
-<H4 CLASS="subsubsection"><A NAME="htoc15">3.1.1</A>&nbsp;&nbsp;Host Names</H4><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc14">3.1</A>&nbsp;&nbsp;<A NAME="hostnames">Host Names</A></H3><!--SEC END -->
 
-<A NAME="sec:confighostname"></A>
+<A NAME="sec:hostnames"></A>
 
 The option <TT>hosts</TT> defines a list containing one or more domains that
 <TT>ejabberd</TT> will serve.<BR>
@@ -467,175 +488,61 @@ The option <TT>hosts</TT> defines a list containing one or more domains that
 Examples:
 <UL CLASS="itemize"><LI CLASS="li-itemize">
 Serving one domain:
-<UL CLASS="itemize"><LI CLASS="li-itemize">
-<PRE CLASS="verbatim">
+ <PRE CLASS="verbatim">
   {hosts, ["example.org"]}.
-</PRE><LI CLASS="li-itemize">Backwards compatibility with older <TT>ejabberd</TT> versions can be retained
- with:
+</PRE><LI CLASS="li-itemize">Serving one domain, and backwards compatible with older <TT>ejabberd</TT>
+ versions:
  <PRE CLASS="verbatim">
   {host, "example.org"}.
-</PRE></UL>
-<LI CLASS="li-itemize">Serving two domains:
+</PRE><LI CLASS="li-itemize">Serving two domains:
 <PRE CLASS="verbatim">
   {hosts, ["example.net", "example.com"]}.
 </PRE></UL>
-<!--TOC subsubsection Default Language-->
-
-<H4 CLASS="subsubsection"><A NAME="htoc16">3.1.2</A>&nbsp;&nbsp;Default Language</H4><!--SEC END -->
-
-<A NAME="sec:configlanguage"></A>
-
-The option <TT>language</TT> defines the default language of server strings that
-can be seen by Jabber clients. If a Jabber client do not support
-<TT>xml:lang</TT>, the specified language is used. The default value for the
-option <TT>language</TT> is <TT>"en"</TT>. In order to take effect there must be a
-translation file <TT>&lt;language&gt;.msg</TT> in <TT>ejabberd</TT>'s <TT>msgs</TT> directory.<BR>
-<BR>
-Examples:
-<UL CLASS="itemize"><LI CLASS="li-itemize">
-To set Russian as default language:
-<PRE CLASS="verbatim">
-  {language, "ru"}.
-</PRE><LI CLASS="li-itemize">To set Spanish as default language:
-<PRE CLASS="verbatim">
-  {language, "es"}.
-</PRE></UL>
-<!--TOC subsubsection Access Rules-->
+<!--TOC subsection Virtual Hosting-->
 
-<H4 CLASS="subsubsection"><A NAME="htoc17">3.1.3</A>&nbsp;&nbsp;Access Rules</H4><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc15">3.2</A>&nbsp;&nbsp;<A NAME="virtualhost">Virtual Hosting</A></H3><!--SEC END -->
 
-<A NAME="sec:configaccess"></A>
+<A NAME="sec:virtualhost"></A>
 
-Access control in <TT>ejabberd</TT> is performed via Access Control Lists (ACLs). The
-declarations of ACLs in the configuration file have the following syntax:
-<PRE CLASS="verbatim">
-  {acl, &lt;aclname&gt;, {&lt;acltype&gt;, ...}}.
-</PRE>
-<TT>&lt;acltype&gt;</TT> can be one of the following:
-<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
-<B><TT>all</TT></B><DD CLASS="dd-description"> Matches all JIDs. Example:
-<PRE CLASS="verbatim">
-{acl, all, all}.
-</PRE><DT CLASS="dt-description"><B><TT>{user, &lt;username&gt;}</TT></B><DD CLASS="dd-description"> Matches the user with the name
- <TT>&lt;username&gt;</TT> at the first virtual host. Example:
-<PRE CLASS="verbatim">
-{acl, admin, {user, "yozhik"}}.
-</PRE><DT CLASS="dt-description"><B><TT>{user, &lt;username&gt;, &lt;server&gt;}</TT></B><DD CLASS="dd-description"> Matches the user with the JID
- <TT>&lt;username&gt;@&lt;server&gt;</TT> and any resource. Example:
-<PRE CLASS="verbatim">
-{acl, admin, {user, "yozhik", "example.org"}}.
-</PRE><DT CLASS="dt-description"><B><TT>{server, &lt;server&gt;}</TT></B><DD CLASS="dd-description"> Matches any JID from server
- <TT>&lt;server&gt;</TT>. Example:
-<PRE CLASS="verbatim">
-{acl, exampleorg, {server, "example.org"}}.
-</PRE><DT CLASS="dt-description"><B><TT>{user_regexp, &lt;regexp&gt;}</TT></B><DD CLASS="dd-description"> Matches any local user with a name that
- matches <TT>&lt;regexp&gt;</TT> at the first virtual host. Example:
-<PRE CLASS="verbatim">
-{acl, tests, {user, "^test[0-9]*$"}}.
-</PRE><DT CLASS="dt-description"><B><TT>{user_regexp, &lt;regexp&gt;, &lt;server&gt;}</TT></B><DD CLASS="dd-description"> Matches any user with a name
- that matches <TT>&lt;regexp&gt;</TT> at server <TT>&lt;server&gt;</TT>. Example:
-<PRE CLASS="verbatim">
-{acl, tests, {user, "^test", "example.org"}}.
-</PRE><DT CLASS="dt-description"><B><TT>{server_regexp, &lt;regexp&gt;}</TT></B><DD CLASS="dd-description"> Matches any JID from the server that
- matches <TT>&lt;regexp&gt;</TT>. Example:
-<PRE CLASS="verbatim">
-{acl, icq, {server, "^icq\\."}}.
-</PRE><DT CLASS="dt-description"><B><TT>{node_regexp, &lt;user_regexp&gt;, &lt;server_regexp&gt;}</TT></B><DD CLASS="dd-description"> Matches any user
- with a name that matches <TT>&lt;user_regexp&gt;</TT> at any server that matches
- <TT>&lt;server_regexp&gt;</TT>. Example:
-<PRE CLASS="verbatim">
-{acl, yohzik, {node_regexp, "^yohzik$", "^example.(com|org)$"}}.
-</PRE><DT CLASS="dt-description"><B><TT>{user_glob, &lt;glob&gt;}</TT></B><DD CLASS="dd-description">
-<DT CLASS="dt-description"><B><TT>{user_glob, &lt;glob&gt;, &lt;server&gt;}</TT></B><DD CLASS="dd-description">
-<DT CLASS="dt-description"><B><TT>{server_glob, &lt;glob&gt;}</TT></B><DD CLASS="dd-description">
-<DT CLASS="dt-description"><B><TT>{node_glob, &lt;user_glob&gt;, &lt;server_glob&gt;}</TT></B><DD CLASS="dd-description"> This is the same as
- above. However, it uses shell glob patterns instead of regexp. These patterns
- can have the following special characters:
- <DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
- <B><TT>*</TT></B><DD CLASS="dd-description"> matches any string including the null string.
- <DT CLASS="dt-description"><B><TT>?</TT></B><DD CLASS="dd-description"> matches any single character.
- <DT CLASS="dt-description"><B><TT>[...]</TT></B><DD CLASS="dd-description"> matches any of the enclosed characters. Character
- ranges are specified by a pair of characters separated by a <TT>`-'</TT>.
- If the first character after <TT>`['</TT> is a <TT>`!'</TT>, any
- character not enclosed is matched.
- </DL>
-</DL>
-The following ACLs are pre-defined:
-<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
-<B><TT>all</TT></B><DD CLASS="dd-description"> Matches any JID.
-<DT CLASS="dt-description"><B><TT>none</TT></B><DD CLASS="dd-description"> Matches no JID.
-</DL>
-An entry allowing or denying access to different services looks similar to
-this:
-<PRE CLASS="verbatim">
-  {access, &lt;accessname&gt;, [{allow, &lt;aclname&gt;},
-                          {deny, &lt;aclname&gt;},
-                          ...
-                         ]}.
-</PRE>When a JID is checked to have access to <TT>&lt;accessname&gt;</TT>, 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 &#8220;<TT>deny</TT>&#8221; is returned.<BR>
-<BR>
-Example:
+Options can be defined separately for every virtual host using the
+<TT>host_config</TT> option. It has the following
+syntax:
 <PRE CLASS="verbatim">
-  {access, configure, [{allow, admin}]}.
-  {access, something, [{deny, badmans},
-                       {allow, all}]}.
+  {host_config, &lt;hostname&gt;, [&lt;option&gt;, &lt;option&gt;, ...]}.
 </PRE>
-The following access rules are pre-defined:
-<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
-<B><TT>all</TT></B><DD CLASS="dd-description"> Always returns &#8220;<TT>allow</TT>&#8221;
-<DT CLASS="dt-description"><B><TT>none</TT></B><DD CLASS="dd-description"> Always returns &#8220;<TT>deny</TT>&#8221;
-</DL>
-<!--TOC subsubsection Shapers-->
-
-<H4 CLASS="subsubsection"><A NAME="htoc18">3.1.4</A>&nbsp;&nbsp;Shapers</H4><!--SEC END -->
-
-<A NAME="sec:configshaper"></A>
-
-Shapers enable you to limit connection traffic. The syntax of
-shapers is like this:
-<PRE CLASS="verbatim">
-  {shaper, &lt;shapername&gt;, &lt;kind&gt;}.
-</PRE>Currently only one kind of shaper called <TT>maxrate</TT> is available. It has the
-following syntax:
-<PRE CLASS="verbatim">
-  {maxrate, &lt;rate&gt;}
-</PRE>where <TT>&lt;rate&gt;</TT> stands for the maximum allowed incomig rate in bytes per
-second.<BR>
-<BR>
 Examples:
 <UL CLASS="itemize"><LI CLASS="li-itemize">
-To define a shaper named &#8220;<TT>normal</TT>&#8221; with traffic speed limited to
-1,000&nbsp;bytes/second:
-<PRE CLASS="verbatim">
-  {shaper, normal, {maxrate, 1000}}.
-</PRE><LI CLASS="li-itemize">To define a shaper named &#8220;<TT>fast</TT>&#8221; with traffic speed limited to
-50,000&nbsp;bytes/second:
+Domain <TT>example.net</TT> is using the internal authentication method while
+ domain <TT>example.com</TT> is using the LDAP server running on the
+ domain <TT>localhost</TT> to perform authentication:
 <PRE CLASS="verbatim">
-  {shaper, fast, {maxrate, 50000}}.
-</PRE></UL>
-<!--TOC subsubsection Limitation of the number of opened sessions-->
-
-<H4 CLASS="subsubsection"><A NAME="htoc19">3.1.5</A>&nbsp;&nbsp;Limitation of the number of opened sessions</H4><!--SEC END -->
+{host_config, "example.net", [{auth_method, internal}]}.
 
-<A NAME="sec:configmaxsessions"></A>
+{host_config, "example.com", [{auth_method, ldap},
+                              {ldap_servers, ["localhost"]},
+                              {ldap_uidattr, "uid"},
+                              {ldap_rootdn, "dc=localdomain"},
+                              {ldap_rootdn, "dc=example,dc=com"},
+                              {ldap_password, ""}]}.
+</PRE><LI CLASS="li-itemize">Domain <TT>example.net</TT> is using ODBC to perform authentication
+ while domain <TT>example.com</TT> is using the LDAP servers running on the domains
+ <TT>localhost</TT> and <TT>otherhost</TT>:
+<PRE CLASS="verbatim">
+{host_config, "example.net", [{auth_method, odbc},
+                              {odbc_server, "DSN=ejabberd;UID=ejabberd;PWD=ejabberd"}]}.
 
-This option specifies the maximum number of sessions (authenticated
-connections) per user. If a user tries to open more than the maximum number of
-allowed sessions, with different resources, the first opened session will be
-disconnected. The error &#8220;<TT>session replaced</TT>&#8221; is send to the
-disconnected session. This value is either a number or <TT>infinity</TT>. For
-example <CODE>{max\_user\_sessions, 10}</CODE>. The default value is <TT>10</TT>.<BR>
-<BR>
-This option can be define per virtual host. See section&nbsp;<A HREF="#sec:configvirtualhost">3.1.8</A>.<BR>
-<BR>
-<!--TOC subsubsection Listened Sockets-->
+{host_config, "example.com", [{auth_method, ldap},
+                              {ldap_servers, ["localhost", "otherhost"]},
+                              {ldap_uidattr, "uid"},
+                              {ldap_rootdn, "dc=localdomain"},
+                              {ldap_rootdn, "dc=example,dc=com"},
+                              {ldap_password, ""}]}.
+</PRE></UL>
+<!--TOC subsection Listened Sockets-->
 
-<H4 CLASS="subsubsection"><A NAME="htoc20">3.1.6</A>&nbsp;&nbsp;Listened Sockets</H4><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc16">3.3</A>&nbsp;&nbsp;<A NAME="listened">Listened Sockets</A></H3><!--SEC END -->
 
-<A NAME="sec:configlistened"></A>
+<A NAME="sec:listened"></A>
 
 The option <TT>listen</TT> defines for which addresses and ports <TT>ejabberd</TT>
 will listen and what services will be run on them. Each element of the list is a
@@ -697,7 +604,7 @@ Currently next modules are implemented:
 The following options are available:
 <DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
  <B><TT>{access, &lt;access rule&gt;}</TT></B><DD CLASS="dd-description"> This option defines
- access to the port. The default value is &#8220;<TT>all</TT>&#8221;.
+ access to the port. The default value is <TT>all</TT>.
  <DT CLASS="dt-description"><B><TT>{certfile, Path}</TT></B><DD CLASS="dd-description"> Path to a file containing the SSL certificate.
  <DT CLASS="dt-description"><B><TT>{hosts, [Hostnames], [HostOptions]}</TT></B><DD CLASS="dd-description"> This option
  defines one or more hostnames of connected services and enables you to
@@ -718,12 +625,13 @@ If HTTP Polling is enabled, it will be available at
  <DT CLASS="dt-description"><B><TT>{ip, IPAddress}</TT></B><DD CLASS="dd-description"> This option specifies which network
  interface to listen for. For example <CODE>{ip, {192, 168, 1, 1}}</CODE>.
  <DT CLASS="dt-description"><B><TT>{max_stanza_size, Size}</TT></B><DD CLASS="dd-description"> This
- option specifies an approximate maximal size in bytes of XML stanzas.
- For example <CODE>{max\_stanza\_size, 65536}</CODE>. The default value
- is &#8220;<TT>infinity</TT>&#8221;.
+ option specifies an approximate maximum size in bytes of XML stanzas.
+ Approximate, because it is calculated with the precision of one block of
+ readed data. For example <CODE>{max\_stanza\_size, 65536}</CODE>. The default
+ value is <TT>infinity</TT>.
  <DT CLASS="dt-description"><B><TT>{shaper, &lt;access rule&gt;}</TT></B><DD CLASS="dd-description"> This option defines a
- shaper for the port (see section&nbsp;<A HREF="#sec:configshaper">3.1.4</A>). The default value
- is &#8220;<TT>none</TT>&#8221;.
+ shaper for the port (see section&nbsp;<A HREF="#sec:shapers">3.6</A>). The default value
+ is <TT>none</TT>.
  <DT CLASS="dt-description"><B><TT>ssl</TT></B><DD CLASS="dd-description"> This option specifies that traffic on
  the port will be encrypted using SSL. You should also set the
  <TT>certfile</TT> option. It is recommended to use the <TT>tls</TT> option
@@ -740,57 +648,58 @@ If HTTP Polling is enabled, it will be available at
  should also set the <TT>certfile</TT> option.
  <DT CLASS="dt-description"><B><TT>zlib</TT></B><DD CLASS="dd-description"> This
  option specifies that Zlib stream compression (as defined in <A HREF="http://www.jabber.org/jeps/jep-0138.html">JEP-0138</A>)
- is available on connections to the port. Client cannot use stream compression and
- stream encryption simultaneously, so if you specify both <TT>tls</TT> (or <TT>ssl</TT>)
- and <TT>zlib</TT> the latter option will not affect connection at all.
+ is available on connections to the port. Client connections cannot use
+ stream compression and stream encryption simultaneously. Hence, if you
+ specify both <TT>tls</TT> (or <TT>ssl</TT>) and <TT>zlib</TT>, the latter
+ option will not affect connections (there will be no stream compression).
  <DT CLASS="dt-description"><B><TT>web_admin</TT></B><DD CLASS="dd-description"> This option
  enables the web interface for <TT>ejabberd</TT> administration which is available
  at <CODE>http://server:port/admin/</CODE>. Login and password are the username and
  password of one of the registered users who are granted access by the
- &#8220;configure&#8221; access rule.
+ `configure' access rule.
 </DL>
-Also the following global options are available for s2s connections:
+In addition, the following options are available for s2s connections:
 <DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
  <B><TT>{s2s_use_starttls, true|false}</TT></B><DD CLASS="dd-description">
- This option defines whether to use STARTTLS
- for s2s connections.
- <DT CLASS="dt-description"><B><TT>{s2s_certfile, Path}</TT></B><DD CLASS="dd-description"> Path to the
- file containing the SSL certificate.
+ This option defines whether to
+ use STARTTLS for s2s connections.
+ <DT CLASS="dt-description"><B><TT>{s2s_certfile, Path}</TT></B><DD CLASS="dd-description"> Path to a
+ file containing a SSL certificate.
  <DT CLASS="dt-description"><B><TT>{domain_certfile, Domain, Path}</TT></B><DD CLASS="dd-description"> Path
  to the file containing the SSL certificate for the specified domain.
 </DL>
 For instance, the following configuration defines that:
 <UL CLASS="itemize"><LI CLASS="li-itemize">
 c2s connections are listened for on port 5222 and 5223 (SSL) and denied
- for the user &#8220;<TT>bad</TT>&#8221;
+ for the user called `<TT>bad</TT>'.
 <LI CLASS="li-itemize">s2s connections are listened for on port 5269 with STARTTLS for secured
  traffic enabled.
 <LI CLASS="li-itemize">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&nbsp;<A HREF="#sec:webadm">3.4.1</A> shows how exactly this can be done.
+ example in section&nbsp;<A HREF="#sec:webinterface">7.1</A> shows how exactly this can be done.
 <LI CLASS="li-itemize">All users except for the administrators have a traffic of limit 
  1,000&nbsp;Bytes/second
 <LI CLASS="li-itemize">The
  <A HREF="http://ejabberd.jabber.ru/pyaimt">AIM transport</A>
  <TT>aim.example.org</TT> is connected to port 5233 with password
- &#8220;<TT>aimsecret</TT>&#8221;
+ `<TT>aimsecret</TT>'.
 <LI CLASS="li-itemize">The ICQ transport JIT (<TT>icq.example.org</TT> and
  <TT>sms.example.org</TT>) is connected to port 5234 with password
- &#8220;<TT>jitsecret</TT>&#8221;
+ `<TT>jitsecret</TT>'.
 <LI CLASS="li-itemize">The
  <A HREF="http://ejabberd.jabber.ru/pymsnt">MSN transport</A>
  <TT>msn.example.org</TT> is connected to port 5235 with password
- &#8220;<TT>msnsecret</TT>&#8221;
+ `<TT>msnsecret</TT>'.
 <LI CLASS="li-itemize">The
  <A HREF="http://ejabberd.jabber.ru/yahoo-transport-2">Yahoo! transport</A>
  <TT>yahoo.example.org</TT> is connected to port 5236 with password
- &#8220;<TT>yahoosecret</TT>&#8221;
+ `<TT>yahoosecret</TT>'.
 <LI CLASS="li-itemize">The <A HREF="http://ejabberd.jabber.ru/jabber-gg-transport">Gadu-Gadu transport</A> <TT>gg.example.org</TT> is
- connected to port 5237 with password &#8220;<TT>ggsecret</TT>&#8221;
+ connected to port 5237 with password `<TT>ggsecret</TT>'.
 <LI CLASS="li-itemize">The
  <A HREF="http://ejabberd.jabber.ru/jmc">Jabber Mail Component</A>
  <TT>jmc.example.org</TT> is connected to port 5238 with password
- &#8220;<TT>jmcsecret</TT>&#8221;
+ `<TT>jmcsecret</TT>'.
 </UL>
 <PRE CLASS="verbatim">
   {acl, blocked, {user, "bad"}}.
@@ -853,198 +762,354 @@ services you have to make the transports log and do XDB by themselves:
     &lt;/xdb_file&gt;
   &lt;/xdb&gt;
 </PRE>
-<!--TOC subsubsection Modules-->
+<!--TOC subsection Authentication-->
 
-<H4 CLASS="subsubsection"><A NAME="htoc21">3.1.7</A>&nbsp;&nbsp;Modules</H4><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc17">3.4</A>&nbsp;&nbsp;<A NAME="auth">Authentication</A></H3><!--SEC END -->
 
-<A NAME="sec:configmodules"></A>
+<A NAME="sec:auth"></A>
 
-The option <TT>modules</TT> defines the list of modules that will be loaded after
-<TT>ejabberd</TT>'s startup. Each entry in the list is a tuple in which the first
-element is the name of a module and the second is a list of options for that
-module. Read section&nbsp;<A HREF="#sec:modules">A</A> for detailed information about modules.<BR>
-<BR>
-Examples:
+The option <TT>auth_method</TT> defines the authentication method that is used
+for user authentication:
+<PRE CLASS="verbatim">
+  {auth_method, [&lt;method&gt;]}.
+</PRE>
+The following authentication methods are supported by <TT>ejabberd</TT>:
 <UL CLASS="itemize"><LI CLASS="li-itemize">
-In this simple example, only the module <TT>mod_echo</TT> is loaded and no
- options are specified between square brackets:
- <PRE CLASS="verbatim">
-  {modules,
-   [{mod_echo,      []}
-   ]}.
-</PRE><LI CLASS="li-itemize">The second example is also simple: the modules <TT>mod_echo</TT>, <TT>mod_time</TT>, and
- <TT>mod_version</TT> are loaded without options. Remark that, besides the last entry,
- all entries end with a comma:
- <PRE CLASS="verbatim">
-  {modules,
-   [{mod_echo,      []},
-    {mod_time,      []},
-    {mod_version,   []}
-   ]}.
-</PRE></UL>
-<!--TOC subsubsection Virtual Hosting-->
+internal (default) &mdash; See section&nbsp;<A HREF="#sec:internalauth">3.4.1</A>.
+<LI CLASS="li-itemize">external &mdash; There are <A HREF="http://ejabberd.jabber.ru/extauth">some
+ example authentication scripts</A>.
+<LI CLASS="li-itemize">ldap &mdash; See section&nbsp;<A HREF="#sec:ldap">4.5</A>.
+<LI CLASS="li-itemize">odbc &mdash; See section&nbsp;<A HREF="#sec:mysql">4.1</A>, <A HREF="#sec:pgsql">4.3</A>,
+ <A HREF="#sec:mssql">4.2</A> and <A HREF="#sec:odbc">4.4</A>.
+<LI CLASS="li-itemize">anonymous &mdash; See section&nbsp;<A HREF="#sec:saslanonymous">3.4.2</A>.
+</UL>
+<!--TOC subsubsection Internal-->
 
-<H4 CLASS="subsubsection"><A NAME="htoc22">3.1.8</A>&nbsp;&nbsp;Virtual Hosting</H4><!--SEC END -->
+<H4 CLASS="subsubsection"><A NAME="htoc18">3.4.1</A>&nbsp;&nbsp;<A NAME="internalauth">Internal</A></H4><!--SEC END -->
 
-<A NAME="sec:configvirtualhost"></A>
+<A NAME="sec:internalauth"></A>
 
-Options can be defined separately for every virtual host using the
-<TT>host_config</TT> option. It has the following
-syntax:
-<PRE CLASS="verbatim">
-  {host_config, &lt;hostname&gt;, [&lt;option&gt;, &lt;option&gt;, ...]}.
-</PRE>
+<TT>ejabberd</TT> uses its internal Mnesia database as the default authentication method.
+<UL CLASS="itemize"><LI CLASS="li-itemize">
+<TT>auth_method</TT>: The value <TT>internal</TT> will enable the internal
+ authentication method.
+</UL>
 Examples:
 <UL CLASS="itemize"><LI CLASS="li-itemize">
-Domain <TT>example.net</TT> is using the internal authentication method while
- domain <TT>example.com</TT> is using the LDAP server running on the domain
- <TT>localhost</TT> to perform authentication:
-<PRE CLASS="verbatim">
-{host_config, "example.net", [{auth_method, internal}]}.
-
-{host_config, "example.com", [{auth_method, ldap},
-                              {ldap_servers, ["localhost"]},
-                              {ldap_uidattr, "uid"},
-                              {ldap_rootdn, "dc=localdomain"},
-                              {ldap_rootdn, "dc=example,dc=com"},
-                              {ldap_password, ""}]}.
-</PRE><LI CLASS="li-itemize">Domain <TT>example.net</TT> is using ODBC to perform authentication
- while domain <TT>example.com</TT> is using the LDAP servers running on the domains
- <TT>localhost</TT> and <TT>otherhost</TT>:
-<PRE CLASS="verbatim">
-{host_config, "example.net", [{auth_method, odbc},
-                              {odbc_server, "DSN=ejabberd;UID=ejabberd;PWD=ejabberd"}]}.
-
-{host_config, "example.com", [{auth_method, ldap},
-                              {ldap_servers, ["localhost", "otherhost"]},
-                              {ldap_uidattr, "uid"},
-                              {ldap_rootdn, "dc=localdomain"},
-                              {ldap_rootdn, "dc=example,dc=com"},
-                              {ldap_password, ""}]}.
+To use internal authentication on <TT>example.org</TT> and LDAP
+ authentication on <TT>example.net</TT>:
+ <PRE CLASS="verbatim">
+{host_config, "example.org", [{auth_method, [internal]}]}.
+{host_config, "example.net", [{auth_method, [ldap]}]}.
+</PRE><LI CLASS="li-itemize">To use internal authentication on all virtual hosts:
+ <PRE CLASS="verbatim">
+{auth_method, internal}.
 </PRE></UL>
-<!--TOC subsubsection SASL anonymous and anonymous login-->
+<!--TOC subsubsection SASL Anonymous and Anonymous Login-->
 
-<H4 CLASS="subsubsection"><A NAME="htoc23">3.1.9</A>&nbsp;&nbsp;SASL anonymous and anonymous login</H4><!--SEC END -->
+<H4 CLASS="subsubsection"><A NAME="htoc19">3.4.2</A>&nbsp;&nbsp;<A NAME="saslanonymous">SASL Anonymous and Anonymous Login</A></H4><!--SEC END -->
 
-<A NAME="sec:configsaslanonymous"></A>
+<A NAME="sec:saslanonymous"></A>
 
-The configuration of the anonymous mode can be done with three
-<TT>host_config</TT> parameters:
-<UL CLASS="itemize"><LI CLASS="li-itemize"> 
-<TT>auth_method</TT>: This value is used for defining the authentication method:
-internal, odbc, ldap, external). You now have a special extra option to enable
-anonymous mode: anonymous.<BR>
-<BR>
-<LI CLASS="li-itemize"><TT>allow_multiple_connections</TT>: This option can be either true or false and
-is only used when the anonymous mode is enabled. Setting it to true means that
-the same username will be able to be taken several time in anonymous login
-mode if different resource are used to connect. This option is only useful in
-very special cases. It defaults to false.<BR>
-<BR>
+The anonymous authentication method can be configured with the following
+options. Remember that you can use the <TT>host_config</TT> option to set virtual
+host specific options (see section&nbsp;<A HREF="#sec:virtualhost">3.2</A>). Note that there also
+is a detailed tutorial regarding <A HREF="http://support.process-one.net/doc/display/MESSENGER/Anonymous+users+support">SASL
+Anonymous and anonymous login configuration</A>.
+<UL CLASS="itemize"><LI CLASS="li-itemize">
+<TT>auth_method</TT>: The value <TT>anonymous</TT> will enable the anonymous
+ authentication method.
+<LI CLASS="li-itemize"><TT>allow_multiple_connections</TT>: This value for this option can be
+ either <TT>true</TT> or <TT>false</TT> and is only used when the anonymous mode is
+ enabled. Setting it to <TT>true</TT> means that the same username can be taken
+ multiple times in anonymous login mode if different resource are used to
+ connect. This option is only useful in very special occasions. The default
+ value is <TT>false</TT>.
 <LI CLASS="li-itemize"><TT>anonymous_protocol</TT>: This option can take three values:
- <TT>sasl_anon</TT>, <TT>login_anon</TT> or both. <TT>sasl_anon</TT> means that
- SASL anonymous mode is enabled. <TT>login_anon</TT> means that anonymous
- login mode is enabled. both means that SASL anonymous and login anonymous are
- enabled.
+ <TT>sasl_anon</TT>, <TT>login_anon</TT> or <TT>both</TT>. <TT>sasl_anon</TT> means
+ that the SASL Anonymous method will be used. <TT>login_anon</TT> means that the
+ anonymous login method will be used. <TT>both</TT> means that SASL Anonymous and
+ login anonymous are both enabled.
 </UL>
 Those options are defined for each virtual host with the <TT>host_config</TT>
-parameter (see section&nbsp;<A HREF="#sec:configvirtualhost">3.1.8</A>).<BR>
+parameter (see section&nbsp;<A HREF="#sec:virtualhost">3.2</A>).<BR>
 <BR>
 Examples:
 <UL CLASS="itemize"><LI CLASS="li-itemize">
-To enable anonymous login on a virtual host:
-<PRE CLASS="verbatim">
-{host_config, "public.example.org", [{auth_method, anonymous},
+To enable anonymous login on all virtual hosts:
+ <PRE CLASS="verbatim">
+{auth_method, [anonymous]}.
+{anonymous_protocol, login_anon}.
+  </PRE><LI CLASS="li-itemize">Similar as previous example, but limited to <TT>public.example.org</TT>:
+ <PRE CLASS="verbatim">
+{host_config, "public.example.org", [{auth_method, [anonymous]},
                                      {anonymous_protocol, login_anon}]}.
 </PRE><LI CLASS="li-itemize">To enable anonymous login and internal authentication on a virtual host:
-<PRE CLASS="verbatim">
+ <PRE CLASS="verbatim">
 {host_config, "public.example.org", [{auth_method, [anonymous,internal]},
                                      {anonymous_protocol, login_anon}]}.
-</PRE><LI CLASS="li-itemize">To enable SASL anonymous on a virtual host:
-<PRE CLASS="verbatim">
+</PRE><LI CLASS="li-itemize">To enable SASL Anonymous on a virtual host:
+ <PRE CLASS="verbatim">
 {host_config, "public.example.org", [{auth_method, [anonymous]},
                                      {anonymous_protocol, sasl_anon}]}.
-</PRE><LI CLASS="li-itemize">To enable SASL anonymous and anonymous login on a virtual host:
-<PRE CLASS="verbatim">
+</PRE><LI CLASS="li-itemize">To enable SASL Anonymous and anonymous login on a virtual host:
+ <PRE CLASS="verbatim">
 {host_config, "public.example.org", [{auth_method, [anonymous]},
                                      {anonymous_protocol, both}]}.
-</PRE><LI CLASS="li-itemize">To enable SASL anonymous, anonymous login and internal authentication on
+</PRE><LI CLASS="li-itemize">To enable SASL Anonymous, anonymous login, and internal authentication on
 a virtual host:
-<PRE CLASS="verbatim">
+ <PRE CLASS="verbatim">
 {host_config, "public.example.org", [{auth_method, [anonymous,internal]},
                                      {anonymous_protocol, both}]}.
 </PRE></UL>
-A detailled tutorial on SASL anonymous and anonymous login support is
-available from:
-<A HREF="http://support.process-one.net/doc/display/MESSENGER/Anonymous+users+support"><TT>http://support.process-one.net/doc/display/MESSENGER/Anonymous+users+support</TT></A><BR>
-<BR>
-<!--TOC subsection Relational Database Support-->
+<!--TOC subsection Access Rules-->
 
-<H3 CLASS="subsection"><A NAME="htoc24">3.2</A>&nbsp;&nbsp;Relational Database Support</H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc20">3.5</A>&nbsp;&nbsp;<A NAME="accessrules">Access Rules</A></H3><!--SEC END -->
 
-<A NAME="sec:relationaldatabase"></A>
-<!--TOC subsubsection Preliminary steps-->
+<A NAME="sec:accessrules"></A>
 
-<H4 CLASS="subsubsection"><A NAME="htoc25">3.2.1</A>&nbsp;&nbsp;Preliminary steps</H4><!--SEC END -->
-
-<A NAME="sec:relationaldatabasecompilation"></A>
-If you have installed ejabberd using a binary version, the compilation steps
-are not needed as they have already been done correctly.<BR>
-<BR>
-Otherwise, to be able to use ejabberd with a relational database you need to
-enable ODBC modules during compilation, even if you want to use ejabberd with
-MySQL or PostgreSQL in native mode. The following <TT>configure</TT> command can
-be used to enable the relational modules:
+Access control in <TT>ejabberd</TT> is performed via Access Control Lists (ACLs). The
+declarations of ACLs in the configuration file have the following syntax:
 <PRE CLASS="verbatim">
-./configure --enable-odbc
+  {acl, &lt;aclname&gt;, {&lt;acltype&gt;, ...}}.
 </PRE>
-If you are planning to use Microsoft SQL Server with ODBC, you need to specify
-it from the <TT>configure</TT> command before compilation:
+<TT>&lt;acltype&gt;</TT> can be one of the following:
+<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
+<B><TT>all</TT></B><DD CLASS="dd-description"> Matches all JIDs. Example:
 <PRE CLASS="verbatim">
-./configure --enable-odbc --enable-mssql
-</PRE>
-<!--TOC subsubsection Authentication against a relational database-->
-
-<H4 CLASS="subsubsection"><A NAME="htoc26">3.2.2</A>&nbsp;&nbsp;Authentication against a relational database</H4><!--SEC END -->
-
-<A NAME="sec:relationaldatabaseauth"></A>
-ejabberd use its internal Mnesia database as a default. It is however possible
-to use relational database to store persistant, long-living data. When
-switching the <TT>auth_method</TT> from internal to <TT>odbc</TT>, you are
-telling ejabberd to use a relational database for authentication. Different
-<TT>auth_method</TT> values can be used for different virtual hosts in the
-system.<BR>
-<BR>
-The option value name be misleading, as the method name is use both for access
-to relational database through ODBC or through the native interface. In any
-case, the first step is to define the odbc <TT>auth_method</TT>. For example:
+{acl, all, all}.
+</PRE><DT CLASS="dt-description"><B><TT>{user, &lt;username&gt;}</TT></B><DD CLASS="dd-description"> Matches the user with the name
+ <TT>&lt;username&gt;</TT> at the first virtual host. Example:
 <PRE CLASS="verbatim">
-{host_config, "public.example.org", [{auth_method, [odbc]}]}.
-</PRE>
-The actual database access is defined in the option <TT>odbc_server</TT>. Its
-value is use to defined if we want to use ODBC, or one of the two native
-interface available, PostgreSQL or MySQL.<BR>
-<BR>
-To use a relational database through ODBC, you can pass the ODBC connection
-string as <TT>odbc_server</TT> parameter. For example:
+{acl, admin, {user, "yozhik"}}.
+</PRE><DT CLASS="dt-description"><B><TT>{user, &lt;username&gt;, &lt;server&gt;}</TT></B><DD CLASS="dd-description"> Matches the user with the JID
+ <TT>&lt;username&gt;@&lt;server&gt;</TT> and any resource. Example:
 <PRE CLASS="verbatim">
-{odbc_server, "DSN=database;UID=ejabberd;PWD=password"}.
-</PRE>
-To use the native PostgreSQL interface, you can pass a tuple of the following form as
-parameter:
+{acl, admin, {user, "yozhik", "example.org"}}.
+</PRE><DT CLASS="dt-description"><B><TT>{server, &lt;server&gt;}</TT></B><DD CLASS="dd-description"> Matches any JID from server
+ <TT>&lt;server&gt;</TT>. Example:
 <PRE CLASS="verbatim">
-{pgsql, "Server", "Database", "Username", "Password"}
+{acl, exampleorg, {server, "example.org"}}.
+</PRE><DT CLASS="dt-description"><B><TT>{user_regexp, &lt;regexp&gt;}</TT></B><DD CLASS="dd-description"> Matches any local user with a name that
+ matches <TT>&lt;regexp&gt;</TT> at the first virtual host. Example:
+<PRE CLASS="verbatim">
+{acl, tests, {user, "^test[0-9]*$"}}.
+</PRE><DT CLASS="dt-description"><B><TT>{user_regexp, &lt;regexp&gt;, &lt;server&gt;}</TT></B><DD CLASS="dd-description"> Matches any user with a name
+ that matches <TT>&lt;regexp&gt;</TT> at server <TT>&lt;server&gt;</TT>. Example:
+<PRE CLASS="verbatim">
+{acl, tests, {user, "^test", "example.org"}}.
+</PRE><DT CLASS="dt-description"><B><TT>{server_regexp, &lt;regexp&gt;}</TT></B><DD CLASS="dd-description"> Matches any JID from the server that
+ matches <TT>&lt;regexp&gt;</TT>. Example:
+<PRE CLASS="verbatim">
+{acl, icq, {server, "^icq\\."}}.
+</PRE><DT CLASS="dt-description"><B><TT>{node_regexp, &lt;user_regexp&gt;, &lt;server_regexp&gt;}</TT></B><DD CLASS="dd-description"> Matches any user
+ with a name that matches <TT>&lt;user_regexp&gt;</TT> at any server that matches
+ <TT>&lt;server_regexp&gt;</TT>. Example:
+<PRE CLASS="verbatim">
+{acl, yohzik, {node_regexp, "^yohzik$", "^example.(com|org)$"}}.
+</PRE><DT CLASS="dt-description"><B><TT>{user_glob, &lt;glob&gt;}</TT></B><DD CLASS="dd-description">
+<DT CLASS="dt-description"><B><TT>{user_glob, &lt;glob&gt;, &lt;server&gt;}</TT></B><DD CLASS="dd-description">
+<DT CLASS="dt-description"><B><TT>{server_glob, &lt;glob&gt;}</TT></B><DD CLASS="dd-description">
+<DT CLASS="dt-description"><B><TT>{node_glob, &lt;user_glob&gt;, &lt;server_glob&gt;}</TT></B><DD CLASS="dd-description"> This is the same as
+ above. However, it uses shell glob patterns instead of regexp. These patterns
+ can have the following special characters:
+ <DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
+ <B><TT>*</TT></B><DD CLASS="dd-description"> matches any string including the null string.
+ <DT CLASS="dt-description"><B><TT>?</TT></B><DD CLASS="dd-description"> matches any single character.
+ <DT CLASS="dt-description"><B><TT>[...]</TT></B><DD CLASS="dd-description"> matches any of the enclosed characters. Character
+ ranges are specified by a pair of characters separated by a <TT>`-'</TT>.
+ If the first character after <TT>`['</TT> is a <TT>`!'</TT>, any
+ character not enclosed is matched.
+ </DL>
+</DL>
+The following ACLs are pre-defined:
+<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
+<B><TT>all</TT></B><DD CLASS="dd-description"> Matches any JID.
+<DT CLASS="dt-description"><B><TT>none</TT></B><DD CLASS="dd-description"> Matches no JID.
+</DL>
+An entry allowing or denying access to different services looks similar to
+this:
+<PRE CLASS="verbatim">
+  {access, &lt;accessname&gt;, [{allow, &lt;aclname&gt;},
+                          {deny, &lt;aclname&gt;},
+                          ...
+                         ]}.
+</PRE>When a JID is checked to have access to <TT>&lt;accessname&gt;</TT>, 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 the value `<TT>deny</TT>' is
+returned.<BR>
+<BR>
+Example:
+<PRE CLASS="verbatim">
+  {access, configure, [{allow, admin}]}.
+  {access, something, [{deny, badmans},
+                       {allow, all}]}.
 </PRE>
-<TT>pgsql</TT> is a keyword that should be kept as is. For example:
+The following access rules are pre-defined:
+<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
+<B><TT>all</TT></B><DD CLASS="dd-description"> Always returns the value `<TT>allow</TT>'.
+<DT CLASS="dt-description"><B><TT>none</TT></B><DD CLASS="dd-description"> Always returns the value `<TT>deny</TT>'.
+</DL>
+<!--TOC subsection Shapers-->
+
+<H3 CLASS="subsection"><A NAME="htoc21">3.6</A>&nbsp;&nbsp;<A NAME="shapers">Shapers</A></H3><!--SEC END -->
+
+<A NAME="sec:shapers"></A>
+
+Shapers enable you to limit connection traffic. The syntax of
+shapers is like this:
 <PRE CLASS="verbatim">
-{odbc_server, {pgsql, "localhost", "database", "ejabberd", "password"}}.
+  {shaper, &lt;shapername&gt;, &lt;kind&gt;}.
+</PRE>Currently only one kind of shaper called <TT>maxrate</TT> is available. It has the
+following syntax:
+<PRE CLASS="verbatim">
+  {maxrate, &lt;rate&gt;}
+</PRE>where <TT>&lt;rate&gt;</TT> stands for the maximum allowed incomig rate in bytes per
+second.<BR>
+<BR>
+Examples:
+<UL CLASS="itemize"><LI CLASS="li-itemize">
+To define a shaper named `<TT>normal</TT>' with traffic speed limited to
+1,000&nbsp;bytes/second:
+<PRE CLASS="verbatim">
+  {shaper, normal, {maxrate, 1000}}.
+</PRE><LI CLASS="li-itemize">To define a shaper named `<TT>fast</TT>' with traffic speed limited to
+50,000&nbsp;bytes/second:
+<PRE CLASS="verbatim">
+  {shaper, fast, {maxrate, 50000}}.
+</PRE></UL>
+<!--TOC subsection Limiting Opened Sessions-->
+
+<H3 CLASS="subsection"><A NAME="htoc22">3.7</A>&nbsp;&nbsp;Limiting Opened Sessions</H3><!--SEC END -->
+
+<A NAME="sec:configmaxsessions"></A>
+
+This option specifies the maximum number of sessions (authenticated
+connections) per user. If a user tries to open more sessions by using different
+resources, the first opened session will be disconnected. The error
+<TT>session replaced</TT> will be sent to the disconnected session. The value
+for this option can be either a number, or <TT>infinity</TT>. The default
+value is <TT>10</TT>.<BR>
+<BR>
+Examples:
+<UL CLASS="itemize"><LI CLASS="li-itemize">
+To limit the number of sessions per user to 10 on all virtual
+hosts:
+<PRE CLASS="verbatim">
+  {max\_user\_sessions, 10}.
+</PRE><LI CLASS="li-itemize">This option can be defined per virtual host (see
+section&nbsp;<A HREF="#sec:virtualhost">3.2</A>). In next example the number of
+sessions per user on the first host is six, while there is no limit on the
+second host:
+<PRE CLASS="verbatim">
+  {host_config, "example.net", [{max\_user\_sessions, 6}]}.
+  {host_config, "example.com", [{max\_user\_sessions, infinity}]}.
+</PRE></UL>
+<!--TOC subsection Default Language-->
+
+<H3 CLASS="subsection"><A NAME="htoc23">3.8</A>&nbsp;&nbsp;<A NAME="language">Default Language</A></H3><!--SEC END -->
+
+<A NAME="sec:language"></A>
+
+The option <TT>language</TT> defines the default language of server strings that
+can be seen by Jabber clients. If a Jabber client do not support
+<TT>xml:lang</TT>, the specified language is used. The default value is
+<TT>en</TT>. In order to take effect there must be a translation file
+<TT>&lt;language&gt;.msg</TT> in <TT>ejabberd</TT>'s <TT>msgs</TT> directory.<BR>
+<BR>
+Examples:
+<UL CLASS="itemize"><LI CLASS="li-itemize">
+To set Russian as default language:
+<PRE CLASS="verbatim">
+  {language, "ru"}.
+</PRE><LI CLASS="li-itemize">To set Spanish as default language:
+<PRE CLASS="verbatim">
+  {language, "es"}.
+</PRE></UL>
+<!--TOC section Database Configuration-->
+
+<H2 CLASS="section"><A NAME="htoc24">4</A>&nbsp;&nbsp;<A NAME="database">Database Configuration</A></H2><!--SEC END -->
+
+<A NAME="sec:database"></A>
+
+
+<TT>ejabberd</TT> uses its internal Mnesia database by default. However, it is
+possible to use a relational database or an LDAP server to store persistant,
+long-living data. <TT>ejabberd</TT> is very flexible: you can configure different
+authentication methods for different virtual hosts, you can configure different
+authentication mechanisms for the same virtual host (fallback), you can set
+different storage systems for modules, and so forth.<BR>
+<BR>
+The following databases are supported by <TT>ejabberd</TT>:
+<UL CLASS="itemize"><LI CLASS="li-itemize">
+<A HREF="http://www.microsoft.com/sql/">Microsoft SQL Server</A>
+<LI CLASS="li-itemize"><A HREF="http://www.erlang.org/doc/doc-5.5.1/lib/mnesia-4.3.2/doc/">Mnesia</A>
+<LI CLASS="li-itemize"><A HREF="http://mysql.com/">MySQL</A>
+<LI CLASS="li-itemize"><A HREF="http://en.wikipedia.org/wiki/Open_Database_Connectivity">Any ODBC compatible database</A>
+<LI CLASS="li-itemize"><A HREF="http://www.postgresql.org/">PostgreSQL</A>
+</UL>
+The following LDAP servers are tested with <TT>ejabberd</TT>:
+<UL CLASS="itemize"><LI CLASS="li-itemize">
+<A HREF="http://www.microsoft.com/activedirectory/">Active Directory</A>
+ (see section&nbsp;<A HREF="#sec:ad">4.5.3</A>)
+<LI CLASS="li-itemize"><A HREF="http://www.openldap.org/">OpenLDAP</A>
+<LI CLASS="li-itemize">Normally any LDAP compatible server should work; inform us about your
+ success with a not-listed server so that we can list it here.
+</UL>
+<!--TOC subsection MySQL-->
+
+<H3 CLASS="subsection"><A NAME="htoc25">4.1</A>&nbsp;&nbsp;<A NAME="mysql">MySQL</A></H3><!--SEC END -->
+
+<A NAME="sec:mysql"></A>
+
+Although this section will describe <TT>ejabberd</TT>'s configuration when you want to
+use the native MySQL driver, it does not describe MySQL's installation and
+database creation. Check the MySQL documentation and the tutorial <A HREF="http://support.process-one.net/doc/display/MESSENGER/Using+ejabberd+with+MySQL+native+driver">Using ejabberd with MySQL native driver</A> for information regarding these topics.
+Note that the tutorial contains information about <TT>ejabberd</TT>'s configuration
+which is duplicate to this section.<BR>
+<BR>
+Moreover, the file mysql.sql in the directory src/odbc might be interesting for
+you. This file contains the ejabberd schema for MySQL. At the end of the file
+you can find information to update your database schema.<BR>
+<BR>
+<!--TOC subsubsection Driver Compilation-->
+
+<H4 CLASS="subsubsection"><A NAME="htoc26">4.1.1</A>&nbsp;&nbsp;<A NAME="compilemysql">Driver Compilation</A></H4><!--SEC END -->
+
+<A NAME="sec:compilemysql"></A>
+
+You can skip this step if you installed <TT>ejabberd</TT> using a binary installer or
+if the binary packages of <TT>ejabberd</TT> you are using include support for MySQL.
+<OL CLASS="enumerate" type=1><LI CLASS="li-enumerate">
+First, install the <A HREF="http://support.process-one.net/doc/display/CONTRIBS/Yxa">Erlang
+ MySQL library</A>. Make sure the compiled files are in your Erlang path; you can
+ put them for example in the same directory as your ejabberd .beam files.
+<LI CLASS="li-enumerate">Then, configure and install <TT>ejabberd</TT> with ODBC support enabled (this is
+ also needed for native MySQL support!). This can be done, by using next
+ commands:
+ <PRE CLASS="verbatim">
+./configure --enable-odbc &amp;&amp; make install
+</PRE></OL>
+<!--TOC subsubsection Authentication-->
+
+<H4 CLASS="subsubsection"><A NAME="htoc27">4.1.2</A>&nbsp;&nbsp;<A NAME="mysqlauth">Authentication</A></H4><!--SEC END -->
+
+<A NAME="sec:mysqlauth"></A>
+
+The option value name may be misleading, as the <TT>auth_method</TT> name is used
+for access to a relational database through ODBC, as well as through the native
+MySQL interface. Anyway, the first configuration step is to define the odbc
+<TT>auth_method</TT>. For example:
+<PRE CLASS="verbatim">
+{host_config, "public.example.org", [{auth_method, [odbc]}]}.
 </PRE>
-Note that you need to install the Erlang PgSQL library first. This library is
-available from Sourceforge: <A HREF="http://cvs.sourceforge.net/viewcvs.py/jungerl/jungerl/lib/pgsql/"><TT>http://cvs.sourceforge.net/viewcvs.py/jungerl/jungerl/lib/pgsql/</TT></A><BR>
+The actual database access is defined in the option <TT>odbc_server</TT>. Its
+value is used to define if we want to use ODBC, or one of the two native
+interface available, PostgreSQL or MySQL.<BR>
 <BR>
-To use the native MySQL interface, the same tuple should be passed, except
-that you now have to use the <TT>mysql</TT> keyword instead of the <TT>pgsql</TT>
-keyword:
+To use the native MySQL interface, you can pass a tuple of the following form as
+parameter:
 <PRE CLASS="verbatim">
 {mysql, "Server", "Database", "Username", "Password"}
 </PRE>
@@ -1052,396 +1117,470 @@ keyword:
 <PRE CLASS="verbatim">
 {odbc_server, {mysql, "localhost", "test", "root", "password"}}.
 </PRE>
-Note that you need to install the Erlang MySQL library first. This library is
-directly available from Process-one website: <A HREF="http://support.process-one.net/doc/display/CONTRIBS/Yxa"><TT>http://support.process-one.net/doc/display/CONTRIBS/Yxa</TT></A><BR>
+<!--TOC subsubsection Storage-->
+
+<H4 CLASS="subsubsection"><A NAME="htoc28">4.1.3</A>&nbsp;&nbsp;<A NAME="mysqlstorage">Storage</A></H4><!--SEC END -->
+
+<A NAME="sec:mysqlstorage"></A>
+
+MySQL also can be used to store information into from several <TT>ejabberd</TT>
+modules. See section&nbsp;<A HREF="#sec:modoverview">5.1</A> to see which modules have a version
+with the `_odbc'. This suffix indicates that the module can be used with
+relational databases like MySQL. To enable storage to your database, just make
+sure that your database is running well (see previous sections), and replace the
+suffix-less or ldap module variant with the odbc module variant. Keep in mind
+that you cannot have several variants of the same module loaded!<BR>
+<BR>
+<!--TOC subsection Microsoft SQL Server-->
+
+<H3 CLASS="subsection"><A NAME="htoc29">4.2</A>&nbsp;&nbsp;<A NAME="mssql">Microsoft SQL Server</A></H3><!--SEC END -->
+
+<A NAME="sec:mssql"></A>
+
+Although this section will describe <TT>ejabberd</TT>'s configuration when you want to
+use Microsoft SQL Server, it does not describe Microsoft SQL Server's
+installation and database creation. Check the MySQL documentation and the
+tutorial <A HREF="http://support.process-one.net/doc/display/MESSENGER/Using+ejabberd+with+MySQL+native+driver">Using ejabberd with MySQL native driver</A> for information regarding these topics.
+Note that the tutorial contains information about <TT>ejabberd</TT>'s configuration
+which is duplicate to this section.<BR>
 <BR>
-A detailled tutorial to set-up <TT>ejabberd</TT> using the native MySQL interface is
-available from: <A HREF="http://support.process-one.net/doc/display/MESSENGER/Using+ejabberd+with+MySQL+native+driver"><TT>http://support.process-one.net/doc/display/MESSENGER/Using+ejabberd+with+MySQL+native+driver</TT></A><BR>
+Moreover, the file mssql.sql in the directory src/odbc might be interesting for
+you. This file contains the ejabberd schema for Microsoft SQL Server. At the end
+of the file you can find information to update your database schema.<BR>
 <BR>
-<!--TOC subsubsection Relational database for other modules-->
+<!--TOC subsubsection Driver Compilation-->
 
-<H4 CLASS="subsubsection"><A NAME="htoc27">3.2.3</A>&nbsp;&nbsp;Relational database for other modules</H4><!--SEC END -->
+<H4 CLASS="subsubsection"><A NAME="htoc30">4.2.1</A>&nbsp;&nbsp;<A NAME="compilemssql">Driver Compilation</A></H4><!--SEC END -->
 
-<A NAME="sec:relationaldatabaseextra"></A>
-It is possible to use a relational database to store pieces of
-information. You can do this by changing the module name to a name with an
-<TT>_odbc</TT> suffix in <TT>ejabberd</TT> config file. You can use a relational
-database for the following data:
-<UL CLASS="itemize"><LI CLASS="li-itemize">
-Last connection date and time: Use <TT>mod_last_odbc</TT> instead of
- <TT>mod_last</TT>.
-<LI CLASS="li-itemize">Offline messages: Use <TT>mod_offline_odbc</TT> instead of
- <TT>mod_offline</TT>.
-<LI CLASS="li-itemize">Rosters: Use <TT>mod_roster_odbc</TT> instead of <TT>mod_roster</TT>.
-<LI CLASS="li-itemize">Users' VCARD: Use <TT>mod_vcard_odbc</TT> instead of <TT>mod_vcard</TT>.
-</UL>
-<!--TOC subsection Creating an Initial Administrator-->
+<A NAME="sec:compilemssql"></A>
+
+You can skip this step if you installed <TT>ejabberd</TT> using a binary installer or
+if the binary packages of <TT>ejabberd</TT> you are using include support for ODBC.<BR>
+<BR>
+If you want to use Microsoft SQL Server with ODBC, you need to configure,
+compile and install <TT>ejabberd</TT> with support for ODBC and Microsoft SQL Server
+enabled. This can be done, by using next commands:
+<PRE CLASS="verbatim">
+./configure --enable-odbc --enable-mssql &amp;&amp; make install
+</PRE>
+<!--TOC subsubsection Authentication-->
 
-<H3 CLASS="subsection"><A NAME="htoc28">3.3</A>&nbsp;&nbsp;Creating an Initial Administrator</H3><!--SEC END -->
+<H4 CLASS="subsubsection"><A NAME="htoc31">4.2.2</A>&nbsp;&nbsp;<A NAME="mssqlauth">Authentication</A></H4><!--SEC END -->
 
-<A NAME="sec:initialadmin"></A>
-Before the web interface can be entered to perform administration tasks, an
-account with administrator rights is needed on your <TT>ejabberd</TT> deployment.<BR>
+<A NAME="sec:mssqlauth"></A>
+
+The configuration of Microsoft SQL Server is the same as the configuration of
+ODBC compatible serers (see section&nbsp;<A HREF="#sec:odbcauth">4.4.2</A>).<BR>
 <BR>
-Instructions to create an initial administrator account:
+<!--TOC subsubsection Storage-->
+
+<H4 CLASS="subsubsection"><A NAME="htoc32">4.2.3</A>&nbsp;&nbsp;<A NAME="mssqlstorage">Storage</A></H4><!--SEC END -->
+
+<A NAME="sec:mssqlstorage"></A>
+
+Microsoft SQL Server also can be used to store information into from several
+<TT>ejabberd</TT> modules. See section&nbsp;<A HREF="#sec:modoverview">5.1</A> to see which modules have
+a version with the `_odbc'. This suffix indicates that the module can be used
+with relational databases like Microsoft SQL Server. To enable storage to your
+database, just make sure that your database is running well (see previous
+sections), and replace the suffix-less or ldap module variant with the odbc
+module variant. Keep in mind that you cannot have several variants of the same
+module loaded!<BR>
+<BR>
+<!--TOC subsection PostgreSQL-->
+
+<H3 CLASS="subsection"><A NAME="htoc33">4.3</A>&nbsp;&nbsp;<A NAME="pgsql">PostgreSQL</A></H3><!--SEC END -->
+
+<A NAME="sec:pgsql"></A>
+
+Although this section will describe <TT>ejabberd</TT>'s configuration when you want to
+use the native PostgreSQL driver, it does not describe PostgreSQL's installation
+and database creation. Check the PostgreSQL documentation and the tutorial <A HREF="http://support.process-one.net/doc/display/MESSENGER/Using+ejabberd+with+MySQL+native+driver">Using ejabberd with MySQL native driver</A> for information regarding these topics.
+Note that the tutorial contains information about <TT>ejabberd</TT>'s configuration
+which is duplicate to this section.<BR>
+<BR>
+Also the file pg.sql in the directory src/odbc might be interesting for you.
+This file contains the ejabberd schema for PostgreSQL. At the end of the file
+you can find information to update your database schema.<BR>
+<BR>
+<!--TOC subsubsection Driver Compilation-->
+
+<H4 CLASS="subsubsection"><A NAME="htoc34">4.3.1</A>&nbsp;&nbsp;<A NAME="compilepgsql">Driver Compilation</A></H4><!--SEC END -->
+
+<A NAME="sec:compilepgsql"></A>
+
+You can skip this step if you installed <TT>ejabberd</TT> using a binary installer or
+if the binary packages of <TT>ejabberd</TT> you are using include support for
+PostgreSQL.
 <OL CLASS="enumerate" type=1><LI CLASS="li-enumerate">
-Register an account on your <TT>ejabberd</TT> deployment. An account can be
- created in two ways:
- <OL CLASS="enumerate" type=a><LI CLASS="li-enumerate">
- Using the tool <TT>ejabberdctl</TT> (see
- section&nbsp;<A HREF="#sec:ejabberdctl">3.4.2</A>):
- <PRE CLASS="verbatim">
-% ejabberdctl node@host register admin example.org password
-</PRE><LI CLASS="li-enumerate">Using In-Band Registration (see section&nbsp;<A HREF="#sec:modregister">A.14</A>): you can
- use a Jabber client to register an account.
- </OL>
-<LI CLASS="li-enumerate">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.
+First, install the Erlang PgSQL library from
+ <A HREF="http://jungerl.sourceforge.net/">Jungerl</A>. Make sure the compiled
+ files are in your Erlang path; you can put them for example in the same
+ directory as your ejabberd .beam files.
+<LI CLASS="li-enumerate">Then, configure, compile and install <TT>ejabberd</TT> with ODBC support enabled
+ (this is also needed for native PostgreSQL support!). This can be done, by
+ using next commands:
  <PRE CLASS="verbatim">
-  {acl, admins, {user, "admin", "example.org"}}.
-  {access, configure, [{allow, admins}]}.
-</PRE><LI CLASS="li-enumerate">Restart <TT>ejabberd</TT> to load the new configuration.
-<LI CLASS="li-enumerate">Open the web interface (<CODE>http://server:port/admin/</CODE>) in your
- favourite browser. Make sure to enter the <EM>full</EM> JID as username (in this
- example: <TT>admin@example.org</TT>. The reason that you also need to enter the
- suffix, is because <TT>ejabberd</TT>'s virtual hosting support.
-</OL>
-<!--TOC subsection Online Configuration and Monitoring-->
+./configure --enable-odbc &amp;&amp; make install
+</PRE></OL>
+<!--TOC subsubsection Authentication-->
 
-<H3 CLASS="subsection"><A NAME="htoc29">3.4</A>&nbsp;&nbsp;Online Configuration and Monitoring</H3><!--SEC END -->
+<H4 CLASS="subsubsection"><A NAME="htoc35">4.3.2</A>&nbsp;&nbsp;<A NAME="pgsqlauth">Authentication</A></H4><!--SEC END -->
 
-<A NAME="sec:onlineconfig"></A>
-<!--TOC subsubsection Web Interface-->
+<A NAME="sec:pgsqlauth"></A>
 
-<H4 CLASS="subsubsection"><A NAME="htoc30">3.4.1</A>&nbsp;&nbsp;Web Interface</H4><!--SEC END -->
+The option value name may be misleading, as the <TT>auth_method</TT> name is used
+for access to a relational database through ODBC, as well as through the native
+PostgreSQL interface. Anyway, the first configuration step is to define the odbc
+<TT>auth_method</TT>. For example:
+<PRE CLASS="verbatim">
+{host_config, "public.example.org", [{auth_method, [odbc]}]}.
+</PRE>
+The actual database access is defined in the option <TT>odbc_server</TT>. Its
+value is used to define if we want to use ODBC, or one of the two native
+interface available, PostgreSQL or MySQL.<BR>
+<BR>
+To use the native PostgreSQL interface, you can pass a tuple of the following
+form as parameter:
+<PRE CLASS="verbatim">
+{pgsql, "Server", "Database", "Username", "Password"}
+</PRE>
+<TT>pgsql</TT> is a keyword that should be kept as is. For example:
+<PRE CLASS="verbatim">
+{odbc_server, {pgsql, "localhost", "database", "ejabberd", "password"}}.
+</PRE>
+<!--TOC subsubsection Storage-->
 
-<A NAME="sec:webadm"></A>
+<H4 CLASS="subsubsection"><A NAME="htoc36">4.3.3</A>&nbsp;&nbsp;<A NAME="pgsqlstorage">Storage</A></H4><!--SEC END -->
 
-To perform online configuration of <TT>ejabberd</TT> you need to enable the
-<TT>ejabberd_http</TT> listener with the option <TT>web_admin</TT> (see
-section&nbsp;<A HREF="#sec:configlistened">3.1.6</A>). Then you can open 
-<CODE>http://server:port/admin/</CODE> in your favourite web browser. You
-will be asked to enter the username (the <EM>full</EM> Jabber ID) and password
-of an <TT>ejabberd</TT> user with administrator rights. After authentication
-you will see a page similar to figure&nbsp;<A HREF="#fig:webadmmain">1</A>.
-<BLOCKQUOTE CLASS="figure"><DIV CLASS="center"><DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV>
- 
- <IMG SRC="webadmmain.png">
- 
+<A NAME="sec:pgsqlstorage"></A>
 
- <BR>
+PostgreSQL also can be used to store information into from several <TT>ejabberd</TT>
+modules. See section&nbsp;<A HREF="#sec:modoverview">5.1</A> to see which modules have a version
+with the `_odbc'. This suffix indicates that the module can be used with
+relational databases like PostgreSQL. To enable storage to your database, just
+make sure that your database is running well (see previous sections), and
+replace the suffix-less or ldap module variant with the odbc module variant.
+Keep in mind that you cannot have several variants of the same module loaded!<BR>
 <BR>
-<DIV CLASS="center">Figure 1: Top page from the web interface</DIV><BR>
+<!--TOC subsection ODBC Compatible-->
+
+<H3 CLASS="subsection"><A NAME="htoc37">4.4</A>&nbsp;&nbsp;<A NAME="odbc">ODBC Compatible</A></H3><!--SEC END -->
+
+<A NAME="sec:odbc"></A>
+
+Although this section will describe <TT>ejabberd</TT>'s configuration when you want to
+use the ODBC driver, it does not describe the installation and database creation
+of your database. Check the documentation of your database. The tutorial <A HREF="http://support.process-one.net/doc/display/MESSENGER/Using+ejabberd+with+MySQL+native+driver">Using ejabberd with MySQL native driver</A> also can help you. Note that the tutorial
+contains information about <TT>ejabberd</TT>'s configuration which is duplicate to
+this section.<BR>
 <BR>
+<!--TOC subsubsection Compilation-->
 
- <A NAME="fig:webadmmain"></A>
-<DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV></DIV></BLOCKQUOTE>
-Here you can edit access restrictions, manage users, create backups,
-manage the database, enable/disable ports listened for, view server
-statistics,...<BR>
+<H4 CLASS="subsubsection"><A NAME="htoc38">4.4.1</A>&nbsp;&nbsp;<A NAME="compileodbc">Compilation</A></H4><!--SEC END -->
+
+<A NAME="sec:compileodbc"></A>
+You can skip this step if you installed <TT>ejabberd</TT> using a binary installer or
+if the binary packages of <TT>ejabberd</TT> you are using include support for
+ODBC.
+<OL CLASS="enumerate" type=1><LI CLASS="li-enumerate">
+First, install the <A HREF="http://support.process-one.net/doc/display/CONTRIBS/Yxa">Erlang
+ MySQL library</A>. Make sure the compiled files are in your Erlang path; you can
+ put them for example in the same directory as your ejabberd .beam files.
+<LI CLASS="li-enumerate">Then, configure, compile and install <TT>ejabberd</TT> with ODBC support
+ enabled. This can be done, by using next commands:
+ <PRE CLASS="verbatim">
+./configure --enable-odbc &amp;&amp; make install
+</PRE></OL>
+<!--TOC subsubsection Authentication-->
+
+<H4 CLASS="subsubsection"><A NAME="htoc39">4.4.2</A>&nbsp;&nbsp;<A NAME="odbcauth">Authentication</A></H4><!--SEC END -->
+
+<A NAME="sec:odbcauth"></A>
+
+The first configuration step is to define the odbc <TT>auth_method</TT>. For
+example:
+<PRE CLASS="verbatim">
+{host_config, "public.example.org", [{auth_method, [odbc]}]}.
+</PRE>
+The actual database access is defined in the option <TT>odbc_server</TT>. Its
+value is used to defined if we want to use ODBC, or one of the two native
+interface available, PostgreSQL or MySQL.<BR>
 <BR>
-Examples:
-<UL CLASS="itemize"><LI CLASS="li-itemize">
-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 <CODE>http://example.org:5280/admin/</CODE> to
- administer all virtual hosts or to
- <CODE>http://example.org:5280/admin/server/example.com/</CODE> to administer only
- the virtual host <TT>example.com</TT>. 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 <TT>ejabberd</TT>. In this example you can enter as
- username &#8220;<TT>admin@example.net</TT>&#8221; to administer all virtual hosts (first
- URL). If you log in with &#8220;<TT>admin@example.com</TT>&#8221; on<BR>
-<CODE>http://example.org:5280/admin/server/example.com/</CODE> you can only
- administer the virtual host <TT>example.com</TT>.
- <PRE CLASS="verbatim">
-  ...
-  {acl, admins, {user, "admin", "example.net"}}.
-  {host_config, "example.com", [{acl, admins, {user, "admin", "example.com"}}]}.
-  {access, configure, [{allow, admins}]}.
-  ...
-  {hosts, ["example.org"]}.
-  ...
-  {listen,
-   [...
-    {5280, ejabberd_http, [http_poll, web_admin]},
-    ...
-   ]
-  }.
-</PRE><LI CLASS="li-itemize">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 <CODE>https://192.168.1.1:5280/admin/</CODE>:
- <PRE CLASS="verbatim">
-  ...
-  {hosts, ["example.org"]}.
-  ...
-  {listen,
-   [...
-    {5270, ejabberd_http,    [http_poll]},
-    {5280, ejabberd_http,    [web_admin, {ip, {192, 168, 1, 1}},
-                              tls, {certfile, "/usr/local/etc/server.pem"}]},
-    ...
-   ]
-  }.
-</PRE></UL>
-<!--TOC subsubsection <TT>ejabberdctl</TT>-->
-
-<H4 CLASS="subsubsection"><A NAME="htoc31">3.4.2</A>&nbsp;&nbsp;<TT>ejabberdctl</TT></H4><!--SEC END -->
-
-<A NAME="sec:ejabberdctl"></A>
-It is possible to do some administration operations using the command
-line tool <TT>ejabberdctl</TT>. You can list all available options by
-running <TT>ejabberdctl</TT> without arguments:
+To use a relational database through ODBC, you can pass the ODBC connection
+string as <TT>odbc_server</TT> parameter. For example:
 <PRE CLASS="verbatim">
-% ejabberdctl
-Usage: ejabberdctl node command
-
-Available commands:
-  status                        get ejabberd status
-  stop                          stop ejabberd
-  restart                       restart ejabberd
-  reopen-log                    reopen log file
-  register user server password register a user
-  unregister user server        unregister a user
-  backup file                   store a database backup to file
-  restore file                  restore a database backup from file
-  install-fallback file         install a database fallback from file
-  dump file                     dump a database to a text file
-  load file                     restore a database from a text file
-  import-file file              import user data from jabberd 1.4 spool file
-  import-dir dir                import user data from jabberd 1.4 spool directory
-  registered-users              list all registered users
-  delete-expired-messages       delete expired offline messages from database
-
-Example:
-  ejabberdctl ejabberd@host restart
+{odbc_server, "DSN=database;UID=ejabberd;PWD=password"}.
 </PRE>
-Additional information:
-<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
-<B><TT>reopen-log </TT></B><DD CLASS="dd-description"> If you use a tool to rotate logs, you have to configure it
- so that this command is executed after each rotation.
-<DT CLASS="dt-description"><B><TT>backup, restore, install-fallback, dump, load</TT></B><DD CLASS="dd-description"> You can use these
- commands to create and restore backups. 
-<DT CLASS="dt-description"><B><TT>import-file, import-dir</TT></B><DD CLASS="dd-description"> 
- These options can be used to migrate from other Jabber/XMPP servers. There
- exist tutorials to <A HREF="http://ejabberd.jabber.ru/jabberd1-to-ejabberd">migrate from jabberd 1.4</A>
- and to <A HREF="http://ejabberd.jabber.ru/jabberd2-to-ejabberd">migrate from jabberd2</A>.
-<DT CLASS="dt-description"><B><TT>delete-expired-messages</TT></B><DD CLASS="dd-description"> 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.
-</DL>
-<!--TOC section Firewall Settings-->
-
-<H2 CLASS="section"><A NAME="htoc32">4</A>&nbsp;&nbsp;Firewall Settings</H2><!--SEC END -->
-
-<A NAME="sec:firewall"></A>
-
-You need to take the following TCP ports in mind when configuring your firewall:
-<BLOCKQUOTE CLASS="table"><DIV CLASS="center"><DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV>
- <TABLE BORDER=1 CELLSPACING=0 CELLPADDING=1>
-<TR><TD ALIGN=left NOWRAP>Port</TD>
-<TD ALIGN=left NOWRAP>Description</TD>
-</TR>
-<TR><TD ALIGN=left NOWRAP>5222</TD>
-<TD ALIGN=left NOWRAP>SASL and unencrypted c2s connections.</TD>
-</TR>
-<TR><TD ALIGN=left NOWRAP>5223</TD>
-<TD ALIGN=left NOWRAP>Obsolete SSL c2s connections.</TD>
-</TR>
-<TR><TD ALIGN=left NOWRAP>5269</TD>
-<TD ALIGN=left NOWRAP>s2s connections.</TD>
-</TR>
-<TR><TD ALIGN=left NOWRAP>4369</TD>
-<TD ALIGN=left NOWRAP>Only for clustering (see&nbsp;<A HREF="#sec:clustering">6</A>).</TD>
-</TR>
-<TR><TD ALIGN=left NOWRAP>port range</TD>
-<TD ALIGN=left NOWRAP>Only for clustring (see&nbsp;<A HREF="#sec:clustering">6</A>). This range
- is configurable (see&nbsp;<A HREF="#sec:starting">2.4</A>).</TD>
-</TR></TABLE>
-<DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV></DIV></BLOCKQUOTE>
-<!--TOC section SRV Records-->
-
-<H2 CLASS="section"><A NAME="htoc33">5</A>&nbsp;&nbsp;SRV Records</H2><!--SEC END -->
-
-<A NAME="sec:srv"></A>
-
-<UL CLASS="itemize"><LI CLASS="li-itemize">
-General information:
- <A HREF="http://en.wikipedia.org/wiki/SRV_record">SRV record</A>
-<LI CLASS="li-itemize">Practical information:
- <A HREF="http://jabberd.jabberstudio.org/2/docs/section05.html#5_7">Setting DNS SRV Records</A>
-</UL>
-<!--TOC section Clustering-->
-
-<H2 CLASS="section"><A NAME="htoc34">6</A>&nbsp;&nbsp;Clustering</H2><!--SEC END -->
-
-<A NAME="sec:clustering"></A>
+<!--TOC subsubsection Storage-->
 
-<!--TOC subsection How it Works-->
-
-<H3 CLASS="subsection"><A NAME="htoc35">6.1</A>&nbsp;&nbsp;How it Works</H3><!--SEC END -->
+<H4 CLASS="subsubsection"><A NAME="htoc40">4.4.3</A>&nbsp;&nbsp;<A NAME="odbcstorage">Storage</A></H4><!--SEC END -->
 
-<A NAME="sec:howitworks"></A>
+<A NAME="sec:odbcstorage"></A>
 
-A Jabber domain is served by one or more <TT>ejabberd</TT> nodes. These nodes can
-be run on different machines that are connected via a network. They all
-must have the ability to connect to port 4369 of all another nodes, and must
-have the same magic cookie (see Erlang/OTP documentation, in other words the
-file <TT>~ejabberd/.erlang.cookie</TT> must be the same on all nodes). This is
-needed because all nodes exchange information about connected users, s2s
-connections, registered services, etc...<BR>
+An ODBC compatible database also can be used to store information into from
+several <TT>ejabberd</TT> modules. See section&nbsp;<A HREF="#sec:modoverview">5.1</A> to see which
+modules have a version with the `_odbc'. This suffix indicates that the module
+can be used with ODBC compatible relational databases. To enable storage to your
+database, just make sure that your database is running well (see previous
+sections), and replace the suffix-less or ldap module variant with the odbc
+module variant. Keep in mind that you cannot have several variants of the same
+module loaded!<BR>
 <BR>
-Each <TT>ejabberd</TT> node has the following modules:
-<UL CLASS="itemize"><LI CLASS="li-itemize">
-router,
-<LI CLASS="li-itemize">local router,
-<LI CLASS="li-itemize">session manager,
-<LI CLASS="li-itemize">s2s manager.
-</UL>
-<!--TOC subsubsection Router-->
+<!--TOC subsection LDAP-->
 
-<H4 CLASS="subsubsection"><A NAME="htoc36">6.1.1</A>&nbsp;&nbsp;Router</H4><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc41">4.5</A>&nbsp;&nbsp;<A NAME="ldap">LDAP</A></H3><!--SEC END -->
 
+<A NAME="sec:ldap"></A>
 
-This module is the main router of Jabber packets on each node. It
-routes them based on their destination's domains. It uses a global
-routing table. The domain of the packet's destination is searched in the
-routing table, and if it is found, the packet is routed to the
-appropriate process. If not, it is sent to the s2s manager.<BR>
+<TT>ejabberd</TT> has built-in LDAP support. You can authenticate users against LDAP
+server and use LDAP directory as vCard storage. Shared rosters are not supported
+yet.<BR>
 <BR>
-<!--TOC subsubsection Local Router-->
-
-<H4 CLASS="subsubsection"><A NAME="htoc37">6.1.2</A>&nbsp;&nbsp;Local Router</H4><!--SEC END -->
+<!--TOC subsubsection Connection-->
 
+<H4 CLASS="subsubsection"><A NAME="htoc42">4.5.1</A>&nbsp;&nbsp;<A NAME="ldapconnection">Connection</A></H4><!--SEC END -->
 
-This module routes packets which have a destination domain equal to
-one of this server's host names. If the destination JID has a non-empty user
-part, it is routed to the session manager, otherwise it is processed depending
-on its content.<BR>
+<A NAME="sec:ldapconnection"></A>
+Parameters:
+<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
+<B><TT>ldap_server</TT></B><DD CLASS="dd-description"> IP address or dns name of your
+LDAP server. This option is required.
+<DT CLASS="dt-description"><B><TT>ldap_port</TT></B><DD CLASS="dd-description"> Port to connect to your LDAP server.
+ The default value is&nbsp;389.
+<DT CLASS="dt-description"><B><TT>ldap_rootdn</TT></B><DD CLASS="dd-description"> Bind DN. The default value
+ is&nbsp;<TT>""</TT> which means `anonymous connection'.
+<DT CLASS="dt-description"><B><TT>ldap_password</TT></B><DD CLASS="dd-description"> Bind password. The default
+ value is <TT>""</TT>.
+</DL>
+Example:
+<PRE CLASS="verbatim">
+  {auth_method, ldap}.
+  {ldap_servers, ["ldap.example.org"]}.
+  {ldap_port, 389}.
+  {ldap_rootdn, "cn=Manager,dc=domain,dc=org"}.
+  {ldap_password, "secret"}.
+</PRE>
+Note that current LDAP implementation does not support SSL secured communication
+and SASL authentication.<BR>
 <BR>
-<!--TOC subsubsection Session Manager-->
+<!--TOC subsubsection Authentication-->
 
-<H4 CLASS="subsubsection"><A NAME="htoc38">6.1.3</A>&nbsp;&nbsp;Session Manager</H4><!--SEC END -->
+<H4 CLASS="subsubsection"><A NAME="htoc43">4.5.2</A>&nbsp;&nbsp;<A NAME="ldapauth">Authentication</A></H4><!--SEC END -->
 
+<A NAME="sec:ldapauth"></A>
+You can authenticate users against an LDAP directory. Available options are:
+<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
+<B><TT>ldap_base</TT></B><DD CLASS="dd-description">LDAP base directory which stores users
+ accounts. This option is required.
+<DT CLASS="dt-description"><B><TT>ldap_uidattr</TT></B><DD CLASS="dd-description">LDAP attribute which holds
+ the user's part of a JID. The default value is <TT>"uid"</TT>.
+<DT CLASS="dt-description"><B><TT>ldap_uidattr_format</TT></B><DD CLASS="dd-description">Format of the
+ <TT>ldap_uidattr</TT> variable. The format <EM>must</EM> contain one and only one
+ pattern variable <TT>"%u"</TT> which will be replaced by the user's part of a
+ JID. For example, <TT>"%u@example.org"</TT>. The default value is <TT>"%u"</TT>.
+<DT CLASS="dt-description"><B><TT>ldap_filter</TT></B><DD CLASS="dd-description">
+ <A HREF="http://www.faqs.org/rfcs/rfc2254.html">RFC 2254</A> LDAP filter. The
+ default is <TT>none</TT>. Example:
+ <TT>"(&amp;(objectClass=shadowAccount)(memberOf=Jabber Users))"</TT>. Please, do
+ not forget to close brackets and do not use superfluous whitespaces. Also you
+ <EM>must not</EM> use <TT>ldap_uidattr</TT> attribute in filter because this
+ attribute will be substituted in LDAP filter automatically.
+</DL>
+<!--TOC subsubsection Examples-->
 
-This module routes packets to local users. It looks up to which user
-resource a packet must be sent via a presence table. Then the packet is
-either routed to the appropriate c2s process, or stored in offline
-storage, or bounced back.<BR>
-<BR>
-<!--TOC subsubsection s2s Manager-->
+<H4 CLASS="subsubsection"><A NAME="htoc44">4.5.3</A>&nbsp;&nbsp;<A NAME="ldapexamples">Examples</A></H4><!--SEC END -->
 
-<H4 CLASS="subsubsection"><A NAME="htoc39">6.1.4</A>&nbsp;&nbsp;s2s Manager</H4><!--SEC END -->
+<A NAME="sec:ldapexamples"></A>
+<!--TOC paragraph Common example-->
 
+<H5 CLASS="paragraph"><A NAME="ldapcommonexample">Common example</A></H5><!--SEC END -->
 
-This module routes packets to other Jabber servers. First, it
-checks if an opened s2s connection from the domain of the packet's
-source to the domain of the packet's destination exists. If that is the case,
-the s2s manager routes the packet to the process
-serving this connection, otherwise a new connection is opened.<BR>
+Let's say <TT>ldap.example.org</TT> is the name of our LDAP server. We have
+users with their passwords in <TT>"ou=Users,dc=example,dc=org"</TT> directory.
+Also we have addressbook, which contains users emails and their additional
+infos in <TT>"ou=AddressBook,dc=example,dc=org"</TT> directory. Corresponding
+authentication section should looks like this:
+<PRE CLASS="verbatim">
+  %% authentication method
+  {auth_method, ldap}.
+  %% DNS name of our LDAP server
+  {ldap_servers, ["ldap.example.org"]}.
+  %% Bind to LDAP server as "cn=Manager,dc=example,dc=org" with password "secret"
+  {ldap_rootdn, "cn=Manager,dc=example,dc=org"}.
+  {ldap_password, "secret"}.
+  %% define the user's base
+  {ldap_base, "ou=Users,dc=example,dc=org"}.
+  %% We want to authorize users from 'shadowAccount' object class only
+  {ldap_filter, "(objectClass=shadowAccount)"}.
+</PRE>
+Now we want to use users LDAP-info as their vCards. We have four attributes
+defined in our LDAP schema: <TT>"mail"</TT> &mdash; email address, <TT>"givenName"</TT>
+&mdash; first name, <TT>"sn"</TT> &mdash; second name, <TT>"birthDay"</TT> &mdash; birthday.
+Also we want users to search each other. Let's see how we can set it up:
+<PRE CLASS="verbatim">
+  {modules,
+    ...
+    {mod_vcard_ldap,
+     [
+      %% We use the same server and port, but want to bind anonymously because
+      %% our LDAP server accepts anonymous requests to
+      %% "ou=AddressBook,dc=example,dc=org" subtree.
+      {ldap_rootdn, ""},
+      {ldap_password, ""},
+      %% define the addressbook's base
+      {ldap_base, "ou=AddressBook,dc=example,dc=org"},
+      %% user's part of JID is located in the "mail" attribute
+      {ldap_uidattr, "mail"},
+      %% common format for our emails
+      {ldap_uidattr_format, "%u@mail.example.org"},
+      %% We have to define empty filter here, because entries in addressbook does not
+      %% belong to shadowAccount object class
+      {ldap_filter, ""},
+      %% Now we want to define vCard pattern
+      {ldap_vcard_map,
+       [{"NICKNAME", "%u", []}, % just use user's part of JID as his nickname
+        {"GIVEN", "%s", ["givenName"]},
+        {"FAMILY", "%s", ["sn"]},
+        {"FN", "%s, %s", ["sn", "givenName"]}, % example: "Smith, John"
+        {"EMAIL", "%s", ["mail"]},
+        {"BDAY", "%s", ["birthDay"]}]},
+      %% Search form
+      {ldap_search_fields,
+       [{"User", "%u"},
+        {"Name", "givenName"},
+        {"Family Name", "sn"},
+        {"Email", "mail"},
+        {"Birthday", "birthDay"}]},
+      %% vCard fields to be reported
+      %% Note that JID is always returned with search results
+      {ldap_search_reported,
+       [{"Full Name", "FN"},
+        {"Nickname", "NICKNAME"},
+        {"Birthday", "BDAY"}]}
+    ]}
+    ...
+  }.
+</PRE>
+Note that <TT>mod_vcard_ldap</TT> module checks for the existence of the user before
+searching in his information in LDAP.<BR>
 <BR>
-<!--TOC subsection Clustering Setup-->
+<!--TOC paragraph Active Directory-->
 
-<H3 CLASS="subsection"><A NAME="htoc40">6.2</A>&nbsp;&nbsp;Clustering Setup</H3><!--SEC END -->
+<H5 CLASS="paragraph"><A NAME="ad">Active Directory</A></H5><!--SEC END -->
 
-<A NAME="sec:cluster"></A>
+<A NAME="sec:ad"></A>
 
-Suppose you already configured <TT>ejabberd</TT> on one machine named (<TT>first</TT>),
-and you need to setup another one to make an <TT>ejabberd</TT> cluster. Then do
-following steps:
-<OL CLASS="enumerate" type=1><LI CLASS="li-enumerate">
-Copy <CODE>~ejabberd/.erlang.cookie</CODE> file from <TT>first</TT> to
- <TT>second</TT>.<BR>
-<BR>
-(alt) You can also add &#8220;<CODE>-cookie content_of_.erlang.cookie</CODE>&#8221;
- option to all &#8220;<TT>erl</TT>&#8221; commands below.<BR>
-<BR>
-<LI CLASS="li-enumerate">On <TT>second</TT> run as the `<TT>ejabberd</TT>' user in the directory
- where <TT>ejabberd</TT> will work later the following command:
+Active Directory is just an LDAP-server with predefined attributes. A sample
+configuration is showed below:
 <PRE CLASS="verbatim">
-erl -sname ejabberd \
-    -mnesia extra_db_nodes "['ejabberd@first']" \
-    -s mnesia
-</PRE>
- This will start Mnesia serving the same database as <TT>ejabberd@first</TT>.
- You can check this by running the command &#8220;<CODE>mnesia:info().</CODE>&#8221;. You
- should see a lot of remote tables and a line like the following:
-<PRE CLASS="verbatim">
-running db nodes   = [ejabberd@first, ejabberd@second]
-</PRE><BR>
-<BR>
-<LI CLASS="li-enumerate">Now run the following in the same &#8220;<TT>erl</TT>&#8221; session:
-<PRE CLASS="verbatim">
-mnesia:change_table_copy_type(schema, node(), disc_copies).
+  {auth_method, ldap}.
+  {ldap_servers, ["office.org"]}.    % List of LDAP servers
+  {ldap_base, "DC=office,DC=org"}. % Search base of LDAP directory
+  {ldap_rootdn, "CN=Administrator,CN=Users,DC=office,DC=org"}. % LDAP manager
+  {ldap_password, "*******"}. % Password to LDAP manager
+  {ldap_uidattr, "sAMAccountName"}.
+  {ldap_filter, "(memberOf=*)"}.
+  
+  {mod_vcard_ldap,
+   [{ldap_vcard_map,
+     [{"NICKNAME", "%u", []},
+      {"GIVEN", "%s", ["givenName"]},
+      {"MIDDLE", "%s", ["initials"]},
+      {"FAMILY", "%s", ["sn"]},
+      {"FN", "%s", ["displayName"]},
+      {"EMAIL", "%s", ["mail"]},
+      {"ORGNAME", "%s", ["company"]},
+      {"ORGUNIT", "%s", ["department"]},
+      {"CTRY", "%s", ["c"]},
+      {"LOCALITY", "%s", ["l"]},
+      {"STREET", "%s", ["streetAddress"]},
+      {"REGION", "%s", ["st"]},
+      {"PCODE", "%s", ["postalCode"]},
+      {"TITLE", "%s", ["title"]},
+      {"URL", "%s", ["wWWHomePage"]},
+      {"DESC", "%s", ["description"]},
+      {"TEL", "%s", ["telephoneNumber"]}]},
+    {ldap_search_fields,
+     [{"User", "%u"},
+      {"Name", "givenName"},
+      {"Family Name", "sn"},
+      {"Email", "mail"},
+      {"Company", "company"},
+      {"Department", "department"},
+      {"Role", "title"},
+      {"Description", "description"},
+      {"Phone", "telephoneNumber"}]},
+    {ldap_search_reported,
+     [{"Full Name", "FN"},
+      {"Nickname", "NICKNAME"},
+      {"Email", "EMAIL"}]}
+   ]
+  }.
 </PRE>
- This will create local disc storage for the database.<BR>
-<BR>
-(alt) Change storage type of `<TT>scheme</TT>' table to &#8220;RAM and disc
- copy&#8221; on the second node via the web interface.<BR>
-<BR>
-<LI CLASS="li-enumerate">Now you can add replicas of various tables to this node with
- &#8220;<CODE>mnesia:add_table_copy</CODE>&#8221; or
- &#8220;<CODE>mnesia:change_table_copy_type</CODE>&#8221; as above (just replace
- &#8220;<CODE>schema</CODE>&#8221; with another table name and &#8220;<CODE>disc_copies</CODE>&#8221;
- can be replaced with &#8220;<CODE>ram_copies</CODE>&#8221; or
- &#8220;<CODE>disc_only_copies</CODE>&#8221;).<BR>
-<BR>
-Which tables to replicate is very dependant on your needs, you can get
- some hints from the command &#8220;<CODE>mnesia:info().</CODE>&#8221;, by looking at the
- size of tables and the default storage type for each table on 'first'.<BR>
-<BR>
-Replicating a table makes lookups in this table faster on this node.
- Writing, on the other hand, will be slower. And of course if machine with one
- of the replicas is down, other replicas will be used.<BR>
-<BR>
-Also <A HREF="http://www.erlang.se/doc/doc-5.4.9/lib/mnesia-4.2.2/doc/html/Mnesia_chap5.html#5.3">section 5.3 (Table Fragmentation) of Mnesia User's Guide</A> can be helpful.
- <BR>
-<BR>
- (alt) Same as in previous item, but for other tables.<BR>
-<BR>
-<LI CLASS="li-enumerate">Run &#8220;<CODE>init:stop().</CODE>&#8221; or just &#8220;<CODE>q().</CODE>&#8221; to exit from
- the Erlang shell. This probably can take some time if Mnesia has not yet
- transfered and processed all data it needed from <TT>first</TT>.<BR>
-<BR>
-<LI CLASS="li-enumerate">Now run <TT>ejabberd</TT> on <TT>second</TT> with almost the same config as
- on <TT>first</TT> (you probably don't need to duplicate &#8220;<CODE>acl</CODE>&#8221;
- and &#8220;<CODE>access</CODE>&#8221; options &mdash; they will be taken from
- <TT>first</TT>, and <CODE>mod_muc</CODE> and <CODE>mod_irc</CODE> should be
- enabled only on one machine in the cluster).
-</OL>
-You can repeat these steps for other machines supposed to serve this
-domain.<BR>
-<BR>
-
-<!--TOC section Built-in Modules-->
+<!--TOC section Modules Configuration-->
 
-<H2 CLASS="section"><A NAME="htoc41">A</A>&nbsp;&nbsp;Built-in Modules</H2><!--SEC END -->
+<H2 CLASS="section"><A NAME="htoc45">5</A>&nbsp;&nbsp;<A NAME="modules">Modules Configuration</A></H2><!--SEC END -->
 
 <A NAME="sec:modules"></A>
 
+The option <TT>modules</TT> defines the list of modules that will be loaded after
+<TT>ejabberd</TT>'s startup. Each entry in the list is a tuple in which the first
+element is the name of a module and the second is a list of options for that
+module.<BR>
+<BR>
+Examples:
+<UL CLASS="itemize"><LI CLASS="li-itemize">
+In this example only the module <TT>mod_echo</TT> is loaded and no module
+ options are specified between the square brackets:
+ <PRE CLASS="verbatim">
+  {modules,
+   [{mod_echo,      []}
+   ]}.
+</PRE><LI CLASS="li-itemize">In the second example the modules <TT>mod_echo</TT>, <TT>mod_time</TT>, and
+ <TT>mod_version</TT> are loaded without options. Remark that, besides the last entry,
+ all entries end with a comma:
+ <PRE CLASS="verbatim">
+  {modules,
+   [{mod_echo,      []},
+    {mod_time,      []},
+    {mod_version,   []}
+   ]}.
+</PRE></UL>
 <!--TOC subsection Overview-->
 
-<H3 CLASS="subsection"><A NAME="htoc42">A.1</A>&nbsp;&nbsp;Overview</H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc46">5.1</A>&nbsp;&nbsp;<A NAME="modoverview">Overview</A></H3><!--SEC END -->
 
 <A NAME="sec:modoverview"></A>
 
 The following table lists all modules available in the official <TT>ejabberd</TT>
 distribution. You can find more
 <A HREF="http://ejabberd.jabber.ru/contributions">contributed modules</A> on the
-ejabberd website. Please remember that these contributions might not work or
+<TT>ejabberd</TT> website. Please remember that these contributions might not work or
 that they can contain severe bugs and security leaks. Therefore, use them at
 your own risk!<BR>
 <BR>
 You can see which database backend each module needs by looking at the suffix:
 <UL CLASS="itemize"><LI CLASS="li-itemize">
-&#8220;_ldap&#8221;, this means that the module needs an LDAP server as backend.
-<LI CLASS="li-itemize">&#8220;_odbc&#8221;, this means that the module needs an ODBC compatible database,
- a MySQL database, or a PostgreSQL database as backend.
-<LI CLASS="li-itemize">Nothing, this means that the modules uses Erlang's built-in database
+`_ldap', this means that the module needs an LDAP server as backend.
+<LI CLASS="li-itemize">`_odbc', this means that the module needs a supported database
+ (see&nbsp;<A HREF="#sec:database">4</A>) as backend.
+<LI CLASS="li-itemize">No suffix, this means that the modules uses Erlang's built-in database
  Mnesia as backend.
 </UL>
+If you want to
+It is possible to use a relational database to store pieces of
+information. You can do this by changing the module name to a name with an
+<TT>_odbc</TT> suffix in <TT>ejabberd</TT> config file. You can use a relational
+database for the following data:
+<UL CLASS="itemize"><LI CLASS="li-itemize">
+Last connection date and time: Use <TT>mod_last_odbc</TT> instead of
+ <TT>mod_last</TT>.
+<LI CLASS="li-itemize">Offline messages: Use <TT>mod_offline_odbc</TT> instead of
+ <TT>mod_offline</TT>.
+<LI CLASS="li-itemize">Rosters: Use <TT>mod_roster_odbc</TT> instead of <TT>mod_roster</TT>.
+<LI CLASS="li-itemize">Users' VCARD: Use <TT>mod_vcard_odbc</TT> instead of <TT>mod_vcard</TT>.
+</UL>
 <BLOCKQUOTE CLASS="table"><DIV CLASS="center"><DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV>
  <TABLE BORDER=1 CELLSPACING=0 CELLPADDING=1>
 <TR><TD ALIGN=left NOWRAP>Module</TD>
@@ -1465,7 +1604,7 @@ You can see which database backend each module needs by looking at the suffix:
 <TD ALIGN=left NOWRAP>No</TD>
 </TR>
 <TR><TD ALIGN=left NOWRAP>&nbsp;</TD>
-<TD ALIGN=left NOWRAP>configuration of ejabberd</TD>
+<TD ALIGN=left NOWRAP>configuration of <TT>ejabberd</TT></TD>
 <TD ALIGN=left NOWRAP>&nbsp;</TD>
 <TD ALIGN=left NOWRAP>&nbsp;</TD>
 </TR>
@@ -1491,19 +1630,9 @@ You can see which database backend each module needs by looking at the suffix:
 </TR>
 <TR><TD ALIGN=left NOWRAP><TT>mod_last_odbc</TT></TD>
 <TD ALIGN=left NOWRAP>Last Activity (<A HREF="http://www.jabber.org/jeps/jep-0012.html">JEP-0012</A>)</TD>
-<TD ALIGN=left NOWRAP>ODBC compatible</TD>
+<TD ALIGN=left NOWRAP>supported database (*)</TD>
 <TD ALIGN=left NOWRAP>No</TD>
 </TR>
-<TR><TD ALIGN=left NOWRAP>&nbsp;</TD>
-<TD ALIGN=left NOWRAP>&nbsp;</TD>
-<TD ALIGN=left NOWRAP>database, MySQL</TD>
-<TD ALIGN=left NOWRAP>&nbsp;</TD>
-</TR>
-<TR><TD ALIGN=left NOWRAP>&nbsp;</TD>
-<TD ALIGN=left NOWRAP>&nbsp;</TD>
-<TD ALIGN=left NOWRAP>or PostgreSQL</TD>
-<TD ALIGN=left NOWRAP>&nbsp;</TD>
-</TR>
 <TR><TD ALIGN=left NOWRAP><TT>mod_muc</TT></TD>
 <TD ALIGN=left NOWRAP>Multi-User Chat (<A HREF="http://www.jabber.org/jeps/jep-0045.html">JEP-0045</A>)</TD>
 <TD ALIGN=left NOWRAP>&nbsp;</TD>
@@ -1521,19 +1650,9 @@ You can see which database backend each module needs by looking at the suffix:
 </TR>
 <TR><TD ALIGN=left NOWRAP><TT>mod_offline_odbc</TT></TD>
 <TD ALIGN=left NOWRAP>Offline message storage</TD>
-<TD ALIGN=left NOWRAP>ODBC compatible</TD>
+<TD ALIGN=left NOWRAP>supported database (*)</TD>
 <TD ALIGN=left NOWRAP>No</TD>
 </TR>
-<TR><TD ALIGN=left NOWRAP>&nbsp;</TD>
-<TD ALIGN=left NOWRAP>&nbsp;</TD>
-<TD ALIGN=left NOWRAP>database, MySQL</TD>
-<TD ALIGN=left NOWRAP>&nbsp;</TD>
-</TR>
-<TR><TD ALIGN=left NOWRAP>&nbsp;</TD>
-<TD ALIGN=left NOWRAP>&nbsp;</TD>
-<TD ALIGN=left NOWRAP>or PostgreSQL</TD>
-<TD ALIGN=left NOWRAP>&nbsp;</TD>
-</TR>
 <TR><TD ALIGN=left NOWRAP><TT>mod_privacy</TT></TD>
 <TD ALIGN=left NOWRAP>Blocking Communication</TD>
 <TD ALIGN=left NOWRAP>&nbsp;</TD>
@@ -1557,22 +1676,12 @@ You can see which database backend each module needs by looking at the suffix:
 <TR><TD ALIGN=left NOWRAP><TT>mod_roster</TT></TD>
 <TD ALIGN=left NOWRAP>Roster management</TD>
 <TD ALIGN=left NOWRAP>&nbsp;</TD>
-<TD ALIGN=left NOWRAP>Yes (*)</TD>
+<TD ALIGN=left NOWRAP>Yes (**)</TD>
 </TR>
 <TR><TD ALIGN=left NOWRAP><TT>mod_roster_odbc</TT></TD>
 <TD ALIGN=left NOWRAP>Roster management</TD>
-<TD ALIGN=left NOWRAP>ODBC compatible</TD>
-<TD ALIGN=left NOWRAP>Yes (*)</TD>
-</TR>
-<TR><TD ALIGN=left NOWRAP>&nbsp;</TD>
-<TD ALIGN=left NOWRAP>&nbsp;</TD>
-<TD ALIGN=left NOWRAP>database, MySQL</TD>
-<TD ALIGN=left NOWRAP>&nbsp;</TD>
-</TR>
-<TR><TD ALIGN=left NOWRAP>&nbsp;</TD>
-<TD ALIGN=left NOWRAP>&nbsp;</TD>
-<TD ALIGN=left NOWRAP>or PostgreSQL</TD>
-<TD ALIGN=left NOWRAP>&nbsp;</TD>
+<TD ALIGN=left NOWRAP>supported database (*)</TD>
+<TD ALIGN=left NOWRAP>Yes (**)</TD>
 </TR>
 <TR><TD ALIGN=left NOWRAP><TT>mod_service_log</TT></TD>
 <TD ALIGN=left NOWRAP>Copy user messages to logger service</TD>
@@ -1611,39 +1720,31 @@ You can see which database backend each module needs by looking at the suffix:
 </TR>
 <TR><TD ALIGN=left NOWRAP><TT>mod_vcard_odbc</TT></TD>
 <TD ALIGN=left NOWRAP>vcard-temp (<A HREF="http://www.jabber.org/jeps/jep-0054.html">JEP-0054</A>)</TD>
-<TD ALIGN=left NOWRAP>ODBC compatible</TD>
+<TD ALIGN=left NOWRAP>supported database (*)</TD>
 <TD ALIGN=left NOWRAP>No</TD>
 </TR>
-<TR><TD ALIGN=left NOWRAP>&nbsp;</TD>
-<TD ALIGN=left NOWRAP>&nbsp;</TD>
-<TD ALIGN=left NOWRAP>database, MySQL</TD>
-<TD ALIGN=left NOWRAP>&nbsp;</TD>
-</TR>
-<TR><TD ALIGN=left NOWRAP>&nbsp;</TD>
-<TD ALIGN=left NOWRAP>&nbsp;</TD>
-<TD ALIGN=left NOWRAP>or PostgreSQL</TD>
-<TD ALIGN=left NOWRAP>&nbsp;</TD>
-</TR>
 <TR><TD ALIGN=left NOWRAP><TT>mod_version</TT></TD>
 <TD ALIGN=left NOWRAP>Software Version (<A HREF="http://www.jabber.org/jeps/jep-0092.html">JEP-0092</A>)</TD>
 <TD ALIGN=left NOWRAP>&nbsp;</TD>
 <TD ALIGN=left NOWRAP>No</TD>
 </TR></TABLE>
 <DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV></DIV></BLOCKQUOTE>
-(*) This module or a similar one with another database backend is needed for
-XMPP compliancy.<BR>
-<BR>
+<UL CLASS="itemize"><LI CLASS="li-itemize">
+(*) For a list of supported databases, see section&nbsp;<A HREF="#sec:database">4</A>.
+<LI CLASS="li-itemize">(**) This module or a similar one with another database backend is needed for
+XMPP compliancy.
+</UL>
 <!--TOC subsection Common Options-->
 
-<H3 CLASS="subsection"><A NAME="htoc43">A.2</A>&nbsp;&nbsp;Common Options</H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc47">5.2</A>&nbsp;&nbsp;<A NAME="modcommonoptions">Common Options</A></H3><!--SEC END -->
 
-<A NAME="sec:modcommonopts"></A>
+<A NAME="sec:modcommonoptions"></A>
 The following options are used by many modules. Therefore, they are described in
 this separate section.<BR>
 <BR>
 <!--TOC subsubsection <TT>iqdisc</TT>-->
 
-<H4 CLASS="subsubsection"><A NAME="htoc44">A.2.1</A>&nbsp;&nbsp;<TT>iqdisc</TT></H4><!--SEC END -->
+<H4 CLASS="subsubsection"><A NAME="htoc48">5.2.1</A>&nbsp;&nbsp;<A NAME="modiqdiscoption"><TT>iqdisc</TT></A></H4><!--SEC END -->
 
 <A NAME="sec:modiqdiscoption"></A>
 
@@ -1677,7 +1778,7 @@ Example:
 </PRE>
 <!--TOC subsubsection <TT>hosts</TT>-->
 
-<H4 CLASS="subsubsection"><A NAME="htoc45">A.2.2</A>&nbsp;&nbsp;<TT>hosts</TT></H4><!--SEC END -->
+<H4 CLASS="subsubsection"><A NAME="htoc49">5.2.2</A>&nbsp;&nbsp;<A NAME="modhostsoption"><TT>hosts</TT></A></H4><!--SEC END -->
 
 <A NAME="sec:modhostsoption"></A>
 
@@ -1695,7 +1796,7 @@ Serving the echo module on one domain:
     {mod_echo, [{hosts, ["echo.example.org"]}]},
     ...
    ]}.
-</PRE><LI CLASS="li-itemize">Backwards compatibility with older ejabberd versions can be retained
+</PRE><LI CLASS="li-itemize">Backwards compatibility with older <TT>ejabberd</TT> versions can be retained
  with:
  <PRE CLASS="verbatim">
   {modules,
@@ -1716,7 +1817,7 @@ Serving the echo module on one domain:
 </PRE></UL>
 <!--TOC subsection <TT>mod_announce</TT>-->
 
-<H3 CLASS="subsection"><A NAME="htoc46">A.3</A>&nbsp;&nbsp;<TT>mod_announce</TT></H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc50">5.3</A>&nbsp;&nbsp;<A NAME="modannounce"><TT>mod_announce</TT></A></H3><!--SEC END -->
 
 <A NAME="sec:modannounce"></A>
 
@@ -1732,7 +1833,7 @@ hosts:
  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&nbsp;<A HREF="#sec:modoffline">A.10</A>) is enabled.
+ (see section&nbsp;<A HREF="#sec:modoffline">5.10</A>) is enabled.
 <DT CLASS="dt-description"><B><TT>example.org/announce/online (example.org/announce/all-hosts/online)</TT></B><DD CLASS="dd-description">The
  message is sent to all connected users. If the user is online and connected
  to several resources, all resources will receive the message.
@@ -1782,7 +1883,7 @@ Only administrators can send announcements:
 </PRE></UL>
 <!--TOC subsection <TT>mod_disco</TT>-->
 
-<H3 CLASS="subsection"><A NAME="htoc47">A.4</A>&nbsp;&nbsp;<TT>mod_disco</TT></H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc51">5.4</A>&nbsp;&nbsp;<A NAME="moddisco"><TT>mod_disco</TT></A></H3><!--SEC END -->
 
 <A NAME="sec:moddisco"></A>
 
@@ -1799,7 +1900,7 @@ Options:
 <B><TT>iqdisc</TT></B><DD CLASS="dd-description"> This specifies 
 the processing discipline for Service Discovery (<TT>http://jabber.org/protocol/disco#items</TT> and
  <TT>http://jabber.org/protocol/disco#info</TT>) IQ queries
-(see section&nbsp;<A HREF="#sec:modiqdiscoption">A.2.1</A>).
+(see section&nbsp;<A HREF="#sec:modiqdiscoption">5.2.1</A>).
 <DT CLASS="dt-description"><B><TT>extra_domains</TT></B><DD CLASS="dd-description"> With this option,
  extra domains can be added to the Service Discovery item list.
 </DL>
@@ -1834,7 +1935,7 @@ To serve a link to the Jabber User Directory on <TT>jabber.org</TT>:
 </PRE></UL>
 <!--TOC subsection <TT>mod_echo</TT>-->
 
-<H3 CLASS="subsection"><A NAME="htoc48">A.5</A>&nbsp;&nbsp;<TT>mod_echo</TT></H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc52">5.5</A>&nbsp;&nbsp;<A NAME="modecho"><TT>mod_echo</TT></A></H3><!--SEC END -->
 
 <A NAME="sec:modecho"></A>
 
@@ -1846,8 +1947,8 @@ Options:
 <DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
 
  <B><TT>hosts</TT></B><DD CLASS="dd-description">  This option defines the hostnames of the
- service (see section&nbsp;<A HREF="#sec:modhostsoption">A.2.2</A>). If neither <TT>hosts</TT> nor
- the old <TT>host</TT> is present, the prefix &#8220;<TT>echo.</TT>&#8221; is added to all
+ service (see section&nbsp;<A HREF="#sec:modhostsoption">5.2.2</A>). If neither <TT>hosts</TT> nor
+ the old <TT>host</TT> is present, the prefix `<TT>echo.</TT>' is added to all
  <TT>ejabberd</TT> hostnames.
 
 </DL>
@@ -1863,11 +1964,11 @@ Mirror, mirror, on the wall, who is the most beautiful
     ...
    ]}.
 </PRE><LI CLASS="li-itemize">If you still do not understand the inner workings of <TT>mod_echo</TT>,
- you can find a few more examples in section&nbsp;<A HREF="#sec:modhostsoption">A.2.2</A>.
+ you can find a few more examples in section&nbsp;<A HREF="#sec:modhostsoption">5.2.2</A>.
 </UL>
 <!--TOC subsection <TT>mod_irc</TT>-->
 
-<H3 CLASS="subsection"><A NAME="htoc49">A.6</A>&nbsp;&nbsp;<TT>mod_irc</TT></H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc53">5.6</A>&nbsp;&nbsp;<A NAME="modirc"><TT>mod_irc</TT></A></H3><!--SEC END -->
 
 <A NAME="sec:modirc"></A>
 
@@ -1877,16 +1978,16 @@ servers.<BR>
 End user information:
 
 <UL CLASS="itemize"><LI CLASS="li-itemize">
-A Jabber client with &#8220;groupchat 1.0&#8221; support or Multi-User
+A Jabber client with `groupchat 1.0' support or Multi-User
  Chat support (<A HREF="http://www.jabber.org/jeps/jep-0045.html">JEP-0045</A>) is necessary to join IRC channels.
 <LI CLASS="li-itemize">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 &#8220;channel%<TT>irc.example.org</TT>&#8221; in case <TT>irc.example.org</TT> is
- the IRC server hosting &#8220;channel&#8221;. And of course the host should point
+ be `channel%<TT>irc.example.org</TT>' in case <TT>irc.example.org</TT> is
+ the IRC server hosting `channel'. And of course the host should point
  to the IRC transport instead of the Multi-User Chat service.
-<LI CLASS="li-itemize">You can register your nickame by sending &#8220;IDENTIFY password&#8221; to<BR>
+<LI CLASS="li-itemize">You can register your nickame by sending `IDENTIFY password' to<BR>
 <TT>nickserver!irc.example.org@irc.jabberserver.org</TT>.
-<LI CLASS="li-itemize">Entering your password is possible by sending &#8220;LOGIN nick password&#8221;<BR>
+<LI CLASS="li-itemize">Entering your password is possible by sending `LOGIN nick password'<BR>
 to <TT>nickserver!irc.example.org@irc.jabberserver.org</TT>.
 <LI CLASS="li-itemize">When using a popular Jabber server, it can occur that no
  connection can be achieved with some IRC servers because they limit the
@@ -1896,8 +1997,8 @@ Options:
 <DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
 
  <B><TT>hosts</TT></B><DD CLASS="dd-description">  This option defines the hostnames of the
- service (see section&nbsp;<A HREF="#sec:modhostsoption">A.2.2</A>). If neither <TT>hosts</TT> nor
- the old <TT>host</TT> is present, the prefix &#8220;<TT>irc.</TT>&#8221; is added to all
+ service (see section&nbsp;<A HREF="#sec:modhostsoption">5.2.2</A>). If neither <TT>hosts</TT> nor
+ the old <TT>host</TT> is present, the prefix `<TT>irc.</TT>' is added to all
  <TT>ejabberd</TT> hostnames.
 
 <DT CLASS="dt-description"><B><TT>access</TT></B><DD CLASS="dd-description"> This option can be used to specify who
@@ -1906,7 +2007,7 @@ Options:
 Examples:
 <UL CLASS="itemize"><LI CLASS="li-itemize">
 In the first example, the IRC transport is available on (all) your
- virtual host(s) with the prefix &#8220;<TT>irc.</TT>&#8221;. Furthermore, anyone is
+ virtual host(s) with the prefix `<TT>irc.</TT>'. Furthermore, anyone is
  able to use the transport.
  <PRE CLASS="verbatim">
   {modules,
@@ -1937,7 +2038,7 @@ In the first example, the IRC transport is available on (all) your
 </PRE></UL>
 <!--TOC subsection <TT>mod_last</TT>-->
 
-<H3 CLASS="subsection"><A NAME="htoc50">A.7</A>&nbsp;&nbsp;<TT>mod_last</TT></H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc54">5.7</A>&nbsp;&nbsp;<A NAME="modlast"><TT>mod_last</TT></A></H3><!--SEC END -->
 
 <A NAME="sec:modlast"></A>
 
@@ -1950,11 +2051,11 @@ Options:
 <DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
 <B><TT>iqdisc</TT></B><DD CLASS="dd-description"> This specifies 
 the processing discipline for Last activity (<TT>jabber:iq:last</TT>) IQ queries
-(see section&nbsp;<A HREF="#sec:modiqdiscoption">A.2.1</A>).
+(see section&nbsp;<A HREF="#sec:modiqdiscoption">5.2.1</A>).
 </DL>
 <!--TOC subsection <TT>mod_muc</TT>-->
 
-<H3 CLASS="subsection"><A NAME="htoc51">A.8</A>&nbsp;&nbsp;<TT>mod_muc</TT></H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc55">5.8</A>&nbsp;&nbsp;<A NAME="modmuc"><TT>mod_muc</TT></A></H3><!--SEC END -->
 
 <A NAME="sec:modmuc"></A>
 
@@ -1974,8 +2075,8 @@ Options:
 <DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
 
  <B><TT>hosts</TT></B><DD CLASS="dd-description">  This option defines the hostnames of the
- service (see section&nbsp;<A HREF="#sec:modhostsoption">A.2.2</A>). If neither <TT>hosts</TT> nor
- the old <TT>host</TT> is present, the prefix &#8220;<TT>conference.</TT>&#8221; is added to all
+ service (see section&nbsp;<A HREF="#sec:modhostsoption">5.2.2</A>). If neither <TT>hosts</TT> nor
+ the old <TT>host</TT> is present, the prefix `<TT>conference.</TT>' is added to all
  <TT>ejabberd</TT> hostnames.
 
 <DT CLASS="dt-description"><B><TT>access</TT></B><DD CLASS="dd-description"> You can specify who is allowed to use
@@ -1988,14 +2089,14 @@ Options:
  value is <TT>none</TT>, which means that only the room creator can
  administer his room). By sending a message to the service JID,
  administrators can send service messages that will be displayed in every
- active room.<BR>
-<BR>
-<DT CLASS="dt-description"><B><TT>history_size</TT></B><DD CLASS="dd-description"> a small history of the
- current discussion is send to users when they enter the room. This option make
- it possible to define the number of history messages to keep and send to the
- user joining the room. The value is a integer. Setting the value to <TT>0</TT>
- disable the history feature and nothing is kept in memory. The default value
- is <TT>20</TT>. This value is global and affects all MUC rooms on the server.
+ active room.
+<DT CLASS="dt-description"><B><TT>history_size</TT></B><DD CLASS="dd-description"> A small history of the
+ current discussion is sent to users when they enter the room. With this option
+ you can define the number of history messages to keep and send to users
+ joining the room. The value is an integer. Setting the value to <TT>0</TT>
+ disables the history feature and, as a result, nothing is kept in memory. The
+ default value is <TT>20</TT>. This value is global and thus affects all rooms on
+ the server.
 </DL>
 Examples:
 <UL CLASS="itemize"><LI CLASS="li-itemize">
@@ -2003,9 +2104,9 @@ 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
  <TT>admin@example.org</TT> is allowed to administrate any room. In this
  example he is also a global administrator. When <TT>admin@example.org</TT>
- sends a message such as &#8220;Tomorrow, the Jabber server will be moved
+ sends a message such as `Tomorrow, the Jabber server will be moved
  to new hardware. This will involve service breakdowns around 23:00 UMT.
- We apologise for this inconvenience.&#8221; to <TT>conference.example.org</TT>,
+ We apologise for this inconvenience.' to <TT>conference.example.org</TT>,
  it will be displayed in all active rooms. In this example the history
  feature is disabled.
  <PRE CLASS="verbatim">
@@ -2026,9 +2127,9 @@ In the first example everyone is allowed to use the Multi-User Chat
  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. When
- <TT>admin@example.org</TT> sends a message such as &#8220;Tomorrow, the Jabber
+ <TT>admin@example.org</TT> sends a message such as `Tomorrow, the Jabber
  server will be moved to new hardware. This will involve service breakdowns
- around 23:00 UMT. We apologise for this inconvenience.&#8221; to
+ around 23:00 UMT. We apologise for this inconvenience.' to
  <TT>conference.example.org</TT>, it will be displayed in all active rooms. No
  <TT>history_size</TT> option is used, this means that the feature is enabled
  and the default value of 20 history messages will be send to the users.
@@ -2055,62 +2156,77 @@ In the first example everyone is allowed to use the Multi-User Chat
 </PRE></UL>
 <!--TOC subsection <TT>mod_muc_log</TT>-->
 
-<H3 CLASS="subsection"><A NAME="htoc52">A.9</A>&nbsp;&nbsp;<TT>mod_muc_log</TT></H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc56">5.9</A>&nbsp;&nbsp;<A NAME="modmuclog"><TT>mod_muc_log</TT></A></H3><!--SEC END -->
 
 <A NAME="sec:modmuclog"></A>
 
-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.<BR>
+This module enables optional logging of Multi-User Chat (MUC) conversations to
+HTML. Once you enable this module, users can join a chatroom using a MUC capable
+Jabber client, and if they have enough privileges, they can request the
+configuration form in which they can set the option to enable chatroom logging.<BR>
 <BR>
-Some of the features of generated logs:
+Features:
 <UL CLASS="itemize"><LI CLASS="li-itemize">
-A lot of information about chatroom is added on top of the page: Room title, JID, subject author, subject and configuration.
-<LI CLASS="li-itemize">Room title and JID are links to join the chatroom (using XMPP-IRI).
+Chatroom details are added on top of each page: room title, JID,
+ author, subject and configuration.
+<LI CLASS="li-itemize">
+ Room title and JID are links to join the chatroom (using
+ <A HREF="http://www.ietf.org/rfc/rfc4622.txt">XMPP URIs</A>).
 <LI CLASS="li-itemize">Subject and chatroom configuration changes are tracked and displayed.
-<LI CLASS="li-itemize">Joins, leaves, nick changes, kicks, bans and /me are tracked and displayed, including the reason when available.
+<LI CLASS="li-itemize">Joins, leaves, nick changes, kicks, bans and `/me' are tracked and
+ displayed, including the reason if available.
 <LI CLASS="li-itemize">Generated HTML files are XHTML 1.0 Transitional and CSS compliant.
 <LI CLASS="li-itemize">Timestamps are self-referencing links.
 <LI CLASS="li-itemize">Links on top for quicker navigation: Previous day, Next day, Up.
 <LI CLASS="li-itemize">CSS is used for style definition, and a custom CSS file can be used.
 <LI CLASS="li-itemize">URLs on messages and subjects are converted to hyperlinks.
 <LI CLASS="li-itemize">Timezone used on timestamps is shown on the log files.
-<LI CLASS="li-itemize">A custom link can be added on top of page.
+<LI CLASS="li-itemize">A custom link can be added on top of each page.
 </UL>
 Options:
 <DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
 <B><TT>access_log</TT></B><DD CLASS="dd-description">
- Restricts which users are allowed to enable or disable chatroom logging using ACL and ACCESS.
- Default: <TT>muc_admin</TT>.
- If you want to allow any chatroom owner put: <TT>muc</TT>.
+ This option restricts which users are allowed to enable or disable chatroom
+ logging. The default value is <TT>muc_admin</TT>. Note for this default setting
+ you need to have an access rule for <TT>muc_admin</TT> in order to take effect.
 <DT CLASS="dt-description"><B><TT>cssfile</TT></B><DD CLASS="dd-description">
- If HTMLs will use a custom CSS file or the embedded one.
- Allowed values:
- <TT>false</TT>: HTMLs will include the standard CSS code;
- <TT>"CSS-URL"</TT>: the URL of the CSS file (for example: "http://example.com/my.css").
- Default: <TT>false</TT>.
+ With this option you can set whether the HTML files should have a custom CSS
+ file or if they need to use the embedded CSS file. Allowed values are
+ <TT>false</TT> and an URL to a CSS file. With the first value, HTML files will
+ include the embedded CSS code. With the latter, you can specify the URL of the
+ custom CSS file (for example: `http://example.com/my.css'). The default value
+ is <TT>false</TT>.
 <DT CLASS="dt-description"><B><TT>dirtype</TT></B><DD CLASS="dd-description">
- Type of directory that will be created.
-	Allowed values: 
-		<TT>subdirs</TT>: creates subdirectories for year and month; 
- <TT>plain</TT>: the filename contains the full date, no subdirs.
- Default: <TT>subdirs</TT>.
+ The type of the created directories can be specified with this option. Allowed
+ values are <TT>subdirs</TT> and <TT>plain</TT>. With the first value,
+ subdirectories are created for each year and month. With the latter, the
+ names of the log files contain the full date, and there are no subdirectories.
+ The default value is <TT>subdirs</TT>.
 <DT CLASS="dt-description"><B><TT>outdir</TT></B><DD CLASS="dd-description">
- Full path to the directory where html will be generated.
- Make sure the system user has write access on that directory. 
- Default: <TT>"www/muc"</TT>.
+ This option sets the full path to the directory in which the HTML files should
+ be stored. Make sure the <TT>ejabberd</TT> daemon user has write access on that
+ directory. The default value is <TT>"www/muc"</TT>.
 <DT CLASS="dt-description"><B><TT>timezone</TT></B><DD CLASS="dd-description">
- What timezone should be used.
- Allowed values:
-		<TT>local</TT>: use local time, as reported to Erlang by the operating system;
- <TT>universal</TT>: use GMT/UTC time.
- Default: <TT>local</TT>.
+ The time zone for the logs is configurable with this option. Allowed values
+ are <TT>local</TT> and <TT>universal</TT>. With the first value, the local time,
+ as reported to Erlang by the operating system, will be used. With the latter,
+ GMT/UTC time will be used. The default value is <TT>local</TT>.
 <DT CLASS="dt-description"><B><TT>top_link</TT></B><DD CLASS="dd-description">
- Customizable link on top right corner. Syntax of this option: <TT>{"URL", "Text"}</TT>.
- Default: <TT>{"/", "Home"}</TT>.
+ With this option you can customize the link on the top right corner of each
+ log file. The syntax of this option is <TT>{"URL", "Text"}</TT>. The default
+ value is <TT>{"/", "Home"}</TT>.
 </DL>
-Example configuration:
-<PRE CLASS="verbatim">
+Examples:
+<UL CLASS="itemize"><LI CLASS="li-itemize">
+In the first example any chatroom owner can enable logging, and a
+ custom CSS file will be used (http://example.com/my.css). Further, the names
+ of the log files will contain the full date, and there will be no
+ subdirectories. The log files will be stored in /var/www/muclogs, and the
+ time zone will be GMT/UTC. Finally, the top link will be
+ <CODE>&lt;a href="http://www.jabber.ru"&gt;Jabber.ru&lt;/a&gt;</CODE>.
+ <PRE CLASS="verbatim">
+  {access, muc, [{allow, all}]}.
+  ...
   {modules,
    [
     ...
@@ -2124,10 +2240,35 @@ Example configuration:
     ]},
     ...
    ]}.
-</PRE>
+</PRE><LI CLASS="li-itemize">In the second example only <TT>admin1@example.org</TT> and
+ <TT>admin2@example.net</TT> can enable logging, and the embedded CSS file will be
+ used. Further, the names of the log files will only contain the day (number),
+ and there will be subdirectories for each year and month. The log files will
+ be stored in /var/www/muclogs, and the local time will be used. Finally, the
+ top link will be the default <CODE>&lt;a href="/"&gt;Home&lt;/a&gt;</CODE>.
+ <PRE CLASS="verbatim">
+  {acl, admins, {user, "admin1", "example.org"}}.
+  {acl, admins, {user, "admin2", "example.net"}}.
+  ...
+  {access, muc_log, [{allow, admins},
+                     {deny, all}]}.
+  ...
+  {modules,
+   [
+    ...
+    {mod_muc_log, [
+               {access_log, muc_log},
+               {cssfile, false},
+               {dirtype, subdirs},
+               {outdir, "/var/www/muclogs"},
+               {timezone, local}
+    ]},
+    ...
+   ]}.
+</PRE></UL>
 <!--TOC subsection <TT>mod_offline</TT>-->
 
-<H3 CLASS="subsection"><A NAME="htoc53">A.10</A>&nbsp;&nbsp;<TT>mod_offline</TT></H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc57">5.10</A>&nbsp;&nbsp;<A NAME="modoffline"><TT>mod_offline</TT></A></H3><!--SEC END -->
 
 <A NAME="sec:modoffline"></A>
 
@@ -2135,11 +2276,11 @@ This module implements offline message storage. This means that all messages
 sent to an offline user will be stored on the server until that user comes
 online again. Thus it is very similar to how email works. Note that
 <TT>ejabberdctl</TT> has a command to delete expired messages
-(see section&nbsp;<A HREF="#sec:ejabberdctl">3.4.2</A>).<BR>
+(see section&nbsp;<A HREF="#sec:ejabberdctl">7.2</A>).<BR>
 <BR>
 <!--TOC subsection <TT>mod_privacy</TT>-->
 
-<H3 CLASS="subsection"><A NAME="htoc54">A.11</A>&nbsp;&nbsp;<TT>mod_privacy</TT></H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc58">5.11</A>&nbsp;&nbsp;<A NAME="modprivacy"><TT>mod_privacy</TT></A></H3><!--SEC END -->
 
 <A NAME="sec:modprivacy"></A>
 
@@ -2148,19 +2289,19 @@ as defined in section 10 from XMPP IM. If end users have support for it in
 their Jabber client, they will be able to:
 <BLOCKQUOTE CLASS="quote">
 <UL CLASS="itemize"><LI CLASS="li-itemize">
-Retrieving one's privacy lists. 
-<LI CLASS="li-itemize">Adding, removing, and editing one's privacy lists. 
-<LI CLASS="li-itemize">Setting, changing, or declining active lists. 
+Retrieving one's privacy lists.
+<LI CLASS="li-itemize">Adding, removing, and editing one's privacy lists.
+<LI CLASS="li-itemize">Setting, changing, or declining active lists.
 <LI CLASS="li-itemize">Setting, changing, or declining the default list (i.e., the list that
- is active by default). 
+ is active by default).
 <LI CLASS="li-itemize">Allowing or blocking messages based on JID, group, or subscription type
- (or globally). 
+ (or globally).
 <LI CLASS="li-itemize">Allowing or blocking inbound presence notifications based on JID, group,
- or subscription type (or globally). 
+ or subscription type (or globally).
 <LI CLASS="li-itemize">Allowing or blocking outbound presence notifications based on JID, group,
- or subscription type (or globally). 
+ or subscription type (or globally).
 <LI CLASS="li-itemize">Allowing or blocking IQ stanzas based on JID, group, or subscription type
- (or globally). 
+ (or globally).
 <LI CLASS="li-itemize">Allowing or blocking all communications based on JID, group, or
  subscription type (or globally).
 </UL>
@@ -2170,11 +2311,11 @@ Options:
 <DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
 <B><TT>iqdisc</TT></B><DD CLASS="dd-description"> This specifies 
 the processing discipline for Blocking Communication (<TT>jabber:iq:privacy</TT>) IQ queries
-(see section&nbsp;<A HREF="#sec:modiqdiscoption">A.2.1</A>).
+(see section&nbsp;<A HREF="#sec:modiqdiscoption">5.2.1</A>).
 </DL>
 <!--TOC subsection <TT>mod_private</TT>-->
 
-<H3 CLASS="subsection"><A NAME="htoc55">A.12</A>&nbsp;&nbsp;<TT>mod_private</TT></H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc59">5.12</A>&nbsp;&nbsp;<A NAME="modprivate"><TT>mod_private</TT></A></H3><!--SEC END -->
 
 <A NAME="sec:modprivate"></A>
 
@@ -2189,11 +2330,11 @@ Options:
 <DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
 <B><TT>iqdisc</TT></B><DD CLASS="dd-description"> This specifies 
 the processing discipline for Private XML Storage (<TT>jabber:iq:private</TT>) IQ queries
-(see section&nbsp;<A HREF="#sec:modiqdiscoption">A.2.1</A>).
+(see section&nbsp;<A HREF="#sec:modiqdiscoption">5.2.1</A>).
 </DL>
 <!--TOC subsection <TT>mod_pubsub</TT>-->
 
-<H3 CLASS="subsection"><A NAME="htoc56">A.13</A>&nbsp;&nbsp;<TT>mod_pubsub</TT></H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc60">5.13</A>&nbsp;&nbsp;<A NAME="modpubsub"><TT>mod_pubsub</TT></A></H3><!--SEC END -->
 
 <A NAME="sec:modpubsub"></A>
 
@@ -2223,16 +2364,15 @@ Options:
 <DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
 
  <B><TT>hosts</TT></B><DD CLASS="dd-description">  This option defines the hostnames of the
- service (see section&nbsp;<A HREF="#sec:modhostsoption">A.2.2</A>). If neither <TT>hosts</TT> nor
- the old <TT>host</TT> is present, the prefix &#8220;<TT>pubsub.</TT>&#8221; is added to all
+ service (see section&nbsp;<A HREF="#sec:modhostsoption">5.2.2</A>). If neither <TT>hosts</TT> nor
+ the old <TT>host</TT> is present, the prefix `<TT>pubsub.</TT>' is added to all
  <TT>ejabberd</TT> hostnames.
 
 <DT CLASS="dt-description"><B><TT>served_hosts</TT></B><DD CLASS="dd-description"> To specify which hosts needs to
  be served, you can use this option. If absent, only the main <TT>ejabberd</TT>
  host is served. <DT CLASS="dt-description"><B><TT>access_createnode</TT></B><DD CLASS="dd-description"> 
- Restricts which users are allowed to create pubsub nodes using ACL and ACCESS.
- Default: <TT>pubsub_createnode</TT>.
-</DL>
+ This option restricts which users are allowed to create pubsub nodes using
+ ACL and ACCESS. The default value is <TT>pubsub_createnode</TT>. </DL>
 Example:
 <PRE CLASS="verbatim">
   {modules,
@@ -2246,7 +2386,7 @@ Example:
 </PRE>
 <!--TOC subsection <TT>mod_register</TT>-->
 
-<H3 CLASS="subsection"><A NAME="htoc57">A.14</A>&nbsp;&nbsp;<TT>mod_register</TT></H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc61">5.14</A>&nbsp;&nbsp;<A NAME="modregister"><TT>mod_register</TT></A></H3><!--SEC END -->
 
 <A NAME="sec:modregister"></A>
 
@@ -2260,12 +2400,12 @@ Register a new account on the server.
 Options:
 <DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
 <B><TT>access</TT></B><DD CLASS="dd-description"> This option can be configured to specify
- rules to restrict registration. If a rule returns &#8220;deny&#8221; on the requested
+ 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).
 <DT CLASS="dt-description"><B><TT>iqdisc</TT></B><DD CLASS="dd-description"> This specifies 
 the processing discipline for In-Band Registration (<TT>jabber:iq:register</TT>) IQ queries
-(see section&nbsp;<A HREF="#sec:modiqdiscoption">A.2.1</A>).
+(see section&nbsp;<A HREF="#sec:modiqdiscoption">5.2.1</A>).
 </DL>
 Examples:
 <UL CLASS="itemize"><LI CLASS="li-itemize">
@@ -2302,7 +2442,7 @@ Next example prohibits the registration of too short account names:
 </PRE></UL>
 <!--TOC subsection <TT>mod_roster</TT>-->
 
-<H3 CLASS="subsection"><A NAME="htoc58">A.15</A>&nbsp;&nbsp;<TT>mod_roster</TT></H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc62">5.15</A>&nbsp;&nbsp;<A NAME="modroster"><TT>mod_roster</TT></A></H3><!--SEC END -->
 
 <A NAME="sec:modroster"></A>
 
@@ -2312,11 +2452,11 @@ Options:
 <DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
 <B><TT>iqdisc</TT></B><DD CLASS="dd-description"> This specifies 
 the processing discipline for Roster Management (<TT>jabber:iq:roster</TT>) IQ queries
-(see section&nbsp;<A HREF="#sec:modiqdiscoption">A.2.1</A>).
+(see section&nbsp;<A HREF="#sec:modiqdiscoption">5.2.1</A>).
 </DL>
 <!--TOC subsection <TT>mod_service_log</TT>-->
 
-<H3 CLASS="subsection"><A NAME="htoc59">A.16</A>&nbsp;&nbsp;<TT>mod_service_log</TT></H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc63">5.16</A>&nbsp;&nbsp;<A NAME="modservicelog"><TT>mod_service_log</TT></A></H3><!--SEC END -->
 
 <A NAME="sec:modservicelog"></A>
 
@@ -2356,7 +2496,7 @@ To log all end user packets to the Bandersnatch service running on
 </PRE></UL>
 <!--TOC subsection <TT>mod_shared_roster</TT>-->
 
-<H3 CLASS="subsection"><A NAME="htoc60">A.17</A>&nbsp;&nbsp;<TT>mod_shared_roster</TT></H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc64">5.17</A>&nbsp;&nbsp;<A NAME="modsharedroster"><TT>mod_shared_roster</TT></A></H3><!--SEC END -->
 
 <A NAME="sec:modsharedroster"></A>
 
@@ -2370,7 +2510,7 @@ Shared roster groups can be edited <EM>only</EM> via the web interface. Each gro
 has a unique identification and the following parameters:
 <DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
 <B>Name</B><DD CLASS="dd-description"> The name of the group, which will be displayed in the roster.
-<DT CLASS="dt-description"><B>Description</B><DD CLASS="dd-description"> The description of the group. This parameter doesn't affect
+<DT CLASS="dt-description"><B>Description</B><DD CLASS="dd-description"> The description of the group. This parameter does not affect
  anything.
 <DT CLASS="dt-description"><B>Members</B><DD CLASS="dd-description"> A list of full JIDs of group members, entered one per line in
  the web interface.
@@ -2483,474 +2623,685 @@ Take the case of a computer club that wants all its members seeing each
 </UL>
 <!--TOC subsection <TT>mod_stats</TT>-->
 
-<H3 CLASS="subsection"><A NAME="htoc61">A.18</A>&nbsp;&nbsp;<TT>mod_stats</TT></H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc65">5.18</A>&nbsp;&nbsp;<A NAME="modstats"><TT>mod_stats</TT></A></H3><!--SEC END -->
+
+<A NAME="sec:modstats"></A>
+
+This module adds support for Statistics Gathering (<A HREF="http://www.jabber.org/jeps/jep-0039.html">JEP-0039</A>). This protocol
+allows you to retrieve next statistics from your <TT>ejabberd</TT> deployment:
+<UL CLASS="itemize"><LI CLASS="li-itemize">
+Total number of registered users on the current virtual host (users/total).
+<LI CLASS="li-itemize">Total number of registered users on all virtual hosts (users/all-hosts/total).
+<LI CLASS="li-itemize">Total number of online users on the current virtual host (users/online).
+<LI CLASS="li-itemize">Total number of online users on all virtual hosts (users/all-hosts/online).
+</UL>
+Options:
+<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
+<B><TT>iqdisc</TT></B><DD CLASS="dd-description"> This specifies 
+the processing discipline for Statistics Gathering (<TT>http://jabber.org/protocol/stats</TT>) IQ queries
+(see section&nbsp;<A HREF="#sec:modiqdiscoption">5.2.1</A>).
+</DL>
+As there are only a small amount of clients (for example
+<A HREF="http://tkabber.jabber.ru/">Tkabber</A>) 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:
+<UL CLASS="itemize"><LI CLASS="li-itemize">
+You can request the number of online users on the current virtual host
+ (<TT>example.org</TT>) by sending:
+ <PRE CLASS="verbatim">
+&lt;iq to='example.org' type='get'&gt;
+  &lt;query xmlns='http://jabber.org/protocol/stats'&gt;
+    &lt;stat name='users/online'/&gt;
+  &lt;/query&gt;
+&lt;/iq&gt;
+</PRE><LI CLASS="li-itemize">You can request the total number of registered users on all virtual hosts
+ by sending:
+ <PRE CLASS="verbatim">
+&lt;iq to='example.org' type='get'&gt;
+  &lt;query xmlns='http://jabber.org/protocol/stats'&gt;
+    &lt;stat name='users/all-hosts/total'/&gt;
+  &lt;/query&gt;
+&lt;/iq&gt;
+</PRE></UL>
+<!--TOC subsection <TT>mod_time</TT>-->
+
+<H3 CLASS="subsection"><A NAME="htoc66">5.19</A>&nbsp;&nbsp;<A NAME="modtime"><TT>mod_time</TT></A></H3><!--SEC END -->
+
+<A NAME="sec:modtime"></A>
+
+This module features support for Entity Time (<A HREF="http://www.jabber.org/jeps/jep-0090.html">JEP-0090</A>). By using this JEP,
+you are able to discover the time at another entity's location.<BR>
+<BR>
+Options:
+<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
+<B><TT>iqdisc</TT></B><DD CLASS="dd-description"> This specifies 
+the processing discipline for Entity Time (<TT>jabber:iq:time</TT>) IQ queries
+(see section&nbsp;<A HREF="#sec:modiqdiscoption">5.2.1</A>).
+</DL>
+<!--TOC subsection <TT>mod_vcard</TT>-->
+
+<H3 CLASS="subsection"><A NAME="htoc67">5.20</A>&nbsp;&nbsp;<A NAME="modvcard"><TT>mod_vcard</TT></A></H3><!--SEC END -->
+
+<A NAME="sec:modvcard"></A>
+
+This module allows end users to store and retrieve their vCard, and to retrieve
+other users vCards, as defined in vcard-temp (<A HREF="http://www.jabber.org/jeps/jep-0054.html">JEP-0054</A>). The module also
+implements an uncomplicated Jabber User Directory based on the vCards of
+these users. Moreover, it enables the server to send its vCard when queried.<BR>
+<BR>
+Options:
+<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
+
+ <B><TT>hosts</TT></B><DD CLASS="dd-description">  This option defines the hostnames of the
+ service (see section&nbsp;<A HREF="#sec:modhostsoption">5.2.2</A>). If neither <TT>hosts</TT> nor
+ the old <TT>host</TT> is present, the prefix `<TT>vjud.</TT>' is added to all
+ <TT>ejabberd</TT> hostnames.
+
+<DT CLASS="dt-description"><B><TT>iqdisc</TT></B><DD CLASS="dd-description"> This specifies 
+the processing discipline for <TT>vcard-temp</TT> IQ queries
+(see section&nbsp;<A HREF="#sec:modiqdiscoption">5.2.1</A>).
+<DT CLASS="dt-description"><B><TT>search</TT></B><DD CLASS="dd-description">This option specifies whether the search
+ functionality is enabled (value: <TT>true</TT>) or disabled (value:
+ <TT>false</TT>). If disabled, the option <TT>hosts</TT> will be ignored and the
+ Jabber User Directory service will not appear in the Service Discovery item
+ list. The default value is <TT>true</TT>.
+<DT CLASS="dt-description"><B><TT>matches</TT></B><DD CLASS="dd-description">With this option, the number of reported
+ search results can be limited. If the option's value is set to <TT>infinity</TT>,
+ all search results are reported. The default value is <TT>30</TT>.
+<DT CLASS="dt-description"><B><TT>allow_return_all</TT></B><DD CLASS="dd-description">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
+ <TT>false</TT>.
+<DT CLASS="dt-description"><B><TT>search_all_hosts</TT></B><DD CLASS="dd-description">If this option is set
+ to <TT>true</TT>, search operations will apply to all virtual hosts. Otherwise
+ only the current host will be searched. The default value is <TT>true</TT>.
+</DL>
+Examples:
+<UL CLASS="itemize"><LI CLASS="li-itemize">
+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:
+ <PRE CLASS="verbatim">
+  {modules,
+   [
+    ...
+    {mod_vcard, [{search, true},
+                 {matches, 20},
+                 {allow_return_all, true},
+                 {search_all_hosts, false}]},
+    ...
+   ]}.
+</PRE><LI CLASS="li-itemize">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:
+ <PRE CLASS="verbatim">
+  {modules,
+   [
+    ...
+    {mod_vcard, [{search, true},
+                 {matches, infinity},
+                 {allow_return_all, true}]},
+    ...
+   ]}.
+</PRE></UL>
+<!--TOC subsection <TT>mod_vcard_ldap</TT>-->
+
+<H3 CLASS="subsection"><A NAME="htoc68">5.21</A>&nbsp;&nbsp;<A NAME="modvcardldap"><TT>mod_vcard_ldap</TT></A></H3><!--SEC END -->
+
+<A NAME="sec:modvcardldap"></A>
+
+<TT>ejabberd</TT> can map LDAP attributes to vCard fields. This behaviour is
+implemented in the <TT>mod_vcard_ldap</TT> module. This module does not depend on the
+authentication method (see&nbsp;<A HREF="#sec:ldapauth">4.5.2</A>). The <TT>mod_vcard_ldap</TT> module
+has its own optional parameters. The first group of parameters has the same
+meaning as the top-level LDAP parameters to set the authentication method:
+<TT>ldap_servers</TT>, <TT>ldap_port</TT>, <TT>ldap_rootdn</TT>,
+<TT>ldap_password</TT>, <TT>ldap_base</TT>, <TT>ldap_uidattr</TT>,
+<TT>ldap_uidattr_format</TT> and <TT>ldap_filter</TT>. See
+section&nbsp;<A HREF="#sec:ldapauth">4.5.2</A> for detailed information about these options. If one
+of these options is not set, <TT>ejabberd</TT> will look for the top-level option with
+the same name. The second group of parameters consists of the following
+<TT>mod_vcard_ldap</TT>-specific options:
+<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
+
+ <B><TT>hosts</TT></B><DD CLASS="dd-description">  This option defines the hostnames of the
+ service (see section&nbsp;<A HREF="#sec:modhostsoption">5.2.2</A>). If neither <TT>hosts</TT> nor
+ the old <TT>host</TT> is present, the prefix `<TT>vjud.</TT>' is added to all
+ <TT>ejabberd</TT> hostnames.
+
+<DT CLASS="dt-description"><B><TT>iqdisc</TT></B><DD CLASS="dd-description"> This specifies 
+the processing discipline for <TT>vcard-temp</TT> IQ queries
+(see section&nbsp;<A HREF="#sec:modiqdiscoption">5.2.1</A>).
+<DT CLASS="dt-description"><B><TT>search</TT></B><DD CLASS="dd-description">This option specifies whether the search
+ functionality is enabled (value: <TT>true</TT>) or disabled (value:
+ <TT>false</TT>). If disabled, the option <TT>hosts</TT> will be ignored and the
+ Jabber User Directory service will not appear in the Service Discovery item
+ list. The default value is <TT>true</TT>.
+<DT CLASS="dt-description"><B><TT>ldap_vcard_map</TT></B><DD CLASS="dd-description">With this option you can
+ set the table that maps LDAP attributes to vCard fields. The format is:
+ <TT>[Name_of_vCard_field, Pattern, List_of_LDAP_attributes, ...]</TT>.
+ <TT>Name_of_vcard_field</TT> is the type name of the vCard as defined in
+ <A HREF="http://www.ietf.org/rfc/rfc2426.txt">RFC 2426</A>. <TT>Pattern</TT> is a
+ string which contains pattern variables <TT>"%u"</TT>, <TT>"%d"</TT> or
+ <TT>"%s"</TT>. <TT>List_of_LDAP_attributes</TT> is the list containing LDAP
+ attributes. The pattern variables <TT>"%s"</TT> will be sequentially replaced
+ with the values of LDAP attributes from <TT>List_of_LDAP_attributes</TT>,
+ <TT>"%u"</TT> will be replaced with the user part of a JID, and <TT>"%d"</TT>
+ will be replaced with the domain part of a JID. The default is:
+ <PRE CLASS="verbatim">
+  [{"NICKNAME", "%u", []},
+   {"FN", "%s", ["displayName"]},
+   {"FAMILY", "%s", ["sn"]},
+   {"GIVEN", "%s", ["givenName"]},
+   {"MIDDLE", "%s", ["initials"]},
+   {"ORGNAME", "%s", ["o"]},
+   {"ORGUNIT", "%s", ["ou"]},
+   {"CTRY", "%s", ["c"]},
+   {"LOCALITY", "%s", ["l"]},
+   {"STREET", "%s", ["street"]},
+   {"REGION", "%s", ["st"]},
+   {"PCODE", "%s", ["postalCode"]},
+   {"TITLE", "%s", ["title"]},
+   {"URL", "%s", ["labeleduri"]},
+   {"DESC", "%s", ["description"]},
+   {"TEL", "%s", ["telephoneNumber"]},
+   {"EMAIL", "%s", ["mail"]},
+   {"BDAY", "%s", ["birthDay"]},
+   {"ROLE", "%s", ["employeeType"]},
+   {"PHOTO", "%s", ["jpegPhoto"]}]
+</PRE><DT CLASS="dt-description"><B><TT>ldap_search_fields</TT></B><DD CLASS="dd-description">This option
+ defines the search form and the LDAP attributes to search within. The format
+ is: <TT>[Name, Attribute, ...]</TT>. <TT>Name</TT> is the name of a search form
+ field which will be automatically translated by using the translation
+ files (see <TT>msgs/*.msg</TT> for available words). <TT>Attribute</TT> is the
+ LDAP attribute or the pattern <TT>"%u"</TT>. The default is:
+ <PRE CLASS="verbatim">
+  [{"User", "%u"},
+   {"Full Name", "displayName"},
+   {"Given Name", "givenName"},
+   {"Middle Name", "initials"},
+   {"Family Name", "sn"},
+   {"Nickname", "%u"},
+   {"Birthday", "birthDay"},
+   {"Country", "c"},
+   {"City", "l"},
+   {"Email", "mail"},
+   {"Organization Name", "o"},
+   {"Organization Unit", "ou"}]
+</PRE><DT CLASS="dt-description"><B><TT>ldap_search_reported</TT></B><DD CLASS="dd-description">This option
+ defines which search fields should be reported. The format is:
+ <TT>[Name, vCard_Name, ...]</TT>. <TT>Name</TT> is the name of a search form
+ field which will be automatically translated by using the translation
+ files (see <TT>msgs/*.msg</TT> for available words). <TT>vCard_Name</TT> is the
+ vCard field name defined in the <TT>ldap_vcard_map</TT> option. The default
+ is:
+<PRE CLASS="verbatim">
+  [{"Full Name", "FN"},
+   {"Given Name", "GIVEN"},
+   {"Middle Name", "MIDDLE"},
+   {"Family Name", "FAMILY"},
+   {"Nickname", "NICKNAME"},
+   {"Birthday", "BDAY"},
+   {"Country", "CTRY"},
+   {"City", "LOCALITY"},
+   {"Email", "EMAIL"},
+   {"Organization Name", "ORGNAME"},
+   {"Organization Unit", "ORGUNIT"}]
+</PRE></DL>
+Examples:
+<UL CLASS="itemize"><LI CLASS="li-itemize">
+<BR>
+<BR>
+Let's say <TT>ldap.example.org</TT> is the name of our LDAP server. We have
+users with their passwords in <TT>"ou=Users,dc=example,dc=org"</TT> directory.
+Also we have addressbook, which contains users emails and their additional
+infos in <TT>"ou=AddressBook,dc=example,dc=org"</TT> directory. Corresponding
+authentication section should looks like this:
+<PRE CLASS="verbatim">
+  %% authentication method
+  {auth_method, ldap}.
+  %% DNS name of our LDAP server
+  {ldap_servers, ["ldap.example.org"]}.
+  %% We want to authorize users from 'shadowAccount' object class only
+  {ldap_filter, "(objectClass=shadowAccount)"}.
+</PRE>
+Now we want to use users LDAP-info as their vCards. We have four attributes
+defined in our LDAP schema: <TT>"mail"</TT> &mdash; email address, <TT>"givenName"</TT>
+&mdash; first name, <TT>"sn"</TT> &mdash; second name, <TT>"birthDay"</TT> &mdash; birthday.
+Also we want users to search each other. Let's see how we can set it up:
+<PRE CLASS="verbatim">
+  {modules,
+    ...
+    {mod_vcard_ldap,
+     [
+      %% We use the same server and port, but want to bind anonymously because
+      %% our LDAP server accepts anonymous requests to
+      %% "ou=AddressBook,dc=example,dc=org" subtree.
+      {ldap_rootdn, ""},
+      {ldap_password, ""},
+      %% define the addressbook's base
+      {ldap_base, "ou=AddressBook,dc=example,dc=org"},
+      %% user's part of JID is located in the "mail" attribute
+      {ldap_uidattr, "mail"},
+      %% common format for our emails
+      {ldap_uidattr_format, "%u@mail.example.org"},
+      %% We have to define empty filter here, because entries in addressbook does not
+      %% belong to shadowAccount object class
+      {ldap_filter, ""},
+      %% Now we want to define vCard pattern
+      {ldap_vcard_map,
+       [{"NICKNAME", "%u", []}, % just use user's part of JID as his nickname
+        {"GIVEN", "%s", ["givenName"]},
+        {"FAMILY", "%s", ["sn"]},
+        {"FN", "%s, %s", ["sn", "givenName"]}, % example: "Smith, John"
+        {"EMAIL", "%s", ["mail"]},
+        {"BDAY", "%s", ["birthDay"]}]},
+      %% Search form
+      {ldap_search_fields,
+       [{"User", "%u"},
+        {"Name", "givenName"},
+        {"Family Name", "sn"},
+        {"Email", "mail"},
+        {"Birthday", "birthDay"}]},
+      %% vCard fields to be reported
+      %% Note that JID is always returned with search results
+      {ldap_search_reported,
+       [{"Full Name", "FN"},
+        {"Nickname", "NICKNAME"},
+        {"Birthday", "BDAY"}]}
+    ]}
+    ...
+  }.
+</PRE>
+Note that <TT>mod_vcard_ldap</TT> module checks an existence of the user before
+searching his info in LDAP.<BR>
+<BR>
+<LI CLASS="li-itemize"><TT>ldap_vcard_map</TT> example:
+<PRE CLASS="verbatim">
+  {ldap_vcard_map,
+   [{"NICKNAME", "%u", []},
+    {"FN", "%s", ["displayName"]},
+    {"CTRY", "Russia", []},
+    {"EMAIL", "%u@%d", []},
+    {"DESC", "%s\n%s", ["title", "description"]}
+   ]},
+</PRE><LI CLASS="li-itemize"><TT>ldap_search_fields</TT> example:
+<PRE CLASS="verbatim">
+  {ldap_search_fields,
+   [{"User", "uid"},
+    {"Full Name", "displayName"},
+    {"Email", "mail"}
+   ]},
+</PRE><LI CLASS="li-itemize"><TT>ldap_search_reported</TT> example:
+<PRE CLASS="verbatim">
+  {ldap_search_reported,
+   [{"Full Name", "FN"},
+    {"Email", "EMAIL"},
+    {"Birthday", "BDAY"},
+    {"Nickname", "NICKNAME"}
+   ]},
+</PRE></UL>
+<!--TOC subsection <TT>mod_version</TT>-->
+
+<H3 CLASS="subsection"><A NAME="htoc69">5.22</A>&nbsp;&nbsp;<A NAME="modversion"><TT>mod_version</TT></A></H3><!--SEC END -->
+
+<A NAME="sec:modversion"></A>
+
+This module implements Software Version (<A HREF="http://www.jabber.org/jeps/jep-0092.html">JEP-0092</A>). Consequently, it
+answers <TT>ejabberd</TT>'s version when queried.<BR>
+<BR>
+Options:
+<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
+<B><TT>iqdisc</TT></B><DD CLASS="dd-description"> This specifies 
+the processing discipline for Software Version (<TT>jabber:iq:version</TT>) IQ queries
+(see section&nbsp;<A HREF="#sec:modiqdiscoption">5.2.1</A>).
+</DL>
+<!--TOC section Creating an Initial Administrator-->
+
+<H2 CLASS="section"><A NAME="htoc70">6</A>&nbsp;&nbsp;<A NAME="initialadmin">Creating an Initial Administrator</A></H2><!--SEC END -->
+
+<A NAME="sec:initialadmin"></A>
+Before the web interface can be entered to perform administration tasks, an
+account with administrator rights is needed on your <TT>ejabberd</TT> deployment.<BR>
+<BR>
+Instructions to create an initial administrator account:
+<OL CLASS="enumerate" type=1><LI CLASS="li-enumerate">
+Register an account on your <TT>ejabberd</TT> deployment. An account can be
+ created in two ways:
+ <OL CLASS="enumerate" type=a><LI CLASS="li-enumerate">
+ Using the tool <TT>ejabberdctl</TT> (see
+ section&nbsp;<A HREF="#sec:ejabberdctl">7.2</A>):
+ <PRE CLASS="verbatim">
+% ejabberdctl node@host register admin example.org password
+</PRE><LI CLASS="li-enumerate">Using In-Band Registration (see section&nbsp;<A HREF="#sec:modregister">5.14</A>): you can
+ use a Jabber client to register an account.
+ </OL>
+<LI CLASS="li-enumerate">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.
+ <PRE CLASS="verbatim">
+  {acl, admins, {user, "admin", "example.org"}}.
+  {access, configure, [{allow, admins}]}.
+</PRE><LI CLASS="li-enumerate">Restart <TT>ejabberd</TT> to load the new configuration.
+<LI CLASS="li-enumerate">Open the web interface (<CODE>http://server:port/admin/</CODE>) in your
+ favourite browser. Make sure to enter the <EM>full</EM> JID as username (in this
+ example: <TT>admin@example.org</TT>. The reason that you also need to enter the
+ suffix, is because <TT>ejabberd</TT>'s virtual hosting support.
+</OL>
+<!--TOC section Online Configuration and Monitoring-->
+
+<H2 CLASS="section"><A NAME="htoc71">7</A>&nbsp;&nbsp;<A NAME="onlineconfig">Online Configuration and Monitoring</A></H2><!--SEC END -->
+
+<A NAME="sec:onlineconfig"></A>
+<!--TOC subsection Web Interface-->
+
+<H3 CLASS="subsection"><A NAME="htoc72">7.1</A>&nbsp;&nbsp;<A NAME="webinterface">Web Interface</A></H3><!--SEC END -->
+
+<A NAME="sec:webinterface"></A>
+
+To perform online configuration of <TT>ejabberd</TT> you need to enable the
+<TT>ejabberd_http</TT> listener with the option <TT>web_admin</TT> (see
+section&nbsp;<A HREF="#sec:listened">3.3</A>). Then you can open 
+<CODE>http://server:port/admin/</CODE> in your favourite web browser. You
+will be asked to enter the username (the <EM>full</EM> Jabber ID) and password
+of an <TT>ejabberd</TT> user with administrator rights. After authentication
+you will see a page similar to figure&nbsp;<A HREF="#fig:webadmmain">1</A>.
+<BLOCKQUOTE CLASS="figure"><DIV CLASS="center"><DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV>
+ 
+ <IMG SRC="webadmmain.png" ALT="webadmmain.png">
+ 
 
-<A NAME="sec:modstats"></A>
+ <BR>
+<BR>
+<DIV CLASS="center">Figure 1: Top page from the web interface</DIV><BR>
+<BR>
 
-This module adds support for Statistics Gathering (<A HREF="http://www.jabber.org/jeps/jep-0039.html">JEP-0039</A>). This protocol
-allows you to retrieve next statistics from your <TT>ejabberd</TT> deployment:
-<UL CLASS="itemize"><LI CLASS="li-itemize">
-Total number of registered users on the current virtual host (users/total).
-<LI CLASS="li-itemize">Total number of registered users on all virtual hosts (users/all-hosts/total).
-<LI CLASS="li-itemize">Total number of online users on the current virtual host (users/online).
-<LI CLASS="li-itemize">Total number of online users on all virtual hosts (users/all-hosts/online).
-</UL>
-Options:
-<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
-<B><TT>iqdisc</TT></B><DD CLASS="dd-description"> This specifies 
-the processing discipline for Statistics Gathering (<TT>http://jabber.org/protocol/stats</TT>) IQ queries
-(see section&nbsp;<A HREF="#sec:modiqdiscoption">A.2.1</A>).
-</DL>
-As there are only a small amount of clients (for example
-<A HREF="http://tkabber.jabber.ru/">Tkabber</A>) 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:
+ <A NAME="fig:webadmmain"></A>
+<DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV></DIV></BLOCKQUOTE>
+Here you can edit access restrictions, manage users, create backups,
+manage the database, enable/disable ports listened for, view server
+statistics,...<BR>
+<BR>
+Examples:
 <UL CLASS="itemize"><LI CLASS="li-itemize">
-You can request the number of online users on the current virtual host
- (<TT>example.org</TT>) by sending:
+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 <CODE>http://example.org:5280/admin/</CODE> to
+ administer all virtual hosts or to
+ <CODE>http://example.org:5280/admin/server/example.com/</CODE> to administer only
+ the virtual host <TT>example.com</TT>. 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 <TT>ejabberd</TT>. In this example you can enter as
+ username `<TT>admin@example.net</TT>' to administer all virtual hosts (first
+ URL). If you log in with `<TT>admin@example.com</TT>' on<BR>
+<CODE>http://example.org:5280/admin/server/example.com/</CODE> you can only
+ administer the virtual host <TT>example.com</TT>.
  <PRE CLASS="verbatim">
-&lt;iq to='example.org' type='get'&gt;
-  &lt;query xmlns='http://jabber.org/protocol/stats'&gt;
-    &lt;stat name='users/online'/&gt;
-  &lt;/query&gt;
-&lt;/iq&gt;
-</PRE><LI CLASS="li-itemize">You can request the total number of registered users on all virtual hosts
- by sending:
+  ...
+  {acl, admins, {user, "admin", "example.net"}}.
+  {host_config, "example.com", [{acl, admins, {user, "admin", "example.com"}}]}.
+  {access, configure, [{allow, admins}]}.
+  ...
+  {hosts, ["example.org"]}.
+  ...
+  {listen,
+   [...
+    {5280, ejabberd_http, [http_poll, web_admin]},
+    ...
+   ]
+  }.
+</PRE><LI CLASS="li-itemize">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 <CODE>https://192.168.1.1:5280/admin/</CODE>:
  <PRE CLASS="verbatim">
-&lt;iq to='example.org' type='get'&gt;
-  &lt;query xmlns='http://jabber.org/protocol/stats'&gt;
-    &lt;stat name='users/all-hosts/total'/&gt;
-  &lt;/query&gt;
-&lt;/iq&gt;
+  ...
+  {hosts, ["example.org"]}.
+  ...
+  {listen,
+   [...
+    {5270, ejabberd_http,    [http_poll]},
+    {5280, ejabberd_http,    [web_admin, {ip, {192, 168, 1, 1}},
+                              tls, {certfile, "/usr/local/etc/server.pem"}]},
+    ...
+   ]
+  }.
 </PRE></UL>
-<!--TOC subsection <TT>mod_time</TT>-->
+<!--TOC subsection <TT>ejabberdctl</TT>-->
 
-<H3 CLASS="subsection"><A NAME="htoc62">A.19</A>&nbsp;&nbsp;<TT>mod_time</TT></H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc73">7.2</A>&nbsp;&nbsp;<A NAME="ejabberdctl"><TT>ejabberdctl</TT></A></H3><!--SEC END -->
 
-<A NAME="sec:modtime"></A>
+<A NAME="sec:ejabberdctl"></A>
 
-This module features support for Entity Time (<A HREF="http://www.jabber.org/jeps/jep-0090.html">JEP-0090</A>). By using this JEP,
-you are able to discover the time at another entity's location.<BR>
-<BR>
-Options:
+It is possible to do some administration operations using the command
+line tool <TT>ejabberdctl</TT>. You can list all available options by
+running <TT>ejabberdctl</TT> without arguments:
+<PRE CLASS="verbatim">
+% ejabberdctl
+Usage: ejabberdctl node command
+
+Available commands:
+  status                        get ejabberd status
+  stop                          stop ejabberd
+  restart                       restart ejabberd
+  reopen-log                    reopen log file
+  register user server password register a user
+  unregister user server        unregister a user
+  backup file                   store a database backup to file
+  restore file                  restore a database backup from file
+  install-fallback file         install a database fallback from file
+  dump file                     dump a database to a text file
+  load file                     restore a database from a text file
+  import-file file              import user data from jabberd 1.4 spool file
+  import-dir dir                import user data from jabberd 1.4 spool directory
+  registered-users              list all registered users
+  delete-expired-messages       delete expired offline messages from database
+
+Example:
+  ejabberdctl ejabberd@host restart
+</PRE>
+Additional information:
 <DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
-<B><TT>iqdisc</TT></B><DD CLASS="dd-description"> This specifies 
-the processing discipline for Entity Time (<TT>jabber:iq:time</TT>) IQ queries
-(see section&nbsp;<A HREF="#sec:modiqdiscoption">A.2.1</A>).
+<B><TT>reopen-log </TT></B><DD CLASS="dd-description"> If you use a tool to rotate logs, you have to configure it
+ so that this command is executed after each rotation.
+<DT CLASS="dt-description"><B><TT>backup, restore, install-fallback, dump, load</TT></B><DD CLASS="dd-description"> You can use these
+ commands to create and restore backups. 
+<DT CLASS="dt-description"><B><TT>import-file, import-dir</TT></B><DD CLASS="dd-description"> 
+ These options can be used to migrate from other Jabber/XMPP servers. There
+ exist tutorials to <A HREF="http://ejabberd.jabber.ru/migrate-to-ejabberd">migrate from other software to ejabberd</A>.
+<DT CLASS="dt-description"><B><TT>delete-expired-messages</TT></B><DD CLASS="dd-description"> 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.
 </DL>
-<!--TOC subsection <TT>mod_vcard</TT>-->
+<!--TOC section Firewall Settings-->
 
-<H3 CLASS="subsection"><A NAME="htoc63">A.20</A>&nbsp;&nbsp;<TT>mod_vcard</TT></H3><!--SEC END -->
+<H2 CLASS="section"><A NAME="htoc74">8</A>&nbsp;&nbsp;<A NAME="firewall">Firewall Settings</A></H2><!--SEC END -->
 
-<A NAME="sec:modvcard"></A>
+<A NAME="sec:firewall"></A>
 
-This module allows end users to store and retrieve their vCard, and to retrieve
-other users vCards, as defined in vcard-temp (<A HREF="http://www.jabber.org/jeps/jep-0054.html">JEP-0054</A>). The module also
-implements an uncomplicated Jabber User Directory based on the vCards of
-these users. Moreover, it enables the server to send its vCard when queried.<BR>
-<BR>
-Options:
-<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
+You need to take the following TCP ports in mind when configuring your firewall:
+<BLOCKQUOTE CLASS="table"><DIV CLASS="center"><DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV>
+ <TABLE BORDER=1 CELLSPACING=0 CELLPADDING=1>
+<TR><TD ALIGN=left NOWRAP>Port</TD>
+<TD ALIGN=left NOWRAP>Description</TD>
+</TR>
+<TR><TD ALIGN=left NOWRAP>5222</TD>
+<TD ALIGN=left NOWRAP>SASL and unencrypted c2s connections.</TD>
+</TR>
+<TR><TD ALIGN=left NOWRAP>5223</TD>
+<TD ALIGN=left NOWRAP>Obsolete SSL c2s connections.</TD>
+</TR>
+<TR><TD ALIGN=left NOWRAP>5269</TD>
+<TD ALIGN=left NOWRAP>s2s connections.</TD>
+</TR>
+<TR><TD ALIGN=left NOWRAP>4369</TD>
+<TD ALIGN=left NOWRAP>Only for clustering (see&nbsp;<A HREF="#sec:clustering">10</A>).</TD>
+</TR>
+<TR><TD ALIGN=left NOWRAP>port range</TD>
+<TD ALIGN=left NOWRAP>Only for clustring (see&nbsp;<A HREF="#sec:clustering">10</A>). This range
+ is configurable (see&nbsp;<A HREF="#sec:start">2.4</A>).</TD>
+</TR></TABLE>
+<DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV></DIV></BLOCKQUOTE>
+<!--TOC section SRV Records-->
 
- <B><TT>hosts</TT></B><DD CLASS="dd-description">  This option defines the hostnames of the
- service (see section&nbsp;<A HREF="#sec:modhostsoption">A.2.2</A>). If neither <TT>hosts</TT> nor
- the old <TT>host</TT> is present, the prefix &#8220;<TT>vjud.</TT>&#8221; is added to all
- <TT>ejabberd</TT> hostnames.
+<H2 CLASS="section"><A NAME="htoc75">9</A>&nbsp;&nbsp;<A NAME="srv">SRV Records</A></H2><!--SEC END -->
+
+<A NAME="sec:srv"></A>
 
-<DT CLASS="dt-description"><B><TT>iqdisc</TT></B><DD CLASS="dd-description"> This specifies 
-the processing discipline for <TT>vcard-temp</TT> IQ queries
-(see section&nbsp;<A HREF="#sec:modiqdiscoption">A.2.1</A>).
-<DT CLASS="dt-description"><B><TT>search</TT></B><DD CLASS="dd-description"> This option specifies whether the search
- functionality is enabled (value: <TT>true</TT>) or disabled
- (value: <TT>false</TT>). If disabled, the option <TT>hosts</TT> will be
- ignored and the Jabber User Directory service will not appear in the
- Service Discovery item list. The default value is <TT>true</TT>.
-<DT CLASS="dt-description"><B><TT>matches</TT></B><DD CLASS="dd-description"> With this option, the number of reported
- search results can be limited. If the option's value is set to <TT>infinity</TT>,
- all search results are reported. The default value is <TT>30</TT>.
-<DT CLASS="dt-description"><B><TT>allow_return_all</TT></B><DD CLASS="dd-description"> 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
- <TT>false</TT>.
-<DT CLASS="dt-description"><B><TT>search_all_hosts</TT></B><DD CLASS="dd-description"> If this option is
- set to <TT>true</TT>, search operations will apply to all virtual hosts.
- Otherwise only the current host will be searched. The default value is
- <TT>true</TT>.
-</DL>
-Examples:
 <UL CLASS="itemize"><LI CLASS="li-itemize">
-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:
- <PRE CLASS="verbatim">
-  {modules,
-   [
-    ...
-    {mod_vcard, [{search, true},
-                 {matches, 20},
-                 {allow_return_all, true},
-                 {search_all_hosts, false}]},
-    ...
-   ]}.
-</PRE><LI CLASS="li-itemize">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:
- <PRE CLASS="verbatim">
-  {modules,
-   [
-    ...
-    {mod_vcard, [{search, true},
-                 {matches, infinity},
-                 {allow_return_all, true}]},
-    ...
-   ]}.
-</PRE></UL>
-<!--TOC subsection LDAP and <TT>mod_vcard_ldap</TT>-->
+General information:
+ <A HREF="http://en.wikipedia.org/wiki/SRV_record">SRV record</A>
+<LI CLASS="li-itemize">Practical information:
+ <A HREF="http://jabberd.jabberstudio.org/2/docs/section05.html#5_7">Setting DNS SRV Records</A>
+</UL>
+<!--TOC section Clustering-->
 
-<H3 CLASS="subsection"><A NAME="htoc64">A.21</A>&nbsp;&nbsp;LDAP and <TT>mod_vcard_ldap</TT></H3><!--SEC END -->
+<H2 CLASS="section"><A NAME="htoc76">10</A>&nbsp;&nbsp;<A NAME="clustering">Clustering</A></H2><!--SEC END -->
 
-<A NAME="sec:ldap"></A>
+<A NAME="sec:clustering"></A>
 
-<!--TOC subsubsection Features-->
+<!--TOC subsection How it Works-->
 
-<H4 CLASS="subsubsection"><A NAME="htoc65">A.21.1</A>&nbsp;&nbsp;Features</H4><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc77">10.1</A>&nbsp;&nbsp;<A NAME="howitworks">How it Works</A></H3><!--SEC END -->
 
-<A NAME="sec:ldapfeatures"></A>
-<TT>ejabberd</TT> has built-in LDAP support. You can authenticate users against LDAP
-server and use LDAP directory as vCard storage. Shared rosters are not
-supported yet.<BR>
+<A NAME="sec:howitworks"></A>
+
+A Jabber domain is served by one or more <TT>ejabberd</TT> nodes. These nodes can
+be run on different machines that are connected via a network. They all
+must have the ability to connect to port 4369 of all another nodes, and must
+have the same magic cookie (see Erlang/OTP documentation, in other words the
+file <TT>~ejabberd/.erlang.cookie</TT> must be the same on all nodes). This is
+needed because all nodes exchange information about connected users, s2s
+connections, registered services, etc...<BR>
 <BR>
-<!--TOC subsubsection Connection-->
+Each <TT>ejabberd</TT> node has the following modules:
+<UL CLASS="itemize"><LI CLASS="li-itemize">
+router,
+<LI CLASS="li-itemize">local router,
+<LI CLASS="li-itemize">session manager,
+<LI CLASS="li-itemize">s2s manager.
+</UL>
+<!--TOC subsubsection Router-->
 
-<H4 CLASS="subsubsection"><A NAME="htoc66">A.21.2</A>&nbsp;&nbsp;Connection</H4><!--SEC END -->
+<H4 CLASS="subsubsection"><A NAME="htoc78">10.1.1</A>&nbsp;&nbsp;<A NAME="router">Router</A></H4><!--SEC END -->
 
-<A NAME="sec:ldapconnection"></A>
-Parameters:
-<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
-<B><TT>ldap_server</TT></B><DD CLASS="dd-description"> IP address or dns name of your
-LDAP server. This option is required.
-<DT CLASS="dt-description"><B><TT>ldap_port</TT></B><DD CLASS="dd-description"> Port to connect to LDAP server.
-Default is&nbsp;389.
-<DT CLASS="dt-description"><B><TT>ldap_rootdn</TT></B><DD CLASS="dd-description"> Bind DN. Default is&nbsp;<TT>""</TT>
-which means anonymous connection.
-<DT CLASS="dt-description"><B><TT>ldap_password</TT></B><DD CLASS="dd-description"> Bind password. Default
-is&nbsp;<TT>""</TT>.
-</DL>
-Example:
-<PRE CLASS="verbatim">
-  {auth_method, ldap}.
-  {ldap_servers, ["ldap.mydomain.org"]}.
-  {ldap_port, 389}.
-  {ldap_rootdn, "cn=Manager,dc=domain,dc=org"}.
-  {ldap_password, "secret"}.
-</PRE>
-Note that current LDAP implementation doesn't support SSL connection and SASL
-authentication.<BR>
+<A NAME="sec:router"></A>
+
+This module is the main router of Jabber packets on each node. It
+routes them based on their destination's domains. It uses a global
+routing table. The domain of the packet's destination is searched in the
+routing table, and if it is found, the packet is routed to the
+appropriate process. If not, it is sent to the s2s manager.<BR>
 <BR>
-<!--TOC subsubsection Authentication-->
+<!--TOC subsubsection Local Router-->
 
-<H4 CLASS="subsubsection"><A NAME="htoc67">A.21.3</A>&nbsp;&nbsp;Authentication</H4><!--SEC END -->
+<H4 CLASS="subsubsection"><A NAME="htoc79">10.1.2</A>&nbsp;&nbsp;<A NAME="localrouter">Local Router</A></H4><!--SEC END -->
 
-<A NAME="sec:ldapauthentication"></A>
-You can authenticate users against LDAP directory. Available parameters are
-listed below:
-<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
-<B><TT>ldap_base</TT></B><DD CLASS="dd-description"> LDAP base directory which stores users
-accounts. This option is required.
-<DT CLASS="dt-description"><B><TT>ldap_uidattr</TT></B><DD CLASS="dd-description"> LDAP attribute which holds
-user's part of JID. Default is <TT>"uid"</TT>.
-<DT CLASS="dt-description"><B><TT>ldap_uidattr_format</TT></B><DD CLASS="dd-description"> Format of the
-<TT>ldap_uidattr</TT> variable. Format MUST contain one and only one pattern
-variable <TT>"%u"</TT> which will be replaced by user's part of JID. For example,
-<TT>"%u@mydomain.org"</TT>. Default value is <TT>"%u"</TT>.
-<DT CLASS="dt-description"><B><TT>ldap_filter</TT></B><DD CLASS="dd-description"> RFC 2254 LDAP filter. Default is
-<TT>none</TT>. Example: <TT>"(&amp;(objectClass=shadowAccount)(memberOf=Jabber
- Users))"</TT>. Please, don't forget closing brackets and don't use superfluous
-whitespaces. Also you MUST NOT use <TT>ldap_uidattr</TT> attribute in filter
-because this attribute will be substituted in LDAP filter automatically.
-</DL>
-<!--TOC subsubsection vCards and Search-->
+<A NAME="sec:localrouter"></A>
 
-<H4 CLASS="subsubsection"><A NAME="htoc68">A.21.4</A>&nbsp;&nbsp;vCards and Search</H4><!--SEC END -->
+This module routes packets which have a destination domain equal to
+one of this server's host names. If the destination JID has a non-empty user
+part, it is routed to the session manager, otherwise it is processed depending
+on its content.<BR>
+<BR>
+<!--TOC subsubsection Session Manager-->
 
-<A NAME="sec:modvcardldap"></A>
-<TT>ejabberd</TT> can map LDAP attributes to vCard fields. This behaviour is
-implemented in <TT>mod_vcard_ldap</TT> module. This module doesn't depend on
-authentication method. <TT>mod_vcard_ldap</TT> module has it's own optional
-parameters. The first group of parameters has the same meaning as top-level
-LDAP parameters: <TT>ldap_servers</TT>, <TT>ldap_port</TT>,
-<TT>ldap_rootdn</TT>, <TT>ldap_password</TT>, <TT>ldap_base</TT>,
-<TT>ldap_uidattr</TT>, <TT>ldap_uidattr_format</TT> and
-<TT>ldap_filter</TT>. If one of this option is not set <TT>ejabberd</TT> will look
-for top-level option with the same name. The second group of parameters
-consists of the following options:
-<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
+<H4 CLASS="subsubsection"><A NAME="htoc80">10.1.3</A>&nbsp;&nbsp;<A NAME="sessionmanager">Session Manager</A></H4><!--SEC END -->
 
- <B><TT>hosts</TT></B><DD CLASS="dd-description">  This option defines the hostnames of the
- service (see section&nbsp;<A HREF="#sec:modhostsoption">A.2.2</A>). If neither <TT>hosts</TT> nor
- the old <TT>host</TT> is present, the prefix &#8220;<TT>vjud.</TT>&#8221; is added to all
- <TT>ejabberd</TT> hostnames.
+<A NAME="sec:sessionmanager"></A>
 
-<DT CLASS="dt-description"><B><TT>iqdisc</TT></B><DD CLASS="dd-description"> This specifies 
-the processing discipline for <TT>vcard-temp</TT> IQ queries
-(see section&nbsp;<A HREF="#sec:modiqdiscoption">A.2.1</A>).
-<DT CLASS="dt-description"><B><TT>search</TT></B><DD CLASS="dd-description"> This option specifies whether the search
- functionality is enabled (value: <TT>true</TT>) or disabled
- (value: <TT>false</TT>). If disabled, the option <TT>hosts</TT> will be
- ignored and the Jabber User Directory service will not appear in the
- Service Discovery item list. The default value is <TT>true</TT>.
-<DT CLASS="dt-description"><B><TT>ldap_vcard_map</TT></B><DD CLASS="dd-description"> the table which defines
-reflection of LDAP attributes to vCard fields.
-	Format is:
-		<TT>[Name_of_vcard_field, Pattern, List_of_LDAP_attributes, ...]</TT>
-	where
-		<TT>Name_of_vcard_field</TT> is the type name of vCard as defined
- in RFC 2426,
-		Pattern is a string which contains pattern variables <TT>"%u"</TT>, <TT>"%d"</TT> or <TT>"%s"</TT>,
-		<TT>List_of_LDAP_attributes</TT> is the list which contains of LDAP attributes.
-	Pattern variables <TT>"%s"</TT> will be sequentially replaced with the values of
-	LDAP attributes from <TT>List_of_LDAP_attributes</TT>; <TT>"%u"</TT> will be replaced with
-	user's part of JID and <TT>"%d"</TT> will be replaced with domain part of JID.
-	Example:
-<PRE CLASS="verbatim">
-  {ldap_vcard_map,
-   [{"NICKNAME", "%u", []},
-    {"FN", "%s", ["displayName"]},
-    {"CTRY", "Russia", []},
-    {"EMAIL", "%u@%d", []},
-    {"DESC", "%s\n%s", ["title", "description"]}
-   ]},
-</PRE>
-Default is:
-<PRE CLASS="verbatim">
-  [{"NICKNAME", "%u", []},
-   {"FN", "%s", ["displayName"]},
-   {"FAMILY", "%s", ["sn"]},
-   {"GIVEN", "%s", ["givenName"]},
-   {"MIDDLE", "%s", ["initials"]},
-   {"ORGNAME", "%s", ["o"]},
-   {"ORGUNIT", "%s", ["ou"]},
-   {"CTRY", "%s", ["c"]},
-   {"LOCALITY", "%s", ["l"]},
-   {"STREET", "%s", ["street"]},
-   {"REGION", "%s", ["st"]},
-   {"PCODE", "%s", ["postalCode"]},
-   {"TITLE", "%s", ["title"]},
-   {"URL", "%s", ["labeleduri"]},
-   {"DESC", "%s", ["description"]},
-   {"TEL", "%s", ["telephoneNumber"]},
-   {"EMAIL", "%s", ["mail"]},
-   {"BDAY", "%s", ["birthDay"]},
-   {"ROLE", "%s", ["employeeType"]},
-   {"PHOTO", "%s", ["jpegPhoto"]}]
-</PRE><DT CLASS="dt-description"><B><TT>ldap_search_fields</TT></B><DD CLASS="dd-description"> This option defines
-search form and LDAP attributes to search.
-	Format:
-		<TT>[Name, Attribute, ...]</TT>
-	where
-		<TT>Name</TT> is the name of field in the search form. Will be automatically
-			translated according to definitions in translation files (see
-			<TT>msgs/*.msg</TT> for available words).
-		Attribute is the LDAP attribute or the pattern <TT>"%u"</TT>
- Example:
-<PRE CLASS="verbatim">
-  {ldap_search_fields,
-   [{"User", "uid"},
-    {"Full Name", "displayName"},
-    {"Email", "mail"}
-   ]},
-</PRE>
-Default is:
-<PRE CLASS="verbatim">
-  [{"User", "%u"},
-   {"Full Name", "displayName"},
-   {"Given Name", "givenName"},
-   {"Middle Name", "initials"},
-   {"Family Name", "sn"},
-   {"Nickname", "%u"},
-   {"Birthday", "birthDay"},
-   {"Country", "c"},
-   {"City", "l"},
-   {"Email", "mail"},
-   {"Organization Name", "o"},
-   {"Organization Unit", "ou"}]
-</PRE><DT CLASS="dt-description"><B><TT>ldap_search_reported</TT></B><DD CLASS="dd-description"> This option defines search fields to be reported.
-	Format:
-		<TT>[Name, VCard_Name, ...]</TT>
-	where
-		<TT>Name</TT> is the name of field in the search form. Will be automatically
-			translated according to definitions in translation files (see
-			<TT>msgs/*.msg</TT> for available words).
-		<TT>VCard_Name</TT> is the name of vCard field defined in <TT>ldap_vcard_map</TT> option.
- Example:
-<PRE CLASS="verbatim">
-  {ldap_search_reported,
-   [{"Full Name", "FN"},
-    {"Email", "EMAIL"},
-    {"Birthday", "BDAY"},
-    {"Nickname", "NICKNAME"}
-   ]},
-</PRE>
-Default is:
-<PRE CLASS="verbatim">
-  [{"Full Name", "FN"},
-   {"Given Name", "GIVEN"},
-   {"Middle Name", "MIDDLE"},
-   {"Family Name", "FAMILY"},
-   {"Nickname", "NICKNAME"},
-   {"Birthday", "BDAY"},
-   {"Country", "CTRY"},
-   {"City", "LOCALITY"},
-   {"Email", "EMAIL"},
-   {"Organization Name", "ORGNAME"},
-   {"Organization Unit", "ORGUNIT"}]
-</PRE></DL>
-<!--TOC subsubsection Examples-->
+This module routes packets to local users. It looks up to which user
+resource a packet must be sent via a presence table. Then the packet is
+either routed to the appropriate c2s process, or stored in offline
+storage, or bounced back.<BR>
+<BR>
+<!--TOC subsubsection s2s Manager-->
 
-<H4 CLASS="subsubsection"><A NAME="htoc69">A.21.5</A>&nbsp;&nbsp;Examples</H4><!--SEC END -->
+<H4 CLASS="subsubsection"><A NAME="htoc81">10.1.4</A>&nbsp;&nbsp;<A NAME="s2smanager">s2s Manager</A></H4><!--SEC END -->
 
-<A NAME="sec:ldapexamples"></A>
-<!--TOC paragraph Common example-->
+<A NAME="sec:s2smanager"></A>
+
+This module routes packets to other Jabber servers. First, it
+checks if an opened s2s connection from the domain of the packet's
+source to the domain of the packet's destination exists. If that is the case,
+the s2s manager routes the packet to the process
+serving this connection, otherwise a new connection is opened.<BR>
+<BR>
+<!--TOC subsection Clustering Setup-->
 
-<H5 CLASS="paragraph">Common example</H5><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc82">10.2</A>&nbsp;&nbsp;<A NAME="cluster">Clustering Setup</A></H3><!--SEC END -->
 
-Let's say <TT>ldap.mydomain.org</TT> is the name of our LDAP server. We have
-users with their passwords in <TT>"ou=Users,dc=mydomain,dc=org"</TT> directory.
-Also we have addressbook, which contains users emails and their additional
-infos in <TT>"ou=AddressBook,dc=mydomain,dc=org"</TT> directory. Corresponding
-authentication section should looks like this:
+<A NAME="sec:cluster"></A>
+
+Suppose you already configured <TT>ejabberd</TT> on one machine named (<TT>first</TT>),
+and you need to setup another one to make an <TT>ejabberd</TT> cluster. Then do
+following steps:
+<OL CLASS="enumerate" type=1><LI CLASS="li-enumerate">
+Copy <CODE>~ejabberd/.erlang.cookie</CODE> file from <TT>first</TT> to
+ <TT>second</TT>.<BR>
+<BR>
+(alt) You can also add `<CODE>-cookie content_of_.erlang.cookie</CODE>'
+ option to all `<TT>erl</TT>' commands below.<BR>
+<BR>
+<LI CLASS="li-enumerate">On <TT>second</TT> run the following command as the <TT>ejabberd</TT> daemon user,
+ in the working directory of <TT>ejabberd</TT>:
 <PRE CLASS="verbatim">
-  %% authentication method
-  {auth_method, ldap}.
-  %% DNS name of our LDAP server
-  {ldap_servers, ["ldap.mydomain.org"]}.
-  %% Bind to LDAP server as "cn=Manager,dc=mydomain,dc=org" with password "secret"
-  {ldap_rootdn, "cn=Manager,dc=mydomain,dc=org"}.
-  {ldap_password, "secret"}.
-  %% define the user's base
-  {ldap_base, "ou=Users,dc=mydomain,dc=org"}.
-  %% We want to authorize users from 'shadowAccount' object class only
-  {ldap_filter, "(objectClass=shadowAccount)"}.
+erl -sname ejabberd \
+    -mnesia extra_db_nodes "['ejabberd@first']" \
+    -s mnesia
 </PRE>
-Now we want to use users LDAP-info as their vCards. We have four attributes
-defined in our LDAP schema: <TT>"mail"</TT> &mdash; email address, <TT>"givenName"</TT>
-&mdash; first name, <TT>"sn"</TT> &mdash; second name, <TT>"birthDay"</TT> &mdash; birthday.
-Also we want users to search each other. Let's see how we can set it up:
+ This will start Mnesia serving the same database as <TT>ejabberd@first</TT>.
+ You can check this by running the command `<CODE>mnesia:info().</CODE>'. You
+ should see a lot of remote tables and a line like the following:
 <PRE CLASS="verbatim">
-  {modules,
-    ...
-    {mod_vcard_ldap,
-     [
-      %% We use the same server and port, but want to bind anonymously because
-      %% our LDAP server accepts anonymous requests to
-      %% "ou=AddressBook,dc=mydomain,dc=org" subtree.
-      {ldap_rootdn, ""},
-      {ldap_password, ""},
-      %% define the addressbook's base
-      {ldap_base, "ou=AddressBook,dc=mydomain,dc=org"},
-      %% user's part of JID is located in the "mail" attribute
-      {ldap_uidattr, "mail"},
-      %% common format for our emails
-      {ldap_uidattr_format, "%u@mail.mydomain.org"},
-      %% We have to define empty filter here, because entries in addressbook doesn't
-      %% belong to shadowAccount object class
-      {ldap_filter, ""},
-      %% Now we want to define vCard pattern
-      {ldap_vcard_map,
-       [{"NICKNAME", "%u", []}, % just use user's part of JID as his nickname
-        {"GIVEN", "%s", ["givenName"]},
-        {"FAMILY", "%s", ["sn"]},
-        {"FN", "%s, %s", ["sn", "givenName"]}, % example: "Smith, John"
-        {"EMAIL", "%s", ["mail"]},
-        {"BDAY", "%s", ["birthDay"]}]},
-      %% Search form
-      {ldap_search_fields,
-       [{"User", "%u"},
-        {"Name", "givenName"},
-        {"Family Name", "sn"},
-        {"Email", "mail"},
-        {"Birthday", "birthDay"}]},
-      %% vCard fields to be reported
-      %% Note that JID is always returned with search results
-      {ldap_search_reported,
-       [{"Full Name", "FN"},
-        {"Nickname", "NICKNAME"},
-        {"Birthday", "BDAY"}]}
-    ]}
-    ...
-  }.
-</PRE>
-Note that <TT>mod_vcard_ldap</TT> module checks an existence of the user before
-searching his info in LDAP.<BR>
+running db nodes   = [ejabberd@first, ejabberd@second]
+</PRE><BR>
 <BR>
-<!--TOC paragraph Active Directory-->
-
-<H5 CLASS="paragraph">Active Directory</H5><!--SEC END -->
-
-Active Directory is just an LDAP-server with predefined attributes. Sample
-config file is listed below:
+<LI CLASS="li-enumerate">Now run the following in the same `<TT>erl</TT>' session:
 <PRE CLASS="verbatim">
-  {auth_method, ldap}.
-  {ldap_servers, ["office.org"]}.    % List of LDAP servers
-  {ldap_base, "DC=office,DC=org"}. % Search base of LDAP directory
-  {ldap_rootdn, "CN=Administrator,CN=Users,DC=office,DC=org"}. % LDAP manager
-  {ldap_password, "*******"}. % Password to LDAP manager
-  {ldap_uidattr, "sAMAccountName"}.
-  {ldap_filter, "(memberOf=*)"}.
-  
-  {mod_vcard_ldap,
-   [{ldap_vcard_map,
-     [{"NICKNAME", "%u", []},
-      {"GIVEN", "%s", ["givenName"]},
-      {"MIDDLE", "%s", ["initials"]},
-      {"FAMILY", "%s", ["sn"]},
-      {"FN", "%s", ["displayName"]},
-      {"EMAIL", "%s", ["mail"]},
-      {"ORGNAME", "%s", ["company"]},
-      {"ORGUNIT", "%s", ["department"]},
-      {"CTRY", "%s", ["c"]},
-      {"LOCALITY", "%s", ["l"]},
-      {"STREET", "%s", ["streetAddress"]},
-      {"REGION", "%s", ["st"]},
-      {"PCODE", "%s", ["postalCode"]},
-      {"TITLE", "%s", ["title"]},
-      {"URL", "%s", ["wWWHomePage"]},
-      {"DESC", "%s", ["description"]},
-      {"TEL", "%s", ["telephoneNumber"]}]},
-    {ldap_search_fields,
-     [{"User", "%u"},
-      {"Name", "givenName"},
-      {"Family Name", "sn"},
-      {"Email", "mail"},
-      {"Company", "company"},
-      {"Department", "department"},
-      {"Role", "title"},
-      {"Description", "description"},
-      {"Phone", "telephoneNumber"}]},
-    {ldap_search_reported,
-     [{"Full Name", "FN"},
-      {"Nickname", "NICKNAME"},
-      {"Email", "EMAIL"}]}
-   ]
-  }.
+mnesia:change_table_copy_type(schema, node(), disc_copies).
 </PRE>
-<!--TOC subsection <TT>mod_version</TT>-->
-
-<H3 CLASS="subsection"><A NAME="htoc70">A.22</A>&nbsp;&nbsp;<TT>mod_version</TT></H3><!--SEC END -->
-
-<A NAME="sec:modversion"></A>
-
-This module implements Software Version (<A HREF="http://www.jabber.org/jeps/jep-0092.html">JEP-0092</A>). Consequently, it
-answers <TT>ejabberd</TT>'s version when queried.<BR>
+ This will create local disc storage for the database.<BR>
 <BR>
-Options:
-<DL CLASS="description" COMPACT=compact><DT CLASS="dt-description">
-<B><TT>iqdisc</TT></B><DD CLASS="dd-description"> This specifies 
-the processing discipline for Software Version (<TT>jabber:iq:version</TT>) IQ queries
-(see section&nbsp;<A HREF="#sec:modiqdiscoption">A.2.1</A>).
-</DL>
+(alt) Change storage type of the <TT>scheme</TT> table to `RAM and disc
+ copy' on the second node via the web interface.<BR>
+<BR>
+<LI CLASS="li-enumerate">Now you can add replicas of various tables to this node with
+ `<CODE>mnesia:add_table_copy</CODE>' or
+ `<CODE>mnesia:change_table_copy_type</CODE>' as above (just replace
+ `<CODE>schema</CODE>' with another table name and `<CODE>disc_copies</CODE>'
+ can be replaced with `<CODE>ram_copies</CODE>' or
+ `<CODE>disc_only_copies</CODE>').<BR>
+<BR>
+Which tables to replicate is very dependant on your needs, you can get
+ some hints from the command `<CODE>mnesia:info().</CODE>', by looking at the
+ size of tables and the default storage type for each table on 'first'.<BR>
+<BR>
+Replicating a table makes lookups in this table faster on this node.
+ Writing, on the other hand, will be slower. And of course if machine with one
+ of the replicas is down, other replicas will be used.<BR>
+<BR>
+Also <A HREF="http://www.erlang.se/doc/doc-5.4.9/lib/mnesia-4.2.2/doc/html/Mnesia_chap5.html#5.3">section 5.3 (Table Fragmentation) of Mnesia User's Guide</A> can be helpful.
+ <BR>
+<BR>
+ (alt) Same as in previous item, but for other tables.<BR>
+<BR>
+<LI CLASS="li-enumerate">Run `<CODE>init:stop().</CODE>' or just `<CODE>q().</CODE>' to exit from
+ the Erlang shell. This probably can take some time if Mnesia has not yet
+ transfered and processed all data it needed from <TT>first</TT>.<BR>
+<BR>
+<LI CLASS="li-enumerate">Now run <TT>ejabberd</TT> on <TT>second</TT> with almost the same config as
+ on <TT>first</TT> (you probably do not need to duplicate `<CODE>acl</CODE>'
+ and `<CODE>access</CODE>' options &mdash; they will be taken from
+ <TT>first</TT>, and <CODE>mod_muc</CODE> and <CODE>mod_irc</CODE> should be
+ enabled only on one machine in the cluster).
+</OL>
+You can repeat these steps for other machines supposed to serve this
+domain.<BR>
+<BR>
+
 <!--TOC section Internationalization and Localization-->
 
-<H2 CLASS="section"><A NAME="htoc71">B</A>&nbsp;&nbsp;Internationalization and Localization</H2><!--SEC END -->
+<H2 CLASS="section"><A NAME="htoc83">A</A>&nbsp;&nbsp;<A NAME="i18nl10n">Internationalization and Localization</A></H2><!--SEC END -->
 
 <A NAME="sec:i18nl10n"></A>
 
@@ -2966,7 +3317,7 @@ Figure&nbsp;<A HREF="#fig:discorus">2</A>, for example, shows the reply to the f
 </PRE>
 <BLOCKQUOTE CLASS="figure"><DIV CLASS="center"><DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV>
  
- <IMG SRC="discorus.png">
+ <IMG SRC="discorus.png" ALT="discorus.png">
  
 
  <BR>
@@ -2980,26 +3331,26 @@ The web interface also supports the <CODE>Accept-Language</CODE> HTTP header (co
 figure&nbsp;<A HREF="#fig:webadmmainru">3</A> with figure&nbsp;<A HREF="#fig:webadmmain">1</A>)
 <BLOCKQUOTE CLASS="figure"><DIV CLASS="center"><DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV>
  
- <IMG SRC="webadmmainru.png">
+ <IMG SRC="webadmmainru.png" ALT="webadmmainru.png">
  
 
  <BR>
 <BR>
 <DIV CLASS="center">Figure 3: Top page from the web interface with HTTP header
- &#8220;Accept-Language: ru&#8221;</DIV><BR>
+ `Accept-Language: ru'</DIV><BR>
 <BR>
 
  <A NAME="fig:webadmmainru"></A>
 <DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV></DIV></BLOCKQUOTE>
 <!--TOC section Release Notes-->
 
-<H2 CLASS="section"><A NAME="htoc72">C</A>&nbsp;&nbsp;Release Notes</H2><!--SEC END -->
+<H2 CLASS="section"><A NAME="htoc84">B</A>&nbsp;&nbsp;<A NAME="releasenotes">Release Notes</A></H2><!--SEC END -->
 
 <A NAME="sec:releasenotes"></A>
 
 <!--TOC subsection ejabberd 0.9-->
 
-<H3 CLASS="subsection"><A NAME="htoc73">C.1</A>&nbsp;&nbsp;ejabberd 0.9</H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc85">B.1</A>&nbsp;&nbsp;ejabberd 0.9</H3><!--SEC END -->
 
 <PRE CLASS="verbatim">
        Release notes
@@ -3093,7 +3444,7 @@ Bugfixes
 </PRE>
 <!--TOC subsection ejabberd 0.9.1-->
 
-<H3 CLASS="subsection"><A NAME="htoc74">C.2</A>&nbsp;&nbsp;ejabberd 0.9.1</H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc86">B.2</A>&nbsp;&nbsp;ejabberd 0.9.1</H3><!--SEC END -->
 
 <PRE CLASS="verbatim">
        Release notes
@@ -3161,7 +3512,7 @@ Bugfixes
 </PRE>
 <!--TOC subsection ejabberd 0.9.8-->
 
-<H3 CLASS="subsection"><A NAME="htoc75">C.3</A>&nbsp;&nbsp;ejabberd 0.9.8</H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc87">B.3</A>&nbsp;&nbsp;ejabberd 0.9.8</H3><!--SEC END -->
 
 <PRE CLASS="verbatim">
        Release notes
@@ -3266,7 +3617,7 @@ END
 </PRE>
 <!--TOC subsection ejabberd 1.0.0-->
 
-<H3 CLASS="subsection"><A NAME="htoc76">C.4</A>&nbsp;&nbsp;ejabberd 1.0.0</H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc88">B.4</A>&nbsp;&nbsp;ejabberd 1.0.0</H3><!--SEC END -->
 
 <PRE CLASS="verbatim">
        Release Notes
@@ -3392,7 +3743,7 @@ END
 </PRE>
 <!--TOC subsection ejabberd 1.1.0-->
 
-<H3 CLASS="subsection"><A NAME="htoc77">C.5</A>&nbsp;&nbsp;ejabberd 1.1.0</H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc89">B.5</A>&nbsp;&nbsp;ejabberd 1.1.0</H3><!--SEC END -->
 
 <PRE CLASS="verbatim">
     Release Notes
@@ -3513,7 +3864,7 @@ END
 </PRE>
 <!--TOC subsection ejabberd 1.1.1-->
 
-<H3 CLASS="subsection"><A NAME="htoc78">C.6</A>&nbsp;&nbsp;ejabberd 1.1.1</H3><!--SEC END -->
+<H3 CLASS="subsection"><A NAME="htoc90">B.6</A>&nbsp;&nbsp;ejabberd 1.1.1</H3><!--SEC END -->
 
 <PRE CLASS="verbatim">
     Release Notes
@@ -3638,13 +3989,14 @@ END
 </PRE>
 <!--TOC section Acknowledgements-->
 
-<H2 CLASS="section"><A NAME="htoc79">D</A>&nbsp;&nbsp;Acknowledgements</H2><!--SEC END -->
+<H2 CLASS="section"><A NAME="htoc91">C</A>&nbsp;&nbsp;<A NAME="acknowledgements">Acknowledgements</A></H2><!--SEC END -->
 
 <A NAME="sec:acknowledgements"></A>
-
 Thanks to all people who contributed to this guide:
 <UL CLASS="itemize"><LI CLASS="li-itemize">
 Alexey Shchepin (<A HREF="xmpp:aleksey@jabber.ru"><TT>xmpp:aleksey@jabber.ru</TT></A>)
+<LI CLASS="li-itemize">Badlop (<A HREF="xmpp:badlop@jabberes.org"><TT>xmpp:badlop@jabberes.org</TT></A>)
+<LI CLASS="li-itemize">Evgeniy Khramtsov (<A HREF="xmpp:xram@jabber.ru"><TT>xmpp:xram@jabber.ru</TT></A>)
 <LI CLASS="li-itemize">Florian Zumbiehl (<A HREF="xmpp:florz@florz.de"><TT>xmpp:florz@florz.de</TT></A>)
 <LI CLASS="li-itemize">Michael Grigutsch (<A HREF="xmpp:migri@jabber.i-pobox.net"><TT>xmpp:migri@jabber.i-pobox.net</TT></A>)
 <LI CLASS="li-itemize">Mickael Remond (<A HREF="xmpp:mremond@erlang-projects.org"><TT>xmpp:mremond@erlang-projects.org</TT></A>)
@@ -3652,6 +4004,28 @@ Alexey Shchepin (<A HREF="xmpp:aleksey@jabber.ru"><TT>xmpp:aleksey@jabber.ru</TT
 <LI CLASS="li-itemize">Sergei Golovan (<A HREF="xmpp:sgolovan@nes.ru"><TT>xmpp:sgolovan@nes.ru</TT></A>)
 <LI CLASS="li-itemize">Vsevolod Pelipas (<A HREF="xmpp:vsevoload@jabber.ru"><TT>xmpp:vsevoload@jabber.ru</TT></A>)
 </UL>
+<!--TOC section Copyright Information-->
+
+<H2 CLASS="section"><A NAME="htoc92">D</A>&nbsp;&nbsp;<A NAME="copyright">Copyright Information</A></H2><!--SEC END -->
+
+<A NAME="sec:copyright"></A>
+Ejabberd Installation and Operation Guide.<BR>
+Copyright &copy; January 23, 2003 &mdash;  Alexey Shchepin<BR>
+<BR>
+This document is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.<BR>
+<BR>
+This document is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.<BR>
+<BR>
+You should have received a copy of the GNU General Public License along with
+this document; if not, write to the Free Software Foundation, Inc., 51 Franklin
+Street, Fifth Floor, Boston, MA 02110-1301, USA.<BR>
+<BR>
 <!--HTMLFOOT-->
 <!--ENDHTML-->
 <!--FOOTER-->
diff --git a/doc/guide.tex b/doc/guide.tex
index c9443da5c..468f7143d 100644
--- a/doc/guide.tex
+++ b/doc/guide.tex
@@ -78,10 +78,15 @@ the processing discipline for #1 IQ queries
 \newcommand{\hostitem}[1]{
   \titem{hosts} \ind{options!hosts} This option defines the hostnames of the
   service (see section~\ref{sec:modhostsoption}). If neither \texttt{hosts} nor
-  the old \texttt{host} is present, the prefix ``\jid{#1.}'' is added to all
+  the old \texttt{host} is present, the prefix `\jid{#1.}' is added to all
   \ejabberd{} hostnames.
 }
 
+%\newcommand{\quoting}[2][yozhik]{\begin{quotation}\textcolor{#1}{\textit{#2}}\end{quotation}} % Quotes enabled
+%\renewcommand{command}[args][default]{def}
+%\renewcommand{\headrule}{{\color{ejblue}%
+%\hrule width\headwidth height\headrulewidth \vskip-\headrulewidth}}
+
 %% Title page
 \include{version}
 \title{Ejabberd \version\ Installation and Operation Guide}
@@ -92,9 +97,11 @@ the processing discipline for #1 IQ queries
 %% Options
 \newcommand{\marking}[1]{#1} % Marking disabled
 \newcommand{\quoting}[2][yozhik]{} % Quotes disabled
-\newcommand{\new}{\begin{latexonly}\marginpar{\textsc{new}}\end{latexonly}} % Highlight new features
-\newcommand{\improved}{\begin{latexonly}\marginpar{\textsc{improved}}\end{latexonly}} % Highlight improved features
-\newcommand{\moreinfo}[1]{} % Hide details
+\newcommand{\new}{\marginpar{\textsc{new}}} % Highlight new features
+\newcommand{\improved}{\marginpar{\textsc{improved}}} % Highlight improved features
+
+%% To by-pass errors in the HTML version.
+\newstyle{SPAN}{width:20\%; float:right; text-align:left; margin-left:auto;}
 
 %% Footnotes
 \begin{latexonly}
@@ -108,7 +115,7 @@ the processing discipline for #1 IQ queries
 
 \begin{document}
 
-\label{sec:titlepage}
+\label{titlepage}
 \begin{titlepage}
   \maketitle{}
 
@@ -118,7 +125,7 @@ the processing discipline for #1 IQ queries
   }
   \end{center}
 
-  \begin{quotation}\textit{I can thoroughly recommend ejabberd for ease of setup --
+  \begin{quotation}\textit{I can thoroughly recommend ejabberd for ease of setup ---
   Kevin Smith, Current maintainer of the Psi project}\end{quotation}
 
 \end{titlepage}
@@ -135,31 +142,30 @@ the processing discipline for #1 IQ queries
 % Input introduction.tex
 \input{introduction}
 
-\section{Installation from Source}
-\label{sec:installation}
+\section{\aname{installsource}{Installation from Source}}
+\label{sec:installsource}
 \ind{installation}
 
-\subsection{Installation Requirements}
+\subsection{\aname{installreq}{Installation Requirements}}
 \label{sec:installreq}
+\ind{installation!requirements}
 
-\subsubsection{``Unix-like'' operating systems}
+\subsubsection{\aname{installrequnix}{`Unix-like' operating systems}}
 \label{sec:installrequnix}
-\ind{installation!requirements for ``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:
 \begin{itemize}
-\item GNU Make;
-\item GCC;
-\item libexpat 1.95 or higher;
-\item Erlang/OTP R9C-2 or higher;
-\item OpenSSL 0.9.6 or higher (optional).
-\item Zlib 1.2.3 or higher (optional).
-\item GNU Iconv 1.8 or higher (optional, not needed at all on systems with GNU libc).
+\item GNU Make
+\item GCC
+\item libexpat 1.95 or higher
+\item Erlang/OTP R9C-2 or higher
+\item OpenSSL 0.9.6 or higher (optional)
+\item Zlib 1.2.3 or higher (optional)
+\item GNU Iconv 1.8 or higher (optional, not needed on systems with GNU libc)
 \end{itemize}
 
-\subsubsection{Windows}
+\subsubsection{\aname{installreqwin}{Windows}}
 \label{sec:installreqwin}
-\ind{installation!requirements for Windows}
 
 To compile \ejabberd{} on a Windows flavour, you need:
 \begin{itemize}
@@ -174,7 +180,7 @@ To compile \ejabberd{} on a Windows flavour, you need:
 \item \footahref{http://www.zlib.net/}{Zlib 1.2.3 or higher}
 \end{itemize}
 
-\subsection{Obtaining \ejabberd{}}
+\subsection{\aname{obtaining}{Obtaining \ejabberd{}}}
 \label{sec:obtaining}
 
 \ind{download}
@@ -187,15 +193,14 @@ The latest development version can be retrieved from the Subversion repository\@
   svn co http://svn.process-one.net/ejabberd/trunk ejabberd
 \end{verbatim}
 
-\subsection{Compilation}
-\label{sec:compilation}
-\ind{compilation}
+\subsection{\aname{compile}{Compilation}}
+\label{sec:compile}
+\ind{installation!compilation}
 
-\subsubsection{``Unix-like'' operating systems}
-\label{sec:compilationunix}
-\ind{compilation!on ``Unix-like'' operating systems}
+\subsubsection{\aname{compileunix}{`Unix-like' operating systems}}
+\label{sec:compileunix}
 
-Compile \ejabberd{} on a ``Unix-like'' operating system by executing:
+Compile \ejabberd{} on a `Unix-like' operating system by executing:
 
 \begin{verbatim}
   ./configure
@@ -211,9 +216,12 @@ These commands will:
 \item create a directory called \verb|/var/log/ejabberd| to store log files.
 \end{itemize}
 
-\subsubsection{Windows}
-\label{sec:compilationwin}
-\ind{compilation!on Windows}
+Note: if you want to use an external database, you need to execute the configure
+script with the option(s) \term{--enable-odbc} or \term{--enable-odbc
+--enable-mssql}. See section~\ref{sec:database} for more information.
+
+\subsubsection{\aname{compilewin}{Windows}}
+\label{sec:compilewin}
 
 \begin{itemize}
 \item Install Erlang emulator (for example, into \verb|C:\Program Files\erl5.3|).
@@ -246,9 +254,12 @@ werl -s ejabberd -name ejabberd
 \end{verbatim}
 \end{itemize}
 
-\subsection{Starting}
-\label{sec:starting}
+%TODO: how to compile database support on windows?
+
+\subsection{\aname{start}{Starting}}
+\label{sec:start}
 \ind{starting}
+%TODO: update when the ejabberdctl script is made more userfriendly
 
 Execute the following command to start \ejabberd{}:
 \begin{verbatim}
@@ -259,7 +270,7 @@ or
   erl -pa /var/lib/ejabberd/ebin -sname ejabberd -s ejabberd
 \end{verbatim}
 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
+of the host name, i.\,e. other Erlang nodes outside this domain cannot contact
 this node.
 
 Note that when using the above command, \ejabberd{} will search for the
@@ -297,11 +308,8 @@ To reduce memory usage, you may set the environment variable
 But in this case \ejabberd{} can start to work slower.
 
 
-\section{Configuration}
-\label{sec:configuration}
-
-\subsection{Initial Configuration}
-\label{sec:initconfig}
+\section{\aname{basicconfig}{Basic Configuration}}
+\label{sec:basicconfig}
 \ind{configuration file}
 
 The configuration file will be loaded the first time you start \ejabberd{}. The
@@ -311,7 +319,7 @@ configuration file are appended to the entries in the database. The
 configuration file contains a sequence of Erlang terms. Lines beginning with a
 \term{`\%'} 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.
 
 
@@ -325,8 +333,8 @@ the configuration file:
 With these lines the old global options, local options and ACLs will be removed
 before new ones are added.
 
-\subsubsection{Host Names}
-\label{sec:confighostname}
+\subsection{\aname{hostnames}{Host Names}}
+\label{sec:hostnames}
 \ind{options!hosts}\ind{host names}
 
 The option \option{hosts} defines a list containing one or more domains that
@@ -335,191 +343,64 @@ The option \option{hosts} defines a list containing one or more domains that
 Examples:
 \begin{itemize}
 \item Serving one domain:
-\begin{itemize}
-\item \begin{verbatim}
+  \begin{verbatim}
   {hosts, ["example.org"]}.
 \end{verbatim}
-\item Backwards compatibility with older \ejabberd{} versions can be retained
-  with:
+\item Serving one domain, and backwards compatible with older \ejabberd{}
+  versions:
   \begin{verbatim}
   {host, "example.org"}.
 \end{verbatim}
-\end{itemize}
 \item Serving two domains:
 \begin{verbatim}
   {hosts, ["example.net", "example.com"]}.
 \end{verbatim}
 \end{itemize}
 
-\subsubsection{Default Language}
-\label{sec:configlanguage}
-\ind{options!language}\ind{language}
-
-The option \option{language} defines the default language of server strings that
-can be seen by \Jabber{} clients. If a \Jabber{} client do not support
-\option{xml:lang}, the specified language is used. The default value for the
-option \option{language} is \term{"en"}. In order to take effect there must be a
-translation file \term{<language>.msg} in \ejabberd{}'s \term{msgs} directory.
-
-Examples:
-\begin{itemize}
-\item To set Russian as default language:
-\begin{verbatim}
-  {language, "ru"}.
-\end{verbatim}
-\item To set Spanish as default language:
-\begin{verbatim}
-  {language, "es"}.
-\end{verbatim}
-\end{itemize}
-
-\subsubsection{Access Rules}
-\label{sec:configaccess}
-\ind{options!acl}\ind{access rules}\ind{ACL}\ind{Access Control List}
-
-Access control in \ejabberd{} is performed via Access Control Lists (ACLs). The
-declarations of ACLs in the configuration file have the following syntax:
-\begin{verbatim}
-  {acl, <aclname>, {<acltype>, ...}}.
-\end{verbatim}
-
-\term{<acltype>} can be one of the following:
-\begin{description}
-\titem{all} Matches all JIDs. Example:
-\begin{verbatim}
-{acl, all, all}.
-\end{verbatim}
-\titem{\{user, <username>\}} Matches the user with the name
-  \term{<username>} at the first virtual host. Example:
-\begin{verbatim}
-{acl, admin, {user, "yozhik"}}.
-\end{verbatim}
-\titem{\{user, <username>, <server>\}} Matches the user with the JID
-  \term{<username>@<server>} and any resource. Example:
-\begin{verbatim}
-{acl, admin, {user, "yozhik", "example.org"}}.
-\end{verbatim}
-\titem{\{server, <server>\}} Matches any JID from server
-  \term{<server>}. Example:
-\begin{verbatim}
-{acl, exampleorg, {server, "example.org"}}.
-\end{verbatim}
-\titem{\{user\_regexp, <regexp>\}} Matches any local user with a name that
-  matches \term{<regexp>} at the first virtual host. Example:
-\begin{verbatim}
-{acl, tests, {user, "^test[0-9]*$"}}.
-\end{verbatim}
-%$
-\titem{\{user\_regexp, <regexp>, <server>\}} Matches any user with a name
-  that matches \term{<regexp>} at server \term{<server>}. Example:
-\begin{verbatim}
-{acl, tests, {user, "^test", "example.org"}}.
-\end{verbatim}
-\titem{\{server\_regexp, <regexp>\}} Matches any JID from the server that
-  matches \term{<regexp>}. Example:
-\begin{verbatim}
-{acl, icq, {server, "^icq\\."}}.
-\end{verbatim}
-\titem{\{node\_regexp, <user\_regexp>, <server\_regexp>\}} Matches any user
-  with a name that matches \term{<user\_regexp>} at any server that matches
-  \term{<server\_regexp>}. Example:
-\begin{verbatim}
-{acl, yohzik, {node_regexp, "^yohzik$", "^example.(com|org)$"}}.
-\end{verbatim}
-\titem{\{user\_glob, <glob>\}}
-\titem{\{user\_glob, <glob>, <server>\}}
-\titem{\{server\_glob, <glob>\}}
-\titem{\{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:
-  \begin{description}
-  \titem{*} matches any string including the null string.
-  \titem{?} matches any single character.
-  \titem{[...]} matches any of the enclosed characters. Character
-    ranges are specified by a pair of characters separated by a \term{`-'}.
-    If the first character after \term{`['} is a \term{`!'}, any
-    character not enclosed is matched.
-  \end{description}
-\end{description}
-
-The following ACLs are pre-defined:
-\begin{description}
-\titem{all} Matches any JID.
-\titem{none} Matches no JID.
-\end{description}
-
-An entry allowing or denying access to different services looks similar to
-this:
-\begin{verbatim}
-  {access, <accessname>, [{allow, <aclname>},
-                          {deny, <aclname>},
-                          ...
-                         ]}.
-\end{verbatim}
-When a JID is checked to have access to \term{<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 ``\term{deny}'' is returned.
-
-Example:
-\begin{verbatim}
-  {access, configure, [{allow, admin}]}.
-  {access, something, [{deny, badmans},
-                       {allow, all}]}.
-\end{verbatim}
-
-The following access rules are pre-defined:
-\begin{description}
-\titem{all} Always returns ``\term{allow}''
-\titem{none} Always returns ``\term{deny}''
-\end{description}
-
-\subsubsection{Shapers}
-\label{sec:configshaper}
-\ind{options!shaper}\ind{options!maxrate}\ind{shapers}\ind{maxrate}\ind{traffic speed}
+\subsection{\aname{virtualhost}{Virtual Hosting}}
+\label{sec:virtualhost}
+\ind{virtual hosting}\ind{virtual hosts}\ind{virtual domains}
 
-Shapers enable you to limit connection traffic. The syntax of
-shapers is like this:
-\begin{verbatim}
-  {shaper, <shapername>, <kind>}.
-\end{verbatim}
-Currently only one kind of shaper called \term{maxrate} is available. It has the
-following syntax:
+Options can be defined separately for every virtual host using the
+\term{host\_config} option.\ind{options!host\_config} It has the following
+syntax:
 \begin{verbatim}
-  {maxrate, <rate>}
+  {host_config, <hostname>, [<option>, <option>, ...]}.
 \end{verbatim}
-where \term{<rate>} stands for the maximum allowed incomig rate in bytes per
-second.
 
 Examples:
 \begin{itemize}
-\item To define a shaper named ``\term{normal}'' with traffic speed limited to
-1,000\,bytes/second:
+\item Domain \jid{example.net} is using the internal authentication method while
+  domain \jid{example.com} is using the \ind{LDAP}LDAP server running on the
+  domain \jid{localhost} to perform authentication:
 \begin{verbatim}
-  {shaper, normal, {maxrate, 1000}}.
+{host_config, "example.net", [{auth_method, internal}]}.
+
+{host_config, "example.com", [{auth_method, ldap},
+                              {ldap_servers, ["localhost"]},
+                              {ldap_uidattr, "uid"},
+                              {ldap_rootdn, "dc=localdomain"},
+                              {ldap_rootdn, "dc=example,dc=com"},
+                              {ldap_password, ""}]}.
 \end{verbatim}
-\item To define a shaper named ``\term{fast}'' with traffic speed limited to
-50,000\,bytes/second:
+\item Domain \jid{example.net} is using \ind{ODBC}ODBC to perform authentication
+  while domain \jid{example.com} is using the LDAP servers running on the domains
+  \jid{localhost} and \jid{otherhost}:
 \begin{verbatim}
-  {shaper, fast, {maxrate, 50000}}.
+{host_config, "example.net", [{auth_method, odbc},
+                              {odbc_server, "DSN=ejabberd;UID=ejabberd;PWD=ejabberd"}]}.
+
+{host_config, "example.com", [{auth_method, ldap},
+                              {ldap_servers, ["localhost", "otherhost"]},
+                              {ldap_uidattr, "uid"},
+                              {ldap_rootdn, "dc=localdomain"},
+                              {ldap_rootdn, "dc=example,dc=com"},
+                              {ldap_password, ""}]}.
 \end{verbatim}
 \end{itemize}
 
-\subsubsection{Limitation of the number of opened sessions}
-\label{sec:configmaxsessions}
-\ind{options!max\_user\_sessions}
-
-This option specifies the maximum number of sessions (authenticated
-connections) per user. If a user tries to open more than the maximum number of
-allowed sessions, with different resources, the first opened session will be
-disconnected. The error ``\term{session replaced}'' is send to the
-disconnected session. This value is either a number or \term{infinity}.  For
-example \verb|{max\_user\_sessions, 10}|.  The default value is \term{10}.
-
-This option can be define per virtual host. See section~\ref{sec:configvirtualhost}.
-
-\subsubsection{Listened Sockets}
-\label{sec:configlistened}
+\subsection{\aname{listened}{Listened Sockets}}
+\label{sec:listened}
 \ind{options!listen}
 
 The option \option{listen} defines for which addresses and ports \ejabberd{}
@@ -563,7 +444,7 @@ Currently next modules are implemented:
 The following options are available:
 \begin{description}
   \titem{\{access, <access rule>\}} \ind{options!access}This option defines
-    access to the port. The default value is ``\term{all}''.
+    access to the port. The default value is \term{all}.
   \titem{\{certfile, Path\}} Path to a file containing the SSL certificate.
   \titem{\{hosts, [Hostnames], [HostOptions]\}} \ind{options!hosts}This option
     defines one or more hostnames of connected services and enables you to
@@ -584,17 +465,18 @@ The following options are available:
   \titem{\{ip, IPAddress\}} \ind{options!ip}This option specifies which network
     interface to listen for. For example \verb|{ip, {192, 168, 1, 1}}|.
   \titem{\{max\_stanza\_size, Size\}} \ind{options!max\_stanza\_size}This
-    option specifies an approximate maximal size in bytes of XML stanzas.
-    For example \verb|{max\_stanza\_size, 65536}|.  The default value
-    is ``\term{infinity}''.
+    option specifies an approximate maximum size in bytes of XML stanzas.
+    Approximate, because it is calculated with the precision of one block of
+    readed data. For example \verb|{max\_stanza\_size, 65536}|.  The default
+    value is \term{infinity}.
   \titem{\{shaper, <access rule>\}} \ind{options!shaper}This option defines a
-    shaper for the port (see section~\ref{sec:configshaper}). The default value
-    is ``\term{none}''.
+    shaper for the port (see section~\ref{sec:shapers}). The default value
+    is \term{none}.
   \titem{ssl} \ind{options!ssl}\ind{SSL}This option specifies that traffic on
     the port will be encrypted using SSL. You should also set the
     \option{certfile} option. It is recommended to use the \term{tls} option
     instead.
-  \titem{starttls} \ind{options!starttls}\ind{modules!STARTTLS}This option
+  \titem{starttls} \ind{options!starttls}\ind{STARTTLS}This option
     specifies that STARTTLS encryption is available on connections to the port.
     You should also set the \option{certfile} option.
   \titem{starttls\_required} \ind{options!starttls\_required}This option
@@ -606,23 +488,24 @@ The following options are available:
     should also set the \option{certfile} option.
   \titem{zlib} \ind{options!zlib}\ind{protocols!JEP-0138: Stream Compression}\ind{Zlib}This
     option specifies that Zlib stream compression (as defined in \jepref{0138})
-    is available on connections to the port. Client cannot use stream compression and
-    stream encryption simultaneously, so if you specify both \option{tls} (or \option{ssl})
-    and \option{zlib} the latter option will not affect connection at all.
+    is available on connections to the port. Client connections cannot use
+    stream compression and stream encryption simultaneously. Hence, if you
+    specify both \option{tls} (or \option{ssl}) and \option{zlib}, the latter
+    option will not affect connections (there will be no stream compression).
   \titem{web\_admin} \ind{options!web\_admin}\ind{web interface}This option
     enables the web interface for \ejabberd{} administration which is available
     at \verb|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.
 \end{description}
 
-Also the following global options are available for s2s connections:
+In addition, the following options are available for s2s connections:
 \begin{description}
   \titem{\{s2s\_use\_starttls, true|false\}}
-  \ind{options!s2s\_use\_starttls}This option defines whether to use STARTTLS
-  for s2s connections.
-  \titem{\{s2s\_certfile, Path\}} \ind{options!s2s\_certificate}Path to the
-  file containing the SSL certificate.
+  \ind{options!s2s\_use\_starttls}\ind{STARTTLS}This option defines whether to
+  use STARTTLS for s2s connections.
+  \titem{\{s2s\_certfile, Path\}} \ind{options!s2s\_certificate}Path to a
+  file containing a SSL certificate.
   \titem{\{domain\_certfile, Domain, Path\}} \ind{options!domain\_certfile}Path
   to the file containing the SSL certificate for the specified domain.
 \end{description}
@@ -630,35 +513,35 @@ Also the following global options are available for s2s connections:
 For instance, the following configuration defines that:
 \begin{itemize}
 \item c2s connections are listened for on port 5222 and 5223 (SSL) and denied
-  for the user ``\term{bad}''
+  for the user called `\term{bad}'.
 \item s2s connections are listened for on port 5269 with STARTTLS for secured
   traffic enabled.
 \item 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~\ref{sec:webadm} shows how exactly this can be done.
+  example in section~\ref{sec:webinterface} shows how exactly this can be done.
 \item All users except for the administrators have a traffic of limit 
   1,000\,Bytes/second
 \item \ind{transports!AIM}The
   \footahref{http://ejabberd.jabber.ru/pyaimt}{AIM transport}
   \jid{aim.example.org} is connected to port 5233 with password
-  ``\term{aimsecret}''
+  `\term{aimsecret}'.
 \item \ind{transports!ICQ}The ICQ transport JIT (\jid{icq.example.org} and
   \jid{sms.example.org}) is connected to port 5234 with password
-  ``\term{jitsecret}''
+  `\term{jitsecret}'.
 \item \ind{transports!MSN}The
   \footahref{http://ejabberd.jabber.ru/pymsnt}{MSN transport}
   \jid{msn.example.org} is connected to port 5235 with password
-  ``\term{msnsecret}''
+  `\term{msnsecret}'.
 \item \ind{transports!Yahoo}The
   \footahref{http://ejabberd.jabber.ru/yahoo-transport-2}{Yahoo! transport}
   \jid{yahoo.example.org} is connected to port 5236 with password
-  ``\term{yahoosecret}''
+  `\term{yahoosecret}'.
 \item \ind{transports!Gadu-Gadu}The \footahref{http://ejabberd.jabber.ru/jabber-gg-transport}{Gadu-Gadu transport} \jid{gg.example.org} is
-  connected to port 5237 with password ``\term{ggsecret}''
+  connected to port 5237 with password `\term{ggsecret}'.
 \item \ind{transports!email notifier}The
   \footahref{http://ejabberd.jabber.ru/jmc}{Jabber Mail Component}
   \jid{jmc.example.org} is connected to port 5238 with password
-  ``\term{jmcsecret}''
+  `\term{jmcsecret}'.
 \end{itemize}
 \begin{verbatim}
   {acl, blocked, {user, "bad"}}.
@@ -723,626 +606,869 @@ services you have to make the transports log and do \ind{XDB}XDB by themselves:
   </xdb>
 \end{verbatim}
 
-\subsubsection{Modules}
-\label{sec:configmodules}
-\ind{modules}
+\subsection{\aname{auth}{Authentication}}
+\label{sec:auth}
+\ind{authentication}\ind{options!auth\_method}
 
-The option \term{modules} defines the list of modules that will be loaded after
-\ejabberd{}'s startup. Each entry in the list is a tuple in which the first
-element is the name of a module and the second is a list of options for that
-module. Read section~\ref{sec:modules} for detailed information about modules.
+The option \option{auth\_method} defines the authentication method that is used
+for user authentication:
+\begin{verbatim}
+  {auth_method, [<method>]}.
+\end{verbatim}
 
-Examples:
+The following authentication methods are supported by \ejabberd{}:
 \begin{itemize}
-\item In this simple example, only the module \modecho{} is loaded and no
-  options are specified between square brackets:
-  \begin{verbatim}
-  {modules,
-   [{mod_echo,      []}
-   ]}.
-\end{verbatim}
-\item The second example is also simple: the modules \modecho{}, \modtime{}, and
-  \modversion{} are loaded without options. Remark that, besides the last entry,
-  all entries end with a comma:
-  \begin{verbatim}
-  {modules,
-   [{mod_echo,      []},
-    {mod_time,      []},
-    {mod_version,   []}
-   ]}.
-\end{verbatim}
+\item internal (default) --- See section~\ref{sec:internalauth}.
+\item external --- There are \footahref{http://ejabberd.jabber.ru/extauth}{some
+ example authentication scripts}.
+\item ldap --- See section~\ref{sec:ldap}.
+\item odbc --- See section~\ref{sec:mysql}, \ref{sec:pgsql},
+  \ref{sec:mssql} and \ref{sec:odbc}.
+\item anonymous --- See section~\ref{sec:saslanonymous}.
 \end{itemize}
 
-\subsubsection{Virtual Hosting}
-\label{sec:configvirtualhost}
-\ind{virtual hosting}\ind{virtual hosts}
+\subsubsection{\aname{internalauth}{Internal}}
+\label{sec:internalauth}
+\ind{internal authentication}\ind{Mnesia}
 
-Options can be defined separately for every virtual host using the
-\term{host\_config} option.\ind{options!host\_config} It has the following
-syntax:
-\begin{verbatim}
-  {host_config, <hostname>, [<option>, <option>, ...]}.
-\end{verbatim}
+\ejabberd{} uses its internal Mnesia database as the default authentication method.
 
-Examples:
 \begin{itemize}
-\item Domain \jid{example.net} is using the internal authentication method while
-  domain \jid{example.com} is using the \ind{LDAP}LDAP server running on the domain
-  \jid{localhost} to perform authentication:
-\begin{verbatim}
-{host_config, "example.net", [{auth_method, internal}]}.
+\item \term{auth\_method}: The value \term{internal} will enable the internal
+  authentication method.
+\end{itemize}
 
-{host_config, "example.com", [{auth_method, ldap},
-                              {ldap_servers, ["localhost"]},
-                              {ldap_uidattr, "uid"},
-                              {ldap_rootdn, "dc=localdomain"},
-                              {ldap_rootdn, "dc=example,dc=com"},
-                              {ldap_password, ""}]}.
+Examples:
+\begin{itemize}
+\item To use internal authentication on \jid{example.org} and LDAP
+  authentication on \jid{example.net}:
+  \begin{verbatim}
+{host_config, "example.org", [{auth_method, [internal]}]}.
+{host_config, "example.net", [{auth_method, [ldap]}]}.
 \end{verbatim}
-\item Domain \jid{example.net} is using \ind{ODBC}ODBC to perform authentication
-  while domain \jid{example.com} is using the LDAP servers running on the domains
-  \jid{localhost} and \jid{otherhost}:
-\begin{verbatim}
-{host_config, "example.net", [{auth_method, odbc},
-                              {odbc_server, "DSN=ejabberd;UID=ejabberd;PWD=ejabberd"}]}.
-
-{host_config, "example.com", [{auth_method, ldap},
-                              {ldap_servers, ["localhost", "otherhost"]},
-                              {ldap_uidattr, "uid"},
-                              {ldap_rootdn, "dc=localdomain"},
-                              {ldap_rootdn, "dc=example,dc=com"},
-                              {ldap_password, ""}]}.
+\item To use internal authentication on all virtual hosts:
+  \begin{verbatim}
+{auth_method, internal}.
 \end{verbatim}
 \end{itemize}
 
-\subsubsection{SASL anonymous and anonymous login}
-\label{sec:configsaslanonymous}
+\subsubsection{\aname{saslanonymous}{SASL Anonymous and Anonymous Login}}
+\label{sec:saslanonymous}
 \ind{sasl anonymous}\ind{anonymous login}
 
-The configuration of the anonymous mode can be done with three
-\term{host\_config} parameters:
-
-\begin{itemize} 
-\item \term{auth\_method}: This value is used for defining the authentication method:
-internal, odbc, ldap, external). You now have a special extra option to enable
-anonymous mode: anonymous.
-
-\item \term{allow\_multiple\_connections}: This option can be either true or false and
-is only used when the anonymous mode is enabled. Setting it to true means that
-the same username will be able to be taken several time in anonymous login
-mode if different resource are used to connect. This option is only useful in
-very special cases. It defaults to false.
+%TODO: introduction; tell what people can do with this
+The anonymous authentication method can be configured with the following
+options. Remember that you can use the \term{host\_config} option to set virtual
+host specific options (see section~\ref{sec:virtualhost}). Note that there also
+is a detailed tutorial regarding \footahref{http://support.process-one.net/doc/display/MESSENGER/Anonymous+users+support}{SASL
+Anonymous and anonymous login configuration}.
 
+\begin{itemize}
+\item \term{auth\_method}: The value \term{anonymous} will enable the anonymous
+  authentication method.
+\item \term{allow\_multiple\_connections}: This value for this option can be
+  either \term{true} or \term{false} and is only used when the anonymous mode is
+  enabled. Setting it to \term{true} means that the same username can be taken
+  multiple times in anonymous login mode if different resource are used to
+  connect. This option is only useful in very special occasions. The default
+  value is \term{false}.
 \item \term{anonymous\_protocol}: This option can take three values:
-  \term{sasl\_anon}, \term{login\_anon} or both.  \term{sasl\_anon} means that
-  SASL anonymous mode is enabled.  \term{login\_anon} means that anonymous
-  login mode is enabled. both means that SASL anonymous and login anonymous are
-  enabled.
+  \term{sasl\_anon}, \term{login\_anon} or \term{both}. \term{sasl\_anon} means
+  that the SASL Anonymous method will be used. \term{login\_anon} means that the
+  anonymous login method will be used. \term{both} means that SASL Anonymous and
+  login anonymous are both enabled.
 \end{itemize}
 
 Those options are defined for each virtual host with the \term{host\_config}
-parameter (see section~\ref{sec:configvirtualhost}).
+parameter (see section~\ref{sec:virtualhost}).
 
 Examples:
 \begin{itemize}
-\item To enable anonymous login on a virtual host:
-\begin{verbatim}
-{host_config, "public.example.org", [{auth_method, anonymous},
+\item To enable anonymous login on all virtual hosts:
+  \begin{verbatim}
+{auth_method, [anonymous]}.
+{anonymous_protocol, login_anon}.
+  \end{verbatim}
+\item Similar as previous example, but limited to \jid{public.example.org}:
+  \begin{verbatim}
+{host_config, "public.example.org", [{auth_method, [anonymous]},
                                      {anonymous_protocol, login_anon}]}.
 \end{verbatim}
 \item To enable anonymous login and internal authentication on a virtual host:
-\begin{verbatim}
+  \begin{verbatim}
 {host_config, "public.example.org", [{auth_method, [anonymous,internal]},
                                      {anonymous_protocol, login_anon}]}.
 \end{verbatim}
-\item To enable SASL anonymous on a virtual host:
-\begin{verbatim}
+\item To enable SASL Anonymous on a virtual host:
+  \begin{verbatim}
 {host_config, "public.example.org", [{auth_method, [anonymous]},
                                      {anonymous_protocol, sasl_anon}]}.
 \end{verbatim}
-\item To enable SASL anonymous and anonymous login on a virtual host:
-\begin{verbatim}
+\item To enable SASL Anonymous and anonymous login on a virtual host:
+  \begin{verbatim}
 {host_config, "public.example.org", [{auth_method, [anonymous]},
                                      {anonymous_protocol, both}]}.
 \end{verbatim}
-\item To enable SASL anonymous, anonymous login and internal authentication on
+\item To enable SASL Anonymous, anonymous login, and internal authentication on
 a virtual host:
-\begin{verbatim}
+  \begin{verbatim}
 {host_config, "public.example.org", [{auth_method, [anonymous,internal]},
                                      {anonymous_protocol, both}]}.
 \end{verbatim}
 \end{itemize}
 
-A detailled tutorial on SASL anonymous and anonymous login support is
-available from:
-\ahrefurl{http://support.process-one.net/doc/display/MESSENGER/Anonymous+users+support}
-
-\subsection{Relational Database Support}
-\label{sec:relationaldatabase}
-
-\subsubsection{Preliminary steps}
-\label{sec:relationaldatabasecompilation}
-
-If you have installed ejabberd using a binary version, the compilation steps
-are not needed as they have already been done correctly.
+\subsection{\aname{accessrules}{Access Rules}}
+\label{sec:accessrules}
+\ind{options!acl}\ind{access rules}\ind{ACL}\ind{Access Control List}
 
-Otherwise, to be able to use ejabberd with a relational database you need to
-enable ODBC modules during compilation, even if you want to use ejabberd with
-MySQL or PostgreSQL in native mode. The following \term{configure} command can
-be used to enable the relational modules:
+Access control in \ejabberd{} is performed via Access Control Lists (ACLs). The
+declarations of ACLs in the configuration file have the following syntax:
 \begin{verbatim}
-./configure --enable-odbc
+  {acl, <aclname>, {<acltype>, ...}}.
 \end{verbatim}
 
-If you are planning to use Microsoft SQL Server with ODBC, you need to specify
-it from the \term{configure} command before compilation:
+\term{<acltype>} can be one of the following:
+\begin{description}
+\titem{all} Matches all JIDs. Example:
 \begin{verbatim}
-./configure --enable-odbc --enable-mssql
+{acl, all, all}.
 \end{verbatim}
-
-\subsubsection{Authentication against a relational database}
-\label{sec:relationaldatabaseauth}
-
-ejabberd use its internal Mnesia database as a default. It is however possible
-to use relational database to store persistant, long-living data. When
-switching the \term{auth\_method} from internal to \term{odbc}, you are
-telling ejabberd to use a relational database for authentication. Different
-\term{auth\_method} values can be used for different virtual hosts in the
-system.
-
-The option value name be misleading, as the method name is use both for access
-to relational database through ODBC or through the native interface. In any
-case, the first step is to define the odbc \term{auth\_method}. For example:
+\titem{\{user, <username>\}} Matches the user with the name
+  \term{<username>} at the first virtual host. Example:
 \begin{verbatim}
-{host_config, "public.example.org", [{auth_method, [odbc]}]}.
+{acl, admin, {user, "yozhik"}}.
 \end{verbatim}
+\titem{\{user, <username>, <server>\}} Matches the user with the JID
+  \term{<username>@<server>} and any resource. Example:
+\begin{verbatim}
+{acl, admin, {user, "yozhik", "example.org"}}.
+\end{verbatim}
+\titem{\{server, <server>\}} Matches any JID from server
+  \term{<server>}. Example:
+\begin{verbatim}
+{acl, exampleorg, {server, "example.org"}}.
+\end{verbatim}
+\titem{\{user\_regexp, <regexp>\}} Matches any local user with a name that
+  matches \term{<regexp>} at the first virtual host. Example:
+\begin{verbatim}
+{acl, tests, {user, "^test[0-9]*$"}}.
+\end{verbatim}
+%$
+\titem{\{user\_regexp, <regexp>, <server>\}} Matches any user with a name
+  that matches \term{<regexp>} at server \term{<server>}. Example:
+\begin{verbatim}
+{acl, tests, {user, "^test", "example.org"}}.
+\end{verbatim}
+\titem{\{server\_regexp, <regexp>\}} Matches any JID from the server that
+  matches \term{<regexp>}. Example:
+\begin{verbatim}
+{acl, icq, {server, "^icq\\."}}.
+\end{verbatim}
+\titem{\{node\_regexp, <user\_regexp>, <server\_regexp>\}} Matches any user
+  with a name that matches \term{<user\_regexp>} at any server that matches
+  \term{<server\_regexp>}. Example:
+\begin{verbatim}
+{acl, yohzik, {node_regexp, "^yohzik$", "^example.(com|org)$"}}.
+\end{verbatim}
+\titem{\{user\_glob, <glob>\}}
+\titem{\{user\_glob, <glob>, <server>\}}
+\titem{\{server\_glob, <glob>\}}
+\titem{\{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:
+  \begin{description}
+  \titem{*} matches any string including the null string.
+  \titem{?} matches any single character.
+  \titem{[...]} matches any of the enclosed characters. Character
+    ranges are specified by a pair of characters separated by a \term{`-'}.
+    If the first character after \term{`['} is a \term{`!'}, any
+    character not enclosed is matched.
+  \end{description}
+\end{description}
 
-The actual database access is defined in the option \term{odbc\_server}. Its
-value is use to defined if we want to use ODBC, or one of the two native
-interface available, PostgreSQL or MySQL.
-
-To use a relational database through ODBC, you can pass the ODBC connection
-string as \term{odbc\_server} parameter. For example:
+The following ACLs are pre-defined:
+\begin{description}
+\titem{all} Matches any JID.
+\titem{none} Matches no JID.
+\end{description}
+
+An entry allowing or denying access to different services looks similar to
+this:
 \begin{verbatim}
-{odbc_server, "DSN=database;UID=ejabberd;PWD=password"}.
+  {access, <accessname>, [{allow, <aclname>},
+                          {deny, <aclname>},
+                          ...
+                         ]}.
 \end{verbatim}
+When a JID is checked to have access to \term{<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 the value `\term{deny}' is
+returned.
 
-To use the native PostgreSQL interface, you can pass a tuple of the following form as
-parameter:
+Example:
 \begin{verbatim}
-{pgsql, "Server", "Database", "Username", "Password"}
+  {access, configure, [{allow, admin}]}.
+  {access, something, [{deny, badmans},
+                       {allow, all}]}.
 \end{verbatim}
 
-\term{pgsql} is a keyword that should be kept as is. For example:
+The following access rules are pre-defined:
+\begin{description}
+\titem{all} Always returns the value `\term{allow}'.
+\titem{none} Always returns the value `\term{deny}'.
+\end{description}
+
+\subsection{\aname{shapers}{Shapers}}
+\label{sec:shapers}
+\ind{options!shaper}\ind{options!maxrate}\ind{shapers}\ind{maxrate}\ind{traffic speed}
+
+Shapers enable you to limit connection traffic. The syntax of
+shapers is like this:
 \begin{verbatim}
-{odbc_server, {pgsql, "localhost", "database", "ejabberd", "password"}}.
+  {shaper, <shapername>, <kind>}.
+\end{verbatim}
+Currently only one kind of shaper called \term{maxrate} is available. It has the
+following syntax:
+\begin{verbatim}
+  {maxrate, <rate>}
+\end{verbatim}
+where \term{<rate>} stands for the maximum allowed incomig rate in bytes per
+second.
+
+Examples:
+\begin{itemize}
+\item To define a shaper named `\term{normal}' with traffic speed limited to
+1,000\,bytes/second:
+\begin{verbatim}
+  {shaper, normal, {maxrate, 1000}}.
+\end{verbatim}
+\item To define a shaper named `\term{fast}' with traffic speed limited to
+50,000\,bytes/second:
+\begin{verbatim}
+  {shaper, fast, {maxrate, 50000}}.
 \end{verbatim}
+\end{itemize}
+
+\subsection{Limiting Opened Sessions}
+\label{sec:configmaxsessions}
+\ind{options!max\_user\_sessions}
 
-Note that you need to install the Erlang PgSQL library first. This library is
-available from Sourceforge: \ahrefurl{http://cvs.sourceforge.net/viewcvs.py/jungerl/jungerl/lib/pgsql/}
+This option specifies the maximum number of sessions (authenticated
+connections) per user. If a user tries to open more sessions by using different
+resources, the first opened session will be disconnected. The error
+\term{session replaced} will be sent to the disconnected session. The value
+for this option can be either a number, or \term{infinity}.  The default
+value is \term{10}.
 
-To use the native MySQL interface, the same tuple should be passed, except
-that you now have to use the \term{mysql} keyword instead of the \term{pgsql}
-keyword:
+Examples:
+\begin{itemize}
+\item To limit the number of sessions per user to 10 on all virtual
+hosts:
 \begin{verbatim}
-{mysql, "Server", "Database", "Username", "Password"}
+  {max\_user\_sessions, 10}.
+\end{verbatim}
+\item This option can be defined per virtual host (see
+section~\ref{sec:virtualhost}). In next example the number of
+sessions per user on the first host is six, while there is no limit on the
+second host:
+\begin{verbatim}
+  {host_config, "example.net", [{max\_user\_sessions, 6}]}.
+  {host_config, "example.com", [{max\_user\_sessions, infinity}]}.
 \end{verbatim}
+\end{itemize}
 
-\term{mysql} is a keyword that should be kept as is. For example:
+\subsection{\aname{language}{Default Language}}
+\label{sec:language}
+\ind{options!language}\ind{language}
+
+The option \option{language} defines the default language of server strings that
+can be seen by \Jabber{} clients. If a \Jabber{} client do not support
+\option{xml:lang}, the specified language is used. The default value is
+\term{en}. In order to take effect there must be a translation file
+\term{<language>.msg} in \ejabberd{}'s \term{msgs} directory.
+
+Examples:
+\begin{itemize}
+\item To set Russian as default language:
 \begin{verbatim}
-{odbc_server, {mysql, "localhost", "test", "root", "password"}}.
+  {language, "ru"}.
+\end{verbatim}
+\item To set Spanish as default language:
+\begin{verbatim}
+  {language, "es"}.
 \end{verbatim}
+\end{itemize}
 
-Note that you need to install the Erlang MySQL library first. This library is
-directly available from Process-one website: \ahrefurl{http://support.process-one.net/doc/display/CONTRIBS/Yxa}
 
-A detailled tutorial to set-up \ejabberd{} using the native MySQL interface is
-available from: \ahrefurl{http://support.process-one.net/doc/display/MESSENGER/Using+ejabberd+with+MySQL+native+driver}
+\section{\aname{database}{Database Configuration}}
+\label{sec:database}
+\ind{database}
+%TODO: this whole section is not yet 100% optimized
 
-\subsubsection{Relational database for other modules}
-\label{sec:relationaldatabaseextra}
+\ejabberd{} uses its internal Mnesia database by default. However, it is
+possible to use a relational database or an LDAP server to store persistant,
+long-living data. \ejabberd{} is very flexible: you can configure different
+authentication methods for different virtual hosts, you can configure different
+authentication mechanisms for the same virtual host (fallback), you can set
+different storage systems for modules, and so forth.
 
-It is possible to use a relational database to store pieces of
-information. You can do this by changing the module name to a name with an
-\term{\_odbc} suffix in \ejabberd{} config file. You can use a relational
-database for the following data:
+The following databases are supported by \ejabberd{}:
+\begin{itemize}
+\item \footahref{http://www.microsoft.com/sql/}{Microsoft SQL Server}
+\item \footahref{http://www.erlang.org/doc/doc-5.5.1/lib/mnesia-4.3.2/doc/}{Mnesia}
+\item \footahref{http://mysql.com/}{MySQL}
+\item \footahref{http://en.wikipedia.org/wiki/Open\_Database\_Connectivity}{Any ODBC compatible database}
+\item \footahref{http://www.postgresql.org/}{PostgreSQL}
+\end{itemize}
 
+The following LDAP servers are tested with \ejabberd{}:
 \begin{itemize}
-\item Last connection date and time: Use \term{mod\_last\_odbc} instead of
-  \term{mod\_last}.
-\item Offline messages: Use \term{mod\_offline\_odbc} instead of
-  \term{mod\_offline}.
-\item Rosters: Use \term{mod\_roster\_odbc} instead of \term{mod\_roster}.
-\item Users' VCARD: Use \term{mod\_vcard\_odbc} instead of \term{mod\_vcard}.
+\item \footahref{http://www.microsoft.com/activedirectory/}{Active Directory}
+  (see section~\ref{sec:ad})
+\item \footahref{http://www.openldap.org/}{OpenLDAP}
+\item Normally any LDAP compatible server should work; inform us about your
+  success with a not-listed server so that we can list it here.
 \end{itemize}
 
-\subsection{Creating an Initial Administrator}
-\label{sec:initialadmin}
+\subsection{\aname{mysql}{MySQL}}
+\label{sec:mysql}
+\ind{MySQL}\ind{MySQL!schema}
 
-Before the web interface can be entered to perform administration tasks, an
-account with administrator rights is needed on your \ejabberd{} deployment.
+Although this section will describe \ejabberd{}'s configuration when you want to
+use the native MySQL driver, it does not describe MySQL's installation and
+database creation. Check the MySQL documentation and the tutorial \footahref{http://support.process-one.net/doc/display/MESSENGER/Using+ejabberd+with+MySQL+native+driver}{Using ejabberd with MySQL native driver} for information regarding these topics.
+Note that the tutorial contains information about \ejabberd{}'s configuration
+which is duplicate to this section.
+
+Moreover, the file mysql.sql in the directory src/odbc might be interesting for
+you. This file contains the ejabberd schema for MySQL. At the end of the file
+you can find information to update your database schema.
+
+\subsubsection{\aname{compilemysql}{Driver Compilation}}
+\label{sec:compilemysql}
+\ind{MySQL!Driver Compilation}
+
+You can skip this step if you installed \ejabberd{} using a binary installer or
+if the binary packages of \ejabberd{} you are using include support for MySQL.
 
-Instructions to create an initial administrator account:
 \begin{enumerate}
-\item Register an account on your \ejabberd{} deployment. An account can be
-  created in two ways:
-  \begin{enumerate}
-  \item Using the tool \term{ejabberdctl}\ind{ejabberdctl} (see
-    section~\ref{sec:ejabberdctl}):
-    \begin{verbatim}
-% ejabberdctl node@host register admin example.org password
-\end{verbatim} 
-  \item Using In-Band Registration (see section~\ref{sec:modregister}): you can
-    use a \Jabber{} client to register an account.
-  \end{enumerate}
-\item 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.
+\item First, install the \footahref{http://support.process-one.net/doc/display/CONTRIBS/Yxa}{Erlang
+  MySQL library}. Make sure the compiled files are in your Erlang path; you can
+  put them for example in the same directory as your ejabberd .beam files.
+\item Then, configure and install \ejabberd{} with ODBC support enabled (this is
+  also needed for native MySQL support!). This can be done, by using next
+  commands:
   \begin{verbatim}
-  {acl, admins, {user, "admin", "example.org"}}.
-  {access, configure, [{allow, admins}]}.
-\end{verbatim} 
-\item Restart \ejabberd{} to load the new configuration.
-\item Open the web interface (\verb|http://server:port/admin/|) in your
-  favourite browser. Make sure to enter the \emph{full} JID as username (in this
-  example: \jid{admin@example.org}. The reason that you also need to enter the
-  suffix, is because \ejabberd{}'s virtual hosting support.
+./configure --enable-odbc && make install
+\end{verbatim}
 \end{enumerate}
 
-\subsection{Online Configuration and Monitoring}
-\label{sec:onlineconfig}
-
-\subsubsection{Web Interface}
-\label{sec:webadm}
-\ind{web interface}
+\subsubsection{\aname{mysqlauth}{Authentication}}
+\label{sec:mysqlauth}
+\ind{MySQL!authentication}
 
-To perform online configuration of \ejabberd{} you need to enable the
-\term{ejabberd\_http} listener with the option \term{web\_admin} (see
-section~\ref{sec:configlistened}). Then you can open 
-\verb|http://server:port/admin/| in your favourite web browser. You
-will be asked to enter the username (the \emph{full} \Jabber{} ID) and password
-of an \ejabberd{} user with administrator rights. After authentication
-you will see a page similar to figure~\ref{fig:webadmmain}.
+The option value name may be misleading, as the \term{auth\_method} name is used
+for access to a relational database through ODBC, as well as through the native
+MySQL interface. Anyway, the first configuration step is to define the odbc
+\term{auth\_method}. For example:
+\begin{verbatim}
+{host_config, "public.example.org", [{auth_method, [odbc]}]}.
+\end{verbatim}
 
-\begin{figure}[htbp]
-  \centering
-  \insimg{webadmmain.png}
-  \caption{Top page from the web interface}
-  \label{fig:webadmmain}
-\end{figure}
-Here you can edit access restrictions, manage users, create backups,
-manage the database, enable/disable ports listened for, view server
-statistics,\ldots
+The actual database access is defined in the option \term{odbc\_server}. Its
+value is used to define if we want to use ODBC, or one of the two native
+interface available, PostgreSQL or MySQL.
 
-Examples:
-\begin{itemize}
-\item You can serve the web interface on the same port as the
-  \ind{protocols!JEP-0025: HTTP Polling}HTTP Polling interface. In this example
-  you should point your web browser to \verb|http://example.org:5280/admin/| to
-  administer all virtual hosts or to
-  \verb|http://example.org:5280/admin/server/example.com/| to administer only
-  the virtual host \jid{example.com}. 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 ``\jid{admin@example.net}'' to administer all virtual hosts (first
-  URL). If you log in with ``\jid{admin@example.com}'' on \\
-  \verb|http://example.org:5280/admin/server/example.com/| you can only
-  administer the virtual host \jid{example.com}.
-  \begin{verbatim}
-  ...
-  {acl, admins, {user, "admin", "example.net"}}.
-  {host_config, "example.com", [{acl, admins, {user, "admin", "example.com"}}]}.
-  {access, configure, [{allow, admins}]}.
-  ...
-  {hosts, ["example.org"]}.
-  ...
-  {listen,
-   [...
-    {5280, ejabberd_http, [http_poll, web_admin]},
-    ...
-   ]
-  }.
+To use the native MySQL interface, you can pass a tuple of the following form as
+parameter:
+\begin{verbatim}
+{mysql, "Server", "Database", "Username", "Password"}
 \end{verbatim}
-\item 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 \verb|https://192.168.1.1:5280/admin/|:
-  \begin{verbatim}
-  ...
-  {hosts, ["example.org"]}.
-  ...
-  {listen,
-   [...
-    {5270, ejabberd_http,    [http_poll]},
-    {5280, ejabberd_http,    [web_admin, {ip, {192, 168, 1, 1}},
-                              tls, {certfile, "/usr/local/etc/server.pem"}]},
-    ...
-   ]
-  }.
+
+\term{mysql} is a keyword that should be kept as is. For example:
+\begin{verbatim}
+{odbc_server, {mysql, "localhost", "test", "root", "password"}}.
 \end{verbatim}
-\end{itemize}
 
-\subsubsection{\term{ejabberdctl}}
-\label{sec:ejabberdctl}
+\subsubsection{\aname{mysqlstorage}{Storage}}
+\label{sec:mysqlstorage}
+\ind{MySQL!storage}
 
-It is possible to do some administration operations using the command
-line tool \term{ejabberdctl}. You can list all available options by
-running \term{ejabberdctl} without arguments:
-\begin{verbatim}
-% ejabberdctl
-Usage: ejabberdctl node command
+MySQL also can be used to store information into from several \ejabberd{}
+modules. See section~\ref{sec:modoverview} to see which modules have a version
+with the `\_odbc'. This suffix indicates that the module can be used with
+relational databases like MySQL. To enable storage to your database, just make
+sure that your database is running well (see previous sections), and replace the
+suffix-less or ldap module variant with the odbc module variant. Keep in mind
+that you cannot have several variants of the same module loaded!
 
-Available commands:
-  status                        get ejabberd status
-  stop                          stop ejabberd
-  restart                       restart ejabberd
-  reopen-log                    reopen log file
-  register user server password register a user
-  unregister user server        unregister a user
-  backup file                   store a database backup to file
-  restore file                  restore a database backup from file
-  install-fallback file         install a database fallback from file
-  dump file                     dump a database to a text file
-  load file                     restore a database from a text file
-  import-file file              import user data from jabberd 1.4 spool file
-  import-dir dir                import user data from jabberd 1.4 spool directory
-  registered-users              list all registered users
-  delete-expired-messages       delete expired offline messages from database
+\subsection{\aname{mssql}{Microsoft SQL Server}}
+\label{sec:mssql}
+\ind{Microsoft SQL Server}\ind{Microsoft SQL Server!schema}
 
-Example:
-  ejabberdctl ejabberd@host restart
+Although this section will describe \ejabberd{}'s configuration when you want to
+use Microsoft SQL Server, it does not describe Microsoft SQL Server's
+installation and database creation. Check the MySQL documentation and the
+tutorial \footahref{http://support.process-one.net/doc/display/MESSENGER/Using+ejabberd+with+MySQL+native+driver}{Using ejabberd with MySQL native driver} for information regarding these topics.
+Note that the tutorial contains information about \ejabberd{}'s configuration
+which is duplicate to this section.
+
+Moreover, the file mssql.sql in the directory src/odbc might be interesting for
+you. This file contains the ejabberd schema for Microsoft SQL Server. At the end
+of the file you can find information to update your database schema.
+
+\subsubsection{\aname{compilemssql}{Driver Compilation}}
+\label{sec:compilemssql}
+\ind{Microsoft SQL Server!Driver Compilation}
+
+You can skip this step if you installed \ejabberd{} using a binary installer or
+if the binary packages of \ejabberd{} you are using include support for ODBC.
+
+If you want to use Microsoft SQL Server with ODBC, you need to configure,
+compile and install \ejabberd{} with support for ODBC and Microsoft SQL Server
+enabled. This can be done, by using next commands:
+\begin{verbatim}
+./configure --enable-odbc --enable-mssql && make install
 \end{verbatim}
 
-Additional information:
-\begin{description}
-\titem{reopen-log } If you use a tool to rotate logs, you have to configure it
-  so that this command is executed after each rotation.
-\titem {backup, restore, install-fallback, dump, load} You can use these
-  commands to create and restore backups. 
-%%More information about backuping can
-%%  be found in section~\ref{sec:backup}.
-\titem{import-file, import-dir} \ind{migration!from jabberd 1.4}\ind{migration!from jabberd2}
-  These options can be used to migrate from other \Jabber{}/XMPP servers. There
-  exist tutorials to \footahref{http://ejabberd.jabber.ru/jabberd1-to-ejabberd}{migrate from jabberd 1.4}
-  and to \footahref{http://ejabberd.jabber.ru/jabberd2-to-ejabberd}{migrate from jabberd2}.
-\titem{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.
-\end{description}
+\subsubsection{\aname{mssqlauth}{Authentication}}
+\label{sec:mssqlauth}
+\ind{Microsoft SQL Server!authentication}
 
+%TODO: not sure if this section is right!!!!!!
 
-\section{Firewall Settings}
-\label{sec:firewall}
-\ind{firewall}\ind{ports}\ind{SASL}\ind{TLS}\ind{clustering!ports}
+The configuration of Microsoft SQL Server is the same as the configuration of
+ODBC compatible serers (see section~\ref{sec:odbcauth}).
 
-You need to take the following TCP ports in mind when configuring your firewall:
-\begin{table}[H]
-  \centering
-  \begin{tabular}{|l|l|}
-    \hline Port& Description\\
-    \hline \hline 5222& SASL and unencrypted c2s connections.\\
-    \hline 5223& Obsolete SSL c2s connections.\\
-    \hline 5269& s2s connections.\\
-    \hline 4369& Only for clustering (see~\ref{sec:clustering}).\\
-    \hline port range& Only for clustring (see~\ref{sec:clustering}). This range
-    is configurable (see~\ref{sec:starting}).\\
-    \hline
-  \end{tabular}
-\end{table}
+\subsubsection{\aname{mssqlstorage}{Storage}}
+\label{sec:mssqlstorage}
+\ind{Microsoft SQL Server!storage}
 
+Microsoft SQL Server also can be used to store information into from several
+\ejabberd{} modules. See section~\ref{sec:modoverview} to see which modules have
+a version with the `\_odbc'. This suffix indicates that the module can be used
+with relational databases like Microsoft SQL Server. To enable storage to your
+database, just make sure that your database is running well (see previous
+sections), and replace the suffix-less or ldap module variant with the odbc
+module variant. Keep in mind that you cannot have several variants of the same
+module loaded!
 
-\section{SRV Records}
-\label{sec:srv}
-\ind{SRV Records}\ind{clustering!SRV Records}
+\subsection{\aname{pgsql}{PostgreSQL}}
+\label{sec:pgsql}
+\ind{PostgreSQL}\ind{PostgreSQL!schema}
 
-\begin{itemize}
-\item General information:
-  \footahref{http://en.wikipedia.org/wiki/SRV\_record}{SRV record}
-\item Practical information:
-  \footahref{http://jabberd.jabberstudio.org/2/docs/section05.html\#5\_7}{Setting DNS SRV Records}
-\end{itemize}
+Although this section will describe \ejabberd{}'s configuration when you want to
+use the native PostgreSQL driver, it does not describe PostgreSQL's installation
+and database creation. Check the PostgreSQL documentation and the tutorial \footahref{http://support.process-one.net/doc/display/MESSENGER/Using+ejabberd+with+MySQL+native+driver}{Using ejabberd with MySQL native driver} for information regarding these topics.
+Note that the tutorial contains information about \ejabberd{}'s configuration
+which is duplicate to this section.
 
+Also the file pg.sql in the directory src/odbc might be interesting for you.
+This file contains the ejabberd schema for PostgreSQL. At the end of the file
+you can find information to update your database schema.
 
-\section{Clustering}
-\label{sec:clustering}
-\ind{clustering}
+\subsubsection{\aname{compilepgsql}{Driver Compilation}}
+\label{sec:compilepgsql}
+\ind{PostgreSQL!Driver Compilation}
 
-\subsection{How it Works}
-\label{sec:howitworks}
-\ind{clustering!how it works}
+You can skip this step if you installed \ejabberd{} using a binary installer or
+if the binary packages of \ejabberd{} you are using include support for
+PostgreSQL.
 
-A \Jabber{} domain is served by one or more \ejabberd{} nodes. These nodes can
-be run on different machines that are connected via a network. They all
-must have the ability to connect to port 4369 of all another nodes, and must
-have the same magic cookie (see Erlang/OTP documentation, in other words the
-file \term{\~{}ejabberd/.erlang.cookie} must be the same on all nodes). This is
-needed because all nodes exchange information about connected users, s2s
-connections, registered services, etc\ldots
+\begin{enumerate}
+\item First, install the Erlang PgSQL library from
+  \footahref{http://jungerl.sourceforge.net/}{Jungerl}. Make sure the compiled
+  files are in your Erlang path; you can put them for example in the same
+  directory as your ejabberd .beam files.
+\item Then, configure, compile and install \ejabberd{} with ODBC support enabled
+  (this is also needed for native PostgreSQL support!). This can be done, by
+  using next commands:
+  \begin{verbatim}
+./configure --enable-odbc && make install
+\end{verbatim}
+\end{enumerate}
 
-Each \ejabberd{} node has the following modules:
-\begin{itemize}
-\item router,
-\item local router,
-\item session manager,
-\item s2s manager.
-\end{itemize}
+\subsubsection{\aname{pgsqlauth}{Authentication}}
+\label{sec:pgsqlauth}
+\ind{PostgreSQL!authentication}
 
-\subsubsection{Router}
-\ind{clustering!router}
+The option value name may be misleading, as the \term{auth\_method} name is used
+for access to a relational database through ODBC, as well as through the native
+PostgreSQL interface. Anyway, the first configuration step is to define the odbc
+\term{auth\_method}. For example:
+\begin{verbatim}
+{host_config, "public.example.org", [{auth_method, [odbc]}]}.
+\end{verbatim}
 
-This module is the main router of \Jabber{} packets on each node. It
-routes them based on their destination's domains. It uses a global
-routing table. The domain of the packet's destination is searched in the
-routing table, and if it is found, the packet is routed to the
-appropriate process. If not, it is sent to the s2s manager.
+The actual database access is defined in the option \term{odbc\_server}. Its
+value is used to define if we want to use ODBC, or one of the two native
+interface available, PostgreSQL or MySQL.
 
-\subsubsection{Local Router}
-\ind{clustering!local router}
+To use the native PostgreSQL interface, you can pass a tuple of the following
+form as parameter:
+\begin{verbatim}
+{pgsql, "Server", "Database", "Username", "Password"}
+\end{verbatim}
 
-This module routes packets which have a destination domain equal to
-one of this server's host names. If the destination JID has a non-empty user
-part, it is routed to the session manager, otherwise it is processed depending
-on its content.
+\term{pgsql} is a keyword that should be kept as is. For example:
+\begin{verbatim}
+{odbc_server, {pgsql, "localhost", "database", "ejabberd", "password"}}.
+\end{verbatim}
 
-\subsubsection{Session Manager}
-\ind{clustering!session manager}
+\subsubsection{\aname{pgsqlstorage}{Storage}}
+\label{sec:pgsqlstorage}
+\ind{PostgreSQL!storage}
 
-This module routes packets to local users. It looks up to which user
-resource a packet must be sent via a presence table. Then the packet is
-either routed to the appropriate c2s process, or stored in offline
-storage, or bounced back.
+PostgreSQL also can be used to store information into from several \ejabberd{}
+modules. See section~\ref{sec:modoverview} to see which modules have a version
+with the `\_odbc'. This suffix indicates that the module can be used with
+relational databases like PostgreSQL. To enable storage to your database, just
+make sure that your database is running well (see previous sections), and
+replace the suffix-less or ldap module variant with the odbc module variant.
+Keep in mind that you cannot have several variants of the same module loaded!
 
-\subsubsection{s2s Manager}
-\ind{clustering!s2s manager}
+\subsection{\aname{odbc}{ODBC Compatible}}
+\label{sec:odbc}
+\ind{databases!ODBC}
 
-This module routes packets to other \Jabber{} servers. First, it
-checks if an opened s2s connection from the domain of the packet's
-source to the domain of the packet's destination exists. If that is the case,
-the s2s manager routes the packet to the process
-serving this connection, otherwise a new connection is opened.
+Although this section will describe \ejabberd{}'s configuration when you want to
+use the ODBC driver, it does not describe the installation and database creation
+of your database. Check the documentation of your database. The tutorial \footahref{http://support.process-one.net/doc/display/MESSENGER/Using+ejabberd+with+MySQL+native+driver}{Using ejabberd with MySQL native driver} also can help you. Note that the tutorial
+contains information about \ejabberd{}'s configuration which is duplicate to
+this section.
 
-\subsection{Clustering Setup}
-\label{sec:cluster}
-\ind{clustering!setup}
+\subsubsection{\aname{compileodbc}{Compilation}}
+\label{sec:compileodbc}
 
-Suppose you already configured \ejabberd{} on one machine named (\term{first}),
-and you need to setup another one to make an \ejabberd{} cluster. Then do
-following steps:
+You can skip this step if you installed \ejabberd{} using a binary installer or
+if the binary packages of \ejabberd{} you are using include support for
+ODBC.
 
 \begin{enumerate}
-\item Copy \verb|~ejabberd/.erlang.cookie| file from \term{first} to
-  \term{second}.
-
-  (alt) You can also add ``\verb|-cookie content_of_.erlang.cookie|''
-  option to all ``\shell{erl}'' commands below.
+\item First, install the \footahref{http://support.process-one.net/doc/display/CONTRIBS/Yxa}{Erlang
+  MySQL library}. Make sure the compiled files are in your Erlang path; you can
+  put them for example in the same directory as your ejabberd .beam files.
+\item Then, configure, compile and install \ejabberd{} with ODBC support
+  enabled. This can be done, by using next commands:
+  \begin{verbatim}
+./configure --enable-odbc && make install
+\end{verbatim}
+\end{enumerate}
 
-\item On \term{second} run as the `\term{ejabberd}' user in the directory
-  where \ejabberd{} will work later the following command:
+\subsubsection{\aname{odbcauth}{Authentication}}
+\label{sec:odbcauth}
+\ind{ODBC!authentication}
 
+The first configuration step is to define the odbc \term{auth\_method}. For
+example:
 \begin{verbatim}
-erl -sname ejabberd \
-    -mnesia extra_db_nodes "['ejabberd@first']" \
-    -s mnesia
+{host_config, "public.example.org", [{auth_method, [odbc]}]}.
 \end{verbatim}
 
-  This will start Mnesia serving the same database as \node{ejabberd@first}.
-  You can check this by running the command ``\verb|mnesia:info().|''. You
-  should see a lot of remote tables and a line like the following:
+The actual database access is defined in the option \term{odbc\_server}. Its
+value is used to defined if we want to use ODBC, or one of the two native
+interface available, PostgreSQL or MySQL.
 
+To use a relational database through ODBC, you can pass the ODBC connection
+string as \term{odbc\_server} parameter. For example:
 \begin{verbatim}
-running db nodes   = [ejabberd@first, ejabberd@second]
+{odbc_server, "DSN=database;UID=ejabberd;PWD=password"}.
 \end{verbatim}
 
+\subsubsection{\aname{odbcstorage}{Storage}}
+\label{sec:odbcstorage}
+\ind{ODBC!storage}
 
-\item Now run the following in the same ``\shell{erl}'' session:
+An ODBC compatible database also can be used to store information into from
+several \ejabberd{} modules. See section~\ref{sec:modoverview} to see which
+modules have a version with the `\_odbc'. This suffix indicates that the module
+can be used with ODBC compatible relational databases. To enable storage to your
+database, just make sure that your database is running well (see previous
+sections), and replace the suffix-less or ldap module variant with the odbc
+module variant. Keep in mind that you cannot have several variants of the same
+module loaded!
 
-\begin{verbatim}
-mnesia:change_table_copy_type(schema, node(), disc_copies).
-\end{verbatim}
+\subsection{\aname{ldap}{LDAP}}
+\label{sec:ldap}
+\ind{databases!LDAP}
 
-  This will create local disc storage for the database.
+\ejabberd{} has built-in LDAP support. You can authenticate users against LDAP
+server and use LDAP directory as vCard storage. Shared rosters are not supported
+yet.
 
-  (alt) Change storage type of `\term{scheme}' table to ``RAM and disc
-  copy'' on the second node via the web interface.
+\subsubsection{\aname{ldapconnection}{Connection}}
+\label{sec:ldapconnection}
 
+Parameters:
+\begin{description}
+\titem{ldap\_server} \ind{options!ldap\_server}IP address or dns name of your
+LDAP server. This option is required.
+\titem{ldap\_port} \ind{options!ldap\_port}Port to connect to your LDAP server.
+  The default value is~389.
+\titem{ldap\_rootdn} \ind{options!ldap\_rootdn}Bind DN. The default value
+  is~\term{""} which means `anonymous connection'.
+\titem{ldap\_password} \ind{options!ldap\_password}Bind password. The default
+  value is \term{""}.
+\end{description}
 
-\item Now you can add replicas of various tables to this node with
-  ``\verb|mnesia:add_table_copy|'' or
-  ``\verb|mnesia:change_table_copy_type|'' as above (just replace
-  ``\verb|schema|'' with another table name and ``\verb|disc_copies|''
-  can be replaced with ``\verb|ram_copies|'' or
-  ``\verb|disc_only_copies|'').
+Example:
+\begin{verbatim}
+  {auth_method, ldap}.
+  {ldap_servers, ["ldap.example.org"]}.
+  {ldap_port, 389}.
+  {ldap_rootdn, "cn=Manager,dc=domain,dc=org"}.
+  {ldap_password, "secret"}.
+\end{verbatim}
 
-  Which tables to replicate is very dependant on your needs, you can get
-  some hints from the command ``\verb|mnesia:info().|'', by looking at the
-  size of tables and the default storage type for each table on 'first'.
+Note that current LDAP implementation does not support SSL secured communication
+and SASL authentication.
 
-  Replicating a table makes lookups in this table faster on this node.
-  Writing, on the other hand, will be slower. And of course if machine with one
-  of the replicas is down, other replicas will be used.
+\subsubsection{\aname{ldapauth}{Authentication}}
+\label{sec:ldapauth}
 
-  Also \footahref{http://www.erlang.se/doc/doc-5.4.9/lib/mnesia-4.2.2/doc/html/Mnesia\_chap5.html\#5.3}
-  {section 5.3 (Table Fragmentation) of Mnesia User's Guide} can be helpful.
-  % The above URL needs update every Erlang release!
+You can authenticate users against an LDAP directory. Available options are:
 
-  (alt) Same as in previous item, but for other tables.
+\begin{description}
+\titem{ldap\_base}\ind{options!ldap\_base}LDAP base directory which stores users
+  accounts. This option is required.
+\titem{ldap\_uidattr}\ind{options!ldap\_uidattr}LDAP attribute which holds
+  the user's part of a JID. The default value is \term{"uid"}.
+\titem{ldap\_uidattr\_format}\ind{options!ldap\_uidattr\_format}Format of the
+  \term{ldap\_uidattr} variable. The format \emph{must} contain one and only one
+  pattern variable \term{"\%u"} which will be replaced by the user's part of a
+  JID. For example, \term{"\%u@example.org"}. The default value is \term{"\%u"}.
+\titem{ldap\_filter}\ind{options!ldap\_filter}\ind{protocols!RFC 2254: The String Representation of LDAP Search Filters}
+  \footahref{http://www.faqs.org/rfcs/rfc2254.html}{RFC 2254} LDAP filter. The
+  default is \term{none}. Example:
+  \term{"(\&(objectClass=shadowAccount)(memberOf=Jabber Users))"}. Please, do
+  not forget to close brackets and do not use superfluous whitespaces. Also you
+  \emph{must not} use \option{ldap\_uidattr} attribute in filter because this
+  attribute will be substituted in LDAP filter automatically.
+\end{description}
 
+\subsubsection{\aname{ldapexamples}{Examples}}
+\label{sec:ldapexamples}
 
-\item Run ``\verb|init:stop().|'' or just ``\verb|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 \term{first}.
+\paragraph{\aname{ldapcommonexample}{Common example}}
 
+Let's say \term{ldap.example.org} is the name of our LDAP server. We have
+users with their passwords in \term{"ou=Users,dc=example,dc=org"} directory.
+Also we have addressbook, which contains users emails and their additional
+infos in \term{"ou=AddressBook,dc=example,dc=org"} directory.  Corresponding
+authentication section should looks like this:
 
-\item Now run \ejabberd{} on \term{second} with almost the same config as
-  on \term{first} (you probably don't need to duplicate ``\verb|acl|''
-  and ``\verb|access|'' options --- they will be taken from
-  \term{first}, and \verb|mod_muc| and \verb|mod_irc| should be
-  enabled only on one machine in the cluster).
-\end{enumerate}
+\begin{verbatim}
+  %% authentication method
+  {auth_method, ldap}.
+  %% DNS name of our LDAP server
+  {ldap_servers, ["ldap.example.org"]}.
+  %% Bind to LDAP server as "cn=Manager,dc=example,dc=org" with password "secret"
+  {ldap_rootdn, "cn=Manager,dc=example,dc=org"}.
+  {ldap_password, "secret"}.
+  %% define the user's base
+  {ldap_base, "ou=Users,dc=example,dc=org"}.
+  %% We want to authorize users from 'shadowAccount' object class only
+  {ldap_filter, "(objectClass=shadowAccount)"}.
+\end{verbatim}
 
-You can repeat these steps for other machines supposed to serve this
-domain.
+Now we want to use users LDAP-info as their vCards.  We have four attributes
+defined in our LDAP schema: \term{"mail"} --- email address, \term{"givenName"}
+--- first name, \term{"sn"} --- second name, \term{"birthDay"} --- birthday.
+Also we want users to search each other.  Let's see how we can set it up:
 
-% TODO
-% See also the section about ejabberdctl!!!!
-%\section{Backup and Restore}
-%\label{sec:backup}
-%\ind{backup}
+\begin{verbatim}
+  {modules,
+    ...
+    {mod_vcard_ldap,
+     [
+      %% We use the same server and port, but want to bind anonymously because
+      %% our LDAP server accepts anonymous requests to
+      %% "ou=AddressBook,dc=example,dc=org" subtree.
+      {ldap_rootdn, ""},
+      {ldap_password, ""},
+      %% define the addressbook's base
+      {ldap_base, "ou=AddressBook,dc=example,dc=org"},
+      %% user's part of JID is located in the "mail" attribute
+      {ldap_uidattr, "mail"},
+      %% common format for our emails
+      {ldap_uidattr_format, "%u@mail.example.org"},
+      %% We have to define empty filter here, because entries in addressbook does not
+      %% belong to shadowAccount object class
+      {ldap_filter, ""},
+      %% Now we want to define vCard pattern
+      {ldap_vcard_map,
+       [{"NICKNAME", "%u", []}, % just use user's part of JID as his nickname
+        {"GIVEN", "%s", ["givenName"]},
+        {"FAMILY", "%s", ["sn"]},
+        {"FN", "%s, %s", ["sn", "givenName"]}, % example: "Smith, John"
+        {"EMAIL", "%s", ["mail"]},
+        {"BDAY", "%s", ["birthDay"]}]},
+      %% Search form
+      {ldap_search_fields,
+       [{"User", "%u"},
+        {"Name", "givenName"},
+        {"Family Name", "sn"},
+        {"Email", "mail"},
+        {"Birthday", "birthDay"}]},
+      %% vCard fields to be reported
+      %% Note that JID is always returned with search results
+      {ldap_search_reported,
+       [{"Full Name", "FN"},
+        {"Nickname", "NICKNAME"},
+        {"Birthday", "BDAY"}]}
+    ]}
+    ...
+  }.
+\end{verbatim}
 
-\appendix{}
-\section{Built-in Modules}
-\label{sec:modules}
-\ind{modules}
+Note that \modvcardldap{} module checks for the existence of the user before
+searching in his information in LDAP.
 
-\subsection{Overview}
-\label{sec:modoverview}
-\ind{modules!overview}\ind{XMPP compliancy}
 
-The following table lists all modules available in the official \ejabberd{}
-distribution. You can find more
-\footahref{http://ejabberd.jabber.ru/contributions}{contributed modules} on the
-ejabberd website. Please remember that these contributions might not work or
-that they can contain severe bugs and security leaks. Therefore, use them at
-your own risk!
+\paragraph{\aname{ad}{Active Directory}}
+\label{sec:ad}
+\ind{databases!Active Directory}
 
-You can see which database backend each module needs by looking at the suffix:
-\begin{itemize}
-\item ``\_ldap'', this means that the module needs an LDAP server as backend.
-\item ``\_odbc'', this means that the module needs an ODBC compatible database,
-  a MySQL database, or a PostgreSQL database as backend.
-\item Nothing, this means that the modules uses Erlang's built-in database
-  Mnesia as backend.
-\end{itemize}
+Active Directory is just an LDAP-server with predefined attributes. A sample
+configuration is showed below:
 
-\begin{table}[H]
-  \centering
-  \begin{tabular}{|l|l|l|l|}
-    \hline Module & Feature & Dependencies & Needed for XMPP? \\ 
-    \hline \hline \modadhoc{} & Ad-Hoc Commands (\jepref{0050}) &  & No \\ 
-    \hline \modannounce{} & Manage announcements & \modadhoc{} & No \\ 
-    \hline \modconfigure{} & Support for online & \modadhoc{} & No \\ 
-    & configuration of ejabberd & & \\ 
-    \hline \moddisco{} & Service Discovery (\jepref{0030}) &  & No \\ 
-    \hline \modecho{} & Echoes Jabber packets &  & No \\ 
+\begin{verbatim}
+  {auth_method, ldap}.
+  {ldap_servers, ["office.org"]}.    % List of LDAP servers
+  {ldap_base, "DC=office,DC=org"}. % Search base of LDAP directory
+  {ldap_rootdn, "CN=Administrator,CN=Users,DC=office,DC=org"}. % LDAP manager
+  {ldap_password, "*******"}. % Password to LDAP manager
+  {ldap_uidattr, "sAMAccountName"}.
+  {ldap_filter, "(memberOf=*)"}.
+  
+  {mod_vcard_ldap,
+   [{ldap_vcard_map,
+     [{"NICKNAME", "%u", []},
+      {"GIVEN", "%s", ["givenName"]},
+      {"MIDDLE", "%s", ["initials"]},
+      {"FAMILY", "%s", ["sn"]},
+      {"FN", "%s", ["displayName"]},
+      {"EMAIL", "%s", ["mail"]},
+      {"ORGNAME", "%s", ["company"]},
+      {"ORGUNIT", "%s", ["department"]},
+      {"CTRY", "%s", ["c"]},
+      {"LOCALITY", "%s", ["l"]},
+      {"STREET", "%s", ["streetAddress"]},
+      {"REGION", "%s", ["st"]},
+      {"PCODE", "%s", ["postalCode"]},
+      {"TITLE", "%s", ["title"]},
+      {"URL", "%s", ["wWWHomePage"]},
+      {"DESC", "%s", ["description"]},
+      {"TEL", "%s", ["telephoneNumber"]}]},
+    {ldap_search_fields,
+     [{"User", "%u"},
+      {"Name", "givenName"},
+      {"Family Name", "sn"},
+      {"Email", "mail"},
+      {"Company", "company"},
+      {"Department", "department"},
+      {"Role", "title"},
+      {"Description", "description"},
+      {"Phone", "telephoneNumber"}]},
+    {ldap_search_reported,
+     [{"Full Name", "FN"},
+      {"Nickname", "NICKNAME"},
+      {"Email", "EMAIL"}]}
+   ]
+  }.
+\end{verbatim}
+
+
+\section{\aname{modules}{Modules Configuration}}
+\label{sec:modules}
+\ind{modules}
+
+The option \term{modules} defines the list of modules that will be loaded after
+\ejabberd{}'s startup. Each entry in the list is a tuple in which the first
+element is the name of a module and the second is a list of options for that
+module.
+
+Examples:
+\begin{itemize}
+\item In this example only the module \modecho{} is loaded and no module
+  options are specified between the square brackets:
+  \begin{verbatim}
+  {modules,
+   [{mod_echo,      []}
+   ]}.
+\end{verbatim}
+\item In the second example the modules \modecho{}, \modtime{}, and
+  \modversion{} are loaded without options. Remark that, besides the last entry,
+  all entries end with a comma:
+  \begin{verbatim}
+  {modules,
+   [{mod_echo,      []},
+    {mod_time,      []},
+    {mod_version,   []}
+   ]}.
+\end{verbatim}
+\end{itemize}
+
+\subsection{\aname{modoverview}{Overview}}
+\label{sec:modoverview}
+\ind{modules!overview}\ind{XMPP compliancy}
+
+The following table lists all modules available in the official \ejabberd{}
+distribution. You can find more
+\footahref{http://ejabberd.jabber.ru/contributions}{contributed modules} on the
+\ejabberd{} website. Please remember that these contributions might not work or
+that they can contain severe bugs and security leaks. Therefore, use them at
+your own risk!
+
+You can see which database backend each module needs by looking at the suffix:
+\begin{itemize}
+\item `\_ldap', this means that the module needs an LDAP server as backend.
+\item `\_odbc', this means that the module needs a supported database
+  (see~\ref{sec:database}) as backend.
+\item No suffix, this means that the modules uses Erlang's built-in database
+  Mnesia as backend.
+\end{itemize}
+
+If you want to
+It is possible to use a relational database to store pieces of
+information. You can do this by changing the module name to a name with an
+\term{\_odbc} suffix in \ejabberd{} config file. You can use a relational
+database for the following data:
+
+\begin{itemize}
+\item Last connection date and time: Use \term{mod\_last\_odbc} instead of
+  \term{mod\_last}.
+\item Offline messages: Use \term{mod\_offline\_odbc} instead of
+  \term{mod\_offline}.
+\item Rosters: Use \term{mod\_roster\_odbc} instead of \term{mod\_roster}.
+\item Users' VCARD: Use \term{mod\_vcard\_odbc} instead of \term{mod\_vcard}.
+\end{itemize}
+
+
+\begin{table}[H]
+  \centering
+  \begin{tabular}{|l|l|l|l|}
+    \hline Module & Feature & Dependencies & Needed for XMPP? \\ 
+    \hline \hline \modadhoc{} & Ad-Hoc Commands (\jepref{0050}) &  & No \\ 
+    \hline \modannounce{} & Manage announcements & \modadhoc{} & No \\ 
+    \hline \modconfigure{} & Support for online & \modadhoc{} & No \\ 
+    & configuration of \ejabberd{} & & \\ 
+    \hline \moddisco{} & Service Discovery (\jepref{0030}) &  & No \\ 
+    \hline \modecho{} & Echoes Jabber packets &  & No \\ 
     \hline \modirc{} & IRC transport &  & No \\ 
     \hline \modlast{} & Last Activity (\jepref{0012}) &  & No \\ 
-    \hline \modlastodbc{} & Last Activity (\jepref{0012}) & ODBC compatible & No \\ 
-    & & database, MySQL & \\
-    & & or PostgreSQL & \\
+    \hline \modlastodbc{} & Last Activity (\jepref{0012}) & supported database (*) & No \\ 
     \hline \modmuc{} & Multi-User Chat (\jepref{0045}) &  & No \\ 
     \hline \modmuclog{} & Multi-User Chat room logging & \modmuc{} & No \\ 
     \hline \modoffline{} & Offline message storage &  & No \\ 
-    \hline \modofflineodbc{} & Offline message storage & ODBC compatible & No \\ 
-    & & database, MySQL & \\
-    & & or PostgreSQL & \\
+    \hline \modofflineodbc{} & Offline message storage & supported database (*) & No \\ 
     \hline \modprivacy{} & Blocking Communication &  & Yes \\ 
     \hline \modprivate{} & Private XML Storage (\jepref{0049}) &  & No \\ 
     \hline \modpubsub{} & Publish-Subscribe (\jepref{0060}) &  & No \\ 
     \hline \modregister{} & In-Band Registration (\jepref{0077}) &  & No \\ 
-    \hline \modroster{} & Roster management &  & Yes (*) \\ 
-    \hline \modrosterodbc{} & Roster management & ODBC compatible & Yes (*) \\ 
-    & & database, MySQL & \\
-    & & or PostgreSQL & \\
+    \hline \modroster{} & Roster management &  & Yes (**) \\ 
+    \hline \modrosterodbc{} & Roster management & supported database (*) & Yes (**) \\ 
     \hline \modservicelog{} & Copy user messages to logger service &  & No \\ 
     \hline \modsharedroster{} & Shared roster management & \modroster{} or & No \\ 
     & & \modrosterodbc{} & \\ 
@@ -1350,24 +1476,25 @@ You can see which database backend each module needs by looking at the suffix:
     \hline \modtime{} & Entity Time (\jepref{0090}) &  & No \\ 
     \hline \modvcard{} & vcard-temp (\jepref{0054}) &  & No \\ 
     \hline \modvcardldap{} & vcard-temp (\jepref{0054}) & LDAP server & No \\ 
-    \hline \modvcardodbc{} & vcard-temp (\jepref{0054}) & ODBC compatible & No \\ 
-    & & database, MySQL & \\
-    & & or PostgreSQL & \\
+    \hline \modvcardodbc{} & vcard-temp (\jepref{0054}) & supported database (*) & No \\ 
     \hline \modversion{} & Software Version (\jepref{0092}) &  & No\\
     \hline
   \end{tabular}
 \end{table}
 
-(*) This module or a similar one with another database backend is needed for
+\begin{itemize}
+\item (*) For a list of supported databases, see section~\ref{sec:database}.
+\item (**) This module or a similar one with another database backend is needed for
 XMPP compliancy.
+\end{itemize}
 
-\subsection{Common Options}
-\label{sec:modcommonopts}
+\subsection{\aname{modcommonoptions}{Common Options}}
+\label{sec:modcommonoptions}
 
 The following options are used by many modules. Therefore, they are described in
 this separate section.
 
-\subsubsection{\option{iqdisc}}
+\subsubsection{\option{\aname{modiqdiscoption}{iqdisc}}}
 \label{sec:modiqdiscoption}
 \ind{options!iqdisc}
 
@@ -1401,7 +1528,7 @@ Example:
    ]}.
 \end{verbatim}
 
-\subsubsection{\option{hosts}}
+\subsubsection{\option{\aname{modhostsoption}{hosts}}}
 \label{sec:modhostsoption}
 \ind{options!hosts}
 
@@ -1421,7 +1548,7 @@ Examples:
     ...
    ]}.
 \end{verbatim}
-  \item Backwards compatibility with older ejabberd versions can be retained
+  \item Backwards compatibility with older \ejabberd{} versions can be retained
     with:
     \begin{verbatim}
   {modules,
@@ -1443,7 +1570,7 @@ Examples:
 \end{verbatim}
 \end{itemize}
 
-\subsection{\modannounce{}}
+\subsection{\aname{modannounce}{\modannounce{}}}
 \label{sec:modannounce}
 \ind{modules!\modannounce{}}\ind{MOTD}\ind{message of the day}\ind{announcements}
 
@@ -1512,7 +1639,7 @@ Examples:
 \end{verbatim}
 \end{itemize}
 
-\subsection{\moddisco{}}
+\subsection{\aname{moddisco}{\moddisco{}}}
 \label{sec:moddisco}
 \ind{modules!\moddisco{}}\ind{protocols!JEP-0030: Service Discovery}\ind{protocols!JEP-0011: Jabber Browsing}\ind{protocols!JEP-0094: Agent Information}
 
@@ -1566,7 +1693,7 @@ Examples:
 \end{itemize}
 
 
-\subsection{\modecho{}}
+\subsection{\aname{modecho}{\modecho{}}}
 \label{sec:modecho}
 \ind{modules!\modecho{}}\ind{debugging}
 
@@ -1595,7 +1722,7 @@ Examples:
   you can find a few more examples in section~\ref{sec:modhostsoption}.
 \end{itemize}
 
-\subsection{\modirc{}}
+\subsection{\aname{modirc}{\modirc{}}}
 \label{sec:modirc}
 \ind{modules!\modirc{}}\ind{IRC}
 
@@ -1605,16 +1732,16 @@ servers.
 End user information:
 \ind{protocols!groupchat 1.0}\ind{protocols!JEP-0045: Multi-User Chat}
 \begin{itemize}
-\item A \Jabber{} client with ``groupchat 1.0'' support or Multi-User
+\item A \Jabber{} client with `groupchat 1.0' support or Multi-User
   Chat support (\jepref{0045}) is necessary to join IRC channels.
 \item 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\%\jid{irc.example.org}'' in case \jid{irc.example.org} is
-  the IRC server hosting ``channel''. And of course the host should point
+  be `channel\%\jid{irc.example.org}' in case \jid{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.
-\item You can register your nickame by sending ``IDENTIFY password'' to \\
+\item You can register your nickame by sending `IDENTIFY password' to \\
   \jid{nickserver!irc.example.org@irc.jabberserver.org}.
-\item Entering your password is possible by sending ``LOGIN nick password'' \\
+\item Entering your password is possible by sending `LOGIN nick password' \\
   to \jid{nickserver!irc.example.org@irc.jabberserver.org}.
 \item When using a popular \Jabber{} server, it can occur that no
   connection can be achieved with some IRC servers because they limit the
@@ -1631,7 +1758,7 @@ Options:
 Examples:
 \begin{itemize}
 \item In the first example, the IRC transport is available on (all) your
-  virtual host(s) with the prefix ``\jid{irc.}''. Furthermore, anyone is
+  virtual host(s) with the prefix `\jid{irc.}'. Furthermore, anyone is
   able to use the transport.
   \begin{verbatim}
   {modules,
@@ -1641,7 +1768,8 @@ Examples:
     ...
    ]}.
 \end{verbatim}
-% bug in current svn!!: irc-transport.example.com will *not* show up in the service discovery items; instead you will see irc.example.com!!!!
+%TODO: bug in current svn!: irc-transport.example.com will *not* show up in the
+%      service discovery items; instead you will see irc.example.com
 \item In next example the IRC transport is available on the two virtual hosts
   \jid{example.net} and \jid{example.com} with different prefixes on each host.
   Moreover, the transport is only accessible by paying customers registered on
@@ -1664,7 +1792,7 @@ Examples:
 \end{verbatim}
 \end{itemize}
 
-\subsection{\modlast{}}
+\subsection{\aname{modlast}{\modlast{}}}
 \label{sec:modlast}
 \ind{modules!\modlast{}}\ind{protocols!JEP-0012: Last Activity}
 
@@ -1678,7 +1806,7 @@ Options:
 \iqdiscitem{Last activity (\ns{jabber:iq:last})}
 \end{description}
 
-\subsection{\modmuc{}}
+\subsection{\aname{modmuc}{\modmuc{}}}
 \label{sec:modmuc}
 \ind{modules!\modmuc{}}\ind{protocols!JEP-0045: Multi-User Chat}\ind{conferencing}
 
@@ -1710,13 +1838,13 @@ Options:
   administer his room). By sending a message to the service JID,
   administrators can send service messages that will be displayed in every
   active room.
-
-  \titem{history\_size} \ind{options!history\_size}a small history of the
-  current discussion is send to users when they enter the room. This option make
-  it possible to define the number of history messages to keep and send to the
-  user joining the room. The value is a integer. Setting the value to \term{0}
-  disable the history feature and nothing is kept in memory. The default value
-  is \term{20}. This value is global and affects all MUC rooms on the server.
+\titem{history\_size} \ind{options!history\_size}A small history of the
+  current discussion is sent to users when they enter the room. With this option
+  you can define the number of history messages to keep and send to users
+  joining the room. The value is an integer. Setting the value to \term{0}
+  disables the history feature and, as a result, nothing is kept in memory. The
+  default value is \term{20}. This value is global and thus affects all rooms on
+  the server.
 \end{description}
 
 Examples:
@@ -1725,9 +1853,9 @@ Examples:
   service. Everyone will also be able to create new rooms but only the user
   \jid{admin@example.org} is allowed to administrate any room. In this
   example he is also a global administrator. When \jid{admin@example.org}
-  sends a message such as ``Tomorrow, the \Jabber{} server will be moved
+  sends a message such as `Tomorrow, the \Jabber{} server will be moved
   to new hardware. This will involve service breakdowns around 23:00 UMT.
-  We apologise for this inconvenience.'' to \jid{conference.example.org},
+  We apologise for this inconvenience.' to \jid{conference.example.org},
   it will be displayed in all active rooms. In this example the history
   feature is disabled.
   \begin{verbatim}
@@ -1749,9 +1877,9 @@ Examples:
   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. When
-  \jid{admin@example.org} sends a message such as ``Tomorrow, the \Jabber{}
+  \jid{admin@example.org} sends a message such as `Tomorrow, the \Jabber{}
   server will be moved to new hardware. This will involve service breakdowns
-  around 23:00 UMT. We apologise for this inconvenience.'' to
+  around 23:00 UMT. We apologise for this inconvenience.' to
   \jid{conference.example.org}, it will be displayed in all active rooms. No
   \term{history\_size} option is used, this means that the feature is enabled
   and the default value of 20 history messages will be send to the users.
@@ -1778,64 +1906,79 @@ Examples:
 \end{verbatim}
 \end{itemize}
 
-\subsection{\modmuclog{}}
+\subsection{\aname{modmuclog}{\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.
+This module enables optional logging of Multi-User Chat (MUC) conversations to
+HTML. Once you enable this module, users can join a chatroom using a MUC capable
+Jabber client, and if they have enough privileges, they can request the
+configuration form in which they can set the option to enable chatroom logging.
 
-Some of the features of generated logs:
+Features:
 \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 Chatroom details are added on top of each page: room title, JID,
+  author, subject and configuration.
+\item \ind{protocols!RFC 4622: Internationalized Resource Identifiers (IRIs) and Uniform Resource Identifiers (URIs) for the Extensible Messaging and Presence Protocol (XMPP)}
+  Room title and JID are links to join the chatroom (using
+  \footahref{http://www.ietf.org/rfc/rfc4622.txt}{XMPP URIs}).
 \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 Joins, leaves, nick changes, kicks, bans and `/me' are tracked and
+  displayed, including the reason if 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.
+\item A custom link can be added on top of each 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}.
+  This option restricts which users are allowed to enable or disable chatroom
+  logging. The default value is \term{muc\_admin}. Note for this default setting
+  you need to have an access rule for \term{muc\_admin} in order to take effect.
 \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}.
+  With this option you can set whether the HTML files should have a custom CSS
+  file or if they need to use the embedded CSS file. Allowed values are
+  \term{false} and an URL to a CSS file. With the first value, HTML files will
+  include the embedded CSS code. With the latter, you can specify the URL of the
+  custom CSS file (for example: `http://example.com/my.css'). The default value
+  is \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}.
+  The type of the created directories can be specified with this option. Allowed
+  values are \term{subdirs} and \term{plain}. With the first value,
+  subdirectories are created for each year and month. With the latter, the
+  names of the log files contain the full date, and there are no subdirectories.
+  The default value is \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"}.
+  This option sets the full path to the directory in which the HTML files should
+  be stored. Make sure the \ejabberd{} daemon user has write access on that
+  directory. The default value is \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}.
+  The time zone for the logs is configurable with this option. Allowed values
+  are \term{local} and \term{universal}. With the first value, the local time,
+  as reported to Erlang by the operating system, will be used. With the latter,
+  GMT/UTC time will be used. The default value is \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"\}}.
+  With this option you can customize the link on the top right corner of each
+  log file. The syntax of this option is \term{\{"URL", "Text"\}}. The default
+  value is \term{\{"/", "Home"\}}.
 \end{description}
 
-Example configuration:
-\begin{verbatim}
+Examples:
+\begin{itemize}
+\item In the first example any chatroom owner can enable logging, and a
+  custom CSS file will be used (http://example.com/my.css). Further, the names
+  of the log files will contain the full date, and there will be no
+  subdirectories. The log files will be stored in /var/www/muclogs, and the
+  time zone will be GMT/UTC. Finally, the top link will be
+  \verb|<a href="http://www.jabber.ru">Jabber.ru</a>|.
+  \begin{verbatim}
+  {access, muc, [{allow, all}]}.
+  ...
   {modules,
    [
     ...
@@ -1850,8 +1993,35 @@ Example configuration:
     ...
    ]}.
 \end{verbatim}
+  \item In the second example only \jid{admin1@example.org} and
+  \jid{admin2@example.net} can enable logging, and the embedded CSS file will be
+  used. Further, the names of the log files will only contain the day (number),
+  and there will be subdirectories for each year and month. The log files will
+  be stored in /var/www/muclogs, and the local time will be used. Finally, the
+  top link will be the default \verb|<a href="/">Home</a>|.
+  \begin{verbatim}
+  {acl, admins, {user, "admin1", "example.org"}}.
+  {acl, admins, {user, "admin2", "example.net"}}.
+  ...
+  {access, muc_log, [{allow, admins},
+                     {deny, all}]}.
+  ...
+  {modules,
+   [
+    ...
+    {mod_muc_log, [
+               {access_log, muc_log},
+               {cssfile, false},
+               {dirtype, subdirs},
+               {outdir, "/var/www/muclogs"},
+               {timezone, local}
+    ]},
+    ...
+   ]}.
+\end{verbatim}
+\end{itemize}
 
-\subsection{\modoffline{}}
+\subsection{\aname{modoffline}{\modoffline{}}}
 \label{sec:modoffline}
 \ind{modules!\modoffline{}}
 
@@ -1861,7 +2031,7 @@ online again. Thus it is very similar to how email works. Note that
 \term{ejabberdctl}\ind{ejabberdctl} has a command to delete expired messages
 (see section~\ref{sec:ejabberdctl}).
 
-\subsection{\modprivacy{}}
+\subsection{\aname{modprivacy}{\modprivacy{}}}
 \label{sec:modprivacy}
 \ind{modules!\modprivacy{}}\ind{Blocking Communication}\ind{Privacy Rules}\ind{protocols!RFC 3921: XMPP IM}
 
@@ -1870,19 +2040,19 @@ as defined in section 10 from XMPP IM. If end users have support for it in
 their \Jabber{} client, they will be able to:
 \begin{quote}
 \begin{itemize}
-\item Retrieving one's privacy lists. 
-\item Adding, removing, and editing one's privacy lists. 
-\item Setting, changing, or declining active lists. 
+\item Retrieving one's privacy lists.
+\item Adding, removing, and editing one's privacy lists.
+\item Setting, changing, or declining active lists.
 \item Setting, changing, or declining the default list (i.e., the list that
-  is active by default). 
+  is active by default).
 \item Allowing or blocking messages based on JID, group, or subscription type
-  (or globally). 
+  (or globally).
 \item Allowing or blocking inbound presence notifications based on JID, group,
-  or subscription type (or globally). 
+  or subscription type (or globally).
 \item Allowing or blocking outbound presence notifications based on JID, group,
-  or subscription type (or globally). 
+  or subscription type (or globally).
 \item Allowing or blocking IQ stanzas based on JID, group, or subscription type
-  (or globally). 
+  (or globally).
 \item Allowing or blocking all communications based on JID, group, or
   subscription type (or globally).
 \end{itemize}
@@ -1894,7 +2064,7 @@ Options:
 \iqdiscitem{Blocking Communication (\ns{jabber:iq:privacy})}
 \end{description}
 
-\subsection{\modprivate{}}
+\subsection{\aname{modprivate}{\modprivate{}}}
 \label{sec:modprivate}
 \ind{modules!\modprivate{}}\ind{protocols!JEP-0049: Private XML Storage}\ind{protocols!JEP-0048: Bookmark Storage}
 
@@ -1911,7 +2081,7 @@ Options:
 \iqdiscitem{Private XML Storage (\ns{jabber:iq:private})}
 \end{description}
 
-\subsection{\modpubsub{}}
+\subsection{\aname{modpubsub}{\modpubsub{}}}
 \label{sec:modpubsub}
 \ind{modules!\modpubsub{}}\ind{protocols!JEP-0060: Publish-Subscribe}
 
@@ -1945,8 +2115,8 @@ Options:
   be served, you can use this option. If absent, only the main \ejabberd{}
   host is served. % Not a straigtforward description! This needs to be improved!
 \titem{access\_createnode} \ind{options!access\_createnode}
-    Restricts which users are allowed to create pubsub nodes using ACL and ACCESS.
-    Default: \term{pubsub\_createnode}.
+  This option restricts which users are allowed to create pubsub nodes using
+  ACL and ACCESS. The default value is \term{pubsub\_createnode}. % Not clear enough + do not use abbreviations.
 \end{description}
 
 Example:
@@ -1961,7 +2131,7 @@ Example:
    ]}.
 \end{verbatim}
 
-\subsection{\modregister{}}
+\subsection{\aname{modregister}{\modregister{}}}
 \label{sec:modregister}
 \ind{modules!\modregister{}}\ind{protocols!JEP-0077: In-Band Registration}\ind{public registration}
 
@@ -1977,7 +2147,7 @@ enables end users to use a \Jabber{} client to:
 Options:
 \begin{description}
 \titem{access} \ind{options!access}This option can be configured to specify
-  rules to restrict registration. If a rule returns ``deny'' on the requested
+  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).
 \iqdiscitem{In-Band Registration (\ns{jabber:iq:register})}
@@ -2019,7 +2189,7 @@ Examples:
 \end{verbatim}
 \end{itemize}
 
-\subsection{\modroster{}}
+\subsection{\aname{modroster}{\modroster{}}}
 \label{sec:modroster}
 \ind{modules!\modroster{}}\ind{roster management}\ind{protocols!RFC 3921: XMPP IM}
 
@@ -2030,7 +2200,7 @@ Options:
 \iqdiscitem{Roster Management (\ns{jabber:iq:roster})}
 \end{description}
 
-\subsection{\modservicelog{}}
+\subsection{\aname{modservicelog}{\modservicelog{}}}
 \label{sec:modservicelog}
 \ind{modules!\modservicelog{}}\ind{message auditing}\ind{Bandersnatch}
 
@@ -2072,7 +2242,7 @@ Examples:
 \end{verbatim}
 \end{itemize}
 
-\subsection{\modsharedroster{}}
+\subsection{\aname{modsharedroster}{\modsharedroster{}}}
 \label{sec:modsharedroster}
 \ind{modules!\modsharedroster{}}\ind{shared roster groups}
 
@@ -2086,7 +2256,7 @@ Shared roster groups can be edited \emph{only} via the web interface. Each group
 has a unique identification and the following parameters:
 \begin{description}
 \item[Name] The name of the group, which will be displayed in the roster.
-\item[Description] The description of the group. This parameter doesn't affect
+\item[Description] The description of the group. This parameter does not affect
   anything.
 \item[Members] A list of full JIDs of group members, entered one per line in
   the web interface.
@@ -2175,7 +2345,7 @@ Examples:
 \end{table}
 \end{itemize}
 
-\subsection{\modstats{}}
+\subsection{\aname{modstats}{\modstats{}}}
 \label{sec:modstats}
 \ind{modules!\modstats{}}\ind{protocols!JEP-0039: Statistics Gathering}\ind{statistics}
 
@@ -2218,7 +2388,7 @@ in order to get the statistics. Here they are:
 \end{verbatim}
 \end{itemize}
 
-\subsection{\modtime{}}
+\subsection{\aname{modtime}{\modtime{}}}
 \label{sec:modtime}
 \ind{modules!\modtime{}}\ind{protocols!JEP-0090: Entity Time}
 
@@ -2230,7 +2400,7 @@ Options:
 \iqdiscitem{Entity Time (\ns{jabber:iq:time})}
 \end{description}
 
-\subsection{\modvcard{}}
+\subsection{\aname{modvcard}{\modvcard{}}}
 \label{sec:modvcard}
 \ind{modules!\modvcard{}}\ind{JUD}\ind{Jabber User Directory}\ind{vCard}\ind{protocols!JEP-0054: vcard-temp}
 
@@ -2243,22 +2413,21 @@ Options:
 \begin{description}
 \hostitem{vjud}
 \iqdiscitem{\ns{vcard-temp}}
-\titem{search} \ind{options!search}This option specifies whether the search
-  functionality is enabled (value: \term{true}) or disabled
-  (value: \term{false}). If disabled, the option \term{hosts} will be
-  ignored and the \Jabber{} User Directory service will not appear in the
-  Service Discovery item list. The default value is \term{true}.
-\titem{matches} \ind{options!matches}With this option, the number of reported
+\titem{search}\ind{options!search}This option specifies whether the search
+  functionality is enabled (value: \term{true}) or disabled (value:
+  \term{false}). If disabled, the option \term{hosts} will be ignored and the
+  \Jabber{} User Directory service will not appear in the Service Discovery item
+  list. The default value is \term{true}.
+\titem{matches}\ind{options!matches}With this option, the number of reported
   search results can be limited. If the option's value is set to \term{infinity},
   all search results are reported. The default value is \term{30}.
-\titem{allow\_return\_all} \ind{options!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
+\titem{allow\_return\_all}\ind{options!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
   \term{false}.
-\titem{search\_all\_hosts} \ind{options!search\_all\_hosts}If this option is
-  set to \term{true}, search operations will apply to all virtual hosts.
-  Otherwise only the current host will be searched. The default value is
-  \term{true}.
+\titem{search\_all\_hosts}\ind{options!search\_all\_hosts}If this option is set
+  to \term{true}, search operations will apply to all virtual hosts. Otherwise
+  only the current host will be searched. The default value is \term{true}.
 \end{description}
 
 Examples:
@@ -2291,352 +2460,563 @@ Examples:
 \end{verbatim}
 \end{itemize}
 
-\subsection{LDAP and \modvcardldap{}}
-\label{sec:ldap}
+\subsection{\aname{modvcardldap}{\modvcardldap{}}}
+\label{sec:modvcardldap}
 \ind{modules!\modvcardldap{}}\ind{JUD}\ind{Jabber User Directory}\ind{vCard}\ind{protocols!JEP-0054: vcard-temp}
 
+%TODO: verify if the referers to the LDAP section are still correct
+
+\ejabberd{} can map LDAP attributes to vCard fields. This behaviour is
+implemented in the \modvcardldap{} module. This module does not depend on the
+authentication method (see~\ref{sec:ldapauth}). The \modvcardldap{} module
+has its own optional parameters. The first group of parameters has the same
+meaning as the top-level LDAP parameters to set the authentication method:
+\option{ldap\_servers}, \option{ldap\_port}, \option{ldap\_rootdn},
+\option{ldap\_password}, \option{ldap\_base}, \option{ldap\_uidattr},
+\option{ldap\_uidattr\_format} and \option{ldap\_filter}. See
+section~\ref{sec:ldapauth} for detailed information about these options. If one
+of these options is not set, \ejabberd{} will look for the top-level option with
+the same name. The second group of parameters consists of the following
+\modvcardldap{}-specific options:
+
+\begin{description}
+\hostitem{vjud}
+\iqdiscitem{\ns{vcard-temp}}
+\titem{search}\ind{options!search}This option specifies whether the search
+  functionality is enabled (value: \term{true}) or disabled (value:
+  \term{false}). If disabled, the option \term{hosts} will be ignored and the
+  \Jabber{} User Directory service will not appear in the Service Discovery item
+  list. The default value is \term{true}.
+\titem{ldap\_vcard\_map}\ind{options!ldap\_vcard\_map}With this option you can
+  set the table that maps LDAP attributes to vCard fields. The format is:
+  \term{[{Name\_of\_vCard\_field, Pattern, List\_of\_LDAP\_attributes}, ...]}.\ind{protocols!RFC 2426: vCard MIME Directory Profile}
+  \term{Name\_of\_vcard\_field} is the type name of the vCard as defined in
+  \footahref{http://www.ietf.org/rfc/rfc2426.txt}{RFC 2426}. \term{Pattern} is a
+  string which contains pattern variables \term{"\%u"}, \term{"\%d"} or
+  \term{"\%s"}. \term{List\_of\_LDAP\_attributes} is the list containing LDAP
+  attributes. The pattern variables \term{"\%s"} will be sequentially replaced
+  with the values of LDAP attributes from \term{List\_of\_LDAP\_attributes},
+  \term{"\%u"} will be replaced with the user part of a JID, and \term{"\%d"}
+  will be replaced with the domain part of a JID. The default is:
+  \begin{verbatim}
+  [{"NICKNAME", "%u", []},
+   {"FN", "%s", ["displayName"]},
+   {"FAMILY", "%s", ["sn"]},
+   {"GIVEN", "%s", ["givenName"]},
+   {"MIDDLE", "%s", ["initials"]},
+   {"ORGNAME", "%s", ["o"]},
+   {"ORGUNIT", "%s", ["ou"]},
+   {"CTRY", "%s", ["c"]},
+   {"LOCALITY", "%s", ["l"]},
+   {"STREET", "%s", ["street"]},
+   {"REGION", "%s", ["st"]},
+   {"PCODE", "%s", ["postalCode"]},
+   {"TITLE", "%s", ["title"]},
+   {"URL", "%s", ["labeleduri"]},
+   {"DESC", "%s", ["description"]},
+   {"TEL", "%s", ["telephoneNumber"]},
+   {"EMAIL", "%s", ["mail"]},
+   {"BDAY", "%s", ["birthDay"]},
+   {"ROLE", "%s", ["employeeType"]},
+   {"PHOTO", "%s", ["jpegPhoto"]}]
+\end{verbatim}
+\titem{ldap\_search\_fields}\ind{options!ldap\_search\_fields}This option
+  defines the search form and the LDAP attributes to search within. The format
+  is: \term{[{Name, Attribute}, ...]}. \term{Name} is the name of a search form
+  field which will be automatically translated by using the translation
+  files (see \term{msgs/*.msg} for available words). \term{Attribute} is the
+  LDAP attribute or the pattern \term{"\%u"}. The default is:
+  \begin{verbatim}
+  [{"User", "%u"},
+   {"Full Name", "displayName"},
+   {"Given Name", "givenName"},
+   {"Middle Name", "initials"},
+   {"Family Name", "sn"},
+   {"Nickname", "%u"},
+   {"Birthday", "birthDay"},
+   {"Country", "c"},
+   {"City", "l"},
+   {"Email", "mail"},
+   {"Organization Name", "o"},
+   {"Organization Unit", "ou"}]
+\end{verbatim}
+\titem{ldap\_search\_reported}\ind{options!ldap\_search\_reported}This option
+  defines which search fields should be reported. The format is:
+  \term{[{Name, vCard\_Name}, ...]}. \term{Name} is the name of a search form
+  field which will be automatically translated by using the translation
+  files (see \term{msgs/*.msg} for available words). \term{vCard\_Name} is the
+  vCard field name defined in the \option{ldap\_vcard\_map} option. The default
+  is:
+\begin{verbatim}
+  [{"Full Name", "FN"},
+   {"Given Name", "GIVEN"},
+   {"Middle Name", "MIDDLE"},
+   {"Family Name", "FAMILY"},
+   {"Nickname", "NICKNAME"},
+   {"Birthday", "BDAY"},
+   {"Country", "CTRY"},
+   {"City", "LOCALITY"},
+   {"Email", "EMAIL"},
+   {"Organization Name", "ORGNAME"},
+   {"Organization Unit", "ORGUNIT"}]
+\end{verbatim}
+\end{description}
+
+%TODO: this examples still should be organised better
+Examples:
+\begin{itemize}
+\item 
 
-\subsubsection{Features}
-\label{sec:ldapfeatures}
+Let's say \term{ldap.example.org} is the name of our LDAP server. We have
+users with their passwords in \term{"ou=Users,dc=example,dc=org"} directory.
+Also we have addressbook, which contains users emails and their additional
+infos in \term{"ou=AddressBook,dc=example,dc=org"} directory.  Corresponding
+authentication section should looks like this:
 
-\ejabberd{} has built-in LDAP support.  You can authenticate users against LDAP
-server and use LDAP directory as vCard storage. Shared rosters are not
-supported yet.
+\begin{verbatim}
+  %% authentication method
+  {auth_method, ldap}.
+  %% DNS name of our LDAP server
+  {ldap_servers, ["ldap.example.org"]}.
+  %% We want to authorize users from 'shadowAccount' object class only
+  {ldap_filter, "(objectClass=shadowAccount)"}.
+\end{verbatim}
 
+Now we want to use users LDAP-info as their vCards. We have four attributes
+defined in our LDAP schema: \term{"mail"} --- email address, \term{"givenName"}
+--- first name, \term{"sn"} --- second name, \term{"birthDay"} --- birthday.
+Also we want users to search each other. Let's see how we can set it up:
 
-\subsubsection{Connection}
-\label{sec:ldapconnection}
+\begin{verbatim}
+  {modules,
+    ...
+    {mod_vcard_ldap,
+     [
+      %% We use the same server and port, but want to bind anonymously because
+      %% our LDAP server accepts anonymous requests to
+      %% "ou=AddressBook,dc=example,dc=org" subtree.
+      {ldap_rootdn, ""},
+      {ldap_password, ""},
+      %% define the addressbook's base
+      {ldap_base, "ou=AddressBook,dc=example,dc=org"},
+      %% user's part of JID is located in the "mail" attribute
+      {ldap_uidattr, "mail"},
+      %% common format for our emails
+      {ldap_uidattr_format, "%u@mail.example.org"},
+      %% We have to define empty filter here, because entries in addressbook does not
+      %% belong to shadowAccount object class
+      {ldap_filter, ""},
+      %% Now we want to define vCard pattern
+      {ldap_vcard_map,
+       [{"NICKNAME", "%u", []}, % just use user's part of JID as his nickname
+        {"GIVEN", "%s", ["givenName"]},
+        {"FAMILY", "%s", ["sn"]},
+        {"FN", "%s, %s", ["sn", "givenName"]}, % example: "Smith, John"
+        {"EMAIL", "%s", ["mail"]},
+        {"BDAY", "%s", ["birthDay"]}]},
+      %% Search form
+      {ldap_search_fields,
+       [{"User", "%u"},
+        {"Name", "givenName"},
+        {"Family Name", "sn"},
+        {"Email", "mail"},
+        {"Birthday", "birthDay"}]},
+      %% vCard fields to be reported
+      %% Note that JID is always returned with search results
+      {ldap_search_reported,
+       [{"Full Name", "FN"},
+        {"Nickname", "NICKNAME"},
+        {"Birthday", "BDAY"}]}
+    ]}
+    ...
+  }.
+\end{verbatim}
 
-Parameters:
+Note that \modvcardldap{} module checks an existence of the user before
+searching his info in LDAP.
 
+\item \term{ldap\_vcard\_map} example:
+\begin{verbatim}
+  {ldap_vcard_map,
+   [{"NICKNAME", "%u", []},
+    {"FN", "%s", ["displayName"]},
+    {"CTRY", "Russia", []},
+    {"EMAIL", "%u@%d", []},
+    {"DESC", "%s\n%s", ["title", "description"]}
+   ]},
+\end{verbatim}
+\item \term{ldap\_search\_fields} example:
+\begin{verbatim}
+  {ldap_search_fields,
+   [{"User", "uid"},
+    {"Full Name", "displayName"},
+    {"Email", "mail"}
+   ]},
+\end{verbatim}
+\item \term{ldap\_search\_reported} example:
+\begin{verbatim}
+  {ldap_search_reported,
+   [{"Full Name", "FN"},
+    {"Email", "EMAIL"},
+    {"Birthday", "BDAY"},
+    {"Nickname", "NICKNAME"}
+   ]},
+\end{verbatim}
+\end{itemize}
+
+\subsection{\aname{modversion}{\modversion{}}}
+\label{sec:modversion}
+\ind{modules!\modversion{}}\ind{protocols!JEP-0092: Software Version}
+
+This module implements Software Version (\jepref{0092}). Consequently, it
+answers \ejabberd{}'s version when queried.
+
+Options:
 \begin{description}
-\titem{ldap\_server} \ind{options!ldap\_server}IP address or dns name of your
-LDAP server. This option is required.
-\titem{ldap\_port} \ind{options!ldap\_port}Port to connect to LDAP server.
-Default is~389.
-\titem{ldap\_rootdn} \ind{options!ldap\_rootdn}Bind DN.  Default is~\term{""}
-which means anonymous connection.
-\titem{ldap\_password} \ind{options!ldap\_password}Bind password. Default
-is~\term{""}.
+\iqdiscitem{Software Version (\ns{jabber:iq:version})}
 \end{description}
 
-Example:
+
+\section{\aname{initialadmin}{Creating an Initial Administrator}}
+\label{sec:initialadmin}
+
+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:
+\begin{enumerate}
+\item Register an account on your \ejabberd{} deployment. An account can be
+  created in two ways:
+  \begin{enumerate}
+  \item Using the tool \term{ejabberdctl}\ind{ejabberdctl} (see
+    section~\ref{sec:ejabberdctl}):
+    \begin{verbatim}
+% ejabberdctl node@host register admin example.org password
+\end{verbatim} 
+  \item Using In-Band Registration (see section~\ref{sec:modregister}): you can
+    use a \Jabber{} client to register an account.
+  \end{enumerate}
+\item 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.
+  \begin{verbatim}
+  {acl, admins, {user, "admin", "example.org"}}.
+  {access, configure, [{allow, admins}]}.
+\end{verbatim} 
+\item Restart \ejabberd{} to load the new configuration.
+\item Open the web interface (\verb|http://server:port/admin/|) in your
+  favourite browser. Make sure to enter the \emph{full} JID as username (in this
+  example: \jid{admin@example.org}. The reason that you also need to enter the
+  suffix, is because \ejabberd{}'s virtual hosting support.
+\end{enumerate}
+
+
+\section{\aname{onlineconfig}{Online Configuration and Monitoring}}
+\label{sec:onlineconfig}
+
+\subsection{\aname{webinterface}{Web Interface}}
+\label{sec:webinterface}
+\ind{web interface}
+
+To perform online configuration of \ejabberd{} you need to enable the
+\term{ejabberd\_http} listener with the option \term{web\_admin} (see
+section~\ref{sec:listened}). Then you can open 
+\verb|http://server:port/admin/| in your favourite web browser. You
+will be asked to enter the username (the \emph{full} \Jabber{} ID) and password
+of an \ejabberd{} user with administrator rights. After authentication
+you will see a page similar to figure~\ref{fig:webadmmain}.
+
+\begin{figure}[htbp]
+  \centering
+  \insimg{webadmmain.png}
+  \caption{Top page from the web interface}
+  \label{fig:webadmmain}
+\end{figure}
+Here you can edit access restrictions, manage users, create backups,
+manage the database, enable/disable ports listened for, view server
+statistics,\ldots
+
+Examples:
+\begin{itemize}
+\item You can serve the web interface on the same port as the
+  \ind{protocols!JEP-0025: HTTP Polling}HTTP Polling interface. In this example
+  you should point your web browser to \verb|http://example.org:5280/admin/| to
+  administer all virtual hosts or to
+  \verb|http://example.org:5280/admin/server/example.com/| to administer only
+  the virtual host \jid{example.com}. 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 `\jid{admin@example.net}' to administer all virtual hosts (first
+  URL). If you log in with `\jid{admin@example.com}' on \\
+  \verb|http://example.org:5280/admin/server/example.com/| you can only
+  administer the virtual host \jid{example.com}.
+  \begin{verbatim}
+  ...
+  {acl, admins, {user, "admin", "example.net"}}.
+  {host_config, "example.com", [{acl, admins, {user, "admin", "example.com"}}]}.
+  {access, configure, [{allow, admins}]}.
+  ...
+  {hosts, ["example.org"]}.
+  ...
+  {listen,
+   [...
+    {5280, ejabberd_http, [http_poll, web_admin]},
+    ...
+   ]
+  }.
+\end{verbatim}
+\item 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 \verb|https://192.168.1.1:5280/admin/|:
+  \begin{verbatim}
+  ...
+  {hosts, ["example.org"]}.
+  ...
+  {listen,
+   [...
+    {5270, ejabberd_http,    [http_poll]},
+    {5280, ejabberd_http,    [web_admin, {ip, {192, 168, 1, 1}},
+                              tls, {certfile, "/usr/local/etc/server.pem"}]},
+    ...
+   ]
+  }.
+\end{verbatim}
+\end{itemize}
+
+\subsection{\aname{ejabberdctl}{\term{ejabberdctl}}}
+\label{sec:ejabberdctl}
+%TODO: update when the ejabberdctl script is made more userfriendly
+
+It is possible to do some administration operations using the command
+line tool \term{ejabberdctl}. You can list all available options by
+running \term{ejabberdctl} without arguments:
 \begin{verbatim}
-  {auth_method, ldap}.
-  {ldap_servers, ["ldap.mydomain.org"]}.
-  {ldap_port, 389}.
-  {ldap_rootdn, "cn=Manager,dc=domain,dc=org"}.
-  {ldap_password, "secret"}.
+% ejabberdctl
+Usage: ejabberdctl node command
+
+Available commands:
+  status                        get ejabberd status
+  stop                          stop ejabberd
+  restart                       restart ejabberd
+  reopen-log                    reopen log file
+  register user server password register a user
+  unregister user server        unregister a user
+  backup file                   store a database backup to file
+  restore file                  restore a database backup from file
+  install-fallback file         install a database fallback from file
+  dump file                     dump a database to a text file
+  load file                     restore a database from a text file
+  import-file file              import user data from jabberd 1.4 spool file
+  import-dir dir                import user data from jabberd 1.4 spool directory
+  registered-users              list all registered users
+  delete-expired-messages       delete expired offline messages from database
+
+Example:
+  ejabberdctl ejabberd@host restart
 \end{verbatim}
 
-Note that current LDAP implementation doesn't support SSL connection and SASL
-authentication.
+Additional information:
+\begin{description}
+\titem{reopen-log } If you use a tool to rotate logs, you have to configure it
+  so that this command is executed after each rotation.
+\titem {backup, restore, install-fallback, dump, load} You can use these
+  commands to create and restore backups. 
+%%More information about backuping can
+%%  be found in section~\ref{sec:backup}.
+\titem{import-file, import-dir} \ind{migration from other software}
+  These options can be used to migrate from other \Jabber{}/XMPP servers. There
+  exist tutorials to \footahref{http://ejabberd.jabber.ru/migrate-to-ejabberd}{migrate from other software to ejabberd}.
+\titem{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.
+\end{description}
+
+
+\section{\aname{firewall}{Firewall Settings}}
+\label{sec:firewall}
+\ind{firewall}\ind{ports}\ind{SASL}\ind{TLS}\ind{clustering!ports}
+
+You need to take the following TCP ports in mind when configuring your firewall:
+\begin{table}[H]
+  \centering
+  \begin{tabular}{|l|l|}
+    \hline Port& Description\\
+    \hline \hline 5222& SASL and unencrypted c2s connections.\\
+    \hline 5223& Obsolete SSL c2s connections.\\
+    \hline 5269& s2s connections.\\
+    \hline 4369& Only for clustering (see~\ref{sec:clustering}).\\
+    \hline port range& Only for clustring (see~\ref{sec:clustering}). This range
+    is configurable (see~\ref{sec:start}).\\
+    \hline
+  \end{tabular}
+\end{table}
+
+
+\section{\aname{srv}{SRV Records}}
+\label{sec:srv}
+\ind{SRV Records}\ind{clustering!SRV Records}
+
+\begin{itemize}
+\item General information:
+  \footahref{http://en.wikipedia.org/wiki/SRV\_record}{SRV record}
+\item Practical information:
+  \footahref{http://jabberd.jabberstudio.org/2/docs/section05.html\#5\_7}{Setting DNS SRV Records}
+\end{itemize}
+
+
+\section{\aname{clustering}{Clustering}}
+\label{sec:clustering}
+\ind{clustering}
+
+\subsection{\aname{howitworks}{How it Works}}
+\label{sec:howitworks}
+\ind{clustering!how it works}
+
+A \Jabber{} domain is served by one or more \ejabberd{} nodes. These nodes can
+be run on different machines that are connected via a network. They all
+must have the ability to connect to port 4369 of all another nodes, and must
+have the same magic cookie (see Erlang/OTP documentation, in other words the
+file \term{\~{}ejabberd/.erlang.cookie} must be the same on all nodes). This is
+needed because all nodes exchange information about connected users, s2s
+connections, registered services, etc\ldots
+
+Each \ejabberd{} node has the following modules:
+\begin{itemize}
+\item router,
+\item local router,
+\item session manager,
+\item s2s manager.
+\end{itemize}
+
+\subsubsection{\aname{router}{Router}}
+\label{sec:router}
+\ind{clustering!router}
+
+This module is the main router of \Jabber{} packets on each node. It
+routes them based on their destination's domains. It uses a global
+routing table. The domain of the packet's destination is searched in the
+routing table, and if it is found, the packet is routed to the
+appropriate process. If not, it is sent to the s2s manager.
+
+\subsubsection{\aname{localrouter}{Local Router}}
+\label{sec:localrouter}
+\ind{clustering!local router}
+
+This module routes packets which have a destination domain equal to
+one of this server's host names. If the destination JID has a non-empty user
+part, it is routed to the session manager, otherwise it is processed depending
+on its content.
 
+\subsubsection{\aname{sessionmanager}{Session Manager}}
+\label{sec:sessionmanager}
+\ind{clustering!session manager}
 
-\subsubsection{Authentication}
-\label{sec:ldapauthentication}
+This module routes packets to local users. It looks up to which user
+resource a packet must be sent via a presence table. Then the packet is
+either routed to the appropriate c2s process, or stored in offline
+storage, or bounced back.
 
-You can authenticate users against LDAP directory.  Available parameters are
-listed below:
+\subsubsection{\aname{s2smanager}{s2s Manager}}
+\label{sec:s2smanager}
+\ind{clustering!s2s manager}
 
-\begin{description}
-\titem{ldap\_base} \ind{options!ldap\_base}LDAP base directory which stores users
-accounts.  This option is required.
-\titem{ldap\_uidattr} \ind{options!ldap\_uidattr}LDAP attribute which holds
-user's part of JID.  Default is \term{"uid"}.
-\titem{ldap\_uidattr\_format} \ind{options!ldap\_uidattr\_format}Format of the
-\term{ldap\_uidattr} variable.  Format MUST contain one and only one pattern
-variable \term{"\%u"} which will be replaced by user's part of JID. For example,
-\term{"\%u@mydomain.org"}.  Default value is \term{"\%u"}.
-\titem{ldap\_filter} \ind{options!ldap\_filter}RFC 2254 LDAP filter.  Default is
-\term{none}.  Example: \term{"(\&(objectClass=shadowAccount)(memberOf=Jabber
-  Users))"}. Please, don't forget closing brackets and don't use superfluous
-whitespaces. Also you MUST NOT use \option{ldap\_uidattr} attribute in filter
-because this attribute will be substituted in LDAP filter automatically.
-\end{description}
+This module routes packets to other \Jabber{} servers. First, it
+checks if an opened s2s connection from the domain of the packet's
+source to the domain of the packet's destination exists. If that is the case,
+the s2s manager routes the packet to the process
+serving this connection, otherwise a new connection is opened.
 
+\subsection{\aname{cluster}{Clustering Setup}}
+\label{sec:cluster}
+\ind{clustering!setup}
 
-\subsubsection{vCards and Search}
-\label{sec:modvcardldap}
+Suppose you already configured \ejabberd{} on one machine named (\term{first}),
+and you need to setup another one to make an \ejabberd{} cluster. Then do
+following steps:
 
-\ejabberd{} can map LDAP attributes to vCard fields.  This behaviour is
-implemented in \modvcardldap{} module.  This module doesn't depend on
-authentication method.  \modvcardldap{} module has it's own optional
-parameters.  The first group of parameters has the same meaning as top-level
-LDAP parameters: \option{ldap\_servers}, \option{ldap\_port},
-\option{ldap\_rootdn}, \option{ldap\_password}, \option{ldap\_base},
-\option{ldap\_uidattr}, \option{ldap\_uidattr\_format} and
-\option{ldap\_filter}.  If one of this option is not set \ejabberd{} will look
-for top-level option with the same name.  The second group of parameters
-consists of the following options:
+\begin{enumerate}
+\item Copy \verb|~ejabberd/.erlang.cookie| file from \term{first} to
+  \term{second}.
 
-\begin{description}
-\hostitem{vjud}
-\iqdiscitem{\ns{vcard-temp}}
-\titem{search} \ind{options!search}This option specifies whether the search
-  functionality is enabled (value: \term{true}) or disabled
-  (value: \term{false}).  If disabled, the option \term{hosts} will be
-  ignored and the \Jabber{} User Directory service will not appear in the
-  Service Discovery item list.  The default value is \term{true}.
-\titem{ldap\_vcard\_map} \ind{options!ldap\_vcard\_map}the table which defines
-reflection of LDAP attributes to vCard fields.
-	Format is:
-		\term{[{Name\_of\_vcard\_field, Pattern, List\_of\_LDAP\_attributes}, ...]}
-	where
-		\term{Name\_of\_vcard\_field} is the type name of vCard as defined
-                in RFC 2426,
-		Pattern is a string which contains pattern variables \term{"\%u"}, \term{"\%d"} or \term{"\%s"},
-		\term{List\_of\_LDAP\_attributes} is the list which contains of LDAP attributes.
-	Pattern variables \term{"\%s"} will be sequentially replaced with the values of
-	LDAP attributes from \term{List\_of\_LDAP\_attributes}; \term{"\%u"} will be replaced with
-	user's part of JID and \term{"\%d"} will be replaced with domain part of JID.
-	Example:
-\begin{verbatim}
-  {ldap_vcard_map,
-   [{"NICKNAME", "%u", []},
-    {"FN", "%s", ["displayName"]},
-    {"CTRY", "Russia", []},
-    {"EMAIL", "%u@%d", []},
-    {"DESC", "%s\n%s", ["title", "description"]}
-   ]},
-\end{verbatim}
+  (alt) You can also add `\verb|-cookie content_of_.erlang.cookie|'
+  option to all `\shell{erl}' commands below.
 
-Default is:
-\begin{verbatim}
-  [{"NICKNAME", "%u", []},
-   {"FN", "%s", ["displayName"]},
-   {"FAMILY", "%s", ["sn"]},
-   {"GIVEN", "%s", ["givenName"]},
-   {"MIDDLE", "%s", ["initials"]},
-   {"ORGNAME", "%s", ["o"]},
-   {"ORGUNIT", "%s", ["ou"]},
-   {"CTRY", "%s", ["c"]},
-   {"LOCALITY", "%s", ["l"]},
-   {"STREET", "%s", ["street"]},
-   {"REGION", "%s", ["st"]},
-   {"PCODE", "%s", ["postalCode"]},
-   {"TITLE", "%s", ["title"]},
-   {"URL", "%s", ["labeleduri"]},
-   {"DESC", "%s", ["description"]},
-   {"TEL", "%s", ["telephoneNumber"]},
-   {"EMAIL", "%s", ["mail"]},
-   {"BDAY", "%s", ["birthDay"]},
-   {"ROLE", "%s", ["employeeType"]},
-   {"PHOTO", "%s", ["jpegPhoto"]}]
-\end{verbatim}
-\titem{ldap\_search\_fields} \ind{options!ldap\_search\_fields}This option defines
-search form and LDAP attributes to search.
-	Format:
-		\term{[{Name, Attribute}, ...]}
-	where
-		\term{Name} is the name of field in the search form.  Will be automatically
-			translated according to definitions in translation files (see
-			\term{msgs/*.msg} for available words).
-		Attribute is the LDAP attribute or the pattern \term{"\%u"}
-                  Example:
-\begin{verbatim}
-  {ldap_search_fields,
-   [{"User", "uid"},
-    {"Full Name", "displayName"},
-    {"Email", "mail"}
-   ]},
-\end{verbatim}
+\item On \term{second} run the following command as the \ejabberd{} daemon user,
+  in the working directory of \ejabberd{}:
 
-Default is:
-\begin{verbatim}
-  [{"User", "%u"},
-   {"Full Name", "displayName"},
-   {"Given Name", "givenName"},
-   {"Middle Name", "initials"},
-   {"Family Name", "sn"},
-   {"Nickname", "%u"},
-   {"Birthday", "birthDay"},
-   {"Country", "c"},
-   {"City", "l"},
-   {"Email", "mail"},
-   {"Organization Name", "o"},
-   {"Organization Unit", "ou"}]
-\end{verbatim}
-\titem{ldap\_search\_reported} \ind{options!ldap\_search\_reported}This option defines search fields to be reported.
-	Format:
-		\term{[{Name, VCard\_Name}, ...]}
-	where
-		\term{Name} is the name of field in the search form. Will be automatically
-			translated according to definitions in translation files (see
-			\term{msgs/*.msg} for available words).
-		\term{VCard\_Name} is the name of vCard field defined in \option{ldap\_vcard\_map} option.
-                Example:
 \begin{verbatim}
-  {ldap_search_reported,
-   [{"Full Name", "FN"},
-    {"Email", "EMAIL"},
-    {"Birthday", "BDAY"},
-    {"Nickname", "NICKNAME"}
-   ]},
+erl -sname ejabberd \
+    -mnesia extra_db_nodes "['ejabberd@first']" \
+    -s mnesia
 \end{verbatim}
 
-Default is:
+  This will start Mnesia serving the same database as \node{ejabberd@first}.
+  You can check this by running the command `\verb|mnesia:info().|'. You
+  should see a lot of remote tables and a line like the following:
+
 \begin{verbatim}
-  [{"Full Name", "FN"},
-   {"Given Name", "GIVEN"},
-   {"Middle Name", "MIDDLE"},
-   {"Family Name", "FAMILY"},
-   {"Nickname", "NICKNAME"},
-   {"Birthday", "BDAY"},
-   {"Country", "CTRY"},
-   {"City", "LOCALITY"},
-   {"Email", "EMAIL"},
-   {"Organization Name", "ORGNAME"},
-   {"Organization Unit", "ORGUNIT"}]
+running db nodes   = [ejabberd@first, ejabberd@second]
 \end{verbatim}
-\end{description}
-
 
-\subsubsection{Examples}
-\label{sec:ldapexamples}
-
-\paragraph{Common example}
 
-Let's say \term{ldap.mydomain.org} is the name of our LDAP server. We have
-users with their passwords in \term{"ou=Users,dc=mydomain,dc=org"} directory.
-Also we have addressbook, which contains users emails and their additional
-infos in \term{"ou=AddressBook,dc=mydomain,dc=org"} directory.  Corresponding
-authentication section should looks like this:
+\item Now run the following in the same `\shell{erl}' session:
 
 \begin{verbatim}
-  %% authentication method
-  {auth_method, ldap}.
-  %% DNS name of our LDAP server
-  {ldap_servers, ["ldap.mydomain.org"]}.
-  %% Bind to LDAP server as "cn=Manager,dc=mydomain,dc=org" with password "secret"
-  {ldap_rootdn, "cn=Manager,dc=mydomain,dc=org"}.
-  {ldap_password, "secret"}.
-  %% define the user's base
-  {ldap_base, "ou=Users,dc=mydomain,dc=org"}.
-  %% We want to authorize users from 'shadowAccount' object class only
-  {ldap_filter, "(objectClass=shadowAccount)"}.
+mnesia:change_table_copy_type(schema, node(), disc_copies).
 \end{verbatim}
 
-Now we want to use users LDAP-info as their vCards.  We have four attributes
-defined in our LDAP schema: \term{"mail"} --- email address, \term{"givenName"}
---- first name, \term{"sn"} --- second name, \term{"birthDay"} --- birthday.
-Also we want users to search each other.  Let's see how we can set it up:
+  This will create local disc storage for the database.
 
-\begin{verbatim}
-  {modules,
-    ...
-    {mod_vcard_ldap,
-     [
-      %% We use the same server and port, but want to bind anonymously because
-      %% our LDAP server accepts anonymous requests to
-      %% "ou=AddressBook,dc=mydomain,dc=org" subtree.
-      {ldap_rootdn, ""},
-      {ldap_password, ""},
-      %% define the addressbook's base
-      {ldap_base, "ou=AddressBook,dc=mydomain,dc=org"},
-      %% user's part of JID is located in the "mail" attribute
-      {ldap_uidattr, "mail"},
-      %% common format for our emails
-      {ldap_uidattr_format, "%u@mail.mydomain.org"},
-      %% We have to define empty filter here, because entries in addressbook doesn't
-      %% belong to shadowAccount object class
-      {ldap_filter, ""},
-      %% Now we want to define vCard pattern
-      {ldap_vcard_map,
-       [{"NICKNAME", "%u", []}, % just use user's part of JID as his nickname
-        {"GIVEN", "%s", ["givenName"]},
-        {"FAMILY", "%s", ["sn"]},
-        {"FN", "%s, %s", ["sn", "givenName"]}, % example: "Smith, John"
-        {"EMAIL", "%s", ["mail"]},
-        {"BDAY", "%s", ["birthDay"]}]},
-      %% Search form
-      {ldap_search_fields,
-       [{"User", "%u"},
-        {"Name", "givenName"},
-        {"Family Name", "sn"},
-        {"Email", "mail"},
-        {"Birthday", "birthDay"}]},
-      %% vCard fields to be reported
-      %% Note that JID is always returned with search results
-      {ldap_search_reported,
-       [{"Full Name", "FN"},
-        {"Nickname", "NICKNAME"},
-        {"Birthday", "BDAY"}]}
-    ]}
-    ...
-  }.
-\end{verbatim}
+  (alt) Change storage type of the \term{scheme} table to `RAM and disc
+  copy' on the second node via the web interface.
 
-Note that \modvcardldap{} module checks an existence of the user before
-searching his info in LDAP.
 
+\item Now you can add replicas of various tables to this node with
+  `\verb|mnesia:add_table_copy|' or
+  `\verb|mnesia:change_table_copy_type|' as above (just replace
+  `\verb|schema|' with another table name and `\verb|disc_copies|'
+  can be replaced with `\verb|ram_copies|' or
+  `\verb|disc_only_copies|').
 
-\paragraph{Active Directory}
+  Which tables to replicate is very dependant on your needs, you can get
+  some hints from the command `\verb|mnesia:info().|', by looking at the
+  size of tables and the default storage type for each table on 'first'.
 
-Active Directory is just an LDAP-server with predefined attributes.  Sample
-config file is listed below:
+  Replicating a table makes lookups in this table faster on this node.
+  Writing, on the other hand, will be slower. And of course if machine with one
+  of the replicas is down, other replicas will be used.
 
-\begin{verbatim}
-  {auth_method, ldap}.
-  {ldap_servers, ["office.org"]}.    % List of LDAP servers
-  {ldap_base, "DC=office,DC=org"}. % Search base of LDAP directory
-  {ldap_rootdn, "CN=Administrator,CN=Users,DC=office,DC=org"}. % LDAP manager
-  {ldap_password, "*******"}. % Password to LDAP manager
-  {ldap_uidattr, "sAMAccountName"}.
-  {ldap_filter, "(memberOf=*)"}.
-  
-  {mod_vcard_ldap,
-   [{ldap_vcard_map,
-     [{"NICKNAME", "%u", []},
-      {"GIVEN", "%s", ["givenName"]},
-      {"MIDDLE", "%s", ["initials"]},
-      {"FAMILY", "%s", ["sn"]},
-      {"FN", "%s", ["displayName"]},
-      {"EMAIL", "%s", ["mail"]},
-      {"ORGNAME", "%s", ["company"]},
-      {"ORGUNIT", "%s", ["department"]},
-      {"CTRY", "%s", ["c"]},
-      {"LOCALITY", "%s", ["l"]},
-      {"STREET", "%s", ["streetAddress"]},
-      {"REGION", "%s", ["st"]},
-      {"PCODE", "%s", ["postalCode"]},
-      {"TITLE", "%s", ["title"]},
-      {"URL", "%s", ["wWWHomePage"]},
-      {"DESC", "%s", ["description"]},
-      {"TEL", "%s", ["telephoneNumber"]}]},
-    {ldap_search_fields,
-     [{"User", "%u"},
-      {"Name", "givenName"},
-      {"Family Name", "sn"},
-      {"Email", "mail"},
-      {"Company", "company"},
-      {"Department", "department"},
-      {"Role", "title"},
-      {"Description", "description"},
-      {"Phone", "telephoneNumber"}]},
-    {ldap_search_reported,
-     [{"Full Name", "FN"},
-      {"Nickname", "NICKNAME"},
-      {"Email", "EMAIL"}]}
-   ]
-  }.
-\end{verbatim}
+  Also \footahref{http://www.erlang.se/doc/doc-5.4.9/lib/mnesia-4.2.2/doc/html/Mnesia\_chap5.html\#5.3}
+  {section 5.3 (Table Fragmentation) of Mnesia User's Guide} can be helpful.
+  % The above URL needs update every Erlang release!
 
+  (alt) Same as in previous item, but for other tables.
 
-\subsection{\modversion{}}
-\label{sec:modversion}
-\ind{modules!\modversion{}}\ind{protocols!JEP-0092: Software Version}
 
-This module implements Software Version (\jepref{0092}). Consequently, it
-answers \ejabberd{}'s version when queried.
+\item Run `\verb|init:stop().|' or just `\verb|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 \term{first}.
 
-Options:
-\begin{description}
-\iqdiscitem{Software Version (\ns{jabber:iq:version})}
-\end{description}
 
+\item Now run \ejabberd{} on \term{second} with almost the same config as
+  on \term{first} (you probably do not need to duplicate `\verb|acl|'
+  and `\verb|access|' options --- they will be taken from
+  \term{first}, and \verb|mod_muc| and \verb|mod_irc| should be
+  enabled only on one machine in the cluster).
+\end{enumerate}
+
+You can repeat these steps for other machines supposed to serve this
+domain.
+
+% TODO
+% See also the section about ejabberdctl!!!!
+%\section{Backup and Restore}
+%\label{sec:backup}
+%\ind{backup}
 
-\section{Internationalization and Localization}
+\appendix{}
+\section{\aname{i18nl10n}{Internationalization and Localization}}
 \label{sec:i18nl10n}
 \ind{xml:lang}\ind{internationalization}\ind{localization}\ind{i18n}\ind{l10n}
 
@@ -2665,12 +3045,17 @@ figure~\ref{fig:webadmmainru} with figure~\ref{fig:webadmmain})
   \centering
   \insimg{webadmmainru.png}
   \caption{Top page from the web interface with HTTP header
-    ``Accept-Language: ru''}
+    `Accept-Language: ru'}
   \label{fig:webadmmainru}
 \end{figure}
 
+
+%\section{\aname{ultracomplexexample}{Ultra Complex Example}}
+%\label{sec:ultracomplexexample}
+%TODO: a very big example covering the whole guide, with a good explanation before the example: different authenticaton mechanisms, transports, ACLs, multple virtual hosts, virtual host specific settings and general settings, modules,...
+
 \newpage
-\section{Release Notes}
+\section{\aname{releasenotes}{Release Notes}}
 \label{sec:releasenotes}
 \ind{release notes}
 
@@ -2692,12 +3077,14 @@ figure~\ref{fig:webadmmainru} with figure~\ref{fig:webadmmain})
 \subsection{ejabberd 1.1.1}
 \verbatiminput{release_notes_1.1.1.txt}
 
-\section{Acknowledgements}
+
+\section{\aname{acknowledgements}{Acknowledgements}}
 \label{sec:acknowledgements}
-\ind{acknowledgements}
 Thanks to all people who contributed to this guide:
 \begin{itemize}
 \item Alexey Shchepin (\ahrefurl{xmpp:aleksey@jabber.ru})
+\item Badlop (\ahrefurl{xmpp:badlop@jabberes.org})
+\item Evgeniy Khramtsov (\ahrefurl{xmpp:xram@jabber.ru})
 \item Florian Zumbiehl (\ahrefurl{xmpp:florz@florz.de})
 \item Michael Grigutsch (\ahrefurl{xmpp:migri@jabber.i-pobox.net})
 \item Mickael Remond (\ahrefurl{xmpp:mremond@erlang-projects.org})
@@ -2706,8 +3093,29 @@ Thanks to all people who contributed to this guide:
 \item Vsevolod Pelipas (\ahrefurl{xmpp:vsevoload@jabber.ru})
 \end{itemize}
 
-% TODO
-%\section{Glossary}
+
+\section{\aname{copyright}{Copyright Information}}
+\label{sec:copyright}
+
+Ejabberd Installation and Operation Guide.\\
+Copyright \copyright{} January 23, 2003 --- \today{} Alexey Shchepin
+
+This document is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This document is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with
+this document; if not, write to the Free Software Foundation, Inc., 51 Franklin
+Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+%TODO: a glossary describing common terms
+%\section{\aname{glossary}{Glossary}}
 %\label{sec:glossary}
 %\ind{glossary}
 
@@ -2732,12 +3140,10 @@ Thanks to all people who contributed to this guide:
 %\titem{Regular Expression}
 %\titem{ACL} (Access Control List) <Wikipedia>
 %\titem{IPv6} <Wikipedia>
-%\titem{XDB} ???
+%\titem{Jabber}
 %\titem{LDAP} (Lightweight Directory Access Protocol) <Wikipedia>
 %\titem{ODBC} (Open Database Connectivity) <Wikipedia>
 %\titem{Virtual Hosting} <Wikipedia>
-%\titem{}
-%\titem{}
 
 %\end{description}
 
diff --git a/doc/introduction.tex b/doc/introduction.tex
index 4ad14bc50..fd5a24f05 100644
--- a/doc/introduction.tex
+++ b/doc/introduction.tex
@@ -1,25 +1,31 @@
-\section{Introduction}
-\label{sec:intr}
+\section{\aname{intro}{Introduction}}
+\label{sec:intro}
 
-\quoting{I just tried out ejabberd and was impressed both by ejabberd itself and the language it is written in, Erlang. --
+\quoting{I just tried out ejabberd and was impressed both by ejabberd itself and the language it is written in, Erlang. ---
 Joeri} 
 
-\ejabberd{} is a free (GPL) distributed fault-tolerant \Jabber{}/XMPP server and is mainly written in \footahref{http://www.erlang.org/}{Erlang}.
+%ejabberd is a free and open source instant messaging server written in Erlang. ejabberd is cross-platform, distributed, fault-tolerant, and based on open standards to achieve real-time communication (Jabber/XMPP).
 
-\ejabberd{} is designed to be a \marking{stable}, \marking{standards compliant}, and \marking{\mbox{feature rich}} \Jabber{}/XMPP server.
+\ejabberd{} is a \marking{free and open source} instant messaging server written in \footahref{http://www.erlang.org/}{Erlang}.
 
-\ejabberd{} is suitable for small servers, whether they need to be scalable or not, as well as extremely big servers.
+\ejabberd{} is \marking{cross-platform}, distributed, fault-tolerant, and based on open standards to achieve real-time communication.
 
-%\subsection{Layout with example deployment (title needs a better name)}
+\ejabberd{} is designed to be a \marking{rock-solid and feature rich} XMPP server.
+
+\ejabberd{} is suitable for small deployments, whether they need to be \marking{scalable} or not, as well as extremely big deployments.
+
+%\subsection{\aname{layout}{Layout with example deployment (title needs a better name)}}
+%\label{sec:layout}
 
 %In this section there will be a graphical overview like these:\\
 %\verb|http://www.tipic.com/var/timp/timp_dep.gif| \\
 %\verb|http://www.jabber.com/images/jabber_Com_Platform.jpg| \\
 %\verb|http://www.antepo.com/files/OPN45systemdatasheet.pdf| \\
 
-%Some small images of Jabber clients that are known to work greatly with ejabberd. Less text!!!
+%A page full with names of Jabber client that are known to work with ejabberd. \begin{tiny}tiny font\end{tiny}
 
-%\subsection{Try It Today}
+%\subsection{\aname{trytoday}{Try It Today}}
+%\label{sec:trytoday}
 
 %(Not sure if I will include/finish this section for the next version.)
 
@@ -32,42 +38,42 @@ Joeri}
 %\end{itemize}
 
 \newpage
-\subsection{Key Features}
+\subsection{\aname{keyfeatures}{Key Features}}
 \label{sec:keyfeatures}
 \ind{features!key features}
 
-\quoting{Erlang seems to be tailor-made for writing stable, robust servers. --
+\quoting{Erlang seems to be tailor-made for writing stable, robust servers. ---
 Peter Saint-Andr\'e, Executive Director of the Jabber Software Foundation}
 
 \ejabberd{} is:
 \begin{itemize}
-\item \marking{Multiplatform:} \ejabberd{} runs under Microsoft Windows and Unix derived systems such as Linux, FreeBSD and NetBSD.
+\item \marking{Cross-platform:} \ejabberd{} runs under Microsoft Windows and Unix derived systems such as Linux, FreeBSD and NetBSD.
 
 \item \marking{Distributed:} You can run \ejabberd{} on a cluster of machines and all of them will serve the same \Jabber{} domain(s). 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.
 
-\item \marking{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''.
+\item \marking{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'.
 
 \item \marking{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:
 \begin{itemize}
-\item Comprehensive documentation.\moreinfo{ --- You can start in the \footahref{http://ejabberd.jabber.ru/book}{ejabberd Book}.}
-\item Straightforward installers for Linux, Mac OS X, and Windows.\improved{}\moreinfo{ --- (\footahref{http://ejabberd.jabber.ru/screenshots-linux-installer}{Screenshots}).}
-\item Web interface for administration tasks.\moreinfo{ --- With HTTPS secure access. \footahref{http://ejabberd.jabber.ru/online-demo-webadmin}{Demo}.}
-\item Shared Roster Groups.\moreinfo{ --- The administrator can setup a common list of \Jabber{} users for all users on the server. Those users are virtually added to all rosters. They cannot be removed, but can be renamed or moved into different roster groups. Does not require client implementation. Not related to \jepref{0144} (Roster Item Exchange).\footahref{http://ejabberd.jabber.ru/screenshots-shared-roster-groups}{Screenshots})}
-\item Command line administration tool.\improved{}\moreinfo{ --- Some basic administration tasks can be acomplished using the command line: register/remove users, backup/restore database, amongst others (\footahref{http://ejabberd.jabber.ru/screenshots-administration#ejabberdctl}{Screenshots}).}
+\item Comprehensive documentation.
+\item Straightforward installers for Linux, Mac OS X, and Windows.\improved{}
+\item Web interface for administration tasks.
+\item Shared Roster Groups.
+\item Command line administration tool.
 \item Can integrate with existing authentication mechanisms.
-\item Capability to send announce messages.\improved{}
+\item Capability to send announce messages.
 \end{itemize}
 
 \item \marking{Internationalized:} \ejabberd{} leads in internationalization. Hence it is very well suited in a globalized world. Related features are:
 \begin{itemize}
-\item Translated in 11 languages.\moreinfo{ --- More information is available \footahref{http://ejabberd.jabber.ru/localization}{here}.}
+\item Translated in 11 languages.
 \item Support for \footahref{http://www.ietf.org/rfc/rfc3490.txt}{IDNA}.
 \end{itemize}
 
 \item \marking{Open Standards:} \ejabberd{} is the first Open Source Jabber server claiming to fully comply to the XMPP standard.
 \begin{itemize}
-\item Fully XMPP compliant \moreinfo{ --- ejabberd is fully compliant with XMPP Core 1.0 and XMPP IM 1.0. Check the \footahref{http://ejabberd.jabber.ru/protocols}{supported protocols}.}
-\item XML-based protocol
+\item Fully XMPP compliant.
+\item XML-based protocol.
 \item \footahref{http://ejabberd.jabber.ru/protocols}{Many JEPs supported}.
 \end{itemize}
 
@@ -75,52 +81,51 @@ Peter Saint-Andr\'e, Executive Director of the Jabber Software Foundation}
 
 \newpage
 
-\subsection{Additional Features}
+\subsection{\aname{addfeatures}{Additional Features}}
 \label{sec:addfeatures}
 \ind{features!additional features}
 
-\quoting{ejabberd is making inroads to solving the "buggy incomplete server" problem --
+\quoting{ejabberd is making inroads to solving the "buggy incomplete server" problem ---
 Justin Karneges, Founder of the Psi and the Delta projects}
 
-Besides common \Jabber{} server features, \ejabberd{} comes with a wide range of other features:
+Moreover, \ejabberd{} comes with a wide range of other state-of-the-art features:
 \begin{itemize}
 \item Modular
 \begin{itemize}
 \item Load only the modules you want.
-\item Extend \ejabberd{} with your own custom modules.\moreinfo{ --- A list of contributed modules and patches is available on the \footahref{http://ejabberd.jabber.ru/contributions}{contributions page}.}
+\item Extend \ejabberd{} with your own custom modules.
 \end{itemize}
 \item Security
 \begin{itemize}
-\item SASL and STARTTLS for c2s and s2s connections.\improved{}
+\item SASL and STARTTLS for c2s and s2s connections.
 \item STARTTLS and Dialback s2s connections.
 \item Web interface accessible via HTTPS secure access.
 \end{itemize}
 \item Databases
 \begin{itemize}
-\item Native MySQL support.\new{}
+\item Native MySQL support.
 \item Native PostgreSQL support.
 \item Mnesia.
-\item ODBC data storage support. \moreinfo{ --- ODBC requests can be load
-  balanced between several connections.}
-\item Microsoft SQL Server support (via ODBC).\new{}
+\item ODBC data storage support.
+\item Microsoft SQL Server support.\new{}
 \end{itemize}
 \item Authentication
 \begin{itemize}
-\item LDAP and ODBC. \moreinfo{ --- Accounts can authenticate in a LDAP server.}
+\item LDAP and ODBC.
 \item External Authentication script.
 \item Internal Authentication.
 \end{itemize}
 \item Others
 \begin{itemize}
-\item Compressing XML streams with Stream Compression (\jepref{0138}).\new{}
+\item Compressing XML streams with Stream Compression (\jepref{0138}).
 \item Interface with networks such as AIM, ICQ and MSN.
 \item Statistics via Statistics Gathering (\jepref{0039}).
 \item IPv6 support both for c2s and s2s connections.
 \item \tjepref{0045}{Multi-User Chat} module with logging.\improved{}
 \item Users Directory based on users vCards.
 \item \tjepref{0060}{Publish-Subscribe} component.
-\item Support for virtual hosting. \moreinfo{ --- Several \Jabber{} hosts can be hosted on the same \ejabberd{} instance. As simple as adding a new domain name to the list of hosts in the configuration file.}
+\item Support for virtual hosting.
 \item \tjepref{0025}{HTTP Polling} service.
-\item IRC transport.\improved{}
+\item IRC transport.
 \end{itemize}
 \end{itemize}
\ No newline at end of file
diff --git a/doc/version.tex b/doc/version.tex
index 2a723f87c..90a3dcf92 100644
--- a/doc/version.tex
+++ b/doc/version.tex
@@ -1,2 +1,2 @@
 % Define ejabberd version here.
-\newcommand{\version}{1.1.1}
+\newcommand{\version}{1.1.2}
-- 
cgit v1.2.3


From d31ab5ca13e781ee58e918d5a38a3f8cc56f1c12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20R=C3=A9mond?=
 <mickael.remond@process-one.net>
Date: Fri, 22 Sep 2006 09:25:47 +0000
Subject: * src/msgs/fr.msg: updated French translation.

SVN Revision: 619
---
 ChangeLog       | 2 ++
 src/msgs/fr.msg | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 077cce022..783cb1902 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2006-09-22  Mickael Remond  <mickael.remond@process-one.net>
 
+	* src/msgs/fr.msg: updated French translation.
+	
 	* doc/guide.tex: Large improvements for ejabberd 1.1.2 (thanks to
 	Sander Devrieze)
 	* doc/version.tex: Likewise.
diff --git a/src/msgs/fr.msg b/src/msgs/fr.msg
index 03c58cac2..e2486212b 100644
--- a/src/msgs/fr.msg
+++ b/src/msgs/fr.msg
@@ -74,7 +74,6 @@
 
 % src/mod_vcard_ldap.erl
 {"Erlang Jabber Server\nCopyright (c) 2002-2006 Alexey Shchepin", "Serveur Jabber Erlang\nCopyright (c) 2002-2006 Alexey Shchepin"}.
-{"Given Name", "Prénom"}.
 {"ejabberd vCard module\nCopyright (c) 2003-2006 Alexey Shchepin", "Module vCard ejabberd\nCopyright (c) 2003-2006 Alexey Shchepin"}.
 {"Email", "Email"}.
 {"Search Results for ", "Résultats de recherche pour "}.
@@ -213,7 +212,6 @@
 {"Make room public searchable", "Rendre le salon public"}.
 {"Make participants list public", "Rendre la liste des participants publique"}.
 {"Make room password protected", "Protéger le salon par mot de passe"}.
-{"Make room semianonymous", "Rendre le salon semi-anonyme"}.
 {"Make room members-only", "Réserver le salon aux membres uniquement"}.
 {"Make room moderated", "Rendre le salon modéré"}.
 {"Default users as participants", "Les utilisateurs sont par défaut participant"}.
@@ -224,6 +222,7 @@
 {"Enable logging", "Activer l'archivage"}.
 {"Description", "Description"}.
 {"Number of occupants", "Nombre d'occupants"}.
+{"Who may discover real JIDs?", "Qui peut découvrir les vrais JIDs ?"}.
 
 % mod_irc/mod_irc.erl
 {"ejabberd IRC module\nCopyright (c) 2003-2006 Alexey Shchepin", "Module IRC ejabberd\nCopyright (c) 2003-2006 Alexey Shchepin"}.
-- 
cgit v1.2.3


From 4ea5e493ea96941007f798e497cdc6a9afd8a836 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20R=C3=A9mond?=
 <mickael.remond@process-one.net>
Date: Fri, 22 Sep 2006 17:01:16 +0000
Subject: * src/mod_muc/mod_muc.erl: Component name is now more user friendly
 (thanks to Badlop). * src/mod_irc/mod_irc.erl: Likewise. *
 src/mod_pubsub/mod_pubsub.erl: Likewise.

SVN Revision: 620
---
 ChangeLog                     | 5 +++++
 src/mod_irc/mod_irc.erl       | 2 +-
 src/mod_muc/mod_muc.erl       | 2 +-
 src/mod_pubsub/mod_pubsub.erl | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 783cb1902..f1144ad6c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-09-22  Mickael Remond  <mickael.remond@process-one.net>
 
+	* src/mod_muc/mod_muc.erl: Component name is now more user friendly
+	(thanks to Badlop).
+	* src/mod_irc/mod_irc.erl: Likewise.
+	* src/mod_pubsub/mod_pubsub.erl: Likewise. 
+
 	* src/msgs/fr.msg: updated French translation.
 	
 	* doc/guide.tex: Large improvements for ejabberd 1.1.2 (thanks to
diff --git a/src/mod_irc/mod_irc.erl b/src/mod_irc/mod_irc.erl
index e3ce27268..77c2f575d 100644
--- a/src/mod_irc/mod_irc.erl
+++ b/src/mod_irc/mod_irc.erl
@@ -291,7 +291,7 @@ iq_disco() ->
     [{xmlelement, "identity",
       [{"category", "conference"},
        {"type", "irc"},
-       {"name", "ejabberd/mod_irc"}], []},
+       {"name", "IRC Transport"}], []},
      {xmlelement, "feature",
       [{"var", ?NS_MUC}], []},
      {xmlelement, "feature",
diff --git a/src/mod_muc/mod_muc.erl b/src/mod_muc/mod_muc.erl
index 196181f3f..d5ecb5b91 100644
--- a/src/mod_muc/mod_muc.erl
+++ b/src/mod_muc/mod_muc.erl
@@ -446,7 +446,7 @@ iq_disco_info() ->
     [{xmlelement, "identity",
       [{"category", "conference"},
        {"type", "text"},
-       {"name", "ejabberd/mod_muc"}], []},
+       {"name", "Chatrooms"}], []},
      {xmlelement, "feature", [{"var", ?NS_MUC}], []},
      {xmlelement, "feature", [{"var", ?NS_REGISTER}], []},
      {xmlelement, "feature", [{"var", ?NS_VCARD}], []}].
diff --git a/src/mod_pubsub/mod_pubsub.erl b/src/mod_pubsub/mod_pubsub.erl
index afea05cb0..37eb87c17 100644
--- a/src/mod_pubsub/mod_pubsub.erl
+++ b/src/mod_pubsub/mod_pubsub.erl
@@ -318,7 +318,7 @@ iq_disco_info(SNode) ->
 	    [{xmlelement, "identity",
 	      [{"category", "pubsub"},
 	       {"type", "generic"},
-	       {"name", "ejabberd/mod_pubsub"}], []},
+	       {"name", "Publish-Subscribe"}], []},
 	     {xmlelement, "feature", [{"var", ?NS_PUBSUB}], []},
 	     {xmlelement, "feature", [{"var", ?NS_PUBSUB_EVENT}], []},
 	     {xmlelement, "feature", [{"var", ?NS_PUBSUB_OWNER}], []},
-- 
cgit v1.2.3


From e734ad16822ec68ded52b8fcff8bc96a481fe5c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20R=C3=A9mond?=
 <mickael.remond@process-one.net>
Date: Sat, 23 Sep 2006 09:20:19 +0000
Subject: * src/msgs/cs.msg: Added Czech translation (thanks to Milos Svasek).

SVN Revision: 622
---
 ChangeLog            |   2 +
 doc/introduction.tex |   2 +-
 src/msgs/cs.msg      | 477 +++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 480 insertions(+), 1 deletion(-)
 create mode 100644 src/msgs/cs.msg

diff --git a/ChangeLog b/ChangeLog
index f1144ad6c..58d3c3180 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2006-09-22  Mickael Remond  <mickael.remond@process-one.net>
 
+	* src/msgs/cs.msg: Added Czech translation (thanks to Milos Svasek).
+	
 	* src/mod_muc/mod_muc.erl: Component name is now more user friendly
 	(thanks to Badlop).
 	* src/mod_irc/mod_irc.erl: Likewise.
diff --git a/doc/introduction.tex b/doc/introduction.tex
index fd5a24f05..204a51ddb 100644
--- a/doc/introduction.tex
+++ b/doc/introduction.tex
@@ -66,7 +66,7 @@ Peter Saint-Andr\'e, Executive Director of the Jabber Software Foundation}
 
 \item \marking{Internationalized:} \ejabberd{} leads in internationalization. Hence it is very well suited in a globalized world. Related features are:
 \begin{itemize}
-\item Translated in 11 languages.
+\item Translated in 12 languages.
 \item Support for \footahref{http://www.ietf.org/rfc/rfc3490.txt}{IDNA}.
 \end{itemize}
 
diff --git a/src/msgs/cs.msg b/src/msgs/cs.msg
new file mode 100644
index 000000000..0f3e4d4cf
--- /dev/null
+++ b/src/msgs/cs.msg
@@ -0,0 +1,477 @@
+% $Id$
+% Czech translation
+% Authors: Milos Svasek [DuxforD] from openheads.net
+ 
+
+% jlib.hrl
+{"No resource provided", "Nebyl poskytnutý žádny zdroj"}.
+
+% mod_configure.erl
+{"Choose storage type of tables", "Vyberte typ úložiště pro tabulky"}.
+{"RAM copy", "Kopie RAM"}.
+{"RAM and disc copy", "Kopie RAM a disku"}.
+{"Disc only copy", "Jen kopie disku"}.
+{"Remote copy", "Vzdálená kopie"}.
+{"Stop Modules at ", "Zastavit moduly na "}.
+{"Choose modules to stop", "Vyberte moduly, které mají být zastavené"}.
+{"Start Modules at ", "Spustit moduly na "}.
+{"Enter list of {Module, [Options]}", "Vložte seznam modulů {Modul, [Parametre]}"}.
+{"List of modules to start", "Seznam modulů, které mají být spuštěné"}.
+{"Backup to File at ", "Záloha do souboru na "}.
+{"Enter path to backup file", "Zadajte cestu k souboru se zálohou"}.
+{"Path to File", "Cesta k souboru"}.
+{"Restore Backup from File at ", "Obnovit zálohu ze souboru na "}.
+{"Dump Backup to Text File at ", "Uložit zálohu do textového souboru na "}.
+{"Enter path to text file", "Zadajte cestu k textovému souboru"}.
+{"Import User from File at ", "Importovat uživatele ze souboru na "}.
+{"Enter path to jabberd1.4 spool file", "Zadejte cestu k spool souboru jabberd1.4"}.
+{"Import Users from Dir at ", "Importovat uživatele z adresáře na "}.
+{"Enter path to jabberd1.4 spool dir", "Zadejte cestu k jabberd1.4 spool adresáři"}.
+{"Path to Dir", "Cesta k adresáři"}.
+{"Hostname Configuration", "Konfigurace jména serveru"}.
+{"Choose host name", "Vyberte jméno serveru"}.
+{"Host name", "Jméno serveru"}.
+{"Access Control List Configuration", "Konfigurace seznamu přístupových práv (ACL)"}.
+{"Access control lists", "Seznamy přístupových práv (ACL)"}.
+{"Access Configuration", "Konfigurace přístupů"}.
+{"Access rules", "Pravidla přístupů"}.
+{"Remove Users", "Odstranit uživatele"}.
+{"Choose users to remove", "Vybrat uživatele, kteří budou odstraněni"}.
+{"Administration of ", "Administrace "}.
+{"Action on user", "Akce aplikovaná na uživatele"}.
+{"Edit Properties", "Upravit vlastnosti"}.
+{"Remove User", "Odstranit uživatele"}.
+
+% mod_disco.erl
+{"Configuration", "Konfigurace"}.
+{"Online Users", "Online uživatelé"}.
+{"All Users", "Všichni uživatelé"}.
+{"Outgoing S2S connections", "Odchozí spojení S2S"}.
+{"To ~s", "Pre ~s"}.
+{"From ~s", "Od  ~s"}.
+{"Running Nodes", "Bežící uzly"}.
+{"Stopped Nodes", "Zastavené uzly"}.
+{"Host Name", "Jméno serveru"}.
+{"Access Control Lists", "Seznamy přístupových práv (ACL)"}.
+{"Access Rules", "Pravidla přístupů"}.
+{"Remove Users", "Odstranit uživatele"}.
+{"DB", "DB"}.
+{"Modules", "Moduly"}.
+{"Start Modules", "Spustit moduly"}.
+{"Stop Modules", "Zastavit moduly"}.
+{"Backup Management", "Správa zálohování"}.
+{"Import users from jabberd1.4 spool files", "Importovat uživatele z jabberd1.4 spool souborů"}.
+{"Backup", "Zálohovat"}.
+{"Restore", "Obnovit"}.
+{"Dump to Text File", "Uložit do textového souboru"}.
+{"Import File", "Import souboru"}.
+{"Import Directory", "Import adresáře"}.
+
+% mod_register.erl
+{"Choose a username and password to register with this server",
+ "Zadejte jméno uživatele a heslo pro registraci na tomto serveru"}.
+
+% mod_vcard.erl
+{"You need an x:data capable client to search",
+ "K vyhledávání potřebujete klienta podporujícího x:data"}.
+{"Search users in ", "Hledat uživatele v "}.
+{"Fill in fields to search for any matching Jabber User",
+ "Vyplňte políčka pro vyhledávání Jabber uživatele"}.
+{"Results of search in ", "Výsledky vyhledávání v "}.
+
+{"User",              "Uživatel: "}.
+{"Full Name", 	      "Celé jméno: "}.
+{"Name", 	      "Jméno: "}.
+{"Middle Name",       "Prostřední jméno: "}.
+{"Family Name",       "Příjmení: "}.
+{"Nickname", 	      "Přezdívka: "}.
+{"Birthday", 	      "Datum narození: "}.
+{"Country", 	      "Země: "}.
+{"City", 	      "Město: "}.
+{"email", 	      "E-mail: "}.
+{"Organization Name", "Název firmy: "}.
+{"Organization Unit", "Oddělení: "}.
+
+% mod_muc/mod_muc.erl
+{"You need an x:data capable client to register nickname",
+ "K registraci přezdívky potřebujete klienta podporujícího z x:data"}.
+{"Nickname Registration at ", "Registrace prezdívky na "}.
+{"Enter nickname you want to register", "Zadajte prezdívku, kterou chete zaregistrovat"}.
+{"Only service administrators are allowed to send service messages",
+ "Pouze správci služby mají povolené odesílání servisních zpráv"}.
+{"Conference room does not exist", "Konferenční místnost neexistuje"}.
+{"Access denied by service policy", "Přístup byl zamítnutý nastavením služby"}.
+{"You must fill in field \"nick\" in the form", "Musíte vyplnit políčko \"prezdívka\"  ve formuláři"}.
+{"Specified nickname is already registered", "Zadaná prezdívka je již registrována"}.
+
+% mod_muc/mod_muc_room.erl
+{" has set the subject to: ", "změnil(a) téma na: "}.
+{"You need an x:data capable client to configure room",
+ "Ke konfiguraci místnosti potřebujete klienta podporujícího z x:data"}.
+{"Configuration for ", "Konfigurace pre "}.
+{"Room title", "Název místnosti"}.
+{"Allow users to change subject?", "Povolit uživatelům menit téma?"}.
+{"Allow users to query other users?",
+ "Povolit uživatelům odesílat požadavky (query) ostatním uživatelům?"}.
+{"Allow users to send private messages?",
+ "Povolit uživatelům odesíelat soukromé zprávy?"}.
+{"Make room public searchable?", "Nastavit místnost jako veřejně prohledávatelnou?"}.
+{"Make participants list public?", "Nastavit seznam účastníků jako veřejný?"}.
+{"Make room persistent?", "Nastavit místnost jako trvalou (persistent)?"}.
+{"Make room moderated?", "Nastavit místnost jako moderovanou?"}.
+{"Default users as members?", "Uživatelé jsou implicitně členy?"}.
+{"Make room members only?", "Nastavit místnost jen pro členy?"}.
+{"Allow users to send invites?", "Povolit uživatelům odesíelat pozvánky?"}.
+{"Make room password protected?", "Chránit místnost heslem?"}.
+{"Password", "Heslo"}.
+{"Make room anonymous?", "Nastavit místnost jako anonymní?"}.
+{"Enable logging?", "Zapnout ukládání historie?"}.
+{"Only moderators and participants are allowed to change subject in this room",
+ "Jen moderátoři a účastníci mají povoleno měnit téma této místnosti"}.
+{"Only moderators are allowed to change subject in this room",
+ "Jen moderátoři mají povoleno měnit téma místnosti"}.
+{"Visitors are not allowed to send messages to all occupants",
+ "Návštevníci nemají povoleno zsílat zprávy všem přihlášeným do konference"}.
+{"Only occupants are allowed to send messages to the conference",
+ "Jen členové mají povolené zasílat správy do konference"}.
+{"It is not allowed to send normal messages to the conference",
+ "Není povoleno odesílat normální zprávy do konference"}.
+{"It is not allowed to send private messages to the conference",
+ "Není povoleno odesílat soukromé zprávy do konference"}.
+{"Improper message type", "Nesprávný typ zprávy"}.
+{"Nickname is already in use by another occupant", "Prezdívka je již používána jiným členem"}.
+{"Nickname is registered by another person", "Prezdívka je registrována jinou osobou"}.
+{"It is not allowed to send private messages of type \"groupchat\"",
+ "Není dovoleno odeslání soukromé zprávy typu \"Skupinová zpráva\" "}.
+{"Recipient is not in the conference room", "Příjemce se nenachází v konferenční místnosti"}.
+{"Only occupants are allowed to send queries to the conference",
+ "Jen členové mohou odesílat požadavky (query) do konference"}.
+{"Queries to the conference members are not allowed in this room",
+ "Požadavky (queries) na členy konference nejsou v této místnosti povolené"}.
+{"You have been banned from this room", "Byl jste vyloučen z této místnosti"}.
+{"Membership required to enter this room", "Pro vstup do místnosti musíte být členem"}.
+{"Password required to enter this room", "Pro vstup do místnosti musíte zadat heslo"}.
+{"Incorrect password", "Nesprávne heslo"}.
+{"Administrator privileges required", "Jsou potřebná práva administrátora"}.
+{"Moderator privileges required", "Jsou potřebná práva moderátora"}.
+{"JID ~s is invalid", "JID ~s je neplatné"}.
+{"Nickname ~s does not exist in the room", "Prezdívka ~s v místnosti neexistuje"}.
+{"Invalid affiliation: ~s", "Neplatné přiřazení: ~s"}.
+{"Invalid role: ~s", "Neplatná role: ~s"}.
+{"Owner privileges required", "Jsou vyžadována práva vlastníka"}.
+{"private, ", "soukromá, "}.
+
+% mod_irc/mod_irc.erl
+{"You need an x:data capable client to configure mod_irc settings",
+ "Pro konfiguraci mod_irc potřebujete klienta podporujícího x:data"}.
+{"Registration in mod_irc for ", "Registrace do mod_irc na "}.
+{"Enter username and encodings you wish to use for connecting to IRC servers",
+ "Vložte jméno uživatele a kódování, které chcete používat při připojení na IRC server"}.
+{"IRC Username", "IRC prezdívka"}.
+{"Example: [{\"irc.lucky.net\", \"koi8-r\"}, {\"vendetta.fef.net\", \"iso8859-1\"}].",
+ "Příklad: [{\"irc.freenode.net\",\"utf-8\"}, {\irc.freenode.net\", \"iso8859-2\"}]."}.
+{"Encodings", "Kódování"}.
+
+% web/ejabberd_web_admin.erl
+{"ejabberd administration", "Administrace Ejabberd"}.
+{"Users", "Uživatelé"}.
+{"Nodes", "Uzly"}.
+{"Statistics", "Statistiky"}.
+{"(raw)", "(zdroj)"}.
+{"submitted", "odeslané"}.
+{"bad format", "nesprávný formát"}.
+{"raw", "zdroj"}.
+{"ejabberd access control lists configuration", "Konfigurace seznamu přístupových práv (ACL) Ejabberd"}.
+{"Delete Selected", "Smazat vybrané"}.
+{"Submit", "Odeslat"}.
+{"ejabberd access rules configuration", "Konfigurace pravidel přístupů Ejabberd"}.
+{"~s access rule configuration", "~s konfigurace pravidla přístupu"}.
+{"ejabberd users", "Uživatelé Ejabberd"}.
+{"ejabberd stats", "Statistiky Ejabberd"}.
+{"Node not found", "Uzel nenalezen"}.
+{"Add New", "Přidat nový"}.
+{"Registered users", "Registrovaní uživatelé"}.
+{"Online users", "Online uživatelé"}.
+{"Outgoing S2S servers", "Servery S2S pro odchozí komunikaci"}.
+{"Change Password", "Změnit heslo"}.
+{"Connected Resources:", "Připojené zdroje:"}.
+{"Password:", "Heslo:"}.
+{"None", "Nic"}.
+{"Node ", "Uzel "}.
+{"DB Management", "Správa databáze"}.
+{"Listened Ports Management", "Správa otevřených portů"}.
+{"Restart", "Restart"}.
+{"Stop", "Stop"}.
+{"RPC call error", "Chyba RPC volání"}.
+{"DB Tables at ", "Databázové tabulky na "}.
+{"Name", "Jméno"}.
+{"Storage Type", "Typ úložiště"}.
+{"Size", "Velikost"}.
+{"Memory", "Paměť"}.
+{"Backup Management at ", "Správa záloh na "}.
+{"Store a backup in a file", "Uložit zálohu do souboru "}.
+{"OK", "OK"}.
+{"Restore a backup from a file", "Obnovit zálohu ze souboru"}.
+{"Install a database fallback from a file", "Instalovat nouzovou (fallback) databázi ze souboru"}.
+{"Dump a database in a text file", "Uložit databázi do textového souboru"}.
+{"Restore a database from a text file", "Obnovit databázi z textového souboru"}.
+{"Listened Ports at ", "Otevřené porty na "}.
+{"~p statistics", "~p statistiky"}.
+{"Uptime", "Čas běhu"}.
+{"CPU Time", "Čas procesoru"}.
+{"Transactions commited", "Transakce potvrzena"}.
+{"Transactions aborted", "Transakce zrušena"}.
+{"Transactions restarted", "Transakce restartována"}.
+{"Transactions logged", "Transakce zaznamenána"}.
+{"Port", "Port"}.
+{"Module", "Modul"}.
+{"Options", "Nastavení"}.
+{"Update", "Aktualizovat"}.
+{"Delete", "Smazat"}.
+{"Add User", "Přidat uživatele"}.
+{"Offline messages", "Offline zprávy"}.
+{"Last Activity", "Poslední aktivita"}.
+{"Never", "Nikdy"}.
+{"~s offline messages queue", "~s offline zpráv(y)"}.
+{"Time", "Čas"}.
+{"From", "Od"}.
+{"To", "Pro"}.
+{"Packet", "Paket"}.
+{"Offline messages:", "Offline zprávy:"}.
+{"Roster", "Seznam kontaktů"}.
+{"Nickname", "Prezdívka"}.
+{"Subscription", "Přihlášení"}.
+{"Pending", "Čekající"}.
+{"Groups", "Skupiny"}.
+{"Remove", "Odstranit"}.
+{"Add JID", "Přidat JID"}.
+{"User ", "Uživatel "}.
+{"Roster of ", "Seznam kontaktů "}.
+{"Shared Roster", "Sdílený seznam kontaktů"}.
+{"Online", "Online"}.
+{"Validate", "Ověřit"}.
+{"Not found", "Nenalezeno"}.
+{"Shared roster groups", "Skupiny pre sdíelený seznam kontaktů"}.
+{"Name:", "Jméno:"}.
+{"Description:", "Popis:"}.
+{"Members:", "Členové:"}.
+{"Displayed Groups:", "Zobrazené skupiny:"}.
+{"Group ", "Skupina "}.
+{"Users last activity", "Poslední aktivita uživatele"}.
+{"Period: ", "Čas:"}.
+{"Last month", "Poslední měsíc"}.
+{"Last year", "Poslední rok"}.
+{"All activity", "Všechny aktivity"}.
+{"Show Ordinary Table", "Zobrazit bežnou tabulku"}.
+{"Show Integral Table", "Zobrazit kompletní tabulku"}.
+{"Start", "Start"}.
+{"Modules Management", "Správa modulů"}.
+{"Modules at ", "Moduly na "}.
+{"No data", "Žádná data"}.
+{"Virtual Hosts", "Virtuální servery"}.
+{"ejabberd virtual hosts", "Ejabberd virtuální servery"}.
+{"Host", "Server"}.
+{"ejabberd Web Interface", "Ejabberd Web rozhraní"}.
+
+% mod_vcard_odbc.erl
+{"Erlang Jabber Server\nCopyright (c) 2002-2005 Alexey Shchepin",
+ "Erlang Jabber Server\nCopyright (c) 2002-2005 Alexey Shchepin"}.
+{"Fill in the form to search for any matching Jabber User (Add * to the end of field to match substring)", 
+ "Pro vyhledání Jabber uživatele vyplňte formulář (přidejte znak * na konec, pro vyhledání podřetězce)"}.
+{"ejabberd vCard module\nCopyright (c) 2003-2005 Alexey Shchepin", "Ejabberd vCard modul\nCopyright (c) 2003-2005 Alexey Shchepin"}.
+{"JID", "JID"}.
+
+% ejabberd_c2s.erl
+{"Use of STARTTLS required", "Je vyžadováno STARTTLS."}.
+{"Replaced by new connection", "Nahrazeno novým spojením"}.
+
+% mod_configure.erl
+{"DB Tables Configuration at ", "Databázové tabulky s konfigurácí na "}.
+
+% mod_vcard_ldap.erl
+{"Given Name", "Křestní jméno"}.
+
+% mod_pubsub/mod_pubsub.erl
+{"ejabberd pub/sub module\nCopyright (c) 2003-2005 Alexey Shchepin", 
+ "Ejabberd pub/sub modul\nCopyright (c) 2003-2005 Alexey Shchepin"}.
+{[], " "}.
+{"Node Creator", "Majitel uzlu"}.
+{"Deliver payloads with event notifications", "Doručovat náklad s upozorněním na událost"}.
+{"Notify subscribers when the node configuration changes", "Upozornit členy na změnu nastavení uzlu"}.
+{"Notify subscribers when the node is deleted", "Upozornit členy na smazaní uzlu"}.
+{"Notify subscribers when items are removed from the node", "Upozornit členy na odstranění položek z uzlu"}.
+{"Persist items to storage", "Uložit položky natrvalo do úložiště"}.
+{"Max # of items to persist", "Maximální počet položek, které je možné natrvalo uložit"}.
+{"Whether to allow subscriptions", "Povolit přihlašování"}.
+{"Specify the subscriber model", "Specifikovat přihlašovací model"}.
+{"Specify the publisher model", "Specifikovat model pro publikování"}.
+{"Max payload size in bytes", "Maximální náklad v bajtech"}.
+{"Send items to new subscribers", "Odeslat položky novým uživatelům"}.
+{"Only deliver notifications to available users", "Doručovat upozornení jen aktuálně přihlášeným uživatelům"}.
+{"Specify the current subscription approver", "Zadat současného schvalovatele přihlášení "}.
+
+% web/ejabberd_web_admin.erl
+{"ejabberd (c) 2002-2005 Alexey Shchepin, 2004-2005 Process One", 
+ "Ejabberd (c) 2002-2005 Alexey Shchepin, 2004-2005 Process One"}.
+{"(raw)", "(zdroj)"}.
+{"raw", "zdroj"}.
+{"Authenticated users", "Ověření uživatelé"}.
+
+% mod_irc/mod_irc.erl
+{"ejabberd IRC module\nCopyright (c) 2003-2005 Alexey Shchepin", 
+ "Ejabberd IRC module\nCopyright (c) 2003-2005 Alexey Shchepin"}.
+{"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.", 
+ "Pokud chcete zadat jiné kódování pro IRC servery, vyplňte seznam s hodnotami ve formátě '{\"irc server\",\"encoding\"}'. Předvolené kódování pro tuto službu je \"~s\"."}.
+
+% mod_muc/mod_muc.erl
+{"Room creation is denied by service policy", "Vytváranie miestnosti nie je povolené"}.
+{"ejabberd MUC module\nCopyright (c) 2003-2005 Alexey Shchepin", "Ejabberd MUC modul\nCopyright (c) 2003-2005 Alexey Shchepin"}.
+
+% Local Variables:
+% mode: erlang
+% End:
+
+
+% /usr/home/src/ejabberd/ejabberd/src/mod_vcard_odbc.erl
+{"Erlang Jabber Server\nCopyright (c) 2002-2006 Alexey Shchepin", 
+ "Erlang Jabber Server\nCopyright (c) 2002-2006 Alexey Shchepin"}.
+{"Email", "E-mail"}.
+{"ejabberd vCard module\nCopyright (c) 2003-2006 Alexey Shchepin",
+ "Ejabberd vCard modul\nCopyright (c) 2003-2006 Alexey Shchepin"}.
+{"Search Results for ", "Hledat výsledky pro "}.
+{"Jabber ID", "Jabber ID"}.
+
+% /usr/home/src/ejabberd/ejabberd/src/mod_adhoc.erl
+{"Commands", "Příkazy"}.
+{"Ping", "Ping"}.
+{"Pong", "Pong"}.
+
+% /usr/home/src/ejabberd/ejabberd/src/ejabberd_c2s.erl
+{"Replaced by new connection", "Nahrazeno novým spojením"}.
+
+% /usr/home/src/ejabberd/ejabberd/src/mod_announce.erl
+{"Really delete message of the day?", "Skutečně smazat správu dne?"}.
+{"Subject", "Předmět"}.
+{"Message body", "Tělo zprávy"}.
+{"No body provided for announce message", "Zpráva neobsahuje text"}.
+{"Announcements", "Oznámení"}.
+{"Send announcement to all users", "Odeslat seznam všech uživatelů"}.
+{"Send announcement to all online users", "Odeslat seznam všech online uživatelů"}.
+{"Send announcement to all online users on all hosts", "Odeslat seznam všech online uživatelů na všech serverech"}.
+{"Set message of the day and send to online users", "Nastavit zprávu dne a odeslat jí online uživatelům"}.
+{"Update message of the day (don't send)", "Aktualizovat zprávu dne (neodesíelat)"}.
+{"Delete message of the day", "Smazat zprávu dne"}.
+
+% /usr/home/src/ejabberd/ejabberd/src/mod_configure.erl
+{"Database", "Databáze"}.
+{"Outgoing s2s Connections", "Odchozí s2s spojení"}.
+{"Import Users From jabberd 1.4 Spool Files", "Importovat uživatelů z jabber 1.4 spool souborů"}.
+{"Database Tables Configuration at ", "Konfigurace databázových tabulek "}.
+
+% /usr/home/src/ejabberd/ejabberd/src/mod_pubsub/mod_pubsub.erl
+{"ejabberd pub/sub module\nCopyright (c) 2003-2006 Alexey Shchepin", 
+ "ejabberd pub/sub modul\nCopyright (c) 2003-2006 Alexey Shchepin"}.
+
+% /usr/home/src/ejabberd/ejabberd/src/web/ejabberd_web_admin.erl
+{"ejabberd Web Interface", "Ejabberd Web rozhraní"}.
+{"Administration", "Administrace"}.
+{"ejabberd (c) 2002-2006 Alexey Shchepin, 2004-2006 Process One", 
+ "Ejabberd (c) 2002-2006 Alexey Shchepin, 2004-2006 Process One"}.
+{"(Raw)", "(Zdroj)"}.
+{"Submitted", "Odeslané"}.
+{"Bad format", "Nesprávný formát"}.
+{"Raw", "Zdroj"}.
+{"Users Last Activity", "Poslední aktivita uživatele"}.
+{"Registered Users", "Registrovaní uživatelé"}.
+{"Offline Messages", "Offline zprávy"}.
+{"Registered Users:", "Registrovaní živatelé:"}.
+{"Authenticated Users:", "Ověření uživatelé:"}.
+{"Online Users:", "Online uživatelé:"}.
+{"Outgoing s2s Connections:", "Odchozí s2s spojení:"}.
+{"Outgoing s2s Servers:", "Odchozí s2s servery:"}.
+{"Offline Messages:", "Offline zprávy"}.
+{"~s's Offline Messages Queue", "~s Offline zpráv"}.
+{"Add Jabber ID", "Přidat JID"}.
+{"No Data", "Žádná data"}.
+{"Listened Ports", "Otevřené porty"}.
+{"RPC Call Error", "Chyba RPC volání"}.
+{"Database Tables at ", "Databázové tabulky na "}.
+{"Backup of ", "Záloha na "}.
+{"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.", 
+ "Podotýkáme, že tato nastavení budou zálohované do zabudované databáze Mnesia. Pokud používáte ODBC modul, musíte zálohovat vaší SQL databázi separátně."}.
+{"Store binary backup:", "Uložit binární zálohu:"}.
+{"Restore binary backup immediately:", "Okamžitě obnovit binární zálohu:"}.
+{"Restore binary backup after next ejabberd restart (requires less memory):", 
+ "Obnovit binární zálohu při následujícím restartu Ejabberd (vyžaduje méně paměti)"}.
+{"Store plain text backup:", "Uložit zálohu do textového souboru:"}.
+{"Restore plain text backup immediately:", "Okamžitě obnovit zálohu z textového souboru:"}.
+{"Statistics of ~p", "Statistiky ~p"}.
+{"Uptime:", "Čas běhu"}.
+{"CPU Time:", "Čas procesoru"}.
+{"Transactions Commited:", "Transakce potvrzena"}.
+{"Transactions Aborted:", "Transakce zrušena"}.
+{"Transactions Restarted:", "Transakce restartována"}.
+{"Transactions Logged:", "Transakce zaznamenána"}.
+{"Update ", "Aktualizovat "}.
+{"Update plan", "Aktualizovat plán"}.
+{"Updated modules", "Aktualizované moduly"}.
+{"Update script", "Aktualizované skripty"}.
+{"Low level update script", "Nízkoúrovňový aktualizační skript"}.
+{"Script check", "Kontrola skriptu"}.
+{"Not Found", "Nenalezeno"}.
+{"Shared Roster Groups", "Skupiny pro zdílený seznam kontaktů"}.
+
+% /usr/home/src/ejabberd/ejabberd/src/mod_irc/mod_irc.erl
+{"ejabberd IRC module\nCopyright (c) 2003-2006 Alexey Shchepin", "Ejabberd IRC modul\nCopyright (c) 2003-2006 Alexey Shchepin"}.
+
+% /usr/home/src/ejabberd/ejabberd/src/mod_muc/mod_muc_log.erl
+{"Chatroom configuration modified", "Nastavení diskuzní místnosti bylo změněno"}.
+{"joins the room", "vstoupil(a) do místnosti"}.
+{"leaves the room", "opustil(a) místnost"}.
+{"has been kicked", "byl(a) vyhozen(á) z místnosti"}.
+{"has been banned", "byl(a) zablokován(a)"}.
+{"is now known as", "se přejmenoval(a) na"}.
+{"Monday", "Pondělí"}.
+{"Tuesday", "Úterý"}.
+{"Wednesday", "Středa"}.
+{"Thursday", "Čtvrtek"}.
+{"Friday", "Pátek"}.
+{"Saturday", "Sobota"}.
+{"Sunday", "Neděle"}.
+{"January", "Leden"}.
+{"February", "Únor"}.
+{"March", "Březen"}.
+{"April", "Duben"}.
+{"May", "Květen"}.
+{"June", "Červen"}.
+{"July", "Červenec"}.
+{"August", "Srpen"}.
+{"September", "Září"}.
+{"October", "říjen"}.
+{"November", "Listopad"}.
+{"December", "Prosinec"}.
+{"Room Configuration", "Nastavení místnosti"}.
+
+% /usr/home/src/ejabberd/ejabberd/src/mod_muc/mod_muc.erl
+{"You must fill in field \"Nickname\" in the form", 
+ "Musíte vyplnit políčko \"Prezdívka\" ve formuláři"}.
+{"ejabberd MUC module\nCopyright (c) 2003-2006 Alexey Shchepin", 
+ "Ejabberd MUC modul\nCopyright (c) 2003-2006 Alexey Shchepin"}.
+
+% /usr/home/src/ejabberd/ejabberd/src/mod_muc/mod_muc_room.erl
+{"This room is not anonymous", "Tato místnost není anonymní"}.
+{"Make room persistent", "Nastavit místnost jako stálou"}.
+{"Make room public searchable", "Nastavit místnost jako veřejně prohldávatelnou"}.
+{"Make participants list public", "Nastavit seznam účastníků jako veřejný"}.
+{"Make room password protected", "Chránit místnost heslem"}.
+{"Make room semianonymous", "Nastavit místnost jako částečně anonymní"}.
+{"Make room members-only", "Nastavit místnost jen pro členy"}.
+{"Make room moderated", "Nastavit místnost jako moderovanou"}.
+{"Default users as participants", "Uživatelé jsou implicitně členy"}.
+{"Allow users to change subject", "Povolit uživatelům měnit téma této místnosti"}.
+{"Allow users to send private messages", "Povolit uživatelům odesíelat soukromé zprávy"}.
+{"Allow users to query other users", "Povolit uživatelům odesíela požadavky (query) ostatním uživatelům"}.
+{"Allow users to send invites", "povolit uživatelům posíelání pozvánek"}.
+{"Enable logging", "Zapnout ukládání historie"}.
+{"Description", "Popis"}.
+{"Number of occupants", "Počet účastníků"}.
-- 
cgit v1.2.3


From ccfcfa49fad66fa1e571f49140ca48115145c4f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20R=C3=A9mond?=
 <mickael.remond@process-one.net>
Date: Sat, 23 Sep 2006 09:52:53 +0000
Subject: Improvement coming from trunk (SVN #622): * src/eldap/eldap.erl:
 Enable the keepalive socket option (thanks to Evgeniy Khramtsov) *
 src/ejabberd_auth_ldap.erl: Now uses two LDAP connections (thanks to Evgeniy
 Khramtsov) * src/eldap/eldap_filter.erl: Bugfix (thanks to Evgeniy Khramtsov)
 * src/mod_vcard_ldap.erl: Likewise

SVN Revision: 623
---
 ChangeLog                  | 11 +++++++++++
 src/ejabberd_auth_ldap.erl | 10 +++++++++-
 src/eldap/eldap.erl        |  2 +-
 src/mod_vcard_ldap.erl     | 11 +++--------
 4 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 58d3c3180..60844364f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-09-23  Alexey Shchepin  <alexey@sevcom.net>
+
+	* src/eldap/eldap.erl: Enable the keepalive socket option (thanks
+	to Evgeniy Khramtsov)
+
+	* src/ejabberd_auth_ldap.erl: Now uses two LDAP connections
+	(thanks to Evgeniy Khramtsov)
+
+	* src/eldap/eldap_filter.erl: Bugfix (thanks to Evgeniy Khramtsov)
+	* src/mod_vcard_ldap.erl: Likewise
+
 2006-09-22  Mickael Remond  <mickael.remond@process-one.net>
 
 	* src/msgs/cs.msg: Added Czech translation (thanks to Milos Svasek).
diff --git a/src/ejabberd_auth_ldap.erl b/src/ejabberd_auth_ldap.erl
index a1ce74609..d152d0895 100644
--- a/src/ejabberd_auth_ldap.erl
+++ b/src/ejabberd_auth_ldap.erl
@@ -44,6 +44,7 @@
 
 -record(state, {host,
 		eldap_id,
+		bind_eldap_id,
 		servers,
 		port,
 		dn,
@@ -101,6 +102,11 @@ init(Host) ->
 		     State#state.port,
 		     State#state.dn,
 		     State#state.password),
+    eldap:start_link(State#state.bind_eldap_id,
+		     State#state.servers,
+		     State#state.port,
+		     State#state.dn,
+		     State#state.password),
     ejabberd_ctl:register_commands(
       Host,
       [{"registered-users", "list all registered users"}],
@@ -174,7 +180,7 @@ handle_call({check_pass, User, Password}, _From, State) ->
 		false ->
 		    false;
 		DN ->
-		    case eldap:bind(State#state.eldap_id, DN, Password) of
+		    case eldap:bind(State#state.bind_eldap_id, DN, Password) of
 			ok -> true;
 			_ -> false
 		    end
@@ -327,6 +333,7 @@ usort_attrs(_) ->
 
 parse_options(Host) ->
     Eldap_ID = atom_to_list(gen_mod:get_module_proc(Host, ?MODULE)),
+    Bind_Eldap_ID = atom_to_list(gen_mod:get_module_proc(Host, bind_ejabberd_auth_ldap)),
     LDAPServers = ejabberd_config:get_local_option({ldap_servers, Host}),
     LDAPPort = case ejabberd_config:get_local_option({ldap_port, Host}) of
 		   undefined -> 389;
@@ -363,6 +370,7 @@ parse_options(Host) ->
 	end,
     #state{host = Host,
 	   eldap_id = Eldap_ID,
+	   bind_eldap_id = Bind_Eldap_ID,
 	   servers = LDAPServers,
 	   port = LDAPPort,
 	   dn = RootDN,
diff --git a/src/eldap/eldap.erl b/src/eldap/eldap.erl
index a1f320fc1..894982e82 100644
--- a/src/eldap/eldap.erl
+++ b/src/eldap/eldap.erl
@@ -808,7 +808,7 @@ polish([], Res, Ref) ->
 %%-----------------------------------------------------------------------
 connect_bind(S) ->
     Host = next_host(S#eldap.host, S#eldap.hosts),
-    TcpOpts = [{packet, asn1}, {active, true}, binary],
+    TcpOpts = [{packet, asn1}, {active, true}, {keepalive, true}, binary],
     case gen_tcp:connect(Host, S#eldap.port, TcpOpts) of
 	{ok, Socket} ->
 	    case bind_request(Socket, S) of
diff --git a/src/mod_vcard_ldap.erl b/src/mod_vcard_ldap.erl
index 4389e4bce..0921ce92f 100644
--- a/src/mod_vcard_ldap.erl
+++ b/src/mod_vcard_ldap.erl
@@ -670,14 +670,9 @@ map_vcard_attr(VCardName, Attributes, Pattern, UD) ->
 	_ -> ""
     end.
 
-process_pattern(Str, {User, Domain}, Attrs) ->
-    Res = lists:foldl(
-	    fun(X, Acc) ->
-		    {ok, NewStr, _} = regexp:sub(Acc, "%s", X),
-		    NewStr
-	    end,
-	    Str, Attrs),
-    eldap_filter:do_sub(Res, [{"%u", User},{"%d", Domain}]).
+process_pattern(Str, {User, Domain}, AttrValues) ->
+	eldap_filter:do_sub(Str,
+		[{"%s", V, 1} || V <- AttrValues] ++ [{"%u", User},{"%d", Domain}]).
 
 get_ldap_attr(LDAPAttr, Attributes) ->
     Res = lists:filter(
-- 
cgit v1.2.3


From d786782a0f765fceed36d64ad66e0d937c7e1943 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20R=C3=A9mond?=
 <mickael.remond@process-one.net>
Date: Sun, 24 Sep 2006 09:39:04 +0000
Subject: * src/doc/features.html: Added to be consistent (guide.html is in the
 repository to make Latex optional, but still allow access to the doc). *
 src/ejabberd.hrl: Updated to version 1.1.2.

SVN Revision: 624
---
 ChangeLog         |   9 +++
 doc/features.html | 163 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/ejabberd.hrl  |   2 +-
 3 files changed, 173 insertions(+), 1 deletion(-)
 create mode 100644 doc/features.html

diff --git a/ChangeLog b/ChangeLog
index 60844364f..350556ae1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-09-24  Mickael Remond  <mickael.remond@process-one.net>
+
+	* src/doc/features.html: Added to be consistent (guide.html is in the
+	repository to make Latex optional, but still allow access to the doc).
+
+2006-09-23  Mickael Remond  <mickael.remond@process-one.net>
+
+        * src/ejabberd.hrl: Updated to version 1.1.2
+
 2006-09-23  Alexey Shchepin  <alexey@sevcom.net>
 
 	* src/eldap/eldap.erl: Enable the keepalive socket option (thanks
diff --git a/doc/features.html b/doc/features.html
new file mode 100644
index 000000000..ae3ae9c3d
--- /dev/null
+++ b/doc/features.html
@@ -0,0 +1,163 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
+            "http://www.w3.org/TR/REC-html40/loose.dtd">
+<HTML>
+
+<HEAD>
+
+<TITLE>Ejabberd 1.1.2 Feature Sheet</TITLE>
+
+<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<META name="GENERATOR" content="hevea 1.08">
+<STYLE type="text/css">
+.toc{list-style:none;}
+.title{margin:auto;text-align:center}
+.center{text-align:center;margin-left:auto;margin-right:auto;}
+.flushleft{text-align:left;margin-left:0ex;margin-right:auto;}
+.flushright{text-align:right;margin-left:auto;margin-right:0ex;}
+DIV TABLE{margin-left:inherit;margin-right:inherit;}
+PRE{text-align:left;margin-left:0ex;margin-right:auto;}
+BLOCKQUOTE{margin-left:4ex;margin-right:4ex;text-align:left;}
+.part{margin:auto;text-align:center}
+SPAN{width:20%; float:right; text-align:left; margin-left:auto;}
+</STYLE>
+</HEAD>
+
+<BODY >
+<!--HEVEA command line is: hevea -fix -noiso -pedantic features.tex -->
+<!--HTMLHEAD-->
+<!--ENDHTML-->
+<!--PREFIX <ARG ></ARG>-->
+<!--CUT DEF section 1 -->
+
+<BR>
+<BR>
+<A NAME="titlepage"></A>
+
+ <TABLE CLASS="title">
+<TR><TD>
+<H1 CLASS="titlemain">Ejabberd 1.1.2 Feature Sheet</H1>
+<H3 CLASS="titlerest">Sander Devrieze<BR>
+<A HREF="mailto:s.devrieze@pandora.be"><TT>mailto:s.devrieze@pandora.be</TT></A><BR>
+<A HREF="xmpp:sander@devrieze.dyndns.org"><TT>xmpp:sander@devrieze.dyndns.org</TT></A></H3></TD>
+</TR></TABLE><BR>
+<BR>
+<DIV CLASS="center">
+ 
+ <IMG SRC="logo.png" ALT="logo.png">
+ 
+
+ <BR>
+<BR>
+
+ </DIV>
+ <BLOCKQUOTE CLASS="quotation"><FONT COLOR="#921700"><I>I can thoroughly recommend ejabberd for ease of setup &ndash;
+ Kevin Smith, Current maintainer of the Psi project</I></FONT></BLOCKQUOTE>
+<!--TOC section Introduction-->
+
+<H2 CLASS="section"><A NAME="intro">Introduction</A></H2><!--SEC END -->
+
+<A NAME="sec:intro"></A>
+<BLOCKQUOTE CLASS="quotation"><FONT COLOR="#921700"><I>I just tried out ejabberd and was impressed both by ejabberd itself and the language it is written in, Erlang. &mdash;
+Joeri</I></FONT></BLOCKQUOTE> 
+<TT>ejabberd</TT> is a <B><FONT SIZE=4><FONT COLOR="#001376">free and open source</FONT></FONT></B> instant messaging server written in <A HREF="http://www.erlang.org/">Erlang</A>.<BR>
+<BR>
+<TT>ejabberd</TT> is <B><FONT SIZE=4><FONT COLOR="#001376">cross-platform</FONT></FONT></B>, distributed, fault-tolerant, and based on open standards to achieve real-time communication.<BR>
+<BR>
+<TT>ejabberd</TT> is designed to be a <B><FONT SIZE=4><FONT COLOR="#001376">rock-solid and feature rich</FONT></FONT></B> XMPP server.<BR>
+<BR>
+<TT>ejabberd</TT> is suitable for small deployments, whether they need to be <B><FONT SIZE=4><FONT COLOR="#001376">scalable</FONT></FONT></B> or not, as well as extremely big deployments.<BR>
+<BR>
+<!--TOC subsection Key Features-->
+
+<H3 CLASS="subsection"><A NAME="keyfeatures">Key Features</A></H3><!--SEC END -->
+
+<A NAME="sec:keyfeatures"></A>
+
+<BLOCKQUOTE CLASS="quotation"><FONT COLOR="#921700"><I>Erlang seems to be tailor-made for writing stable, robust servers. &mdash;
+Peter Saint-Andr&eacute;, Executive Director of the Jabber Software Foundation</I></FONT></BLOCKQUOTE>
+<TT>ejabberd</TT> is:
+<UL CLASS="itemize"><LI CLASS="li-itemize">
+<B><FONT SIZE=4><FONT COLOR="#001376">Cross-platform:</FONT></FONT></B> <TT>ejabberd</TT> runs under Microsoft Windows and Unix derived systems such as Linux, FreeBSD and NetBSD.<BR>
+<BR>
+<LI CLASS="li-itemize"><B><FONT SIZE=4><FONT COLOR="#001376">Distributed:</FONT></FONT></B> You can run <TT>ejabberd</TT> on a cluster of machines and all of them will serve the same Jabber domain(s). 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.<BR>
+<BR>
+<LI CLASS="li-itemize"><B><FONT SIZE=4><FONT COLOR="#001376">Fault-tolerant:</FONT></FONT></B> You can deploy an <TT>ejabberd</TT> 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'.<BR>
+<BR>
+<LI CLASS="li-itemize"><B><FONT SIZE=4><FONT COLOR="#001376">Administrator Friendly:</FONT></FONT></B> <TT>ejabberd</TT> 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:
+<UL CLASS="itemize"><LI CLASS="li-itemize">
+Comprehensive documentation.
+<LI CLASS="li-itemize">Straightforward installers for Linux, Mac OS X, and Windows.<FONT COLOR="#FFAA00"><SPAN STYLE="font-variant:small-caps">improved</SPAN></FONT>
+<LI CLASS="li-itemize">Web interface for administration tasks.
+<LI CLASS="li-itemize">Shared Roster Groups.
+<LI CLASS="li-itemize">Command line administration tool.
+<LI CLASS="li-itemize">Can integrate with existing authentication mechanisms.
+<LI CLASS="li-itemize">Capability to send announce messages.
+</UL><BR>
+<BR>
+<LI CLASS="li-itemize"><B><FONT SIZE=4><FONT COLOR="#001376">Internationalized:</FONT></FONT></B> <TT>ejabberd</TT> leads in internationalization. Hence it is very well suited in a globalized world. Related features are:
+<UL CLASS="itemize"><LI CLASS="li-itemize">
+Translated in 11 languages.
+<LI CLASS="li-itemize">Support for <A HREF="http://www.ietf.org/rfc/rfc3490.txt">IDNA</A>.
+</UL><BR>
+<BR>
+<LI CLASS="li-itemize"><B><FONT SIZE=4><FONT COLOR="#001376">Open Standards:</FONT></FONT></B> <TT>ejabberd</TT> is the first Open Source Jabber server claiming to fully comply to the XMPP standard.
+<UL CLASS="itemize"><LI CLASS="li-itemize">
+Fully XMPP compliant.
+<LI CLASS="li-itemize">XML-based protocol.
+<LI CLASS="li-itemize"><A HREF="http://ejabberd.jabber.ru/protocols">Many JEPs supported</A>.
+</UL></UL>
+<!--TOC subsection Additional Features-->
+
+<H3 CLASS="subsection"><A NAME="addfeatures">Additional Features</A></H3><!--SEC END -->
+
+<A NAME="sec:addfeatures"></A>
+
+<BLOCKQUOTE CLASS="quotation"><FONT COLOR="#921700"><I>ejabberd is making inroads to solving the "buggy incomplete server" problem &mdash;
+Justin Karneges, Founder of the Psi and the Delta projects</I></FONT></BLOCKQUOTE>
+Moreover, <TT>ejabberd</TT> comes with a wide range of other state-of-the-art features:
+<UL CLASS="itemize"><LI CLASS="li-itemize">
+Modular
+<UL CLASS="itemize"><LI CLASS="li-itemize">
+Load only the modules you want.
+<LI CLASS="li-itemize">Extend <TT>ejabberd</TT> with your own custom modules.
+</UL>
+<LI CLASS="li-itemize">Security
+<UL CLASS="itemize"><LI CLASS="li-itemize">
+SASL and STARTTLS for c2s and s2s connections.
+<LI CLASS="li-itemize">STARTTLS and Dialback s2s connections.
+<LI CLASS="li-itemize">Web interface accessible via HTTPS secure access.
+</UL>
+<LI CLASS="li-itemize">Databases
+<UL CLASS="itemize"><LI CLASS="li-itemize">
+Native MySQL support.
+<LI CLASS="li-itemize">Native PostgreSQL support.
+<LI CLASS="li-itemize">Mnesia.
+<LI CLASS="li-itemize">ODBC data storage support.
+<LI CLASS="li-itemize">Microsoft SQL Server support.<FONT COLOR="red"><SPAN STYLE="font-variant:small-caps">new</SPAN></FONT>
+</UL>
+<LI CLASS="li-itemize">Authentication
+<UL CLASS="itemize"><LI CLASS="li-itemize">
+LDAP and ODBC.
+<LI CLASS="li-itemize">External Authentication script.
+<LI CLASS="li-itemize">Internal Authentication.
+</UL>
+<LI CLASS="li-itemize">Others
+<UL CLASS="itemize"><LI CLASS="li-itemize">
+Compressing XML streams with Stream Compression (<A HREF="http://www.jabber.org/jeps/jep-0138.html">JEP-0138</A>).
+<LI CLASS="li-itemize">Interface with networks such as AIM, ICQ and MSN.
+<LI CLASS="li-itemize">Statistics via Statistics Gathering (<A HREF="http://www.jabber.org/jeps/jep-0039.html">JEP-0039</A>).
+<LI CLASS="li-itemize">IPv6 support both for c2s and s2s connections.
+<LI CLASS="li-itemize"><A HREF="http://www.jabber.org/jeps/jep-0045.html">Multi-User Chat</A> module with logging.<FONT COLOR="#FFAA00"><SPAN STYLE="font-variant:small-caps">improved</SPAN></FONT>
+<LI CLASS="li-itemize">Users Directory based on users vCards.
+<LI CLASS="li-itemize"><A HREF="http://www.jabber.org/jeps/jep-0060.html">Publish-Subscribe</A> component.
+<LI CLASS="li-itemize">Support for virtual hosting.
+<LI CLASS="li-itemize"><A HREF="http://www.jabber.org/jeps/jep-0025.html">HTTP Polling</A> service.
+<LI CLASS="li-itemize">IRC transport.
+</UL>
+</UL>
+<!--HTMLFOOT-->
+<!--ENDHTML-->
+<!--FOOTER-->
+<HR SIZE=2><BLOCKQUOTE CLASS="quote"><EM>This document was translated from L<sup>A</sup>T<sub>E</sub>X by
+</EM><A HREF="http://pauillac.inria.fr/~maranget/hevea/index.html"><EM>H<FONT SIZE=2><sup>E</sup></FONT>V<FONT SIZE=2><sup>E</sup></FONT>A</EM></A><EM>.</EM></BLOCKQUOTE></BODY>
+</HTML>
diff --git a/src/ejabberd.hrl b/src/ejabberd.hrl
index 90f86d35a..47de8a2c9 100644
--- a/src/ejabberd.hrl
+++ b/src/ejabberd.hrl
@@ -6,7 +6,7 @@
 %%% Id      : $Id$
 %%%----------------------------------------------------------------------
 
--define(VERSION, "1.1.1").
+-define(VERSION, "1.1.2").
 
 %-define(ejabberd_debug, true).
 %-define(DBGFSM, true).
-- 
cgit v1.2.3


From 78aeb15aacbba27238bd719b706ed9a27e2f3069 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20R=C3=A9mond?=
 <mickael.remond@process-one.net>
Date: Sun, 24 Sep 2006 12:35:47 +0000
Subject: * src/doc/guide.html: Minor W3C compliance fix in an Hevea generated
 URL.

SVN Revision: 625
---
 ChangeLog      | 3 +++
 doc/guide.html | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 350556ae1..ae117a034 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-09-24  Mickael Remond  <mickael.remond@process-one.net>
 
+	* src/doc/guide.html: Minor W3C compliance fix in an Hevea
+	generated URL.
+	
 	* src/doc/features.html: Added to be consistent (guide.html is in the
 	repository to make Latex optional, but still allow access to the doc).
 
diff --git a/doc/guide.html b/doc/guide.html
index 130a9c128..214f8ef7f 100644
--- a/doc/guide.html
+++ b/doc/guide.html
@@ -321,7 +321,7 @@ To compile <TT>ejabberd</TT> on a Windows flavour, you need:
 <UL CLASS="itemize"><LI CLASS="li-itemize">
 MS Visual C++ 6.0 Compiler
 <LI CLASS="li-itemize"><A HREF="http://erlang.org/download.html">Erlang/OTP R9C-2 or higher</A>
-<LI CLASS="li-itemize"><A HREF="http://sourceforge.net/project/showfiles.php?group_id=10127&package_id=11277">Expat 1.95.7 or higher</A>
+<LI CLASS="li-itemize"><A HREF="http://sourceforge.net/project/showfiles.php?group_id=10127&amp;package_id=11277">Expat 1.95.7 or higher</A>
 <LI CLASS="li-itemize"><A HREF="http://www.gnu.org/software/libiconv/">GNU Iconv 1.9.1</A>
 (optional)
 <LI CLASS="li-itemize"><A HREF="http://www.slproweb.com/products/Win32OpenSSL.html">Shining Light OpenSSL</A>
-- 
cgit v1.2.3


From 79f5d2772ed20cabd09ce3faa223ad59d91560ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20R=C3=A9mond?=
 <mickael.remond@process-one.net>
Date: Sun, 24 Sep 2006 14:45:12 +0000
Subject: * src/mod_muc/mod_muc_room.erl: Strings update (thanks to Serguei
 Golovan). * src/msgs/ru.msg: Updated Russian translation (thanks to Serguei
 Golovan). * src/msgs/uk.msg: Updated Ukrainian translation (thanks to Serguei
 Golovan). * src/msgs/fr.msg: Update French translation.

SVN Revision: 626
---
 ChangeLog                    | 8 ++++++++
 src/mod_muc/mod_muc_room.erl | 6 +++---
 src/msgs/fr.msg              | 4 +++-
 src/msgs/ru.msg              | 6 ++++--
 src/msgs/uk.msg              | 4 +++-
 5 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ae117a034..4fc9939f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2006-09-24  Mickael Remond  <mickael.remond@process-one.net>
 
+	* src/mod_muc/mod_muc_room.erl: Strings update (thanks to Serguei
+	 Golovan).
+	* src/msgs/ru.msg: Updated Russian translation (thanks to Serguei
+	 Golovan).
+	* src/msgs/uk.msg: Updated Ukrainian translation (thanks to Serguei
+	 Golovan).
+	* src/msgs/fr.msg: Update French translation.
+	
 	* src/doc/guide.html: Minor W3C compliance fix in an Hevea
 	generated URL.
 	
diff --git a/src/mod_muc/mod_muc_room.erl b/src/mod_muc/mod_muc_room.erl
index 6c895d30b..911175547 100644
--- a/src/mod_muc/mod_muc_room.erl
+++ b/src/mod_muc/mod_muc_room.erl
@@ -2137,7 +2137,7 @@ get_config(Lang, StateData, From) ->
 			end),
 	 {xmlelement, "field",
 	  [{"type", "list-single"},
-	   {"label", translate:translate(Lang, "Who may discover real JIDs?")},
+	   {"label", translate:translate(Lang, "Make real JIDs discovered for")},
 	   {"var", "muc#roomconfig_whois"}],
 	  [{xmlelement, "value", [], [{xmlcdata,
 				       if Config#config.anonymous ->
@@ -2145,9 +2145,9 @@ get_config(Lang, StateData, From) ->
 					  true ->
 					       "anyone"
 				       end}]},
-	   {xmlelement, "option", [{"label", "Moderators only"}],
+	   {xmlelement, "option", [{"label", translate:translate(Lang, "moderators only")}],
 	    [{xmlelement, "value", [], [{xmlcdata, "moderators"}]}]},
-	   {xmlelement, "option", [{"label", "Anyone"}],
+	   {xmlelement, "option", [{"label", translate:translate(Lang, "anyone")}],
 	    [{xmlelement, "value", [], [{xmlcdata, "anyone"}]}]}]},
 	 ?BOOLXFIELD("Make room members-only",
 		     "muc#roomconfig_membersonly",
diff --git a/src/msgs/fr.msg b/src/msgs/fr.msg
index e2486212b..ab2c51b6a 100644
--- a/src/msgs/fr.msg
+++ b/src/msgs/fr.msg
@@ -222,7 +222,9 @@
 {"Enable logging", "Activer l'archivage"}.
 {"Description", "Description"}.
 {"Number of occupants", "Nombre d'occupants"}.
-{"Who may discover real JIDs?", "Qui peut découvrir les vrais JIDs ?"}.
+{"Make real JIDs discovered for", "Rendre le JID réel visible pour"}.
+{"moderators only", "modérateurs seulement"}.
+{"anyone", "tout le monde"}.
 
 % mod_irc/mod_irc.erl
 {"ejabberd IRC module\nCopyright (c) 2003-2006 Alexey Shchepin", "Module IRC ejabberd\nCopyright (c) 2003-2006 Alexey Shchepin"}.
diff --git a/src/msgs/ru.msg b/src/msgs/ru.msg
index 454f35307..03e62cce5 100644
--- a/src/msgs/ru.msg
+++ b/src/msgs/ru.msg
@@ -159,7 +159,7 @@
  "Вы должны заполнить поле \"Псевдоним\" в форме"}.
 {"Specified nickname is already registered", "Указанный псевдоним уже зарегистрирован"}.
 
-% /home/sergei/src/ejabberd/ejabberd/src/mod_muc/mod_muc_log.erl
+% mod_muc/mod_muc_log.erl
 {"Chatroom configuration modified", "Конфигурация комнаты изменилась"}.
 {"joins the room", "вошёл(а) в комнату"}.
 {"leaves the room", "вышел(а) из комнаты"}.
@@ -211,7 +211,9 @@
  "Разрешить пользователям посылать приглашения"}.
 {"Make room password protected", "Сделать комнату защищённой паролем"}.
 {"Password", "Пароль"}.
-{"Make room semianonymous", "Сделать комнату полуанонимной"}.
+{"Make real JIDs discovered for", "Сделать реальные JID участников видимыми"}.
+{"moderators only", "только модераторам"}.
+{"anyone", "всем участникам"}.
 {"Enable logging", "Включить журналирование"}.
 {"Only moderators and participants are allowed to change subject in this room",
  "Только модераторы и участники могут изменять тему в этой комнате"}.
diff --git a/src/msgs/uk.msg b/src/msgs/uk.msg
index c1cf57d1c..580720df2 100644
--- a/src/msgs/uk.msg
+++ b/src/msgs/uk.msg
@@ -210,7 +210,9 @@
  "Дозволити користувачам надсилати запрошення"}.
 {"Make room password protected", "Зробити кімнату захищеною паролем"}.
 {"Password", "Пароль"}.
-{"Make room semianonymous", "Зробити кімнату напіванонімною"}.
+{"Make real JIDs discovered for", "Зробити реальні JID учасників видимими"}.
+{"moderators only", "тільки модераторам"}.
+{"anyone", "всім учасникам"}.
 {"Enable logging", "Включити журнал роботи"}.
 {"Only moderators and participants are allowed to change subject in this room",
  "Тільки модератори та учасники можуть змінювати тему в цій кімнаті"}.
-- 
cgit v1.2.3


From 5b9526d99810f0414578603ef3ddd0f7455c3d7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20R=C3=A9mond?=
 <mickael.remond@process-one.net>
Date: Sun, 24 Sep 2006 15:31:21 +0000
Subject: * src/eldap/eldap_filter: Forgot to add eldap_filter.erl in
 ejabberd-1.1.2 branch

SVN Revision: 627
---
 src/eldap/eldap_filter.erl | 285 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 285 insertions(+)
 create mode 100644 src/eldap/eldap_filter.erl

diff --git a/src/eldap/eldap_filter.erl b/src/eldap/eldap_filter.erl
new file mode 100644
index 000000000..a93205295
--- /dev/null
+++ b/src/eldap/eldap_filter.erl
@@ -0,0 +1,285 @@
+%%%====================================================
+%%% File:    eldap_filter.erl
+%%% Purpose: Converts String Representation of
+%%%            LDAP Search Filter (RFC 2254)
+%%%            to eldap's representation of filter
+%%% Author:  Evgeniy Khramtsov <xramtsov@gmail.com>
+%%% License: GPL
+%%%====================================================
+
+-module(eldap_filter).
+-author('xram@jabber.ru').
+
+%%%======================
+%%% Export functions
+%%%======================
+
+-export([parse/1,
+	 parse/2,
+	 do_sub/2
+	]).
+
+%%%-------------------------------------------------------------------------
+%%% Arity: parse/1
+%%% Function: parse(RFC2254_Filter) -> {ok, EldapFilter}   |
+%%%                                    {error, bad_filter}
+%%%
+%%%           RFC2254_Filter = string().
+%%%
+%%% Description: Converts String Representation of LDAP Search Filter (RFC 2254)
+%%%              to eldap's representation of filter.
+%%%
+%%% Example:
+%%%    > eldap_filter:parse("(&(!(uid<=100))(mail=*))").
+%%%
+%%%    {ok,{'and',[{'not',{lessOrEqual,{'AttributeValueAssertion',"uid","100"}}},
+%%%            {present,"mail"}]}}
+%%%-------------------------------------------------------------------------
+parse(RFC2254_Filter) ->
+    parse(RFC2254_Filter, []).
+
+%%%-------------------------------------------------------------------------
+%%% Arity: parse/2
+%%% Function: parse(RFC2254_Filter, [SubstValue |...]) ->
+%%%                                  {ok, EldapFilter}                 |
+%%%                                  {error, bad_filter}               |
+%%%                                  {error, bad_regexp}               |
+%%%                                  {error, max_substitute_recursion}
+%%%
+%%%           SubstValue = {RegExp, Value} | {RegExp, Value, N},
+%%%           RFC2254_Filter = RegExp = Value = string(),
+%%%           N = integer().
+%%%
+%%% Description: The same as parse/1, but substitutes N or all occurences
+%%%              of RegExp with Value *after* parsing.
+%%%
+%%% Example:
+%%%    > eldap_filter:parse(
+%%%            "(|(mail=%u@%d)(jid=%u@%d))",
+%%%            [{"%u", "xramtsov"},{"%d","gmail.com"}]).
+%%%
+%%%    {ok,{'or',[{equalityMatch,{'AttributeValueAssertion',
+%%%                              "mail",
+%%%                              "xramtsov@gmail.com"}},
+%%%           {equalityMatch,{'AttributeValueAssertion',
+%%%                              "jid",
+%%%                              "xramtsov@gmail.com"}}]}}
+%%%--------------------------------------------------------------------------
+parse(RFC2254_Filter, ListOfSubValues) ->
+    case catch convert_filter(parse_filter(RFC2254_Filter), ListOfSubValues) of
+	[EldapFilter] when is_tuple(EldapFilter) ->
+	    {ok, EldapFilter};
+	{regexp, Error} ->
+	    {error, Error};
+	_ ->
+	    {error, bad_filter}
+    end.
+
+%%%==========================
+%%% Internal functions
+%%%==========================
+
+%%%----------------------
+%%% split/1,4
+%%%----------------------
+split(Filter) ->
+    split(Filter, 0, [], []).
+
+split([], _, _, Result) ->
+    Result;
+
+split([H|T], Num, Rest, Result) ->
+    NewNum = case H of
+		 $( -> Num + 1;
+		    $) -> Num - 1;
+		 _ -> Num
+	     end,
+    if
+	NewNum == 0 ->
+	    X = Rest++[H],
+	    LenX = length(X),
+	    if
+		LenX > 2 ->
+		    split(T, 0, [], Result ++ [lists:sublist(X, 2, LenX-2)]);
+		true ->
+		    split(T, 0, Rest, Result)
+	    end;
+	true ->
+	    split(T, NewNum, Rest++[H], Result)
+    end.
+
+%%%-----------------------
+%%% parse_filter/1
+%%%-----------------------
+parse_filter(Filter) ->
+    case Filter of
+	[$! | T] ->
+	    {'not', parse_filter(T)};
+	[$| | T] ->
+	    {'or', parse_filter(T)};
+	[$& | T] ->
+	    {'and', parse_filter(T)};
+	[$( | _] ->
+		parse_filter(split(Filter));
+	[List | _] when is_list(List) ->
+	    [parse_filter(X) || X <- Filter];
+	_ ->
+	    Filter
+    end.
+
+%%%--------------------
+%%% convert_filter/2
+%%%--------------------
+convert_filter({'not', [Val | _]}, Replace) ->
+    eldap:'not'(convert_filter(Val, Replace));
+
+convert_filter({'or', Vals}, Replace) ->
+    eldap:'or'([convert_filter(X, Replace) || X <- Vals]);
+
+convert_filter({'and', Vals}, Replace) ->
+    eldap:'and'([convert_filter(X, Replace) || X <- Vals]);
+
+convert_filter([H|_] = Filter, Replace) when is_integer(H) ->
+    parse_attr(Filter, Replace);
+
+convert_filter(Filter, Replace) when is_list(Filter) ->
+    [convert_filter(X, Replace) || X <- Filter].
+
+%%%-----------------
+%%% parse_attr/2,3
+%%%-----------------
+parse_attr(Attr, ListOfSubValues) ->
+    {Action, [_|_] = Name, [_|_] = Value} = split_attribute(Attr),
+    parse_attr(Action, {Name, Value}, ListOfSubValues).
+
+parse_attr(approx, {Name, Value}, ListOfSubValues) ->
+    NewValue = do_sub(Value, ListOfSubValues),
+    eldap:approxMatch(Name, NewValue);
+
+parse_attr(greater, {Name, Value}, ListOfSubValues) ->
+    NewValue = do_sub(Value, ListOfSubValues),
+    eldap:greaterOrEqual(Name, NewValue);
+
+parse_attr(less, {Name, Value}, ListOfSubValues) ->
+    NewValue = do_sub(Value, ListOfSubValues),
+    eldap:lessOrEqual(Name, NewValue);
+
+parse_attr(equal, {Name, Value}, ListOfSubValues) ->
+    {ok, RegSList} = regexp:split(remove_extra_asterisks(Value), "[*]"),
+    Pattern = case [do_sub(X, ListOfSubValues) || X <- RegSList] of
+		  [Head | Tail] when Tail /= [] ->
+		      {Head, lists:sublist(Tail, length(Tail)-1), lists:last(Tail)};
+		  R ->
+		      R
+	      end,
+    case Pattern of
+	[V] ->
+	    eldap:equalityMatch(Name, V);
+	{[], [], []} ->
+	    eldap:present(Name);
+	{"", Any, ""} ->
+	    eldap:substrings(Name, [{any, X} || X<-Any]);
+	{H, Any, ""} ->
+	    eldap:substrings(Name, [{initial, H}]++[{any, X} || X<-Any]);
+	{"", Any, T} ->
+	    eldap:substrings(Name, [{any, X} || X<-Any]++[{final, T}]);
+	{H, Any, T} ->
+	    eldap:substrings(Name, [{initial, H}]++[{any, X} || X<-Any]++[{final, T}])
+    end;
+
+parse_attr(_, _, _) ->
+    false.
+
+%%%--------------------
+%%% do_sub/2,3
+%%%--------------------
+
+-define(MAX_RECURSION, 100).
+
+do_sub(S, []) ->
+    S;
+
+do_sub([], _) ->
+    [];
+
+do_sub(S, [{RegExp, New} | T]) ->
+    Result = do_sub(S, {RegExp, replace_amps(New)}, 1),
+    do_sub(Result, T);
+
+do_sub(S, [{RegExp, New, Times} | T]) ->
+    Result = do_sub(S, {RegExp, replace_amps(New), Times}, 1),
+    do_sub(Result, T).
+
+do_sub(S, {RegExp, New}, Iter) ->
+    case regexp:sub(S, RegExp, New) of
+	{ok, NewS, 0} ->
+	    NewS;
+	{ok, NewS, _} when Iter =< ?MAX_RECURSION ->
+	    do_sub(NewS, {RegExp, New}, Iter+1);
+	{ok, _, _} when Iter > ?MAX_RECURSION ->
+	    throw({regexp, max_substitute_recursion});
+	_ ->
+	    throw({regexp, bad_regexp})
+    end;
+
+do_sub(S, {_, _, N}, _) when N<1 ->
+    S;
+
+do_sub(S, {RegExp, New, Times}, Iter) ->
+    case regexp:sub(S, RegExp, New) of
+	{ok, NewS, 0} ->
+	    NewS;
+	{ok, NewS, _} when Iter < Times ->
+	    do_sub(NewS, {RegExp, New, Times}, Iter+1);
+	{ok, NewS, _} ->
+	    NewS;
+	_ ->
+	    throw({regexp, bad_regexp})
+    end.
+
+remove_extra_asterisks(String) ->
+    {Res, _} = lists:foldl(
+		 fun(X, {Acc, Last}) ->
+			 case X of
+			     $* when Last==$* ->
+				 {Acc, X};
+			     _ ->
+				 {Acc ++ [X], X}
+			 end
+		 end,
+		 {"", ""}, String),
+    Res.
+
+replace_amps(String) ->
+	lists:foldl(
+		fun(X, Acc) ->
+			if
+				X == $& ->
+					Acc ++ "\\&";
+				true ->
+					Acc ++ [X]
+			end
+		end,
+	"", String).
+
+split_attribute(String) ->
+    split_attribute(String, "", $0).
+
+split_attribute([], _, _) ->
+    {error, "", ""};
+
+split_attribute([H|Tail], Acc, Last) ->
+    case H of
+	$= when Last==$> ->
+	    {greater, lists:sublist(Acc, 1, length(Acc)-1), Tail};
+	$= when Last==$< ->
+	    {less, lists:sublist(Acc, 1, length(Acc)-1), Tail};
+	$= when Last==$~ ->
+	    {approx, lists:sublist(Acc, 1, length(Acc)-1), Tail};
+	$= when Last==$: ->
+	    {equal, lists:sublist(Acc, 1, length(Acc)-1), Tail};
+	$= ->
+	    {equal, Acc, Tail};
+	_ ->
+	    split_attribute(Tail, Acc++[H], H)
+    end.
-- 
cgit v1.2.3


From d574757de4847a69233e67eade4d2240ea8935e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20R=C3=A9mond?=
 <mickael.remond@process-one.net>
Date: Sun, 24 Sep 2006 15:44:24 +0000
Subject: * src/msgs/es.msg: Updated Spanish translation (thanks to Badlop).

SVN Revision: 628
---
 ChangeLog       | 4 +++-
 src/msgs/es.msg | 7 ++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4fc9939f2..b484bb3cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,14 @@
 2006-09-24  Mickael Remond  <mickael.remond@process-one.net>
 
+	* src/msgs/es.msg: Updated Spanish translation (thanks to Badlop).
+
 	* src/mod_muc/mod_muc_room.erl: Strings update (thanks to Serguei
 	 Golovan).
 	* src/msgs/ru.msg: Updated Russian translation (thanks to Serguei
 	 Golovan).
 	* src/msgs/uk.msg: Updated Ukrainian translation (thanks to Serguei
 	 Golovan).
-	* src/msgs/fr.msg: Update French translation.
+	* src/msgs/fr.msg: Updated French translation.
 	
 	* src/doc/guide.html: Minor W3C compliance fix in an Hevea
 	generated URL.
diff --git a/src/msgs/es.msg b/src/msgs/es.msg
index e97fea818..92bc47caf 100644
--- a/src/msgs/es.msg
+++ b/src/msgs/es.msg
@@ -135,7 +135,7 @@
 {"Make participants list public", "La lista de participantes es pública"}.
 {"Make room persistent", "Sala permanente"}.
 {"Make room moderated", "Sala moderada"}.
-{"Default users as participants", "Los usuarios on participantes por defecto"}.
+{"Default users as participants", "Los usuarios son participantes por defecto"}.
 {"Make room members-only", "Sala sólo para miembros"}.
 {"Allow users to send invites", "Permitir a los usuarios enviar invitaciones"}.
 {"Make room password protected", "Proteger la sala con contraseña"}.
@@ -167,9 +167,11 @@
 {"Invalid role: ~s", "Rol no válido: ~s"}.
 {"Owner privileges required", "Se requieren privilegios de propietario de la sala"}.
 {"private, ", "privado"}.
-{"Make room semianonymous", "Hacer la sala semianónima"}.
 {"Description", "Descripción"}.
 {"Number of occupants", "Número de ocupantes"}.
+{"Make real JIDs discovered for", "Los JID reales pueden verlos"}.
+{"moderators only", "solo moderadores"}.
+{"anyone", "cualquiera"}.
 
 % mod_muc/mod_muc_log.erl
 {"Chatroom configuration modified", "Configuración de la sala modificada"}.
@@ -320,7 +322,6 @@
 {"Replaced by new connection", "Reemplazado por una nueva conexión"}.
 
 % mod_vcard_ldap.erl
-{"Given Name", "Nombre dado"}.
 {"Fill in fields to search for any matching Jabber User", "Rellena campos para buscar usuarios Jabber que concuerden"}.
 
 % mod_adhoc.erl
-- 
cgit v1.2.3


From 6a3afa778b05b935be920578214503e78e49d6ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20R=C3=A9mond?=
 <mickael.remond@process-one.net>
Date: Mon, 25 Sep 2006 07:55:43 +0000
Subject: * doc/introduction.tex: Minor doc updates for release 1.1.2.

SVN Revision: 630
---
 ChangeLog            | 4 ++++
 doc/dev.html         | 2 +-
 doc/features.html    | 6 +++---
 doc/guide.html       | 6 +++---
 doc/introduction.tex | 6 +++---
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b484bb3cd..c6f54ae51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-09-25  Mickael Remond  <mickael.remond@process-one.net>
+
+	* doc/introduction.tex: Minor doc updates for release 1.1.2.
+
 2006-09-24  Mickael Remond  <mickael.remond@process-one.net>
 
 	* src/msgs/es.msg: Updated Spanish translation (thanks to Badlop).
diff --git a/doc/dev.html b/doc/dev.html
index 6cb4d2a46..0c0472f76 100644
--- a/doc/dev.html
+++ b/doc/dev.html
@@ -119,7 +119,7 @@ Comprehensive documentation.
 <BR>
 <LI CLASS="li-itemize">Internationalized: <TT>ejabberd</TT> leads in internationalization. Hence it is very well suited in a globalized world. Related features are:
 <UL CLASS="itemize"><LI CLASS="li-itemize">
-Translated in 11 languages.
+Translated in 12 languages.
 <LI CLASS="li-itemize">Support for <A HREF="http://www.ietf.org/rfc/rfc3490.txt">IDNA</A>.
 </UL><BR>
 <BR>
diff --git a/doc/features.html b/doc/features.html
index ae3ae9c3d..0904a2969 100644
--- a/doc/features.html
+++ b/doc/features.html
@@ -89,14 +89,14 @@ Comprehensive documentation.
 <LI CLASS="li-itemize">Straightforward installers for Linux, Mac OS X, and Windows.<FONT COLOR="#FFAA00"><SPAN STYLE="font-variant:small-caps">improved</SPAN></FONT>
 <LI CLASS="li-itemize">Web interface for administration tasks.
 <LI CLASS="li-itemize">Shared Roster Groups.
-<LI CLASS="li-itemize">Command line administration tool.
+<LI CLASS="li-itemize">Command line administration tool.<FONT COLOR="#FFAA00"><SPAN STYLE="font-variant:small-caps">improved</SPAN></FONT>
 <LI CLASS="li-itemize">Can integrate with existing authentication mechanisms.
 <LI CLASS="li-itemize">Capability to send announce messages.
 </UL><BR>
 <BR>
 <LI CLASS="li-itemize"><B><FONT SIZE=4><FONT COLOR="#001376">Internationalized:</FONT></FONT></B> <TT>ejabberd</TT> leads in internationalization. Hence it is very well suited in a globalized world. Related features are:
 <UL CLASS="itemize"><LI CLASS="li-itemize">
-Translated in 11 languages.
+Translated in 12 languages.<FONT COLOR="#FFAA00"><SPAN STYLE="font-variant:small-caps">improved</SPAN></FONT>
 <LI CLASS="li-itemize">Support for <A HREF="http://www.ietf.org/rfc/rfc3490.txt">IDNA</A>.
 </UL><BR>
 <BR>
@@ -137,7 +137,7 @@ Native MySQL support.
 </UL>
 <LI CLASS="li-itemize">Authentication
 <UL CLASS="itemize"><LI CLASS="li-itemize">
-LDAP and ODBC.
+LDAP and ODBC.<FONT COLOR="#FFAA00"><SPAN STYLE="font-variant:small-caps">improved</SPAN></FONT>
 <LI CLASS="li-itemize">External Authentication script.
 <LI CLASS="li-itemize">Internal Authentication.
 </UL>
diff --git a/doc/guide.html b/doc/guide.html
index 214f8ef7f..596a5ec91 100644
--- a/doc/guide.html
+++ b/doc/guide.html
@@ -221,14 +221,14 @@ Comprehensive documentation.
 <LI CLASS="li-itemize">Straightforward installers for Linux, Mac OS X, and Windows.<SPAN STYLE="font-variant:small-caps">improved</SPAN>
 <LI CLASS="li-itemize">Web interface for administration tasks.
 <LI CLASS="li-itemize">Shared Roster Groups.
-<LI CLASS="li-itemize">Command line administration tool.
+<LI CLASS="li-itemize">Command line administration tool.<SPAN STYLE="font-variant:small-caps">improved</SPAN>
 <LI CLASS="li-itemize">Can integrate with existing authentication mechanisms.
 <LI CLASS="li-itemize">Capability to send announce messages.
 </UL><BR>
 <BR>
 <LI CLASS="li-itemize">Internationalized: <TT>ejabberd</TT> leads in internationalization. Hence it is very well suited in a globalized world. Related features are:
 <UL CLASS="itemize"><LI CLASS="li-itemize">
-Translated in 11 languages.
+Translated in 12 languages.<SPAN STYLE="font-variant:small-caps">improved</SPAN>
 <LI CLASS="li-itemize">Support for <A HREF="http://www.ietf.org/rfc/rfc3490.txt">IDNA</A>.
 </UL><BR>
 <BR>
@@ -267,7 +267,7 @@ Native MySQL support.
 </UL>
 <LI CLASS="li-itemize">Authentication
 <UL CLASS="itemize"><LI CLASS="li-itemize">
-LDAP and ODBC.
+LDAP and ODBC.<SPAN STYLE="font-variant:small-caps">improved</SPAN>
 <LI CLASS="li-itemize">External Authentication script.
 <LI CLASS="li-itemize">Internal Authentication.
 </UL>
diff --git a/doc/introduction.tex b/doc/introduction.tex
index 204a51ddb..359f86929 100644
--- a/doc/introduction.tex
+++ b/doc/introduction.tex
@@ -59,14 +59,14 @@ Peter Saint-Andr\'e, Executive Director of the Jabber Software Foundation}
 \item Straightforward installers for Linux, Mac OS X, and Windows.\improved{}
 \item Web interface for administration tasks.
 \item Shared Roster Groups.
-\item Command line administration tool.
+\item Command line administration tool.\improved{}
 \item Can integrate with existing authentication mechanisms.
 \item Capability to send announce messages.
 \end{itemize}
 
 \item \marking{Internationalized:} \ejabberd{} leads in internationalization. Hence it is very well suited in a globalized world. Related features are:
 \begin{itemize}
-\item Translated in 12 languages.
+\item Translated in 12 languages.\improved{}
 \item Support for \footahref{http://www.ietf.org/rfc/rfc3490.txt}{IDNA}.
 \end{itemize}
 
@@ -111,7 +111,7 @@ Moreover, \ejabberd{} comes with a wide range of other state-of-the-art features
 \end{itemize}
 \item Authentication
 \begin{itemize}
-\item LDAP and ODBC.
+\item LDAP and ODBC.\improved{}
 \item External Authentication script.
 \item Internal Authentication.
 \end{itemize}
-- 
cgit v1.2.3


From 5d4093b8ac4efe405ca8ec145468717ce3206ed1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20R=C3=A9mond?=
 <mickael.remond@process-one.net>
Date: Mon, 25 Sep 2006 10:47:52 +0000
Subject: * src/msgs/cs.msg: Updated Czech translation and removed unused
 strings.

SVN Revision: 632
---
 ChangeLog       |  3 ++
 src/msgs/cs.msg | 98 ++++++---------------------------------------------------
 2 files changed, 12 insertions(+), 89 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c6f54ae51..c8e234484 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-09-25  Mickael Remond  <mickael.remond@process-one.net>
 
+	* src/msgs/cs.msg: Updated Czech translation and removed unused
+	strings.
+
 	* doc/introduction.tex: Minor doc updates for release 1.1.2.
 
 2006-09-24  Mickael Remond  <mickael.remond@process-one.net>
diff --git a/src/msgs/cs.msg b/src/msgs/cs.msg
index 0f3e4d4cf..48eb8c21e 100644
--- a/src/msgs/cs.msg
+++ b/src/msgs/cs.msg
@@ -46,7 +46,6 @@
 {"Configuration", "Konfigurace"}.
 {"Online Users", "Online uživatelé"}.
 {"All Users", "Všichni uživatelé"}.
-{"Outgoing S2S connections", "Odchozí spojení S2S"}.
 {"To ~s", "Pre ~s"}.
 {"From ~s", "Od  ~s"}.
 {"Running Nodes", "Bežící uzly"}.
@@ -55,12 +54,10 @@
 {"Access Control Lists", "Seznamy přístupových práv (ACL)"}.
 {"Access Rules", "Pravidla přístupů"}.
 {"Remove Users", "Odstranit uživatele"}.
-{"DB", "DB"}.
 {"Modules", "Moduly"}.
 {"Start Modules", "Spustit moduly"}.
 {"Stop Modules", "Zastavit moduly"}.
 {"Backup Management", "Správa zálohování"}.
-{"Import users from jabberd1.4 spool files", "Importovat uživatele z jabberd1.4 spool souborů"}.
 {"Backup", "Zálohovat"}.
 {"Restore", "Obnovit"}.
 {"Dump to Text File", "Uložit do textového souboru"}.
@@ -77,7 +74,6 @@
 {"Search users in ", "Hledat uživatele v "}.
 {"Fill in fields to search for any matching Jabber User",
  "Vyplňte políčka pro vyhledávání Jabber uživatele"}.
-{"Results of search in ", "Výsledky vyhledávání v "}.
 
 {"User",              "Uživatel: "}.
 {"Full Name", 	      "Celé jméno: "}.
@@ -88,7 +84,6 @@
 {"Birthday", 	      "Datum narození: "}.
 {"Country", 	      "Země: "}.
 {"City", 	      "Město: "}.
-{"email", 	      "E-mail: "}.
 {"Organization Name", "Název firmy: "}.
 {"Organization Unit", "Oddělení: "}.
 
@@ -101,7 +96,6 @@
  "Pouze správci služby mají povolené odesílání servisních zpráv"}.
 {"Conference room does not exist", "Konferenční místnost neexistuje"}.
 {"Access denied by service policy", "Přístup byl zamítnutý nastavením služby"}.
-{"You must fill in field \"nick\" in the form", "Musíte vyplnit políčko \"prezdívka\"  ve formuláři"}.
 {"Specified nickname is already registered", "Zadaná prezdívka je již registrována"}.
 
 % mod_muc/mod_muc_room.erl
@@ -110,22 +104,7 @@
  "Ke konfiguraci místnosti potřebujete klienta podporujícího z x:data"}.
 {"Configuration for ", "Konfigurace pre "}.
 {"Room title", "Název místnosti"}.
-{"Allow users to change subject?", "Povolit uživatelům menit téma?"}.
-{"Allow users to query other users?",
- "Povolit uživatelům odesílat požadavky (query) ostatním uživatelům?"}.
-{"Allow users to send private messages?",
- "Povolit uživatelům odesíelat soukromé zprávy?"}.
-{"Make room public searchable?", "Nastavit místnost jako veřejně prohledávatelnou?"}.
-{"Make participants list public?", "Nastavit seznam účastníků jako veřejný?"}.
-{"Make room persistent?", "Nastavit místnost jako trvalou (persistent)?"}.
-{"Make room moderated?", "Nastavit místnost jako moderovanou?"}.
-{"Default users as members?", "Uživatelé jsou implicitně členy?"}.
-{"Make room members only?", "Nastavit místnost jen pro členy?"}.
-{"Allow users to send invites?", "Povolit uživatelům odesíelat pozvánky?"}.
-{"Make room password protected?", "Chránit místnost heslem?"}.
 {"Password", "Heslo"}.
-{"Make room anonymous?", "Nastavit místnost jako anonymní?"}.
-{"Enable logging?", "Zapnout ukládání historie?"}.
 {"Only moderators and participants are allowed to change subject in this room",
  "Jen moderátoři a účastníci mají povoleno měnit téma této místnosti"}.
 {"Only moderators are allowed to change subject in this room",
@@ -160,6 +139,9 @@
 {"Invalid role: ~s", "Neplatná role: ~s"}.
 {"Owner privileges required", "Jsou vyžadována práva vlastníka"}.
 {"private, ", "soukromá, "}.
+{"Make real JIDs discovered for", "Zjisti skutečné JIDy pro"}.
+{"moderators only", "pouze pro moderátory"}.
+{"anyone", "každý"}.
 
 % mod_irc/mod_irc.erl
 {"You need an x:data capable client to configure mod_irc settings",
@@ -173,91 +155,57 @@
 {"Encodings", "Kódování"}.
 
 % web/ejabberd_web_admin.erl
-{"ejabberd administration", "Administrace Ejabberd"}.
 {"Users", "Uživatelé"}.
 {"Nodes", "Uzly"}.
 {"Statistics", "Statistiky"}.
-{"(raw)", "(zdroj)"}.
-{"submitted", "odeslané"}.
-{"bad format", "nesprávný formát"}.
-{"raw", "zdroj"}.
-{"ejabberd access control lists configuration", "Konfigurace seznamu přístupových práv (ACL) Ejabberd"}.
+{"Submitted", "Odeslané"}.
+{"CPU Time:", "Čas procesoru"}.
 {"Delete Selected", "Smazat vybrané"}.
 {"Submit", "Odeslat"}.
-{"ejabberd access rules configuration", "Konfigurace pravidel přístupů Ejabberd"}.
 {"~s access rule configuration", "~s konfigurace pravidla přístupu"}.
-{"ejabberd users", "Uživatelé Ejabberd"}.
-{"ejabberd stats", "Statistiky Ejabberd"}.
 {"Node not found", "Uzel nenalezen"}.
 {"Add New", "Přidat nový"}.
-{"Registered users", "Registrovaní uživatelé"}.
-{"Online users", "Online uživatelé"}.
-{"Outgoing S2S servers", "Servery S2S pro odchozí komunikaci"}.
 {"Change Password", "Změnit heslo"}.
 {"Connected Resources:", "Připojené zdroje:"}.
 {"Password:", "Heslo:"}.
 {"None", "Nic"}.
 {"Node ", "Uzel "}.
-{"DB Management", "Správa databáze"}.
-{"Listened Ports Management", "Správa otevřených portů"}.
 {"Restart", "Restart"}.
 {"Stop", "Stop"}.
-{"RPC call error", "Chyba RPC volání"}.
-{"DB Tables at ", "Databázové tabulky na "}.
 {"Name", "Jméno"}.
 {"Storage Type", "Typ úložiště"}.
 {"Size", "Velikost"}.
 {"Memory", "Paměť"}.
-{"Backup Management at ", "Správa záloh na "}.
-{"Store a backup in a file", "Uložit zálohu do souboru "}.
 {"OK", "OK"}.
-{"Restore a backup from a file", "Obnovit zálohu ze souboru"}.
-{"Install a database fallback from a file", "Instalovat nouzovou (fallback) databázi ze souboru"}.
-{"Dump a database in a text file", "Uložit databázi do textového souboru"}.
-{"Restore a database from a text file", "Obnovit databázi z textového souboru"}.
 {"Listened Ports at ", "Otevřené porty na "}.
-{"~p statistics", "~p statistiky"}.
-{"Uptime", "Čas běhu"}.
-{"CPU Time", "Čas procesoru"}.
-{"Transactions commited", "Transakce potvrzena"}.
-{"Transactions aborted", "Transakce zrušena"}.
-{"Transactions restarted", "Transakce restartována"}.
-{"Transactions logged", "Transakce zaznamenána"}.
 {"Port", "Port"}.
 {"Module", "Modul"}.
 {"Options", "Nastavení"}.
 {"Update", "Aktualizovat"}.
 {"Delete", "Smazat"}.
 {"Add User", "Přidat uživatele"}.
-{"Offline messages", "Offline zprávy"}.
 {"Last Activity", "Poslední aktivita"}.
 {"Never", "Nikdy"}.
-{"~s offline messages queue", "~s offline zpráv(y)"}.
 {"Time", "Čas"}.
 {"From", "Od"}.
 {"To", "Pro"}.
 {"Packet", "Paket"}.
-{"Offline messages:", "Offline zprávy:"}.
 {"Roster", "Seznam kontaktů"}.
 {"Nickname", "Prezdívka"}.
 {"Subscription", "Přihlášení"}.
 {"Pending", "Čekající"}.
 {"Groups", "Skupiny"}.
 {"Remove", "Odstranit"}.
-{"Add JID", "Přidat JID"}.
 {"User ", "Uživatel "}.
 {"Roster of ", "Seznam kontaktů "}.
 {"Shared Roster", "Sdílený seznam kontaktů"}.
 {"Online", "Online"}.
 {"Validate", "Ověřit"}.
-{"Not found", "Nenalezeno"}.
-{"Shared roster groups", "Skupiny pre sdíelený seznam kontaktů"}.
 {"Name:", "Jméno:"}.
 {"Description:", "Popis:"}.
 {"Members:", "Členové:"}.
 {"Displayed Groups:", "Zobrazené skupiny:"}.
 {"Group ", "Skupina "}.
-{"Users last activity", "Poslední aktivita uživatele"}.
 {"Period: ", "Čas:"}.
 {"Last month", "Poslední měsíc"}.
 {"Last year", "Poslední rok"}.
@@ -265,35 +213,21 @@
 {"Show Ordinary Table", "Zobrazit bežnou tabulku"}.
 {"Show Integral Table", "Zobrazit kompletní tabulku"}.
 {"Start", "Start"}.
-{"Modules Management", "Správa modulů"}.
 {"Modules at ", "Moduly na "}.
-{"No data", "Žádná data"}.
 {"Virtual Hosts", "Virtuální servery"}.
 {"ejabberd virtual hosts", "Ejabberd virtuální servery"}.
 {"Host", "Server"}.
 {"ejabberd Web Interface", "Ejabberd Web rozhraní"}.
 
 % mod_vcard_odbc.erl
-{"Erlang Jabber Server\nCopyright (c) 2002-2005 Alexey Shchepin",
- "Erlang Jabber Server\nCopyright (c) 2002-2005 Alexey Shchepin"}.
 {"Fill in the form to search for any matching Jabber User (Add * to the end of field to match substring)", 
  "Pro vyhledání Jabber uživatele vyplňte formulář (přidejte znak * na konec, pro vyhledání podřetězce)"}.
-{"ejabberd vCard module\nCopyright (c) 2003-2005 Alexey Shchepin", "Ejabberd vCard modul\nCopyright (c) 2003-2005 Alexey Shchepin"}.
-{"JID", "JID"}.
 
 % ejabberd_c2s.erl
 {"Use of STARTTLS required", "Je vyžadováno STARTTLS."}.
 {"Replaced by new connection", "Nahrazeno novým spojením"}.
 
-% mod_configure.erl
-{"DB Tables Configuration at ", "Databázové tabulky s konfigurácí na "}.
-
-% mod_vcard_ldap.erl
-{"Given Name", "Křestní jméno"}.
-
 % mod_pubsub/mod_pubsub.erl
-{"ejabberd pub/sub module\nCopyright (c) 2003-2005 Alexey Shchepin", 
- "Ejabberd pub/sub modul\nCopyright (c) 2003-2005 Alexey Shchepin"}.
 {[], " "}.
 {"Node Creator", "Majitel uzlu"}.
 {"Deliver payloads with event notifications", "Doručovat náklad s upozorněním na událost"}.
@@ -310,27 +244,12 @@
 {"Only deliver notifications to available users", "Doručovat upozornení jen aktuálně přihlášeným uživatelům"}.
 {"Specify the current subscription approver", "Zadat současného schvalovatele přihlášení "}.
 
-% web/ejabberd_web_admin.erl
-{"ejabberd (c) 2002-2005 Alexey Shchepin, 2004-2005 Process One", 
- "Ejabberd (c) 2002-2005 Alexey Shchepin, 2004-2005 Process One"}.
-{"(raw)", "(zdroj)"}.
-{"raw", "zdroj"}.
-{"Authenticated users", "Ověření uživatelé"}.
-
 % mod_irc/mod_irc.erl
-{"ejabberd IRC module\nCopyright (c) 2003-2005 Alexey Shchepin", 
- "Ejabberd IRC module\nCopyright (c) 2003-2005 Alexey Shchepin"}.
 {"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.", 
  "Pokud chcete zadat jiné kódování pro IRC servery, vyplňte seznam s hodnotami ve formátě '{\"irc server\",\"encoding\"}'. Předvolené kódování pro tuto službu je \"~s\"."}.
 
 % mod_muc/mod_muc.erl
 {"Room creation is denied by service policy", "Vytváranie miestnosti nie je povolené"}.
-{"ejabberd MUC module\nCopyright (c) 2003-2005 Alexey Shchepin", "Ejabberd MUC modul\nCopyright (c) 2003-2005 Alexey Shchepin"}.
-
-% Local Variables:
-% mode: erlang
-% End:
-
 
 % /usr/home/src/ejabberd/ejabberd/src/mod_vcard_odbc.erl
 {"Erlang Jabber Server\nCopyright (c) 2002-2006 Alexey Shchepin", 
@@ -378,7 +297,6 @@
 {"ejabberd (c) 2002-2006 Alexey Shchepin, 2004-2006 Process One", 
  "Ejabberd (c) 2002-2006 Alexey Shchepin, 2004-2006 Process One"}.
 {"(Raw)", "(Zdroj)"}.
-{"Submitted", "Odeslané"}.
 {"Bad format", "Nesprávný formát"}.
 {"Raw", "Zdroj"}.
 {"Users Last Activity", "Poslední aktivita uživatele"}.
@@ -407,7 +325,6 @@
 {"Restore plain text backup immediately:", "Okamžitě obnovit zálohu z textového souboru:"}.
 {"Statistics of ~p", "Statistiky ~p"}.
 {"Uptime:", "Čas běhu"}.
-{"CPU Time:", "Čas procesoru"}.
 {"Transactions Commited:", "Transakce potvrzena"}.
 {"Transactions Aborted:", "Transakce zrušena"}.
 {"Transactions Restarted:", "Transakce restartována"}.
@@ -464,7 +381,6 @@
 {"Make room public searchable", "Nastavit místnost jako veřejně prohldávatelnou"}.
 {"Make participants list public", "Nastavit seznam účastníků jako veřejný"}.
 {"Make room password protected", "Chránit místnost heslem"}.
-{"Make room semianonymous", "Nastavit místnost jako částečně anonymní"}.
 {"Make room members-only", "Nastavit místnost jen pro členy"}.
 {"Make room moderated", "Nastavit místnost jako moderovanou"}.
 {"Default users as participants", "Uživatelé jsou implicitně členy"}.
@@ -475,3 +391,7 @@
 {"Enable logging", "Zapnout ukládání historie"}.
 {"Description", "Popis"}.
 {"Number of occupants", "Počet účastníků"}.
+
+% Local Variables:
+% mode: erlang
+% End:
-- 
cgit v1.2.3


From b2acdac5fa9e04556bd8dc8812b17de3f55ed895 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20R=C3=A9mond?=
 <mickael.remond@process-one.net>
Date: Mon, 25 Sep 2006 14:30:44 +0000
Subject: * src/msgs/nl.msg: Updated Dutch translation (thanks to Sander
 Devrieze).

SVN Revision: 634
---
 ChangeLog       | 5 ++++-
 src/msgs/nl.msg | 5 +++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c8e234484..29077cd97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,10 @@
 2006-09-25  Mickael Remond  <mickael.remond@process-one.net>
 
+	* src/msgs/nl.msg: Updated Dutch translation (thanks to Sander
+	 Devrieze).
+
 	* src/msgs/cs.msg: Updated Czech translation and removed unused
-	strings.
+	 strings.
 
 	* doc/introduction.tex: Minor doc updates for release 1.1.2.
 
diff --git a/src/msgs/nl.msg b/src/msgs/nl.msg
index 7b2025b46..4359313b6 100644
--- a/src/msgs/nl.msg
+++ b/src/msgs/nl.msg
@@ -7,7 +7,6 @@
 {"Fill in fields to search for any matching Jabber User", "Vul de velden in om te zoeken naar Jabber-gebruikers op deze server"}.
 {"User", "Gebruiker"}.
 {"Full Name", "Volledige naam"}.
-{"Given Name", "Voornaam"}.
 {"Middle Name", "Tussennaam"}.
 {"Family Name", "Achternaam"}.
 {"Nickname", "Bijnaam"}.
@@ -168,7 +167,6 @@
 {"Make room public searchable", "Chatruimte doorzoekbaar maken"}.
 {"Make participants list public", "Deelnemerslijst publiek maken"}.
 {"Make room password protected", "Chatruimte beveiligen met een wachtwoord"}.
-{"Make room semianonymous", "Chatruimte gedeeltelijk anoniem maken"}.
 {"Make room members-only", "Chatruimte enkel toegankelijk maken voor leden"}.
 {"Make room moderated", "Chatruimte gemodereerd maken"}.
 {"Default users as participants", "Gebruikers standaard instellen als deelnemers"}.
@@ -180,6 +178,9 @@
 {"You need an x:data capable client to configure room", "U hebt een client nodig die x:data ondersteunt om deze chatruimte in te stellen"}.
 {"Description", "Beschrijving"}.
 {"Number of occupants", "Aantal aanwezigen"}.
+{"Make real JIDs discovered for", "Jabber ID's kunnen achterhaald worden door"}.
+{"moderators only", "moderators"}.
+{"anyone", "iedereen"}.
 
 % mod_irc/mod_irc.erl
 {"ejabberd IRC module\nCopyright (c) 2003-2006 Alexey Shchepin", "ejabberd's IRC-module\nCopyright (c) 2003-2006 Alexey Shchepin"}.
-- 
cgit v1.2.3


From 9d7006dfa24d611315a09de3a94d6b473346b809 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20R=C3=A9mond?=
 <mickael.remond@process-one.net>
Date: Mon, 25 Sep 2006 14:41:33 +0000
Subject: * src/msgs/de.msg: Updated German translation (thanks to Marvin
 Preuss).

SVN Revision: 635
---
 ChangeLog       | 3 +++
 src/msgs/de.msg | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 29077cd97..b0e067a5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-09-25  Mickael Remond  <mickael.remond@process-one.net>
 
+	* src/msgs/de.msg: Updated German translation (thanks to Marvin
+	Preuss).
+
 	* src/msgs/nl.msg: Updated Dutch translation (thanks to Sander
 	 Devrieze).
 
diff --git a/src/msgs/de.msg b/src/msgs/de.msg
index 405d54fdc..a482d1fd3 100644
--- a/src/msgs/de.msg
+++ b/src/msgs/de.msg
@@ -236,9 +236,6 @@
 {"Group ", "Gruppe "}.
 {"ejabberd Web Interface", "ejabberd Web Interface"}.
 
-% mod_vcard_ldap.erl
-{"Given Name", "Vorname"}.
-
 % ejabberd_c2s.erl
 {"Use of STARTTLS required", "Verwendung von STARTTLS erforderlich"}.
 {"Replaced by new connection", "Durch neue Verbindung ersetzt"}.
@@ -352,7 +349,6 @@
 {"Make room public searchable", "Raum öffentlich durchsuchbar machen"}.
 {"Make participants list public", "Teilnehmerliste öffentlich machen"}.
 {"Make room password protected", "Raum passwortgeschützt machen"}.
-{"Make room semianonymous", "Raum semi-anonym machen"}.
 {"Make room members-only", "Raum members-only machen"}.
 {"Make room moderated", "Raum modieriert machen"}.
 {"Default users as participants", "Standartbenutzer als Teilnehmer"}.
@@ -363,6 +359,10 @@
 {"Enable logging", "Log-Funktion aktivieren"}.
 {"Description", "Beschreibung"}.
 {"Number of occupants", "Anzahl der Teilnehmer"}.
+{"Make real JIDs discovered for", "Jabber IDs können eingesehen werden
+für"}.
+{"moderators only", "Nur Moderatoren"}.
+{"anyone", "Jeder"}.
 
 % Local Variables:
 % mode: erlang
-- 
cgit v1.2.3


From 37f56859e7e187427fd03d2ca32476d507a102c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20R=C3=A9mond?=
 <mickael.remond@process-one.net>
Date: Mon, 25 Sep 2006 15:19:09 +0000
Subject: * src/msgs/pl.msg: Updated German translation (thanks to Zbyszek
 Zolkiewski).

SVN Revision: 636
---
 ChangeLog       |   3 ++
 src/msgs/pl.msg | 107 ++++++++++----------------------------------------------
 2 files changed, 21 insertions(+), 89 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b0e067a5d..19e30bacd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-09-25  Mickael Remond  <mickael.remond@process-one.net>
 
+	* src/msgs/pl.msg: Updated German translation (thanks to Zbyszek
+	Zolkiewski).
+
 	* src/msgs/de.msg: Updated German translation (thanks to Marvin
 	Preuss).
 
diff --git a/src/msgs/pl.msg b/src/msgs/pl.msg
index 5dc0e1a1a..e14b53b21 100644
--- a/src/msgs/pl.msg
+++ b/src/msgs/pl.msg
@@ -43,7 +43,6 @@
 {"Configuration", "Konfiguracja"}.
 {"Online Users", "Użytkownicy zalogowani"}.
 {"All Users", "Wszyscy użytkownicy"}.
-{"Outgoing S2S connections", "Wychodzące połączenia S2S"}.
 {"To ~s", "Do ~s"}.
 {"From ~s", "Z  ~s"}.
 {"Running Nodes", "Uruchomione gałęzie"}.
@@ -52,12 +51,10 @@
 {"Access Control Lists", "Lista dostępowa"}.
 {"Access Rules", "Zasady dostępu"}.
 {"Remove Users", "Usuń użytkowników"}.
-{"DB", "DB"}.
 {"Modules", "Moduły"}.
 {"Start Modules", "Uruchom moduły"}.
 {"Stop Modules", "Zatrzymaj moduły"}.
 {"Backup Management", "Zarządzanie kopiami zapasowymi"}.
-{"Import users from jabberd1.4 spool files", "Importowanie użytkowników z plikow spoool serwera jabberd1.4"}.
 {"Backup", "Tworzenie kopii"}.
 {"Restore", "Odtwarzanie kopii"}.
 {"Dump to Text File", "Zrzucanie do pliku tekstowego"}.
@@ -74,7 +71,6 @@
 {"Search users in ", "Wyszukaj użytkowników w "}.
 {"Fill in fields to search for any matching Jabber User",
  "Wypełnij pola aby znaleźdź pasujących użytkowników Jabbera"}.
-{"Results of search in ", "Wyniki wyszukiwania w "}.
 
 {"User",              "Użytkownik: "}.
 {"Full Name", 	      "Pełna nazwa: "}.
@@ -85,7 +81,6 @@
 {"Birthday", 	      "Data urodzenia: "}.
 {"Country", 	      "Państwo: "}.
 {"City", 	      "Miasto: "}.
-{"email", 	      "E-Mail: "}.
 {"Organization Name", "Nazwa organizacji: "}.
 {"Organization Unit", "Dział: "}.
 
@@ -98,7 +93,6 @@
  "Jedynie administrator może wysyłać wiadomości serwisowe"}.
 {"Conference room does not exist", "Pokój konferencyjny nie istnieje"}.
 {"Access denied by service policy", "Dostęp zabroniony przez zabezpieczenia serwera"}.
-{"You must fill in field \"nick\" in the form", "Musisz wypełnić pole \"nick\"  w formularzu"}.
 {"Specified nickname is already registered", "Podany nick jest już zarejestrowany"}.
 
 % mod_muc/mod_muc_room.erl
@@ -107,25 +101,7 @@
  "Potrzebujesz klienta kompatybilnego z x:data aby skonfigurować pokój"}.
 {"Configuration for ", "Konfiguracja dla "}.
 {"Room title", "Tytuł pokoju"}.
-{"Allow users to change subject?", "Zezwolić użytkownikom na zmianę tematu?"}.
-{"Allow users to query other users?",
- "Zezwolić użytkownikom na zapraszanie innych użytkowników?"}.
-{"Allow users to send private messages?",
- "Zezwolić użytkownikom na wysyłanie prywatnych wiadomości?"}.
-{"Make room public searchable?", "Uczynić pokój wyszukiwalnym publicznie?"}.
-{"Make participants list public?", "Uczynic obecnych wyszukiwalnymi publicznie?"}.
-{"Make room persistent?", "Uczynić pokój trwałym?"}.
-{"Make room moderated?", "Uczynić pokój moderowanym?"}.
-{"Default users as members?",
- "Domyślni użytkownicy jako członkowie?"}.
-{"Make room members only?",
- "Uczynić pokój tylko dla członków?"}.
-{"Allow users to send invites?",
- "Pozwolić użytkownikom na wysyłanie zaproszeń?"}.
-{"Make room password protected?", "Czy zabezpieczyć pokój hasłem?"}.
 {"Password", "Hasło"}.
-{"Make room anonymous?", "Uczynić pokój anonimowym?"}.
-{"Enable logging?", "Włączyć logowanie?"}.
 {"Only moderators and participants are allowed to change subject in this room",
  "Tylko moderatorzy i wlasciciele mogą zmienić temat tego pokoju"}.
 {"Only moderators are allowed to change subject in this room",
@@ -160,6 +136,9 @@
 {"Invalid role: ~s", "Nieprawidłowa rola: ~s"}.
 {"Owner privileges required", "Wymagane uprawnienia właściciela	"}.
 {"private, ", "prywatny, "}.
+{"Make real JIDs discovered for", "Kto może widzieć prawdziwe JIDy?"}.
+{"moderators only", "tylko moderatorzy"}.
+{"anyone", "każdy"}.
 
 % mod_irc/mod_irc.erl
 {"You need an x:data capable client to configure mod_irc settings",
@@ -173,91 +152,55 @@
 {"Encodings", "Kodowania"}.
 
 % web/ejabberd_web_admin.erl
-{"ejabberd administration", "Administracja serwerem Ejabberd"}.
 {"Users", "Użytkownicy"}.
 {"Nodes", "Gałęzie"}.
 {"Statistics", "Statystyki"}.
-{"(raw)", "(raw)"}.
-{"submitted", "przesłane"}.
-{"bad format", "zły format"}.
-{"raw", "raw"}.
-{"ejabberd access control lists configuration", "Lista konfiguracyjna dostępu do serwera EJabberd"}.
 {"Delete Selected", "Usuń zaznaczone"}.
 {"Submit", "Wprowadź"}.
-{"ejabberd access rules configuration", "Konfiguracja zasad dostępu do serwera EJabberd"}.
 {"~s access rule configuration", "~s konfiguracja zasad dostępu"}.
-{"ejabberd users", "Użytkownicy EJabberd"}.
-{"ejabberd stats", "Statystyki EJabberd"}.
 {"Node not found", "Gałąź nie znaleziona"}.
 {"Add New", "Dodaj nowe"}.
-{"Registered users", "Zarejestrowani użytkownicy"}.
-{"Online users", "Użytkownicy online"}.
-{"Outgoing S2S servers", "Sewery zewnętrzne S2S"}.
 {"Change Password", "Zmień hasło"}.
 {"Connected Resources:", "Zasoby podłączone"}.
 {"Password:", "Hasło:"}.
 {"None", "Brak"}.
 {"Node ", "Gałąź "}.
-{"DB Management", "Zarządzanie bazą danych"}.
-{"Listened Ports Management", "Zarządzanie portami nasłuchującymi"}.
 {"Restart", "Restart"}.
 {"Stop", "Stop"}.
-{"RPC call error", "Błąd RPC"}.
-{"DB Tables at ", "Tabele bazy danych "}.
 {"Name", "Nazwa"}.
 {"Storage Type", "Typ bazy"}.
 {"Size", "Wielkość"}.
 {"Memory", "Pamięć"}.
-{"Backup Management at ", "Zarządzanie kopiami zapasowymi "}.
-{"Store a backup in a file", "Zachowaj kopie zapasowa w pliku "}.
 {"OK", "OK"}.
-{"Restore a backup from a file", "Odtwórz kopię zapasową z pliku"}.
-{"Install a database fallback from a file", "Przywróć zapisaną kopię z pliku"}.
-{"Dump a database in a text file", "Zrzuć bazę danych do pliku tekstowego"}.
-{"Restore a database from a text file", "Odtwórz bazę danych z pliku tekstowego"}.
 {"Listened Ports at ", "Porty nasłuchujące "}.
-{"~p statistics", "~p statystyka"}.
-{"Uptime", "Uptime"}.
-{"CPU Time", "Czas procesora"}.
-{"Transactions commited", "Tarnsakcje rozpoczęte"}.
-{"Transactions aborted", "Transakcje anulowane"}.
-{"Transactions restarted", "Transakcje zrestartowane"}.
-{"Transactions logged", "Transakcje logowane"}.
 {"Port", "Port"}.
 {"Module", "Moduł"}.
 {"Options", "Opcje"}.
 {"Update", "Aktualizacja"}.
 {"Delete", "Usuń"}.
 {"Add User", "Dodaj użytkownika"}.
-{"Offline messages", "Wiadomości offline"}.
 {"Last Activity", "Ostatnia aktywność"}.
 {"Never", "Nigdy"}.
-{"~s offline messages queue", "~s wiadomości offline w kolejce"}.
 {"Time", "Czas"}.
 {"From", "Od"}.
 {"To", "Do"}.
 {"Packet", "Pakiet "}.
-{"Offline messages:", "Wiadomości offline: "}.
 {"Roster", "Roster "}.
 {"Nickname", "Nick "}.
 {"Subscription", "Subskrypcja "}.
 {"Pending", "Oczekiwanie "}.
 {"Groups", "Grupy "}.
 {"Remove", "Usuń "}.
-{"Add JID", "Dodaj JID "}.
 {"User ", "Użytkownik "}.
 {"Roster of ", "Roster "}.
 {"Shared Roster", "Roster współdzielony"}.
 {"Online", "Dostępny"}.
 {"Validate", "Zatwierdź"}.
-{"Not found", "Nie znaleziony"}.
-{"Shared roster groups", "Grupy rosterów współdzielonych"}.
 {"Name:", "Nazwa:"}.
 {"Description:", "Opis:"}.
 {"Members:", "Członkowie:"}.
 {"Displayed Groups:", "Wyświetlane grupy:"}.
 {"Group ", "Grupa "}.
-{"Users last activity", "Ostatnia aktywność użytkowników"}.
 {"Period: ", "Przedział czasu "}.
 {"Last month", "Ostatni miesiąc"}.
 {"Last year", "Ostatni rok"}.
@@ -265,32 +208,20 @@
 {"Show Ordinary Table", "Pokaż zwykłą tabelę"}.
 {"Show Integral Table", "Pokaż tabelę całkowitą"}.
 {"Start", "Start"}.
-{"Modules Management", "Zarządzanie modułami"}.
 {"Modules at ", "Moduły na "}.
-{"No data", "Brak danych"}.
 {"Virtual Hosts", "Wirtualne hosty"}.
 {"ejabberd virtual hosts", "wirtualne hosty ejabberda"}.
 {"Host", "Host"}.
 {"ejabberd Web Interface", ""}.
 
 % mod_vcard_odbc.erl
-{"Erlang Jabber Server\nCopyright (c) 2002-2005 Alexey Shchepin", "Erlang Jabber Server\nCopyright (c) 2002-2005 Alexey Shchepin"}.
 {"Fill in the form to search for any matching Jabber User (Add * to the end of field to match substring)", "Wypełnij formularz aby wyszukać pasujących użytkowników Jabbera (dodaj * na koniec pola aby dopasować)"}.
-{"ejabberd vCard module\nCopyright (c) 2003-2005 Alexey Shchepin", "ejabberd vCard module\nCopyright (c) 2003-2005 Alexey Shchepin"}.
-{"JID", "JID"}.
 
 % ejabberd_c2s.erl
 {"Use of STARTTLS required", "Wymagane użycie STARTTLS"}.
 {"Replaced by new connection", ""}.
 
-% mod_configure.erl
-{"DB Tables Configuration at ", "Konfiguracja tabel bazy dla "}.
-
-% mod_vcard_ldap.erl
-{"Given Name", "Nadana nazwa"}.
-
 % mod_pubsub/mod_pubsub.erl
-{"ejabberd pub/sub module\nCopyright (c) 2003-2005 Alexey Shchepin", "ejabberd pub/sub module\nCopyright (c) 2003-2005 Alexey Shchepin"}.
 {[], " "}.
 {"Node Creator", "Tworzenie gałęzi"}.
 {"Deliver payloads with event notifications", "Do?cz zawarto? publikowanego przedmiotu podczas wysy?nia powiadomienia o publikacji"}.
@@ -307,31 +238,18 @@
 {"Only deliver notifications to available users", "Dostarczaj notyfikacje tylko do osiągalnych użytkowników"}.
 {"Specify the current subscription approver", "Wyznacz aprobującego obecne subskrypcje "}.
 
-% web/ejabberd_web_admin.erl
-{"ejabberd (c) 2002-2005 Alexey Shchepin, 2004-2005 Process One", "ejabberd (c) 2002-2005 Alexey Shchepin, 2004-2005 Process One"}.
-{"(raw)", "(raw)"}.
-{"raw", "raw"}.
-{"Authenticated users", "Użytkownicy zautoryzowani"}.
-
 % mod_irc/mod_irc.erl
-{"ejabberd IRC module\nCopyright (c) 2003-2005 Alexey Shchepin", "ejabberd IRC module\nCopyright (c) 2003-2005 Alexey Shchepin"}.
 {"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.", "Jeśli chcesz ustawić inne kodowanie dla serwerów IRC, wypełnij tą listę wartościami w formacie '{\"irc server\",\"encoding\"}'. Jako domyślne ten serwis używa kodowania \"~s\"."}.
 
 % mod_muc/mod_muc.erl
 {"Room creation is denied by service policy", "Tworzenie pokoju jest zabronione przez polisę"}.
-{"ejabberd MUC module\nCopyright (c) 2003-2005 Alexey Shchepin", "ejabberd MUC module\nCopyright (c) 2003-2005 Alexey Shchepin"}.
-
-% Local Variables:
-% mode: erlang
-% End:
-
 
 % /usr/home/src/ejabberd/ejabberd/src/mod_vcard_odbc.erl
-{"Erlang Jabber Server\nCopyright (c) 2002-2006 Alexey Shchepin", ""}.
+{"Erlang Jabber Server\nCopyright (c) 2002-2006 Alexey Shchepin", "Erlang Jabber Server\nCopyright (c) 2002-2006 Alexey Shchepin"}.
 {"Email", ""}.
-{"ejabberd vCard module\nCopyright (c) 2003-2006 Alexey Shchepin", ""}.
+{"ejabberd vCard module\nCopyright (c) 2003-2006 Alexey Shchepin", "Erlang Jabber Server\nCopyright (c) 2002-2006 Alexey Shchepin"}.
 {"Search Results for ", "Wyniki wyszukiwania dla "}.
-{"Jabber ID", ""}.
+{"Jabber ID", "Jabber ID"}.
 
 % /usr/home/src/ejabberd/ejabberd/src/mod_adhoc.erl
 {"Commands", "Polecenia"}.
@@ -450,7 +368,6 @@
 {"Make room public searchable", "Pozwól wyszukiwać pokój"}.
 {"Make participants list public", "Upublicznij listę uczestników"}.
 {"Make room password protected", "Zabezpiecz pokój hasłem"}.
-{"Make room semianonymous", "Utwórz pokój pół-nieznanym"}.
 {"Make room members-only", "Utwórz pokój tylko dla członków"}.
 {"Make room moderated", "Moderuj pokój"}.
 {"Default users as participants", "Domyślni użytkownicy jako uczestnicy"}.
@@ -461,3 +378,15 @@
 {"Enable logging", "Włącz logowanie"}.
 {"Description", "Opis"}.
 {"Number of occupants", "Liczba uczestników"}.
+
+% mod_vcard_ldap.erl
+{"Erlang Jabber Server\nCopyright (c) 2002-2006 Alexey Shchepin", "Erlang Jabber Server\nCopyright (c) 2002-2006 Alexey Shchepin"}.
+{"ejabberd vCard module\nCopyright (c) 2003-2006 Alexey Shchepin", "ejabberd vCard module\nCopyright (c) 2003-2006 Alexey Shchepin"}.
+{"Jabber ID", "Jabber ID"}.
+
+% mod_vcard.erl
+{"Email", "E-mail"}.
+
+% Local Variables:
+% mode: erlang
+% End:
-- 
cgit v1.2.3


From 751fbec0b6ff3f77b5844bbf37cfd7a637f7d114 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20R=C3=A9mond?=
 <mickael.remond@process-one.net>
Date: Mon, 25 Sep 2006 15:36:17 +0000
Subject: ChangeLog typo

SVN Revision: 637
---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 19e30bacd..414c1066b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 2006-09-25  Mickael Remond  <mickael.remond@process-one.net>
 
-	* src/msgs/pl.msg: Updated German translation (thanks to Zbyszek
+	* src/msgs/pl.msg: Updated Polish translation (thanks to Zbyszek
 	Zolkiewski).
 
 	* src/msgs/de.msg: Updated German translation (thanks to Marvin
-- 
cgit v1.2.3


From 4646bf818aff80acb3d1c0735fa17c4fa070ea0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20R=C3=A9mond?=
 <mickael.remond@process-one.net>
Date: Mon, 25 Sep 2006 20:53:55 +0000
Subject: * src/ejabberd.app: Version update for ejabberd 1.1.2.

SVN Revision: 638
---
 ChangeLog        | 2 ++
 src/ejabberd.app | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 414c1066b..5dfb4aa7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2006-09-25  Mickael Remond  <mickael.remond@process-one.net>
 
+	* src/ejabberd.app: Version update for ejabberd 1.1.2.
+
 	* src/msgs/pl.msg: Updated Polish translation (thanks to Zbyszek
 	Zolkiewski).
 
diff --git a/src/ejabberd.app b/src/ejabberd.app
index 234d78819..ea87c9215 100644
--- a/src/ejabberd.app
+++ b/src/ejabberd.app
@@ -2,7 +2,7 @@
 
 {application, ejabberd,
  [{description, "ejabberd"},
-  {vsn, "1.1.1"},
+  {vsn, "1.1.2"},
   {modules, [acl,
 	     configure,
 	     cyrsasl,
-- 
cgit v1.2.3


From 539000bf6248fb3c3591193782755bb218658a15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20R=C3=A9mond?=
 <mickael.remond@process-one.net>
Date: Mon, 25 Sep 2006 22:06:37 +0000
Subject: * src/msgs/de.msg: Updated German translation (thanks to Nikolaus
 Polak).

SVN Revision: 639
---
 ChangeLog       | 3 +++
 src/msgs/de.msg | 7 +++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5dfb4aa7c..4a7be8bb2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-09-25  Mickael Remond  <mickael.remond@process-one.net>
 
+	* src/msgs/de.msg: Updated German translation (thanks to Nikolaus
+	Polak).
+
 	* src/ejabberd.app: Version update for ejabberd 1.1.2.
 
 	* src/msgs/pl.msg: Updated Polish translation (thanks to Zbyszek
diff --git a/src/msgs/de.msg b/src/msgs/de.msg
index a482d1fd3..16853429a 100644
--- a/src/msgs/de.msg
+++ b/src/msgs/de.msg
@@ -359,10 +359,9 @@
 {"Enable logging", "Log-Funktion aktivieren"}.
 {"Description", "Beschreibung"}.
 {"Number of occupants", "Anzahl der Teilnehmer"}.
-{"Make real JIDs discovered for", "Jabber IDs können eingesehen werden
-für"}.
-{"moderators only", "Nur Moderatoren"}.
-{"anyone", "Jeder"}.
+{"Make real JIDs discovered for", "Echte Jabber IDs anzeigen für"}.
+{"moderators only", "nur Moderatoren"}.
+{"anyone", "jeden"}.
 
 % Local Variables:
 % mode: erlang
-- 
cgit v1.2.3


From d9487135c05bba0f2c77c7a7585f3c49ee735ac3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20R=C3=A9mond?=
 <mickael.remond@process-one.net>
Date: Tue, 26 Sep 2006 10:31:53 +0000
Subject: * src/msgs/pt-br.msg: Updated Brazilian translation (thanks to Renato
 Botelho) and clean-up.

SVN Revision: 640
---
 ChangeLog          |  5 ++++
 src/msgs/pt-br.msg | 73 +++++-------------------------------------------------
 2 files changed, 11 insertions(+), 67 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4a7be8bb2..d5506215f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-26  Mickael Remond  <mickael.remond@process-one.net>
+
+	* src/msgs/pt-br.msg: Updated Brazilian translation (thanks to
+	Renato Botelho) and clean-up.
+
 2006-09-25  Mickael Remond  <mickael.remond@process-one.net>
 
 	* src/msgs/de.msg: Updated German translation (thanks to Nikolaus
diff --git a/src/msgs/pt-br.msg b/src/msgs/pt-br.msg
index 371911e44..f63d4cdc7 100644
--- a/src/msgs/pt-br.msg
+++ b/src/msgs/pt-br.msg
@@ -47,15 +47,12 @@
 {"Backup", "Salvar cópia de segurança"}.
 {"Backup Management", "Gestão de copia de segurança"}.
 {"Configuration", "Configuração"}.
-{"DB", "BD"}.
 {"Dump to Text File", "Exportar para arquivo de texto"}.
 {"From ~s", "De ~s"}.
 {"Import Directory", "Importar diretório"}.
 {"Import File", "Importar arquivo"}.
-{"Import users from jabberd1.4 spool files", "Importar usuários a partir de arquivos da spool do jabberd1.4"}.
 {"Modules", "Módulos"}.
 {"Online Users", "Usuários conectados"}.
-{"Outgoing S2S connections", "Conexões S2S de saída"}. 
 {"Remove Users", "Remover usuários"}.
 {"Restore", "Restaurar"}.
 {"Running Nodes", "Nos em execução"}.
@@ -74,7 +71,6 @@
 {"City", "Cidade"}.
 {"Country","País"}.
 {"ejabberd vCard module\nCopyright (c) 2003-2006 Alexey Shchepin", "Módulo vCard para ejabberd\nCopyright (c) 2002-2006 Alexey Shchepin"}.
-{"email", "e-mail"}.
 {"Erlang Jabber Server\nCopyright (c) 2002-2006 Alexey Shchepin", "Servidor Jabber em Erlang\nCopyright (c) 2002-2006 Alexey Shchepin"}.
 {"Family Name", "Nome de família"}.
 {"Fill in fields to search for any matching Jabber User", "Preencha os campos para procurar usuários Jabber coincidentes"}.
@@ -85,7 +81,6 @@
 {"Nickname", "Nick"}.
 {"Organization Name", "Nome da organização"}.
 {"Organization Unit", "Unidade da organização"}.
-{"Results of search in ", "Resultados da busca em "}.
 {"Search users in ", "Procurar usuários em "}.
 {"User", "Usuário"}.
 {"You need an x:data capable client to search", "Necessitas um cliente com suporte de x:data para poder buscar"}.
@@ -110,19 +105,11 @@
 {"Whether to allow subscriptions", "Permitir subscrições"}.
 
 % mod_muc/mod_muc.erl
-{"Allow users to change subject?", "Permitir aos usuários mudar o tópico?"}.
-{"Allow users to query other users?", "Permitir aos usuários consultar outros usuários?"}.
-{"Allow users to send invites?", "Permitir que os usuários enviem convites?"}.
-{"Allow users to send private messages?", "Permitir que os usuários enviem mensagens privadas?"}.
-{"Default users as members?", "Os usuários padrão são membros?"}.
-{"Enable logging?", "Salvar históricos?"}.
 {"Access denied by service policy", "Aceso denegado por la política do serviço"}.
 {"Conference room does not exist", "La sala de conferencias não existe"}.
 {"ejabberd MUC module\nCopyright (c) 2003-2006 Alexey Shchepin", "Módulo de MUC para ejabbed\nCopyright (c) 2002-2006 Alexey Shchepin"}.
 {"Enter nickname you want to register", "Introduza o apelido que quer registrar"}.
 {"Incorrect password", "Senha incorreta"}.
-{"Make room anonymous?", "Tornar a sala anônima?"}.
-{"Make room password protected?", "Proteger a sala com senha?"}.
 {"Nickname is already in use by another occupant", "O apelido já está em uso por outro ocupante"}.
 {"Nickname is registered by another person", "O apelido já está registrado por outra pessoa"}.
 {"Nickname Registration at ", "Registro do apelido em "}.
@@ -131,18 +118,11 @@
 {"Password", "Senha"}.
 {"Room creation is denied by service policy", "Se te a denegado criar la sala por política do serviço"}.
 {"Specified nickname is already registered", "O apelido especificado já está registrado"}.
-{"You must fill in field \"nick\" in the form", "Deve preencher o campo \"apelido\" no formulário"}.
 {"You need an x:data capable client to register nickname", "Necessitas um cliente com suporte de x:data para poder registrar o nick"}.
 
 % mod_muc/mod_muc_room.erl
 {"Administrator privileges required", "Se necessita privilégios de administrador"}.
-{"Allow users to change subject?", "Permitir aos usuários cambiar o assunto"}.
-{"Allow users to query other users?", "Permitir aos usuários consultar a outros usuários"}.
-{"Allow users to send invites?", "Permitir aos usuários enviar convides"}.
-{"Allow users to send private messages?", "Permitir aos usuários enviar mensagens privados"}.
 {"Configuration for ", "Configuração para "}.
-{"Default users as members?", "Os usuários são membros por defeito"}.
-{"Enable logging?", "Guardar históricos"}.
 {" has set the subject to: ", " a posto o assunto: "}.
 {"Improper message type", "Tipo de mensagem incorreto"}.
 {"Incorrect password", "Senha incorreta"}.
@@ -152,13 +132,6 @@
 {"It is not allowed to send private messages of type \"groupchat\"", "No está permitido enviar mensagens privados do tipo \"groupchat\""}.
 {"It is not allowed to send private messages to the conference", "Impedir o envio de mensagens privados a la sala"}.
 {"JID ~s is invalid", "O JID ~s não es válido"}.
-{"Make participants list public?", "Fazer pública la lista de participantes"}.
-{"Make room anonymous?", "Fazer anônima la sala"}.
-{"Make room members only?", "Fazer la sala solo para membros"}.
-{"Make room moderated?", "Fazer la sala moderada"}.
-{"Make room password protected?", "Proteger la sala com senha"}.
-{"Make room persistent?", "Fazer la sala permanente"}.
-{"Make room public searchable?", "Fazer a sala publicamente visível"}.
 {"Membership required to enter this room", "Necessitas ser membro de esta sala para poder entrar"}.
 {"Moderator privileges required", "Se necessita privilégios de moderador"}.
 {"Nickname is already in use by another occupant", "O nick já está sendo usado por outro ocupante"}.
@@ -192,91 +165,57 @@
 
 
 % web/ejabberd_web_admin.erl
-{"Add JID", "Adicionar JID"}.
 {"Add New", "Adicionar novo"}.
 {"Add User", "Adicionar usuário"}.
 {"All activity", "Toda la atividade"}.
-{"Backup Management at ", "Gestão de copia de segurança em "}.
-{"bad format", "mal formato"}.
 {"Change Password", "Mudar senha"}.
 {"Connected Resources:", "Recursos conectados:"}.
-{"CPU Time", "Tempo de processador consumido"}.
-{"DB Management", "Gestão do BD"}.
-{"DB Tables at ", "Tabelas do BD em "}.
 {"Delete", "Eliminar"}.
 {"Delete Selected", "Remover os selecionados"}.
-{"Dump a database in a text file", "Exportar uma Base de Dados para um arquivo de texto"}.
-{"ejabberd access control lists configuration", "Configuração das Listas de Controle de Acesso do ejabberd"}.
-{"ejabberd access rules configuration", "Configuração de las Regras de Aceso de ejabberd"}.
-{"ejabberd administration", "Administração de ejabberd"}.
 {"ejabberd (c) 2002-2006 Alexey Shchepin, 2004-2006 Process One", "ejabberd (c) 2002-2006 Alexey Shchepin, 2004-2006 Process One"}.
-{"ejabberd stats", "Estatísticas de ejabberd"}.
-{"ejabberd users", "Usuários do ejabberd"}.
 {"ejabberd virtual hosts", "Maquinas virtuais de ejabberd"}.
 {"From", "De"}.
 {"Group ", "Grupo "}.
 {"Groups", "Grupos"}.
 {"Host", "Máquina"}.
-{"Install a database fallback from a file", "Instalar uma recuperação de BD a partir de um arquivo"}.
-{"JID", "JID"}.
 {"Last Activity", "Última atividade"}.
 {"Last month", "Último mês"}.
 {"Last year", "Último ano"}.
 {"Listened Ports at ", "Portas de escuta em "}.
-{"Listened Ports Management", "Gestão dos portas de escuta"}.
 {"Members:", "Miembros:"}.
 {"Memory", "Memória"}.
 {"Module", "Módulo"}.
 {"Modules at ", "Módulos em "}.
-{"Modules Management", "Gestão de módulos"}.
 {"Name:", "Nome:"}.
 {"Name", "Nome"}.
 {"Never", "Nunca"}.
 {"Nickname", "Apelido"}.
 {"Online", "Conectado"}.
-{"Online users", "Usuários conectados"}.
 {"Options", "Opções"}.
-{"Outgoing S2S servers", "Servidores conectados"}.
 {"Packet", "Pacote"}.
 {"Password:", "Senha:"}.
 {"Pending", "Pendente"}.
 {"Period: ", "Período: "}.
 {"Port", "Porta"}.
-{"~p statistics", "Estatísticas de ~p"}.
-{"(raw)", "(cru)"}.
-{"raw", "cru"}.
-{"Registered users", "Usuários registrados"}.
 {"Remove", "Borrar"}.
 {"Restart", "Reiniciar"}.
-{"Restore a backup from a file", "Recuperar uma cópia de segurança a partir do arquivo"}.
-{"Restore a database from a text file", "Restaurar uma Base de Dados a partir de um arquivo de texto"}.
 {"Roster", "Lista de contatos"}.
 {"Roster of ", "Lista de contatos de "}.
-{"RPC call error", "Erro em la chamada RPC"}.
 {"~s access rule configuration", "Configuração da Regra de Acesso ~s"}.
-{"Shared roster groups", "Grupos compartilhado"}.
 {"Shared Roster", "Lista de contatos compartilhada"}.
 {"Show Integral Table", "Mostrar Tabela Integral"}.
 {"Show Ordinary Table", "Mostrar Tabela Ordinária"}.
 {"Size", "Tamanho"}.
-{"~s offline messages queue", "~s cola de mensagens diferidos"}.
 {"Start", "Iniciar"}.
 {"Statistics", "Estatísticas"}.
 {"Stop", "Parar"}.
 {"Storage Type", "Tipo de armazenamento"}.
-{"Store a backup in a file", "Armazenar uma cópia de segurança no arquivo"}.
 {"Submit", "Enviar"}.
-{"submitted", "enviado"}.
 {"Subscription", "Subscrição"}.
 {"Time", "Fecha"}.
 {"To", "Para"}.
-{"Transactions aborted", "Transações abortadas"}.
-{"Transactions commited", "Transações realizadas"}.
-{"Transactions logged", "Transações armazenadas"}.
-{"Transactions restarted", "Transações reiniciadas"}.
+
 {"Update", "Atualizar"}.
-{"Uptime", "Tempo de funcionamento"}.
-{"Users last activity", "Última atividades dos usuários"}.
 {"Users", "Usuários"}.
 {"User ", "Usuário"}.
 {"Validate", "Validar"}.
@@ -288,8 +227,7 @@
 
 % mod_vcard_ldap.erl
 {"Fill in fields to search for any matching Jabber User", "Preencha campos para buscar usuários Jabber que concordem"}.
-{"Given Name", "Nome dado"}.
-{"JID", "JID"}.
+
 
 
 % mod_adhoc.erl
@@ -384,8 +322,6 @@
 {"Description:", "Descrição:"}.
 {"Displayed Groups:", "Grupos Indicados"}.
 
-% mod_irc/mod_irc.erl
-
 % mod_muc/mod_muc_log.erl
 {"Chatroom configuration modified", "Configuração da sala de bate-papo modificada"}.
 {"joins the room", "Entrar na sala"}.
@@ -424,7 +360,6 @@
 {"Make room public searchable", "Tornar sala pública possível de ser encontrada"}.
 {"Make participants list public", "Tornar pública a lista de participantes"}.
 {"Make room password protected", "Tornar protegida a senha da sala"}.
-{"Make room semianonymous", "Tornar sala semi-anônima"}.
 {"Make room members-only", "Tornar sala apenas para membros"}.
 {"Make room moderated", "Tornar a sala moderada"}.
 {"Default users as participants", "Usuários padrões como participantes"}.
@@ -435,6 +370,10 @@
 {"Enable logging", "Permitir criação de logs"}.
 {"Description", "Descrição"}.
 {"Number of occupants", "Número de participantes"}.
+{"Make real JIDs discovered for", "Tornar o JID real visível por"}.
+{"moderators only", "apenas moderadores"}.
+{"anyone", "qualquer um"}.
+{"is now known as", "é agora conhecido como"}.
 
 % Local Variables:
 % mode: erlang
-- 
cgit v1.2.3


From 2a542e9e098349da5044c6fbaebdc73e9b22701f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20R=C3=A9mond?=
 <mickael.remond@process-one.net>
Date: Tue, 26 Sep 2006 10:48:05 +0000
Subject: * src/mod_muc/mod_muc_room.erl: Minor english update. *
 src/msgs/pl.msg: Likewise. * src/msgs/uk.msg: Likewise. * src/msgs/pt-br.msg:
 Likewise. * src/msgs/cs.msg: Likewise. * src/msgs/ru.msg: Likewise. *
 src/msgs/es.msg: Likewise. * src/msgs/fr.msg: Likewise. * src/msgs/de.msg:
 Likewise. * src/msgs/nl.msg: Likewise.

SVN Revision: 641
---
 ChangeLog                    | 11 +++++++++++
 src/mod_muc/mod_muc_room.erl |  2 +-
 src/msgs/cs.msg              |  2 +-
 src/msgs/de.msg              |  2 +-
 src/msgs/es.msg              |  2 +-
 src/msgs/fr.msg              |  2 +-
 src/msgs/nl.msg              |  2 +-
 src/msgs/pl.msg              |  2 +-
 src/msgs/pt-br.msg           |  2 +-
 src/msgs/ru.msg              |  2 +-
 src/msgs/uk.msg              |  2 +-
 11 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d5506215f..dd2b8da7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2006-09-26  Mickael Remond  <mickael.remond@process-one.net>
 
+	* src/mod_muc/mod_muc_room.erl: Minor english update.
+	* src/msgs/pl.msg: Likewise.
+	* src/msgs/uk.msg: Likewise.
+	* src/msgs/pt-br.msg: Likewise.
+	* src/msgs/cs.msg: Likewise.
+	* src/msgs/ru.msg: Likewise.
+	* src/msgs/es.msg: Likewise.
+	* src/msgs/fr.msg: Likewise.
+	* src/msgs/de.msg: Likewise.
+	* src/msgs/nl.msg: Likewise.
+
 	* src/msgs/pt-br.msg: Updated Brazilian translation (thanks to
 	Renato Botelho) and clean-up.
 
diff --git a/src/mod_muc/mod_muc_room.erl b/src/mod_muc/mod_muc_room.erl
index 911175547..6c4352d17 100644
--- a/src/mod_muc/mod_muc_room.erl
+++ b/src/mod_muc/mod_muc_room.erl
@@ -2137,7 +2137,7 @@ get_config(Lang, StateData, From) ->
 			end),
 	 {xmlelement, "field",
 	  [{"type", "list-single"},
-	   {"label", translate:translate(Lang, "Make real JIDs discovered for")},
+	   {"label", translate:translate(Lang, "Present real JIDs to")},
 	   {"var", "muc#roomconfig_whois"}],
 	  [{xmlelement, "value", [], [{xmlcdata,
 				       if Config#config.anonymous ->
diff --git a/src/msgs/cs.msg b/src/msgs/cs.msg
index 48eb8c21e..ecfbc5c49 100644
--- a/src/msgs/cs.msg
+++ b/src/msgs/cs.msg
@@ -139,7 +139,7 @@
 {"Invalid role: ~s", "Neplatná role: ~s"}.
 {"Owner privileges required", "Jsou vyžadována práva vlastníka"}.
 {"private, ", "soukromá, "}.
-{"Make real JIDs discovered for", "Zjisti skutečné JIDy pro"}.
+{"Present real JIDs to", "Zjisti skutečné JIDy pro"}.
 {"moderators only", "pouze pro moderátory"}.
 {"anyone", "každý"}.
 
diff --git a/src/msgs/de.msg b/src/msgs/de.msg
index 16853429a..c47821434 100644
--- a/src/msgs/de.msg
+++ b/src/msgs/de.msg
@@ -359,7 +359,7 @@
 {"Enable logging", "Log-Funktion aktivieren"}.
 {"Description", "Beschreibung"}.
 {"Number of occupants", "Anzahl der Teilnehmer"}.
-{"Make real JIDs discovered for", "Echte Jabber IDs anzeigen für"}.
+{"Present real JIDs to", "Echte Jabber IDs anzeigen für"}.
 {"moderators only", "nur Moderatoren"}.
 {"anyone", "jeden"}.
 
diff --git a/src/msgs/es.msg b/src/msgs/es.msg
index 92bc47caf..7dfe27b48 100644
--- a/src/msgs/es.msg
+++ b/src/msgs/es.msg
@@ -169,7 +169,7 @@
 {"private, ", "privado"}.
 {"Description", "Descripción"}.
 {"Number of occupants", "Número de ocupantes"}.
-{"Make real JIDs discovered for", "Los JID reales pueden verlos"}.
+{"Present real JIDs to", "Los JID reales pueden verlos"}.
 {"moderators only", "solo moderadores"}.
 {"anyone", "cualquiera"}.
 
diff --git a/src/msgs/fr.msg b/src/msgs/fr.msg
index ab2c51b6a..f84ab1576 100644
--- a/src/msgs/fr.msg
+++ b/src/msgs/fr.msg
@@ -222,7 +222,7 @@
 {"Enable logging", "Activer l'archivage"}.
 {"Description", "Description"}.
 {"Number of occupants", "Nombre d'occupants"}.
-{"Make real JIDs discovered for", "Rendre le JID réel visible pour"}.
+{"Present real JIDs to", "Rendre le JID réel visible pour"}.
 {"moderators only", "modérateurs seulement"}.
 {"anyone", "tout le monde"}.
 
diff --git a/src/msgs/nl.msg b/src/msgs/nl.msg
index 4359313b6..c6b87a65e 100644
--- a/src/msgs/nl.msg
+++ b/src/msgs/nl.msg
@@ -178,7 +178,7 @@
 {"You need an x:data capable client to configure room", "U hebt een client nodig die x:data ondersteunt om deze chatruimte in te stellen"}.
 {"Description", "Beschrijving"}.
 {"Number of occupants", "Aantal aanwezigen"}.
-{"Make real JIDs discovered for", "Jabber ID's kunnen achterhaald worden door"}.
+{"Present real JIDs to", "Jabber ID's kunnen achterhaald worden door"}.
 {"moderators only", "moderators"}.
 {"anyone", "iedereen"}.
 
diff --git a/src/msgs/pl.msg b/src/msgs/pl.msg
index e14b53b21..579008090 100644
--- a/src/msgs/pl.msg
+++ b/src/msgs/pl.msg
@@ -136,7 +136,7 @@
 {"Invalid role: ~s", "Nieprawidłowa rola: ~s"}.
 {"Owner privileges required", "Wymagane uprawnienia właściciela	"}.
 {"private, ", "prywatny, "}.
-{"Make real JIDs discovered for", "Kto może widzieć prawdziwe JIDy?"}.
+{"Present real JIDs to", "Kto może widzieć prawdziwe JIDy?"}.
 {"moderators only", "tylko moderatorzy"}.
 {"anyone", "każdy"}.
 
diff --git a/src/msgs/pt-br.msg b/src/msgs/pt-br.msg
index f63d4cdc7..6cc5f4052 100644
--- a/src/msgs/pt-br.msg
+++ b/src/msgs/pt-br.msg
@@ -370,7 +370,7 @@
 {"Enable logging", "Permitir criação de logs"}.
 {"Description", "Descrição"}.
 {"Number of occupants", "Número de participantes"}.
-{"Make real JIDs discovered for", "Tornar o JID real visível por"}.
+{"Present real JIDs to", "Tornar o JID real visível por"}.
 {"moderators only", "apenas moderadores"}.
 {"anyone", "qualquer um"}.
 {"is now known as", "é agora conhecido como"}.
diff --git a/src/msgs/ru.msg b/src/msgs/ru.msg
index 03e62cce5..d8a877816 100644
--- a/src/msgs/ru.msg
+++ b/src/msgs/ru.msg
@@ -211,7 +211,7 @@
  "Разрешить пользователям посылать приглашения"}.
 {"Make room password protected", "Сделать комнату защищённой паролем"}.
 {"Password", "Пароль"}.
-{"Make real JIDs discovered for", "Сделать реальные JID участников видимыми"}.
+{"Present real JIDs to", "Сделать реальные JID участников видимыми"}.
 {"moderators only", "только модераторам"}.
 {"anyone", "всем участникам"}.
 {"Enable logging", "Включить журналирование"}.
diff --git a/src/msgs/uk.msg b/src/msgs/uk.msg
index 580720df2..b14ef23e6 100644
--- a/src/msgs/uk.msg
+++ b/src/msgs/uk.msg
@@ -210,7 +210,7 @@
  "Дозволити користувачам надсилати запрошення"}.
 {"Make room password protected", "Зробити кімнату захищеною паролем"}.
 {"Password", "Пароль"}.
-{"Make real JIDs discovered for", "Зробити реальні JID учасників видимими"}.
+{"Present real JIDs to", "Зробити реальні JID учасників видимими"}.
 {"moderators only", "тільки модераторам"}.
 {"anyone", "всім учасникам"}.
 {"Enable logging", "Включити журнал роботи"}.
-- 
cgit v1.2.3


From 54d05f64bad5a8624a9578704a75d18e6cac4de7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20R=C3=A9mond?=
 <mickael.remond@process-one.net>
Date: Tue, 26 Sep 2006 11:12:03 +0000
Subject: Improvement coming from trunk (SVN #633): * src/ejabberd_s2s.erl:
 Added incoming-s2s-number and outgoing-s2s-number ejabberdctl commands

SVN Revision: 643
---
 ChangeLog            |  3 +++
 src/ejabberd_s2s.erl | 20 +++++++++++++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index dd2b8da7c..e145e25b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-09-26  Mickael Remond  <mickael.remond@process-one.net>
 
+	* src/ejabberd_s2s.erl: Added incoming-s2s-number and
+	outgoing-s2s-number ejabberdctl commands
+	
 	* src/mod_muc/mod_muc_room.erl: Minor english update.
 	* src/msgs/pl.msg: Likewise.
 	* src/msgs/uk.msg: Likewise.
diff --git a/src/ejabberd_s2s.erl b/src/ejabberd_s2s.erl
index f5aac6b8a..9b1177292 100644
--- a/src/ejabberd_s2s.erl
+++ b/src/ejabberd_s2s.erl
@@ -19,7 +19,9 @@
 	 get_key/1,
 	 try_register/1,
 	 remove_connection/1,
-	 dirty_get_connections/0]).
+	 dirty_get_connections/0,
+	 ctl_process/2
+	]).
 
 %% gen_server callbacks
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2,
@@ -27,6 +29,7 @@
 
 -include("ejabberd.hrl").
 -include("jlib.hrl").
+-include("ejabberd_ctl.hrl").
 
 -record(s2s, {fromto, pid, key}).
 -record(state, {}).
@@ -112,6 +115,10 @@ init([]) ->
 			      {attributes, record_info(fields, s2s)}]),
     mnesia:add_table_copy(s2s, node(), ram_copies),
     mnesia:subscribe(system),
+    ejabberd_ctl:register_commands(
+      [{"incoming-s2s-number", "print number of incoming s2s connections on the node"},
+       {"outgoing-s2s-number", "print number of outgoing s2s connections on the node"}],
+      ?MODULE, ctl_process),
     {ok, #state{}}.
 
 %%--------------------------------------------------------------------
@@ -240,6 +247,17 @@ find_connection(From, To) ->
 send_element(Pid, El) ->
     Pid ! {send_element, El}.
 
+ctl_process(_Val, ["incoming-s2s-number"]) ->
+    N = length(supervisor:which_children(ejabberd_s2s_in_sup)),
+    io:format("~p~n", [N]),
+    {stop, ?STATUS_SUCCESS};
+ctl_process(_Val, ["outgoing-s2s-number"]) ->
+    N = length(supervisor:which_children(ejabberd_s2s_out_sup)),
+    io:format("~p~n", [N]),
+    {stop, ?STATUS_SUCCESS};
+ctl_process(Val, _Args) ->
+    Val.
+
 update_tables() ->
     case catch mnesia:table_info(s2s, attributes) of
 	[fromto, node, key] ->
-- 
cgit v1.2.3


From 16c2d399e969498d80fe68f77f5c7f51b8149030 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20R=C3=A9mond?=
 <mickael.remond@process-one.net>
Date: Tue, 26 Sep 2006 14:07:35 +0000
Subject: * src/msgs/pl.msg: Updated (thanks to Andrzej Smyk).

SVN Revision: 644
---
 ChangeLog       |  2 ++
 src/msgs/pl.msg | 53 +++++++++++++++++++++++++++++++++++++++++++----------
 2 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e145e25b7..08ebcf6b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2006-09-26  Mickael Remond  <mickael.remond@process-one.net>
 
+	* src/msgs/pl.msg: Updated (thanks to Andrzej Smyk).
+
 	* src/ejabberd_s2s.erl: Added incoming-s2s-number and
 	outgoing-s2s-number ejabberdctl commands
 	
diff --git a/src/msgs/pl.msg b/src/msgs/pl.msg
index 579008090..05dff9f78 100644
--- a/src/msgs/pl.msg
+++ b/src/msgs/pl.msg
@@ -136,9 +136,10 @@
 {"Invalid role: ~s", "Nieprawidłowa rola: ~s"}.
 {"Owner privileges required", "Wymagane uprawnienia właściciela	"}.
 {"private, ", "prywatny, "}.
-{"Present real JIDs to", "Kto może widzieć prawdziwe JIDy?"}.
+{"Present real JIDs to", "Kto może widzieć prawdziwe JID-y?"}.
 {"moderators only", "tylko moderatorzy"}.
-{"anyone", "każdy"}.
+{"anyone", "wszyscy"}.
+
 
 % mod_irc/mod_irc.erl
 {"You need an x:data capable client to configure mod_irc settings",
@@ -224,7 +225,7 @@
 % mod_pubsub/mod_pubsub.erl
 {[], " "}.
 {"Node Creator", "Tworzenie gałęzi"}.
-{"Deliver payloads with event notifications", "Do?cz zawarto? publikowanego przedmiotu podczas wysy?nia powiadomienia o publikacji"}.
+{"Deliver payloads with event notifications", "Dołącz zawartość publikowanego przedmiotu podczas wysyłania powiadomienia o publikacji"}.
 {"Notify subscribers when the node configuration changes", "Informuj subskrybentów gdy konfiguracja gałęzi się zmieni"}.
 {"Notify subscribers when the node is deleted", "Informuj subskrybentów gdy gałąż zostanie wykasowana"}.
 {"Notify subscribers when items are removed from the node", "Informuj subskrybentów kiedy zostaną z gałęzi usunięte jakieś elementy"}.
@@ -233,7 +234,7 @@
 {"Whether to allow subscriptions", "Czy pozwolić na subskrypcje"}.
 {"Specify the subscriber model", "Oznacz model subskrybenta"}.
 {"Specify the publisher model", "Oznacz model publikującego"}.
-{"Max payload size in bytes", "Maksymalna wielko? powiadomienia w bajtach"}.
+{"Max payload size in bytes", "Maksymalna wielkość powiadomienia w bajtach"}.
 {"Send items to new subscribers", "Wysyłaj rzeczy do nowych subskrybentów"}.
 {"Only deliver notifications to available users", "Dostarczaj notyfikacje tylko do osiągalnych użytkowników"}.
 {"Specify the current subscription approver", "Wyznacz aprobującego obecne subskrypcje "}.
@@ -368,7 +369,7 @@
 {"Make room public searchable", "Pozwól wyszukiwać pokój"}.
 {"Make participants list public", "Upublicznij listę uczestników"}.
 {"Make room password protected", "Zabezpiecz pokój hasłem"}.
-{"Make room members-only", "Utwórz pokój tylko dla członków"}.
+{"Make room members-only", "Utwórz pokój tylko dla uczestnikóww"}.
 {"Make room moderated", "Moderuj pokój"}.
 {"Default users as participants", "Domyślni użytkownicy jako uczestnicy"}.
 {"Allow users to change subject", "Pozwól użytkownikom zmienić tytuł pokoju"}.
@@ -384,9 +385,41 @@
 {"ejabberd vCard module\nCopyright (c) 2003-2006 Alexey Shchepin", "ejabberd vCard module\nCopyright (c) 2003-2006 Alexey Shchepin"}.
 {"Jabber ID", "Jabber ID"}.
 
-% mod_vcard.erl
-{"Email", "E-mail"}.
+% ./mod_presence.erl
+{"You need an x:data capable client to register presence", "Potrzebujesz klinta kompatybilnego z x:data aby zarejestrować widoczność "}.
+{"Presence registration at ", "Rejestracja widoczności na "}.
+{"What presence features do you want to register?", "Jakie usługi widoczności chcesz zarejestrować?"}.
+{"Raw XML", ""}.
+{"Specified presence is already registered", "Określona widoczność już jest zarejestrowana"}.
+{"You must fill in field \"Xml\" in the form", "Musisz wypełnić w formularzu pole \"XML\""}.
+{"You must fill in field \"Icon\" in the form", "Musisz wypełnić w formularzu pole \"Icon\""}.
+{"ejabberd presence module\nCopyright (c) 2006 Igor Goryachev", ""}.
+
+% ./mod_presence/mod_presence.erl
+{"Raw XML export", "Eksport XML do raw"}.
+{"Allow icon export", "Pozwól na eksport ikon"}.
+
+% ./mod_stats2file.erl
+{"CPUtime", "Czas procesora"}.
+
+% ./mod_vcard_odbc.erl
+{"Erlang Jabber Server\nCopyright (c) 2002-2006 Alexey Shchepin", ""}.
+{"Email", ""}.
+{"ejabberd vCard module\nCopyright (c) 2003-2006 Alexey Shchepin", ""}.
+{"Jabber ID", ""}.
+
+% ./mod_pubsub/mod_pubsub.erl
+{"ejabberd pub/sub module\nCopyright (c) 2003-2006 Alexey Shchepin", ""}.
+
+% ./web/ejabberd_web_admin.erl
+{"ejabberd (c) 2002-2006 Alexey Shchepin, 2004-2006 Process One", ""}.
+{"(Raw)", ""}.
+{"Raw", ""}.
+{"Low level update script", "Skrypt aktualizacyjny niskiego poziomu"}.
+
+% ./mod_irc/mod_irc.erl
+{"ejabberd IRC module\nCopyright (c) 2003-2006 Alexey Shchepin", ""}.
+
+% ./mod_muc/mod_muc.erl
+{"ejabberd MUC module\nCopyright (c) 2003-2006 Alexey Shchepin", ""}.
 
-% Local Variables:
-% mode: erlang
-% End:
-- 
cgit v1.2.3


From 4cb24c3e6af062f1c1da167d19782e2334818125 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20R=C3=A9mond?=
 <mickael.remond@process-one.net>
Date: Tue, 26 Sep 2006 17:17:31 +0000
Subject: * doc/release_notes_1.1.2.txt: Draft release notes.

SVN Revision: 645
---
 ChangeLog                   |   2 +
 doc/release_note_1.1.2.txt  |   0
 doc/release_notes_1.1.2.txt | 120 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 122 insertions(+)
 create mode 100644 doc/release_note_1.1.2.txt
 create mode 100644 doc/release_notes_1.1.2.txt

diff --git a/ChangeLog b/ChangeLog
index 08ebcf6b6..c6e3e2c32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2006-09-26  Mickael Remond  <mickael.remond@process-one.net>
 
+	* doc/release_notes_1.1.2.txt: Draft release notes.
+
 	* src/msgs/pl.msg: Updated (thanks to Andrzej Smyk).
 
 	* src/ejabberd_s2s.erl: Added incoming-s2s-number and
diff --git a/doc/release_note_1.1.2.txt b/doc/release_note_1.1.2.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/doc/release_notes_1.1.2.txt b/doc/release_notes_1.1.2.txt
new file mode 100644
index 000000000..1f445141f
--- /dev/null
+++ b/doc/release_notes_1.1.2.txt
@@ -0,0 +1,120 @@
+				Release Notes
+				ejabberd 1.1.2
+			      27 September 2006
+
+   This document describes the main changes in ejabberd 1.1.2.
+
+   This version is a major improvement over ejabberd 1.1.1, improving the
+   overall behaviour of the server in many areas. Users of ejabberd 1.1.1
+   should upgrade to this new release.
+
+   ejabberd can be downloaded from the Process-one website:
+   http://www.process-one.net/en/projects/ejabberd/
+
+   Detailed information can be found in the ejabberd Feature Sheet and User
+   Guide which are available on the Process-one website:
+   http://www.process-one.net/en/projects/ejabberd/docs.html
+
+   A complete list of changes is available from:
+   https://support.process-one.net/secure/ConfigureReport.jspa?filterid=10110&mapper=components&selectedProjectId=10011&reportKey=com.atlassian.jira.plugin.system.reports%3Asinglelevelgroupby&Next=Next
+
+
+   Recent changes include:
+
+LDAP Support 
+
+  - Major improvements have been made on the LDAP module. It is now more
+    flexible and more robust.
+
+HTTP Polling fixes
+
+  - The HTTP poll modules have been fixed and improved: The connection are
+    closed properly and polled messages can no more be lost.
+
+Roster management improvement
+
+  - Roster management improvements make it more reliable, especially in cases
+    where users are on different servers.
+  - Shared rosters are now more reliable.
+
+Improved Robustness
+
+  - It is now possible to limit the number of opened connections for a single
+  user.
+
+Relational database support
+
+  - Database support: Microsoft SQL Server is now officially supported (ODBC
+  mode).
+
+Pubsub improvements
+
+  - Nodes creation can now be prevented with a dedicated ACL rule.
+
+Localization
+
+  - A Czech translation has been added.
+  - Translations have been updated.
+
+Binary installer
+
+  - The same completly packaged binary installer is now available on Windows,
+  Linux and MacOSX PPC.
+
+
+- Anonymous login bugfixes.
+
+XMPP compliance
+
+  - Some protocol compliance fix have been added, after the Portland XMPP
+   Interop Meeting in July.
+
+Various improvements
+
+  - MUC have been improved (logging rendering).
+  - The command line tool ejabberdctl has been improved.
+  - The build chain has been improved, including MacOSX support.
+  - A Czech translation has been added.
+
+Bugfixes
+
+   - Please refer to the ChangeLog file supplied with this release regarding
+     all improvements in ejabberd.
+
+
+   Installation Notes
+
+Supported Erlang Version
+
+   - You need at least Erlang/OTP R9C-2 to run ejabberd 1.1.2.
+
+Installation
+
+   Installers are provided for Microsoft Windows, Linux/x86 and MacOSX/PPC.
+   Installers can be retrieved from:
+   http://www.process-one.net/en/projects/ejabberd/download.html
+
+Migration Notes
+
+   - Before any migration, ejabberd system and database must be properly
+   backed up.
+   - The relational database schema has changed between version 1.1.1 and
+   1.1.2. A "askmessage" column need to be added in the "rosterusers" table to
+   perform the migration.
+
+
+References
+
+   Contributed tutorials and documents of interest are:
+   - Migration from Jabberd1.4, Jabberd2 and WPJabber to ejabberd:
+     http://ejabberd.jabber.ru/migrate-to-ejabberd     
+   - Transport configuration for connecting to other networks:
+     http://ejabberd.jabber.ru/tutorials-transports
+   - Using ejabberd with MySQL native driver:
+     http://support.process-one.net/doc/display/MESSENGER/Using+ejabberd+with+MySQL+native+driver
+   - Anonymous User Support:
+     http://support.process-one.net/doc/display/MESSENGER/Anonymous+users+support
+   - Frequently Asked Questions:
+     http://ejabberd.jabber.ru/faq
+
+END
-- 
cgit v1.2.3


From 7214549508902b5cd4c2e89c608ee09678cbc24b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20R=C3=A9mond?=
 <mickael.remond@process-one.net>
Date: Wed, 27 Sep 2006 13:09:50 +0000
Subject: * doc/guide.tex: Fixed Latexish typos.

SVN Revision: 646
---
 ChangeLog      |  4 ++++
 doc/guide.html | 10 +++++-----
 doc/guide.tex  |  8 ++++----
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c6e3e2c32..16760fdcf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-09-27  Mickael Remond  <mickael.remond@process-one.net>
+
+	* doc/guide.tex: Fixed Latexish typos.
+
 2006-09-26  Mickael Remond  <mickael.remond@process-one.net>
 
 	* doc/release_notes_1.1.2.txt: Draft release notes.
diff --git a/doc/guide.html b/doc/guide.html
index 596a5ec91..489f76c02 100644
--- a/doc/guide.html
+++ b/doc/guide.html
@@ -321,7 +321,7 @@ To compile <TT>ejabberd</TT> on a Windows flavour, you need:
 <UL CLASS="itemize"><LI CLASS="li-itemize">
 MS Visual C++ 6.0 Compiler
 <LI CLASS="li-itemize"><A HREF="http://erlang.org/download.html">Erlang/OTP R9C-2 or higher</A>
-<LI CLASS="li-itemize"><A HREF="http://sourceforge.net/project/showfiles.php?group_id=10127&amp;package_id=11277">Expat 1.95.7 or higher</A>
+<LI CLASS="li-itemize"><A HREF="http://sourceforge.net/project/showfiles.php?group_id=10127&package_id=11277">Expat 1.95.7 or higher</A>
 <LI CLASS="li-itemize"><A HREF="http://www.gnu.org/software/libiconv/">GNU Iconv 1.9.1</A>
 (optional)
 <LI CLASS="li-itemize"><A HREF="http://www.slproweb.com/products/Win32OpenSSL.html">Shining Light OpenSSL</A>
@@ -627,7 +627,7 @@ If HTTP Polling is enabled, it will be available at
  <DT CLASS="dt-description"><B><TT>{max_stanza_size, Size}</TT></B><DD CLASS="dd-description"> This
  option specifies an approximate maximum size in bytes of XML stanzas.
  Approximate, because it is calculated with the precision of one block of
- readed data. For example <CODE>{max\_stanza\_size, 65536}</CODE>. The default
+ readed data. For example <CODE>{max_stanza_size, 65536}</CODE>. The default
  value is <TT>infinity</TT>.
  <DT CLASS="dt-description"><B><TT>{shaper, &lt;access rule&gt;}</TT></B><DD CLASS="dd-description"> This option defines a
  shaper for the port (see section&nbsp;<A HREF="#sec:shapers">3.6</A>). The default value
@@ -997,14 +997,14 @@ Examples:
 To limit the number of sessions per user to 10 on all virtual
 hosts:
 <PRE CLASS="verbatim">
-  {max\_user\_sessions, 10}.
+  {max_user_sessions, 10}.
 </PRE><LI CLASS="li-itemize">This option can be defined per virtual host (see
 section&nbsp;<A HREF="#sec:virtualhost">3.2</A>). In next example the number of
 sessions per user on the first host is six, while there is no limit on the
 second host:
 <PRE CLASS="verbatim">
-  {host_config, "example.net", [{max\_user\_sessions, 6}]}.
-  {host_config, "example.com", [{max\_user\_sessions, infinity}]}.
+  {host_config, "example.net", [{max_user_sessions, 6}]}.
+  {host_config, "example.com", [{max_user_sessions, infinity}]}.
 </PRE></UL>
 <!--TOC subsection Default Language-->
 
diff --git a/doc/guide.tex b/doc/guide.tex
index 468f7143d..d7262c218 100644
--- a/doc/guide.tex
+++ b/doc/guide.tex
@@ -467,7 +467,7 @@ The following options are available:
   \titem{\{max\_stanza\_size, Size\}} \ind{options!max\_stanza\_size}This
     option specifies an approximate maximum size in bytes of XML stanzas.
     Approximate, because it is calculated with the precision of one block of
-    readed data. For example \verb|{max\_stanza\_size, 65536}|.  The default
+    readed data. For example \verb|{max_stanza_size, 65536}|.  The default
     value is \term{infinity}.
   \titem{\{shaper, <access rule>\}} \ind{options!shaper}This option defines a
     shaper for the port (see section~\ref{sec:shapers}). The default value
@@ -866,15 +866,15 @@ Examples:
 \item To limit the number of sessions per user to 10 on all virtual
 hosts:
 \begin{verbatim}
-  {max\_user\_sessions, 10}.
+  {max_user_sessions, 10}.
 \end{verbatim}
 \item This option can be defined per virtual host (see
 section~\ref{sec:virtualhost}). In next example the number of
 sessions per user on the first host is six, while there is no limit on the
 second host:
 \begin{verbatim}
-  {host_config, "example.net", [{max\_user\_sessions, 6}]}.
-  {host_config, "example.com", [{max\_user\_sessions, infinity}]}.
+  {host_config, "example.net", [{max_user_sessions, 6}]}.
+  {host_config, "example.com", [{max_user_sessions, infinity}]}.
 \end{verbatim}
 \end{itemize}
 
-- 
cgit v1.2.3


From de306d0364c7e6175bca69135d576f7d6240a763 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20R=C3=A9mond?=
 <mickael.remond@process-one.net>
Date: Wed, 27 Sep 2006 13:34:18 +0000
Subject: * doc/release_notes_1.1.2.txt: Minor fixes.

SVN Revision: 647
---
 ChangeLog                   |  2 ++
 doc/release_notes_1.1.2.txt | 11 +++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 16760fdcf..17c093ceb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2006-09-27  Mickael Remond  <mickael.remond@process-one.net>
 
+	* doc/release_notes_1.1.2.txt: Minor fixes.
+
 	* doc/guide.tex: Fixed Latexish typos.
 
 2006-09-26  Mickael Remond  <mickael.remond@process-one.net>
diff --git a/doc/release_notes_1.1.2.txt b/doc/release_notes_1.1.2.txt
index 1f445141f..0aa442373 100644
--- a/doc/release_notes_1.1.2.txt
+++ b/doc/release_notes_1.1.2.txt
@@ -6,7 +6,7 @@
 
    This version is a major improvement over ejabberd 1.1.1, improving the
    overall behaviour of the server in many areas. Users of ejabberd 1.1.1
-   should upgrade to this new release.
+   should upgrade to this new release for improved robustness and compliance.
 
    ejabberd can be downloaded from the Process-one website:
    http://www.process-one.net/en/projects/ejabberd/
@@ -15,8 +15,9 @@
    Guide which are available on the Process-one website:
    http://www.process-one.net/en/projects/ejabberd/docs.html
 
-   A complete list of changes is available from:
-   https://support.process-one.net/secure/ConfigureReport.jspa?filterid=10110&mapper=components&selectedProjectId=10011&reportKey=com.atlassian.jira.plugin.system.reports%3Asinglelevelgroupby&Next=Next
+   ejabberd includes 44 improvements. A complete list of changes is available
+   from:
+   http://redir.process-one.net/ejabberd-1.1.2
 
 
    Recent changes include:
@@ -67,13 +68,15 @@ Binary installer
 XMPP compliance
 
   - Some protocol compliance fix have been added, after the Portland XMPP
-   Interop Meeting in July.
+    Interop Meeting in July.
 
 Various improvements
 
   - MUC have been improved (logging rendering).
   - The command line tool ejabberdctl has been improved.
   - The build chain has been improved, including MacOSX support.
+  - The documentation has been improved and updated to describe the new
+    features.
   - A Czech translation has been added.
 
 Bugfixes
-- 
cgit v1.2.3


From 7e948fbbace4b58598ee92d333a574998bf6d4c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20R=C3=A9mond?=
 <mickael.remond@process-one.net>
Date: Wed, 27 Sep 2006 16:22:09 +0000
Subject: * doc/release_notes_1.1.2.txt: Fixed typos and rephrasing.

SVN Revision: 648
---
 doc/release_notes_1.1.2.txt | 60 ++++++++++++++++++++++-----------------------
 1 file changed, 29 insertions(+), 31 deletions(-)

diff --git a/doc/release_notes_1.1.2.txt b/doc/release_notes_1.1.2.txt
index 0aa442373..bca68127d 100644
--- a/doc/release_notes_1.1.2.txt
+++ b/doc/release_notes_1.1.2.txt
@@ -11,73 +11,73 @@
    ejabberd can be downloaded from the Process-one website:
    http://www.process-one.net/en/projects/ejabberd/
 
-   Detailed information can be found in the ejabberd Feature Sheet and User
-   Guide which are available on the Process-one website:
+   Detailed information can be found in the Feature Sheet and in the
+   Installation and Operation Guide which are both available on the
+   Process-one website:
    http://www.process-one.net/en/projects/ejabberd/docs.html
 
-   ejabberd includes 44 improvements. A complete list of changes is available
-   from:
+   ejabberd includes 44 improvements. A complete list of changes can be
+   retrieved from:
    http://redir.process-one.net/ejabberd-1.1.2
 
 
    Recent changes include:
 
-LDAP Support 
+LDAP Improvements
 
   - Major improvements have been made on the LDAP module. It is now more
     flexible and more robust.
 
-HTTP Polling fixes
+HTTP Polling Fixes
 
-  - The HTTP poll modules have been fixed and improved: The connection are
-    closed properly and polled messages can no more be lost.
+  - The HTTP polling modules have been fixed and improved: the connections are
+    closed properly and polled messages cannot be lost anymore.
 
-Roster management improvement
+Roster Management Improvement
 
-  - Roster management improvements make it more reliable, especially in cases
-    where users are on different servers.
-  - Shared rosters are now more reliable.
+  - Roster management improvements increase reliability, especially in cases
+  where users are on different servers.
+  - Shared rosters are more reliable.
 
 Improved Robustness
 
   - It is now possible to limit the number of opened connections for a single
   user.
 
-Relational database support
+Relational databases
 
-  - Database support: Microsoft SQL Server is now officially supported (ODBC
-  mode).
+  - Database support: Microsoft SQL Server is now officially supported in ODBC
+  mode.
 
-Pubsub improvements
+Publish-Subscribe Improvement
 
-  - Nodes creation can now be prevented with a dedicated ACL rule.
+  - Restricting node creation with a dedicated ACL rule is now possible.
 
 Localization
 
   - A Czech translation has been added.
   - Translations have been updated.
 
-Binary installer
+Binary Installer
 
-  - The same completly packaged binary installer is now available on Windows,
-  Linux and MacOSX PPC.
+  - New binary installer for Windows including all requirements.
+  - Improved installers for Linux and MacOSX (PowerPC)
 
 
 - Anonymous login bugfixes.
 
-XMPP compliance
+XMPP Compliancy
 
   - Some protocol compliance fix have been added, after the Portland XMPP
     Interop Meeting in July.
 
-Various improvements
+Miscelanous
 
   - MUC have been improved (logging rendering).
   - The command line tool ejabberdctl has been improved.
   - The build chain has been improved, including MacOSX support.
   - The documentation has been improved and updated to describe the new
     features.
-  - A Czech translation has been added.
 
 Bugfixes
 
@@ -90,11 +90,13 @@ Bugfixes
 Supported Erlang Version
 
    - You need at least Erlang/OTP R9C-2 to run ejabberd 1.1.2.
+   - The recommanded version is Erlang/OTP R10B-10.
+   - Erlang/OTP R11B has not yet been fully certified for ejabberd.
 
 Installation
 
    Installers are provided for Microsoft Windows, Linux/x86 and MacOSX/PPC.
-   Installers can be retrieved from:
+   They can be retrieved from:
    http://www.process-one.net/en/projects/ejabberd/download.html
 
 Migration Notes
@@ -102,21 +104,17 @@ Migration Notes
    - Before any migration, ejabberd system and database must be properly
    backed up.
    - The relational database schema has changed between version 1.1.1 and
-   1.1.2. A "askmessage" column need to be added in the "rosterusers" table to
-   perform the migration.
+   1.1.2. An "askmessage" column needs to be added in the "rosterusers" table
+   to perform the migration.
 
 
 References
 
    Contributed tutorials and documents of interest are:
-   - Migration from Jabberd1.4, Jabberd2 and WPJabber to ejabberd:
+   - Migration from other XMPP servers to ejabberd:
      http://ejabberd.jabber.ru/migrate-to-ejabberd     
    - Transport configuration for connecting to other networks:
      http://ejabberd.jabber.ru/tutorials-transports
-   - Using ejabberd with MySQL native driver:
-     http://support.process-one.net/doc/display/MESSENGER/Using+ejabberd+with+MySQL+native+driver
-   - Anonymous User Support:
-     http://support.process-one.net/doc/display/MESSENGER/Anonymous+users+support
    - Frequently Asked Questions:
      http://ejabberd.jabber.ru/faq
 
-- 
cgit v1.2.3


From 8515833954418ad0b2594623aa61c8175d286cbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20R=C3=A9mond?=
 <mickael.remond@process-one.net>
Date: Wed, 27 Sep 2006 17:29:45 +0000
Subject: * Added release note to documentation.

SVN Revision: 650
---
 doc/guide.html | 136 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 doc/guide.tex  |   2 +
 2 files changed, 134 insertions(+), 4 deletions(-)

diff --git a/doc/guide.html b/doc/guide.html
index 489f76c02..fd3f0a75a 100644
--- a/doc/guide.html
+++ b/doc/guide.html
@@ -182,9 +182,10 @@ SPAN{width:20%; float:right; text-align:left; margin-left:auto;}
 <LI CLASS="li-toc"><A HREF="#htoc88">B.4&nbsp;&nbsp;ejabberd 1.0.0</A>
 <LI CLASS="li-toc"><A HREF="#htoc89">B.5&nbsp;&nbsp;ejabberd 1.1.0</A>
 <LI CLASS="li-toc"><A HREF="#htoc90">B.6&nbsp;&nbsp;ejabberd 1.1.1</A>
+<LI CLASS="li-toc"><A HREF="#htoc91">B.7&nbsp;&nbsp;ejabberd 1.1.2</A>
 </UL>
-<LI CLASS="li-toc"><A HREF="#htoc91">C&nbsp;&nbsp;Acknowledgements</A>
-<LI CLASS="li-toc"><A HREF="#htoc92">D&nbsp;&nbsp;Copyright Information</A>
+<LI CLASS="li-toc"><A HREF="#htoc92">C&nbsp;&nbsp;Acknowledgements</A>
+<LI CLASS="li-toc"><A HREF="#htoc93">D&nbsp;&nbsp;Copyright Information</A>
 </UL>
 
 <!--TOC section Introduction-->
@@ -3985,11 +3986,138 @@ References
    - Frequently Asked Questions:
      http://ejabberd.jabber.ru/faq
 
+END
+</PRE>
+<!--TOC subsection ejabberd 1.1.2-->
+
+<H3 CLASS="subsection"><A NAME="htoc91">B.7</A>&nbsp;&nbsp;ejabberd 1.1.2</H3><!--SEC END -->
+
+<PRE CLASS="verbatim">
+    Release Notes
+    ejabberd 1.1.2
+         27 September 2006
+
+   This document describes the main changes in ejabberd 1.1.2.
+
+   This version is a major improvement over ejabberd 1.1.1, improving the
+   overall behaviour of the server in many areas. Users of ejabberd 1.1.1
+   should upgrade to this new release for improved robustness and compliance.
+
+   ejabberd can be downloaded from the Process-one website:
+   http://www.process-one.net/en/projects/ejabberd/
+
+   Detailed information can be found in the Feature Sheet and in the
+   Installation and Operation Guide which are both available on the
+   Process-one website:
+   http://www.process-one.net/en/projects/ejabberd/docs.html
+
+   ejabberd includes 44 improvements. A complete list of changes can be
+   retrieved from:
+   http://redir.process-one.net/ejabberd-1.1.2
+
+
+   Recent changes include:
+
+LDAP Improvements
+
+  - Major improvements have been made on the LDAP module. It is now more
+    flexible and more robust.
+
+HTTP Polling Fixes
+
+  - The HTTP polling modules have been fixed and improved: the connections are
+    closed properly and polled messages cannot be lost anymore.
+
+Roster Management Improvement
+
+  - Roster management improvements increase reliability, especially in cases
+  where users are on different servers.
+  - Shared rosters are more reliable.
+
+Improved Robustness
+
+  - It is now possible to limit the number of opened connections for a single
+  user.
+
+Relational databases
+
+  - Database support: Microsoft SQL Server is now officially supported in ODBC
+  mode.
+
+Publish-Subscribe Improvement
+
+  - Restricting node creation with a dedicated ACL rule is now possible.
+
+Localization
+
+  - A Czech translation has been added.
+  - Translations have been updated.
+
+Binary Installer
+
+  - New binary installer for Windows including all requirements.
+  - Improved installers for Linux and MacOSX (PowerPC)
+
+
+- Anonymous login bugfixes.
+
+XMPP Compliancy
+
+  - Some protocol compliance fix have been added, after the Portland XMPP
+    Interop Meeting in July.
+
+Miscelanous
+
+  - MUC have been improved (logging rendering).
+  - The command line tool ejabberdctl has been improved.
+  - The build chain has been improved, including MacOSX support.
+  - The documentation has been improved and updated to describe the new
+    features.
+
+Bugfixes
+
+   - Please refer to the ChangeLog file supplied with this release regarding
+     all improvements in ejabberd.
+
+
+   Installation Notes
+
+Supported Erlang Version
+
+   - You need at least Erlang/OTP R9C-2 to run ejabberd 1.1.2.
+   - The recommanded version is Erlang/OTP R10B-10.
+   - Erlang/OTP R11B has not yet been fully certified for ejabberd.
+
+Installation
+
+   Installers are provided for Microsoft Windows, Linux/x86 and MacOSX/PPC.
+   They can be retrieved from:
+   http://www.process-one.net/en/projects/ejabberd/download.html
+
+Migration Notes
+
+   - Before any migration, ejabberd system and database must be properly
+   backed up.
+   - The relational database schema has changed between version 1.1.1 and
+   1.1.2. An "askmessage" column needs to be added in the "rosterusers" table
+   to perform the migration.
+
+
+References
+
+   Contributed tutorials and documents of interest are:
+   - Migration from other XMPP servers to ejabberd:
+     http://ejabberd.jabber.ru/migrate-to-ejabberd     
+   - Transport configuration for connecting to other networks:
+     http://ejabberd.jabber.ru/tutorials-transports
+   - Frequently Asked Questions:
+     http://ejabberd.jabber.ru/faq
+
 END
 </PRE>
 <!--TOC section Acknowledgements-->
 
-<H2 CLASS="section"><A NAME="htoc91">C</A>&nbsp;&nbsp;<A NAME="acknowledgements">Acknowledgements</A></H2><!--SEC END -->
+<H2 CLASS="section"><A NAME="htoc92">C</A>&nbsp;&nbsp;<A NAME="acknowledgements">Acknowledgements</A></H2><!--SEC END -->
 
 <A NAME="sec:acknowledgements"></A>
 Thanks to all people who contributed to this guide:
@@ -4006,7 +4134,7 @@ Alexey Shchepin (<A HREF="xmpp:aleksey@jabber.ru"><TT>xmpp:aleksey@jabber.ru</TT
 </UL>
 <!--TOC section Copyright Information-->
 
-<H2 CLASS="section"><A NAME="htoc92">D</A>&nbsp;&nbsp;<A NAME="copyright">Copyright Information</A></H2><!--SEC END -->
+<H2 CLASS="section"><A NAME="htoc93">D</A>&nbsp;&nbsp;<A NAME="copyright">Copyright Information</A></H2><!--SEC END -->
 
 <A NAME="sec:copyright"></A>
 Ejabberd Installation and Operation Guide.<BR>
diff --git a/doc/guide.tex b/doc/guide.tex
index d7262c218..174dc95a6 100644
--- a/doc/guide.tex
+++ b/doc/guide.tex
@@ -3077,6 +3077,8 @@ figure~\ref{fig:webadmmainru} with figure~\ref{fig:webadmmain})
 \subsection{ejabberd 1.1.1}
 \verbatiminput{release_notes_1.1.1.txt}
 
+\subsection{ejabberd 1.1.2}
+\verbatiminput{release_notes_1.1.2.txt}
 
 \section{\aname{acknowledgements}{Acknowledgements}}
 \label{sec:acknowledgements}
-- 
cgit v1.2.3