diff --git a/ChangeLog b/ChangeLog index 5c148a19b..c984169b7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-03-04 Badlop + + * doc/guide.tex: mod_announce recommends, but doesn't require + mod_adhoc (thanks to Anastasia Gornostaeva) + * doc/guide.html: Likewise + * src/ejabberd.cfg.example: Likewise + 2008-03-03 Alexey Shchepin * src/tls/tls.erl: recv_data/2 doesn't throw exceptions now diff --git a/doc/guide.html b/doc/guide.html index 64671b4d8..fc832fb1e 100644 --- a/doc/guide.html +++ b/doc/guide.html @@ -1508,7 +1508,7 @@ all entries end with a comma:

The following table lists all modules included in ejabberd.

- + @@ -1623,11 +1623,13 @@ the "@HOST@" keyword must be used:

3.3.3  mod_announce

This module enables configured users to broadcast announcements and to set -the message of the day (MOTD). Configured users can do these actions with their -Jabber client using Ad-hoc commands or 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 +the message of the day (MOTD).

Configured users can perform these actions with a +Jabber client either using Ad-hoc commands +or sending messages to specific JIDs.

The Ad-hoc commands are listed in the Server Discovery. +For this feature to work, mod_adhocmust be enabled.

The specific JIDs where messages can be sent are listed listed now. +The first JID in each entry will apply only to the specified virtual host example.org, while the JID between brackets will apply to all virtual -hosts: +hosts in ejabberd:

example.org/announce/all (example.org/announce/all-hosts/all)
The message is sent to all registered users. If the user is online and connected @@ -1660,6 +1662,7 @@ Only administrators can send announcements: {modules, [ ... + {mod_adhoc, []}, {mod_announce, [{access, announce}]}, ... ]}. @@ -1674,6 +1677,7 @@ Only administrators can send announcements: {modules, [ ... + {mod_adhoc, []}, {mod_announce, [{access, announce}]}, ... ]}. diff --git a/doc/guide.tex b/doc/guide.tex index 293ed81ac..cfc0eeef8 100644 --- a/doc/guide.tex +++ b/doc/guide.tex @@ -1897,7 +1897,7 @@ The following table lists all modules included in \ejabberd{}. \begin{tabular}{|l|l|l|l|} \hline Module & Feature & Dependencies & Needed for XMPP? \\ \hline \hline \modadhoc{} & Ad-Hoc Commands (\xepref{0050}) & & No \\ - \hline \modannounce{} & Manage announcements & \modadhoc{} & No \\ + \hline \modannounce{} & Manage announcements & recommends \modadhoc{} & No \\ \hline \modcaps{} & Request and cache Entity Capabilities (\xepref{0115}) & & No \\ \hline \modconfigure{} & Server configuration using Ad-Hoc & \modadhoc{} & No \\ \hline \moddisco{} & Service Discovery (\xepref{0030}) & & No \\ @@ -2045,11 +2045,18 @@ the "@HOST@" keyword must be used: \ind{modules!\modannounce{}}\ind{MOTD}\ind{message of the day}\ind{announcements} This module enables configured users to broadcast announcements and to set -the message of the day (MOTD). Configured users can do these actions with their -\Jabber{} client using Ad-hoc commands or 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 +the message of the day (MOTD). +Configured users can perform these actions with a +\Jabber{} client either using Ad-hoc commands +or sending messages to specific JIDs. + +The Ad-hoc commands are listed in the Server Discovery. +For this feature to work, \modadhoc{} must be enabled. + +The specific JIDs where messages can be sent are listed bellow. +The first JID in each entry will apply only to the specified virtual host \jid{example.org}, while the JID between brackets will apply to all virtual -hosts: +hosts in ejabberd. \begin{description} \titem{example.org/announce/all (example.org/announce/all-hosts/all)} The message is sent to all registered users. If the user is online and connected @@ -2087,6 +2094,7 @@ Examples: {modules, [ ... + {mod_adhoc, []}, {mod_announce, [{access, announce}]}, ... ]}. @@ -2103,6 +2111,7 @@ Examples: {modules, [ ... + {mod_adhoc, []}, {mod_announce, [{access, announce}]}, ... ]}. diff --git a/src/ejabberd.cfg.example b/src/ejabberd.cfg.example index faa8f78fa..fd04c163b 100644 --- a/src/ejabberd.cfg.example +++ b/src/ejabberd.cfg.example @@ -400,7 +400,7 @@ {modules, [ {mod_adhoc, []}, - {mod_announce, [{access, announce}]}, % requires mod_adhoc + {mod_announce, [{access, announce}]}, % recommends mod_adhoc {mod_caps, []}, {mod_configure,[]}, % requires mod_adhoc {mod_disco, []},
ModuleFeatureDependenciesNeeded for XMPP?
mod_adhocAd-Hoc Commands (XEP-0050) No
mod_announceManage announcementsmod_adhocNo
mod_announceManage announcementsrecommends mod_adhocNo
mod_capsRequest and cache Entity Capabilities (XEP-0115) No
mod_configureServer configuration using Ad-Hocmod_adhocNo
mod_discoService Discovery (XEP-0030) No