diff --git a/doc/dev.html b/doc/dev.html index b86448c56..f54c522c0 100644 --- a/doc/dev.html +++ b/doc/dev.html @@ -2,7 +2,7 @@ "http://www.w3.org/TR/REC-html40/loose.dtd"> -Ejabberd 2.1.x Developers Guide +<TITLE>Ejabberd 2.1.11 Developers Guide @@ -49,7 +49,7 @@ TD P{margin:0px;}

-

Ejabberd 2.1.x Developers Guide

Alexey Shchepin
+

Ejabberd 2.1.11 Developers Guide

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

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

-

Ejabberd 2.1.x Feature Sheet

Sander Devrieze
+

Ejabberd 2.1.11 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 eaf999532..a9fe50e12 100644 --- a/doc/guide.html +++ b/doc/guide.html @@ -6,7 +6,7 @@ - ejabberd 2.1.x + ejabberd 2.1.11 Installation and Operation Guide @@ -76,7 +76,7 @@ BLOCKQUOTE.figure DIV.center DIV.center HR{display:none;}


- +
ejabberd 2.1.x
ejabberd 2.1.11
 
Installation and Operation Guide

@@ -109,7 +109,7 @@ BLOCKQUOTE.figure DIV.center DIV.center HR{display:none;}
  • 2.4.7  Specific Notes for Sun Solaris
  • 2.4.8  Specific Notes for Microsoft Windows
    • -
  • 2.5  Create a XMPP Account for Administration +
  • 2.5  Create an XMPP Account for Administration
  • 2.6  Upgrading ejabberd
  • Chapter 3  Configuring ejabberd @@ -348,7 +348,7 @@ as long as your system have all the dependencies.

  • GCC
  • Libexpat 1.95 or higher -
  • Erlang/OTP R10B-9 or higher. The recommended versions are R12B-5 and R13B04. +
  • Erlang/OTP R10B-9 or higher. The recommended versions are R13B04 and R14B04. Don’t use R14A or R14B because they have a bug.
  • OpenSSL 0.9.8 or higher, for STARTTLS, SASL and SSL encryption.
  • Zlib 1.2.3 or higher, for Stream Compression support (XEP-0138). Optional. @@ -513,16 +513,16 @@ variable. nmake -f Makefile.win32
  • Edit the file ejabberd\src\ejabberd.cfg and run 
    werl -s ejabberd -name ejabberd
-

    • -

    2.5  Create a XMPP Account for Administration

    You need a XMPP account and grant him administrative privileges +

    +

    2.5  Create an XMPP Account for Administration

    You need an XMPP account and grant him administrative privileges to enter the ejabberd Web Admin:

    1. -Register a XMPP account on your ejabberd server, for example admin1@example.org. -There are two ways to register a XMPP account: +Register an XMPP account on your ejabberd server, for example admin1@example.org. +There are two ways to register an XMPP account:
      1. Using ejabberdctl (see section 4.1): 
        ejabberdctl register admin1 example.org FgT5bk3
-
      2. Using a XMPP client and In-Band Registration (see section 3.3.19). +
      3. Using an XMPP client and In-Band Registration (see section 3.3.19).
    2. Edit the ejabberd configuration file to give administration rights to the XMPP account you created: 
      {acl, admin, {user, "admin1", "example.org"}}.
@@ -695,7 +695,7 @@ Handles STUN Binding requests as defined in
  Options: certfile
 
      ejabberd_http
      
 Handles incoming HTTP connections.
      
- Options: captcha, certfile, http_bind, http_poll,
+ Options: captcha, certfile, default_host, http_bind, http_poll,
 request_handlers, tls, trusted_proxies, web_admin
      
 
        
      
 
      Options
        
      This is a detailed description of each option allowed by the listening modules:
@@ -712,6 +712,11 @@ immediately). Default value is 5.
 Simple web page that allows a user to fill a CAPTCHA challenge (see section 3.1.8).
 
      {certfile, Path}
       Full path to a file containing the default SSL certificate.
 To define a certificate file specific for a given domain, use the global option domain_certfile.
+
      {default_host, undefined|HostName}
      
+If the HTTP request received by ejabberd contains the HTTP header Host
+with an ambiguous virtual host that doesn’t match any one defined in ejabberd (see 3.1.1),
+then this configured HostName is set as the request Host.
+The default value of this option is: undefined.
 
      {hosts, [Hostname, ...], [HostOption, ...]}
       
 The external Jabber component that connects to this ejabberd_service
 can serve one or more hostnames.
@@ -1059,7 +1064,11 @@ The possible values match exactly the three possibilities described in
 XMPP Core: section 7.7.2.2.
 The default value is closeold.
 If the client uses old Jabber Non-SASL authentication (XEP-0078),
-then this option is not respected, and the action performed is closeold.
        
      
+then this option is not respected, and the action performed is closeold.
      The option fqdn allows you to define the Fully Qualified Domain Name
+of the machine, in case it isn’t detected automatically.
+The FQDN is used to authenticate some clients that use the DIGEST-MD5 SASL mechanism.
+The option syntax is:
+
      {fqdn, undefined|FqdnString}.
        
      
 
      Internal
        
 
      ejabberd uses its internal Mnesia database as the default authentication method.
 The value internal will enable the internal authentication method.
      The option {auth_password_format, plain|scram}
@@ -1340,7 +1349,7 @@ using ImageMagick’s Convert program.
      The configurable options are:
 
      
 {captcha_cmd, Path}
       
 Full path to a script that generates the image.
-The default value is an empty string: ""
+The default value disables the feature: undefined
 
      {captcha_host, ProtocolHostPort}
       
 ProtocolHostPort is a string with the host, and optionally the Protocol and Port number.
 It must identify where ejabberd listens for CAPTCHA requests.
@@ -1950,7 +1959,10 @@ all entries end with a comma:
 
+
+
+
@@ -1958,10 +1970,12 @@ all entries end with a comma:
 
+
-
+
+
@@ -1980,6 +1994,8 @@ all entries end with a comma:
 
+
+
@@ -1989,6 +2005,7 @@ all entries end with a comma:
 
+
      ModuleFeatureDependencies
      
 
      mod_adhocAd-Hoc Commands (XEP-0050) 
      
 
      mod_announceManage announcementsrecommends mod_adhoc
      mod_announce_odbcManage announcementsrecommends mod_adhoc
        supported DB (*)
      
 
      mod_blockingSimple Communications Blocking (XEP-0191)mod_privacy
      mod_blocking_odbcSimple Communications Blocking (XEP-0191)mod_privacy_odbc
      
 
      mod_capsEntity Capabilities (XEP-0115) 
      
 
      mod_configureServer configuration using Ad-Hocmod_adhoc
      
 
      mod_discoService Discovery (XEP-0030) 
      mod_http_bindXMPP over Bosh service (HTTP Binding) 
      
 
      mod_http_fileserverSmall HTTP file server 
      
 
      mod_ircIRC transport 
      mod_irc_odbcIRC transportsupported DB (*)
      
 
      mod_lastLast Activity (XEP-0012) 
      
 
      mod_last_odbcLast Activity (XEP-0012)supported DB (*)
      
 
      mod_mucMulti-User Chat (XEP-0045) 
      mod_muc_logMulti-User Chat room loggingmod_muc
      mod_muc_odbcMulti-User Chat (XEP-0045)supported DB (*)
      mod_muc_logMulti-User Chat room loggingmod_muc or mod_muc_odbc
      
 
      mod_offlineOffline message storage (XEP-0160) 
      
 
      mod_offline_odbcOffline message storage (XEP-0160)supported DB (*)
      
 
      mod_pingXMPP Ping and periodic keepalives (XEP-0199) 
      mod_service_logCopy user messages to logger service 
      
 
      mod_shared_rosterShared roster managementmod_roster or
      
 
        mod_roster_odbc
      mod_shared_roster_odbcShared roster managementsupported DB (*) and
        mod_roster or mod_roster_odbc
      
 
      mod_shared_roster_ldapLDAP Shared roster managementmod_roster or
      
 
        mod_roster_odbc
      
 
      mod_sicServer IP Check (XEP-0279) 
      mod_vcard_ldapvcard-temp (XEP-0054)LDAP server
      
 
      mod_vcard_odbcvcard-temp (XEP-0054)supported DB (*)
      
 
      mod_vcard_xupdatevCard-Based Avatars (XEP-0153)mod_vcard or mod_vcard_odbc
      mod_vcard_xupdate_odbcvCard-Based Avatars (XEP-0153)mod_vcard or mod_vcard_odbc
      
 
      mod_versionSoftware Version (XEP-0092) 
    • @@ -2010,10 +2027,16 @@ Last connection date and time: Use mod_last_odbc instead of
    • Offline messages: Use mod_offline_odbc instead of mod_offline.
    • Rosters: Use mod_roster_odbc instead of mod_roster. +
    • Shared Rosters: Use mod_shared_roster_odbc instead of mod_shared_roster.
    • Users’ VCARD: Use mod_vcard_odbc instead of mod_vcard. +
    • vCard-Based Avatars: Use mod_vcard_xupdate_odbc instead of mod_vcard_xupdate.
    • Private XML storage: Use mod_private_odbc instead of mod_private.
    • User rules for blocking communications: Use mod_privacy_odbc instead of mod_privacy. +
    • Simple Communications Blocking: Use mod_blocking_odbc instead of mod_blocking.
    • Pub-Sub nodes, items and subscriptions: Use mod_pubsub_odbc instead of mod_pubsub. +
    • Multi-user chats: Use mod_muc_odbc instead of mod_muc. +
    • Manage announcements: Use mod_announce_odbc instead of mod_announce. +
    • IRC transport: Use mod_irc_odbc instead of mod_irc.

    You can find more contributed modules on the ejabberd website. Please remember that these contributions might not work or @@ -2526,7 +2549,7 @@ discarded. A good value for this option is 4 seconds.

    {default_room_options, [ {OptionName, OptionValue}, ...]}
    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 XMPP client with MUC capability. +at any time using an XMPP client with MUC capability. The available room options and the default values are:
    {allow_change_subj, true|false}
    Allow occupants to change the subject. @@ -3189,7 +3212,7 @@ Enabling this option reduces the load for both ejabberd and the database. This option does not affect the client in any way. This option is only useful if Roster Versioning is enabled. This option is disabled by default. -Important: if you use mod_shared_roster or mod_shared_roster_ldap, +Important: if you use mod_shared_roster, mod_shared_roster_odbc or mod_shared_roster_ldap, you must disable this option.

    This example configuration enables Roster Versioning with storage of current id: 

    {modules,
@@ -4146,7 +4169,7 @@ the environment variable EJABBERD_DOC_PATH.
 See section 4.1.2.
      
    
 
    4.4  Ad-hoc Commands
      
    If you enable mod_configure and mod_adhoc,
 you can perform several administrative tasks in ejabberd
-with a XMPP client.
+with an XMPP client.
 The client must support Ad-Hoc Commands (XEP-0050),
 and you must login in the XMPP server with
 an account with proper privileges.
      
    
@@ -4467,6 +4490,7 @@ Alexey Shchepin (xmpp:aleksey@jabber.ru
  • Badlop (xmpp:badlop@jabberes.org)
 
  • Evgeniy Khramtsov (xmpp:xram@jabber.ru)
 
  • Florian Zumbiehl (xmpp:florz@florz.de)
+
  • Ludovic Bocquet (xmpp:lbocquet@jabber.org)
 
  • Marcin Owsiany (xmpp:marcin.owsiany@gmail.com)
 
  • Michael Grigutsch (xmpp:migri@jabber.i-pobox.net)
 
  • Mickael Remond (xmpp:mremond@process-one.net)
diff --git a/doc/version.tex b/doc/version.tex
index 905ac86f2..f39b1406c 100644
--- a/doc/version.tex
+++ b/doc/version.tex
@@ -1,2 +1,2 @@
 % ejabberd version (automatically generated).
-\newcommand{\version}{2.1.x}
+\newcommand{\version}{2.1.11}
diff --git a/src/ejabberd.app b/src/ejabberd.app
index 3fb342fe8..2f08601a8 100644
--- a/src/ejabberd.app
+++ b/src/ejabberd.app
@@ -2,7 +2,7 @@
 
 {application, ejabberd,
  [{description, "ejabberd"},
-  {vsn, "2.1.x"},
+  {vsn, "2.1.11"},
   {modules, [acl,
 	     adhoc,
 	     configure,