]> granicus.if.org Git - ejabberd/commitdiff
projects / ejabberd / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 90954cb)
Update ejabberd version number to 2.1.13 v2.1.13
authorBadlop <badlop@process-one.net>
Tue, 25 Jun 2013 08:46:12 +0000 (10:46 +0200)
committerBadlop <badlop@process-one.net>
Tue, 25 Jun 2013 08:46:12 +0000 (10:46 +0200)
doc/dev.html patch | blob | history
doc/features.html patch | blob | history
doc/guide.html patch | blob | history
doc/version.tex patch | blob | history
src/ejabberd.app patch | blob | history

diff --git a/doc/dev.html b/doc/dev.html
index bff534bfb02b4e7cef3d7c87bd5c09eeb38181f0..70f86661221966efd121c6deb269a516912d7a27 100644 (file)
--- a/doc/dev.html
+++ b/doc/dev.html
@@ -2,7 +2,7 @@
             "http://www.w3.org/TR/REC-html40/loose.dtd">
 <HTML>
 <HEAD>
-<TITLE>Ejabberd 2.1.12 Developers Guide
+<TITLE>Ejabberd 2.1.13 Developers Guide
 </TITLE>
 
 <META http-equiv="Content-Type" content="text/html; charset=US-ASCII">
@@ -49,7 +49,7 @@ TD P{margin:0px;}
 <!--HEVEA command line is: /usr/bin/hevea -fix -pedantic dev.tex -->
 <!--CUT DEF section 1 --><P><A NAME="titlepage"></A>
 
-</P><TABLE CLASS="title"><TR><TD><H1 CLASS="titlemain">Ejabberd 2.1.12 Developers Guide</H1><H3 CLASS="titlerest">Alexey Shchepin<BR>
+</P><TABLE CLASS="title"><TR><TD><H1 CLASS="titlemain">Ejabberd 2.1.13 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></TR>
 </TABLE><DIV CLASS="center">
diff --git a/doc/features.html b/doc/features.html
index bd7cb666f2b63edded2006573c1cd9d03d3503e6..7c5fc5b514f6e8f41881ba424c44cd0b78f5b454 100644 (file)
--- a/doc/features.html
+++ b/doc/features.html
@@ -2,7 +2,7 @@
             "http://www.w3.org/TR/REC-html40/loose.dtd">
 <HTML>
 <HEAD>
-<TITLE>Ejabberd 2.1.12 Feature Sheet
+<TITLE>Ejabberd 2.1.13 Feature Sheet
 </TITLE>
 
 <META http-equiv="Content-Type" content="text/html; charset=US-ASCII">
@@ -50,7 +50,7 @@ SPAN{width:20%; float:right; text-align:left; margin-left:auto;}
 <!--HEVEA command line is: /usr/bin/hevea -fix -pedantic features.tex -->
 <!--CUT DEF section 1 --><P><A NAME="titlepage"></A>
 
-</P><TABLE CLASS="title"><TR><TD><H1 CLASS="titlemain">Ejabberd 2.1.12 Feature Sheet</H1><H3 CLASS="titlerest">Sander Devrieze<BR>
+</P><TABLE CLASS="title"><TR><TD><H1 CLASS="titlemain">Ejabberd 2.1.13 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><DIV CLASS="center">
diff --git a/doc/guide.html b/doc/guide.html
index 67d88478e4a8e433b8a99048b21c3903a82777e4..781e2b0e8e371a6972e6a52ed3144cd9147692a9 100644 (file)
--- a/doc/guide.html
+++ b/doc/guide.html
@@ -6,7 +6,7 @@
  
  
 
- ejabberd 2.1.12 
+ ejabberd 2.1.13 
  
  Installation and Operation Guide
  
@@ -76,7 +76,7 @@ BLOCKQUOTE.figure DIV.center DIV.center HR{display:none;}
 <HR SIZE=2><BR>
 <BR>
 
-<TABLE CELLSPACING=6 CELLPADDING=0><TR><TD ALIGN=right NOWRAP> <FONT SIZE=6><B>ejabberd 2.1.12 </B></FONT></TD></TR>
+<TABLE CELLSPACING=6 CELLPADDING=0><TR><TD ALIGN=right NOWRAP> <FONT SIZE=6><B>ejabberd 2.1.13 </B></FONT></TD></TR>
 <TR><TD ALIGN=right NOWRAP>&nbsp;</TD></TR>
 <TR><TD ALIGN=right NOWRAP> <FONT SIZE=6>Installation and Operation Guide</FONT></TD></TR>
 </TABLE><BR>
@@ -688,7 +688,7 @@ Handles incoming s2s connections.<BR>
 Interacts with an <A HREF="http://www.ejabberd.im/tutorials-transports">external component</A>
 (as defined in the Jabber Component Protocol (<A HREF="http://xmpp.org/extensions/xep-0114.html">XEP-0114</A>).<BR>
  Options: <TT>access</TT>, <TT>hosts</TT>, <TT>max_fsm_queue</TT>,
-<TT>service_check_from</TT>, <TT>shaper</TT>
+<TT>service_check_from</TT>, <TT>shaper_rule</TT>
 </DD><DT CLASS="dt-description"><B><TT>ejabberd_stun</TT></B></DT><DD CLASS="dd-description">
 Handles STUN Binding requests as defined in
 <A HREF="http://tools.ietf.org/html/rfc5389">RFC 5389</A>.<BR>
@@ -792,6 +792,9 @@ The default value is <TT>true</TT>, to be compliant with <A HREF="http://xmpp.or
 </DD><DT CLASS="dt-description"><B><TT>{shaper, none|ShaperName}</TT></B></DT><DD CLASS="dd-description"> This option defines a
 shaper for the port (see section&#XA0;<A HREF="#shapers">3.1.6</A>). The default value
 is <TT>none</TT>.
+</DD><DT CLASS="dt-description"><B><TT>{shaper_rule, none|ShaperRule}</TT></B></DT><DD CLASS="dd-description"> This option defines a
+shaper rule for the <TT>ejabberd_service</TT> (see section&#XA0;<A HREF="#shapers">3.1.6</A>). The recommended value
+is <TT>fast</TT>.
 </DD><DT CLASS="dt-description"><B><TT>starttls</TT></B></DT><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.
diff --git a/doc/version.tex b/doc/version.tex
index 924b6afae7b2594f3e7794abbced6ff2c30c1d26..1e0270cefd40f3dfef0253de084a1981eae02e89 100644 (file)
--- a/doc/version.tex
+++ b/doc/version.tex
@@ -1,2 +1,2 @@
 % ejabberd version (automatically generated).
-\newcommand{\version}{2.1.12}
+\newcommand{\version}{2.1.13}
diff --git a/src/ejabberd.app b/src/ejabberd.app
index 720278394975d5965c69f1fbde76b7f12d58bf60..132059782533efd835f791e2dc27ee51ed03e44c 100644 (file)
--- a/src/ejabberd.app
+++ b/src/ejabberd.app
@@ -2,7 +2,7 @@
 
 {application, ejabberd,
  [{description, "ejabberd"},
-  {vsn, "2.1.12"},
+  {vsn, "2.1.13"},
   {modules, [acl,
             adhoc,
             configure,
Unnamed repository; edit this file 'description' to name the repository.