]> granicus.if.org Git - ejabberd/commitdiff
projects / ejabberd / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 88b6849)
This is ejabberd 2.1.x branch, not 2.1.0 tag.
authorBadlop <badlop@process-one.net>
Wed, 9 Dec 2009 10:09:35 +0000 (10:09 +0000)
committerBadlop <badlop@process-one.net>
Wed, 9 Dec 2009 10:09:35 +0000 (10:09 +0000)
SVN Revision: 2796

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 78b7cb092a4e4ddecbbba4ea4080381f9235cc05..c6c10b9472f52ea6149543d4cc54ecbfde3ae2bf 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.0 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.0 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 36f8087d43b667ed78245116e1770089c14f89ed..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.0 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.0 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 1a56ae7a4a75af32c0ff43338a4ae69703fdae06..9c34149576ecf9fdc725fe1cfc904c44c1df99fa 100644 (file)
--- 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;}
 <HR SIZE=2><BR>
 <BR>
 
-<TABLE CELLSPACING=6 CELLPADDING=0><TR><TD ALIGN=right NOWRAP> <FONT SIZE=6><B>ejabberd 2.1.0 </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>
@@ -3823,7 +3823,7 @@ serving this connection, otherwise a new connection is opened.</P><P> <A NAME="c
 and you need to setup another one to make an <TT>ejabberd</TT> cluster. Then do
 following steps:</P><OL CLASS="enumerate" type=1><LI CLASS="li-enumerate">
 Copy <CODE>~ejabberd/.erlang.cookie</CODE> file from <TT>first</TT> to
-<TT>second</TT>.<P>(alt) You can also add &#X2018;<CODE>-cookie content_of_.erlang.cookie</CODE>&#X2019;
+<TT>second</TT>.<P>(alt) You can also add &#X2018;<CODE>-setcookie content_of_.erlang.cookie</CODE>&#X2019;
 option to all &#X2018;<TT>erl</TT>&#X2019; commands below.</P></LI><LI CLASS="li-enumerate">On <TT>second</TT> run the following command as the <TT>ejabberd</TT> daemon user,
 in the working directory of <TT>ejabberd</TT>:<PRE CLASS="verbatim">erl -sname ejabberd \
     -mnesia dir "/var/lib/ejabberd/" \
diff --git a/doc/version.tex b/doc/version.tex
index 6ef8b9e677cfaee3f2fce9df641afbb70e3d1186..905ac86f23de79b131f11b31f2d0aae71f38305a 100644 (file)
--- 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 9d944c06743fdc18162efc9a0829c1d20a260426..e347daf3bbb8bc90f7490ba92f823d87b2d5b8f4 100644 (file)
--- 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,
Unnamed repository; edit this file 'description' to name the repository.