diff --git a/ChangeLog b/ChangeLog index 75c9a6751..762ece800 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2008-05-19 Badlop + * doc/guide.html: Updated + * doc/dev.html: Likewise + * doc/features.html: Likewise + * doc/version.tex: Likewise + + * src/ejabberd.hrl: Version is 2.0.x + * src/configure.ac: R12 support: remove compilation warning (EJAB-630) * src/configure: Likewise diff --git a/doc/dev.html b/doc/dev.html index c866e0589..8b8db8886 100644 --- a/doc/dev.html +++ b/doc/dev.html @@ -2,7 +2,7 @@ "http://www.w3.org/TR/REC-html40/loose.dtd"> -Ejabberd 2.0.0 Developers Guide +<TITLE>Ejabberd 2.0.x Developers Guide @@ -49,7 +49,7 @@ TD P{margin:0px;}

-

Ejabberd 2.0.0 Developers Guide

Alexey Shchepin
+

Ejabberd 2.0.x Developers Guide

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

diff --git a/doc/features.html b/doc/features.html index 2997992a9..cea27449e 100644 --- a/doc/features.html +++ b/doc/features.html @@ -2,7 +2,7 @@ "http://www.w3.org/TR/REC-html40/loose.dtd"> -Ejabberd 2.0.0 Feature Sheet +<TITLE>Ejabberd 2.0.x Feature Sheet @@ -50,7 +50,7 @@ SPAN{width:20%; float:right; text-align:left; margin-left:auto;}

-

Ejabberd 2.0.0 Feature Sheet

Sander Devrieze
+

Ejabberd 2.0.x Feature Sheet

Sander Devrieze
mailto:s.devrieze@pandora.be
xmpp:sander@devrieze.dyndns.org

diff --git a/doc/guide.html b/doc/guide.html index 24cb80fa8..a298e575a 100644 --- a/doc/guide.html +++ b/doc/guide.html @@ -6,14 +6,17 @@ - ejabberd 2.0.0 + ejabberd 2.0.x Installation and Operation Guide - + + + + @@ -83,14 +86,17 @@ SPAN{width:20%; float:right; text-align:left; margin-left:auto;}


- +
ejabberd 2.0.0
ejabberd 2.0.x
 
Installation and Operation Guide


-


+

+
+ +



@@ -342,7 +348,7 @@ as long as your system have all the dependencies.

+

Several connections to a remote Jabber server with ACL

+ +

The special access max_s2s_connections specifies how many +simultaneus S2S connections can be stablished to a specific remote Jabber server. +The default value is 1. +There’s also available the access max_s2s_connections_per_node.

The syntax is: +

  {access, max_s2s_connections, [{<maxnumber>, <aclname>},
+                                 ...
+                                ]}.
+

Examples: +

  • +Allow up to 3 connections with each remote server: +
      {access, max_s2s_connections, [{3, all}]}.

3.1.6  Shapers

@@ -1608,6 +1631,9 @@ recommended if the processing of a query can take a relatively long time. 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. +

{queues, N}
: N separate queues are created to process the +queries. The queries are thus process in parallel, but in a +controlled way.
parallel
For every packet with this discipline a separate Erlang process is spawned. Consequently, all these packets are processed in parallel. Although spawning of Erlang process has a relatively low cost, this can break @@ -1943,7 +1969,7 @@ distributed at creation time on all available MUC module instances. The multi-user chat module is clustered but the room themselves are not clustered nor fault-tolerant: if the node managing a set of rooms goes down, the rooms disappear and they will be recreated -on an available node on first connection attempt.

Options: +on an available node on first connection attempt.

Module options:

host
This option defines the Jabber ID of the @@ -1964,27 +1990,32 @@ who is allowed to administrate the Multi-User Chat service (the default value is none, which means that only the room creator can administer his room). By sending a message to the service JID, administrators can send service messages that will be displayed in every -active room.
history_size
A small history of +active room. +
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 0 disables the history feature and, as a result, nothing is kept in memory. The default value is 20. This value is global and thus affects all rooms on the -server.
max_users
This option defines at +server. +
max_users
This option defines at the server level, the maximum number of users allowed per MUC room. It can be lowered in each room configuration but cannot be increased in individual MUC room configuration. The default value is -200.
max_users_admin_threshold
+200. +
max_users_admin_threshold
This option defines the number of MUC admins or owners to allow to enter the room even if the maximum number of allowed users is reached. The default limits -is 5. In most cases this default value is the best setting.
max_user_conferences
+is 5. In most cases this default value is the best setting. +
max_user_conferences
This option define the maximum number of chat room any given user will be able to join. The default is 10. This option is used to prevent possible abuses. Note that this is a soft limits: Some users can sometime join more conferences -in cluster configurations.
min_message_interval
+in cluster configurations. +
min_message_interval
This option defines the minimum interval between two messages send by a user in seconds. This option is global and valid for all chat rooms. A decimal value can be used. When this option is not defined, @@ -1993,7 +2024,8 @@ MUC service from users abuses and limit number of messages that will be broadcasted by the service. A good value for this minimum message interval is 0.4 second. If a user tries to send messages faster, an error is send back explaining that the message have been discarded -and describing the reason why the message is not acceptable.
min_presence_interval
+and describing the reason why the message is not acceptable. +
min_presence_interval
This option defines the minimum of time between presence changes coming from a given user in seconds. This option is global and valid for all chat rooms. A @@ -2005,18 +2037,33 @@ to change its presence more often than the specified interval, the presence is cached by ejabberd and only the last presence is broadcasted to all users in the room after expiration of the interval delay. Intermediate presence packets are silently -discarded. A good value for this option is 4 seconds.
default_room_options
This -option allow to define the desired default room options. Obviously, -the room creator can modify the room options at any time. The -available room options are: allow_change_subj, -allow_private_messages, allow_query_users, -allow_user_invites, anonymous, logging, -members_by_default, members_only, -moderated, password, password_protected, -persistent, public, public_list, -title. All of them can be set to true or -false, except password and title which -are strings. +discarded. A good value for this option is 4 seconds. +
default_room_options
+This module option allows to define the desired default room options. +Note that the creator of a room can modify the options of his room +at any time using a Jabber client with MUC capability. +The available room options and the default values are: +
+{allow_change_subj, true}
Allow occupants to change the subject. +
{allow_private_messages, true}
Occupants can send private messages to other occupants. +
{allow_query_users, true}
Occupants can send IQ queries to other occupants. +
{allow_user_invites, false}
Allow occupants to send invitations. +
{anonymous, true}
Occupants are allowed to see the real JIDs of other occupants. +
{logging, false}
The public messages are logged using mod_muc_log. +
{max_users, 200}
Maximum number of occupants in the room. +
{members_by_default, true}
The occupants that enter the room are participants by default, so they have ’voice’. +
{members_only, false}
Only members of the room can enter. +
{moderated, true}
Only occupants with ’voice’ can send public messages. +
{password, ""}
Password of the room. You may want to enable the next option too. +
{password_protected, false}
The password is required to enter the room. +
{persistent, false}
The room persists even if the last participant leaves. +
{public, true}
The room is public in the list of the MUC service, so it can be discovered. +
{public_list, true}
The list of participants is public, without requiring to enter the room. +
{title, ""}
A human-readable title of the room. +
+All of those room options can be set to true or false, +except password and title which are strings, +and max_users that is integer.

Examples:

  • In the first example everyone is allowed to use the Multi-User Chat @@ -2323,7 +2370,8 @@ The simpliest configuration of the module:

    This module offers a Publish-Subscribe Service (XEP-0060). The functionality in mod_pubsub can be extended using plugins. The plugin that implements PEP (Personal Eventing via Pubsub) (XEP-0163) -is enabled by default, and requires mod_caps.

    Options: +is enabled in the default ejabberd configuration file, +and it requires mod_caps.

    Options:

    host
    This option defines the Jabber ID of the @@ -2370,7 +2418,15 @@ the second string is the message body. list of JIDs which will be notified each time a new account is registered.
    iqdisc
    This specifies the processing discipline for In-Band Registration (jabber:iq:register) IQ queries (see section 3.3.2). -

    Examples: +

This module reads also another option defined globably for the server: +{registration_timeout, Timeout}. +This option limits the frequency of registration from a given IP or username. +So, a user can’t register a new account from the same IP address or JID during +this number of seconds after previous registration. +Timeout is expressed in seconds, and must be an integer. +To disable this limitation, +instead of an integer put a word like: infinity. +Default value: 600 seconds.

Examples:

  • Next example prohibits the registration of too short account names: 
      {acl, shortname, {user_glob, "?"}}.
@@ -2400,8 +2456,10 @@ example all In-Band Registration functionality is disabled:
 %    {mod_register, [{access, register}]},
     ...
    ]}.
-
  • Define the welcome message and three registration watchers: -
      {modules,
+
  • Define the welcome message and three registration watchers. +Also define a registration timeout of one hour: +
      {registration_timeout, 3600}.
+  {modules,
    [
     ...
      {mod_register, [
diff --git a/doc/guide.tex b/doc/guide.tex
index 43e98d5b3..c71acc5f3 100644
--- a/doc/guide.tex
+++ b/doc/guide.tex
@@ -121,7 +121,7 @@ the processing discipline for #1 IQ queries (see section~\ref{modiqdiscoption}).
 {\rule{\larg}{1mm}}
 \vspace{2mm} \\
 \begin{center}
-    {\large  \bf May 2, 2008}
+    {\large  \bf \today}
 \end{center}
 \vspace{5.5cm}
 }
diff --git a/doc/version.tex b/doc/version.tex
index bbec028c2..299f276d2 100644
--- a/doc/version.tex
+++ b/doc/version.tex
@@ -1,2 +1,2 @@
 % ejabberd version (automatically generated).
-\newcommand{\version}{2.0.0}
+\newcommand{\version}{2.0.x}
diff --git a/src/ejabberd.hrl b/src/ejabberd.hrl
index 89791639e..45f26a065 100644
--- a/src/ejabberd.hrl
+++ b/src/ejabberd.hrl
@@ -19,7 +19,7 @@
 %%%
 %%%----------------------------------------------------------------------
 
--define(VERSION, "2.0.0").
+-define(VERSION, "2.0.x").
 
 -define(MYHOSTS, ejabberd_config:get_global_option(hosts)).
 -define(MYNAME, hd(ejabberd_config:get_global_option(hosts))).