From 3250c24ff15e8477c3b12a0523338ca6f2c92570 Mon Sep 17 00:00:00 2001 From: Badlop Date: Wed, 9 Dec 2009 10:09:35 +0000 Subject: [PATCH] This is ejabberd 2.1.x branch, not 2.1.0 tag. SVN Revision: 2796 --- doc/dev.html | 4 ++-- doc/features.html | 4 ++-- doc/guide.html | 6 +++--- doc/version.tex | 2 +- src/ejabberd.app | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/doc/dev.html b/doc/dev.html index 78b7cb092..c6c10b947 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.0 Developers Guide +<TITLE>Ejabberd 2.1.x Developers Guide @@ -49,7 +49,7 @@ TD P{margin:0px;}

-

Ejabberd 2.1.0 Developers Guide

Alexey Shchepin
+

Ejabberd 2.1.x Developers Guide

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

diff --git a/doc/features.html b/doc/features.html index 36f8087d4..503ac0d3f 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.0 Feature Sheet +<TITLE>Ejabberd 2.1.x Feature Sheet @@ -50,7 +50,7 @@ SPAN{width:20%; float:right; text-align:left; margin-left:auto;}

-

Ejabberd 2.1.0 Feature Sheet

Sander Devrieze
+

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


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

@@ -3823,7 +3823,7 @@ serving this connection, otherwise a new connection is opened.

  • Copy ~ejabberd/.erlang.cookie file from first to -second.

    (alt) You can also add ‘-cookie content_of_.erlang.cookie’ +second.

    (alt) You can also add ‘-setcookie content_of_.erlang.cookie’ option to all ‘erl’ commands below.

  • On second run the following command as the ejabberd daemon user, in the working directory of ejabberd:
    erl -sname ejabberd \
     -mnesia dir "/var/lib/ejabberd/" \
diff --git a/doc/version.tex b/doc/version.tex
index 6ef8b9e67..905ac86f2 100644
--- a/doc/version.tex
+++ b/doc/version.tex
@@ -1,2 +1,2 @@
 % ejabberd version (automatically generated).
-\newcommand{\version}{2.1.0}
+\newcommand{\version}{2.1.x}
diff --git a/src/ejabberd.app b/src/ejabberd.app
index 9d944c067..e347daf3b 100644
--- a/src/ejabberd.app
+++ b/src/ejabberd.app
@@ -2,7 +2,7 @@
 
 {application, ejabberd,
  [{description, "ejabberd"},
-  {vsn, "2.1.0"},
+  {vsn, "2.1.x"},
   {modules, [acl,
 	     adhoc,
 	     configure,