diff options
| author | Badlop <badlop@process-one.net> | 2011-03-11 10:55:34 +0100 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2011-03-11 10:55:34 +0100 |
| commit | 8cd0894ad5df6ecb34255b5ea184920570b03d46 (patch) | |
| tree | 8019585b537e3c3776ce98c30f9b234f48ef56b2 /doc | |
| parent | Document that ODBC tables are created by ejabberd itself (EJAB-1421) (diff) | |
Update version numbers of the related: exmpp, ejabberd 2, and Erlangv3.0.0-alpha-2
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/guide.tex | 2 | ||||
| -rw-r--r-- | doc/release_notes_3.0.0.txt | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/doc/guide.tex b/doc/guide.tex index 58f11f76a..ef8cac13b 100644 --- a/doc/guide.tex +++ b/doc/guide.tex @@ -312,7 +312,7 @@ To compile \ejabberd{} on a `Unix-like' operating system, you need: \begin{itemize} \item GNU Make \item GCC -\item Erlang/OTP R12B-5 or higher. The recommended versions are R12B-5 and R13B04. +\item Erlang/OTP R12B-5 or higher. The recommended versions are R12B-5, R13B04 and R14B01. Don't use R14A or R14B because \footahref{http://www.erlang.org/cgi-bin/ezmlm-cgi/4/54598}{they have a bug}. \item exmpp 0.9.6 or higher \item OpenSSL 0.9.8 or higher, for STARTTLS, SASL and SSL encryption. diff --git a/doc/release_notes_3.0.0.txt b/doc/release_notes_3.0.0.txt index e33cfcbe0..644efb1bc 100644 --- a/doc/release_notes_3.0.0.txt +++ b/doc/release_notes_3.0.0.txt @@ -9,7 +9,7 @@ * The database schema may change before ejabberd 3.0.0 is released, * and no migration code will be developed for this preliminary schema. * The only supported migrations are -* from any ejabberd 0.9.0 ... 2.1.5 to the final 3.0.0. +* from any ejabberd 0.9.0 ... 2.1.x to the final 3.0.0. * Don't use this preliminary ejabberd release for a production server. * You can test this release with a blank database or with a copy of your * production database, but don't let your users connect to this copy @@ -45,15 +45,15 @@ ejabberd 3.0.0 includes three major changes: but it is still incomplete, untested and undocumented. -This is a more detailed list of changes since ejabberd 2.1.5: +This is a more detailed list of changes since ejabberd 2.1.x releases: * Requirements - Erlang/OTP R12B-5 or higher is required -- exmpp 0.9.5 or higher is required, not optional +- exmpp 0.9.6 or higher is required, not optional - ESASL library is optional, for SASL GSSAPI authentication - Libexpat not required by ejabberd, it uses exmpp now (EJAB-1111) - GNU Iconv not required, because mod_irc isn't included anymore (EJAB-954) -- Only database migration from ejabberd 0.9.0 up to 2.1.5 is supported +- Only database migration from ejabberd 0.9.0 up to 2.1.x is supported - ejabberd modules developed for previous releases need to be upgraded to exmpp * Configuration |