Skip to content

Commit

Permalink
Go back to the 2.1.x branch name
Browse files Browse the repository at this point in the history
  • Loading branch information
badlop committed Aug 5, 2010
1 parent 4ed00c3 commit 071c0a1
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 17 deletions.
4 changes: 2 additions & 2 deletions doc/dev.html
Expand Up @@ -2,7 +2,7 @@
"http://www.w3.org/TR/REC-html40/loose.dtd">
<HTML>
<HEAD>
<TITLE>Ejabberd 2.1.5 Developers Guide
<TITLE>Ejabberd 2.1.x Developers Guide
</TITLE>

<META http-equiv="Content-Type" content="text/html; charset=US-ASCII">
Expand Down Expand Up @@ -49,7 +49,7 @@
<!--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.5 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">
Expand Down
4 changes: 2 additions & 2 deletions doc/features.html
Expand Up @@ -2,7 +2,7 @@
"http://www.w3.org/TR/REC-html40/loose.dtd">
<HTML>
<HEAD>
<TITLE>Ejabberd 2.1.5 Feature Sheet
<TITLE>Ejabberd 2.1.x Feature Sheet
</TITLE>

<META http-equiv="Content-Type" content="text/html; charset=US-ASCII">
Expand Down Expand Up @@ -50,7 +50,7 @@
<!--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.5 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">
Expand Down
4 changes: 2 additions & 2 deletions doc/guide.html
Expand Up @@ -6,7 +6,7 @@



ejabberd 2.1.5
ejabberd 2.1.x

Installation and Operation Guide

Expand Down Expand Up @@ -76,7 +76,7 @@
<HR SIZE=2><BR>
<BR>

<TABLE CELLSPACING=6 CELLPADDING=0><TR><TD ALIGN=right NOWRAP> <FONT SIZE=6><B>ejabberd 2.1.5 </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>
Expand Down
2 changes: 1 addition & 1 deletion doc/version.tex
@@ -1,2 +1,2 @@
% ejabberd version (automatically generated).
\newcommand{\version}{2.1.5}
\newcommand{\version}{2.1.x}
18 changes: 9 additions & 9 deletions src/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.65 for ejabberd 2.1.5.
# Generated by GNU Autoconf 2.65 for ejabberd 2.1.x.
#
# Report bugs to <ejabberd@process-one.net>.
#
Expand Down Expand Up @@ -552,8 +552,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='ejabberd'
PACKAGE_TARNAME='ejabberd'
PACKAGE_VERSION='2.1.5'
PACKAGE_STRING='ejabberd 2.1.5'
PACKAGE_VERSION='2.1.x'
PACKAGE_STRING='ejabberd 2.1.x'
PACKAGE_BUGREPORT='ejabberd@process-one.net'
PACKAGE_URL=''

Expand Down Expand Up @@ -1278,7 +1278,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures ejabberd 2.1.5 to adapt to many kinds of systems.
\`configure' configures ejabberd 2.1.x to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
Expand Down Expand Up @@ -1344,7 +1344,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of ejabberd 2.1.5:";;
short | recursive ) echo "Configuration of ejabberd 2.1.x:";;
esac
cat <<\_ACEOF
Expand Down Expand Up @@ -1469,7 +1469,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
ejabberd configure 2.1.5
ejabberd configure 2.1.x
generated by GNU Autoconf 2.65
Copyright (C) 2009 Free Software Foundation, Inc.
Expand Down Expand Up @@ -1815,7 +1815,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by ejabberd $as_me 2.1.5, which was
It was created by ejabberd $as_me 2.1.x, which was
generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
Expand Down Expand Up @@ -5654,7 +5654,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by ejabberd $as_me 2.1.5, which was
This file was extended by ejabberd $as_me 2.1.x, which was
generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -5707,7 +5707,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
ejabberd config.status 2.1.5
ejabberd config.status 2.1.x
configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"
Expand Down
2 changes: 1 addition & 1 deletion src/ejabberd.app
Expand Up @@ -2,7 +2,7 @@

{application, ejabberd,
[{description, "ejabberd"},
{vsn, "2.1.5"},
{vsn, "2.1.x"},
{modules, [acl,
adhoc,
configure,
Expand Down

0 comments on commit 071c0a1

Please sign in to comment.