]> granicus.if.org Git - ejabberd/commitdiff
projects / ejabberd / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 606c207)
Revert branch name back to 2.1.x
authorBadlop <badlop@process-one.net>
Thu, 16 Dec 2010 12:33:30 +0000 (13:33 +0100)
committerBadlop <badlop@process-one.net>
Mon, 20 Dec 2010 12:10:33 +0000 (13:10 +0100)
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 6709b6a12ed771ba8f53b00cb4beb9d416659397..b7fea526a95bbb3dc411a91e7858129d2d7ccc68 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.6 Developers Guide
+<TITLE>Ejabberd 2.1.x 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.6 Developers Guide</H1><H3 CLASS="titlerest">Alexey Shchepin<BR>
+</P><TABLE CLASS="title"><TR><TD><H1 CLASS="titlemain">Ejabberd 2.1.x 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 8ed0bd76cac23234bd606a0c549fe900915ff2a5..503ac0d3f87f01d4eb007e7613333750d3cfe9d6 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.6 Feature Sheet
+<TITLE>Ejabberd 2.1.x 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.6 Feature Sheet</H1><H3 CLASS="titlerest">Sander Devrieze<BR>
+</P><TABLE CLASS="title"><TR><TD><H1 CLASS="titlemain">Ejabberd 2.1.x 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 b1b30a6d6f65fdb64d24e55fb47237e1a17be8bd..8835f90bae5935d1abc9c5b023adc40a63ef0fda 100644 (file)
--- a/doc/guide.html
+++ b/doc/guide.html
@@ -6,7 +6,7 @@
  
  
 
- ejabberd 2.1.6 
+ ejabberd 2.1.x 
  
  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.6 </B></FONT></TD></TR>
+<TABLE CELLSPACING=6 CELLPADDING=0><TR><TD ALIGN=right NOWRAP> <FONT SIZE=6><B>ejabberd 2.1.x </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>
diff --git a/doc/version.tex b/doc/version.tex
index 10a0da534ea92bb6e7e6ae988438874ffdf78dc7..905ac86f23de79b131f11b31f2d0aae71f38305a 100644 (file)
--- a/doc/version.tex
+++ b/doc/version.tex
@@ -1,2 +1,2 @@
 % ejabberd version (automatically generated).
-\newcommand{\version}{2.1.6}
+\newcommand{\version}{2.1.x}
diff --git a/src/ejabberd.app b/src/ejabberd.app
index c2d282d3163df90b8c5ac44e0c0801f426be3c46..67653d2415212d0b08db05314d5e6128d92f6a08 100644 (file)
--- a/src/ejabberd.app
+++ b/src/ejabberd.app
@@ -2,7 +2,7 @@
 
 {application, ejabberd,
  [{description, "ejabberd"},
-  {vsn, "2.1.6"},
+  {vsn, "2.1.x"},
   {modules, [acl,
             adhoc,
             configure,
Unnamed repository; edit this file 'description' to name the repository.