From f954d6829b715ca060ba3ced406babcdd972123a Mon Sep 17 00:00:00 2001
From: Badlop
Date: Tue, 14 Apr 2009 18:31:29 +0000
Subject: [PATCH] * doc/guide.tex: Explain that the recommended Erlang/OTP
version is R12B-5, and R13 is not supported yet. * doc/guide.html: Likewise *
README: Likewise
SVN Revision: 2021
---
ChangeLog | 5 +++++
README | 8 ++++++--
doc/guide.html | 2 +-
doc/guide.tex | 2 +-
4 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 020ddbd71..4d4117410 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2009-04-14 Badlop
+ * doc/guide.tex: Explain that the recommended Erlang/OTP version
+ is R12B-5, and R13 is not supported yet.
+ * doc/guide.html: Likewise
+ * README: Likewise
+
* src/mod_muc/mod_muc_log.erl: Linkify also xmpp:..., as it was
done previously (thanks to Konstantin Khomoutov)(EJAB-850)
diff --git a/README b/README
index bbc9511ab..e6b235452 100644
--- a/README
+++ b/README
@@ -8,12 +8,16 @@ Quickstart guide
To compile ejabberd you need:
- GNU Make
- GCC
- - libexpat 1.95 or higher
- - Erlang/OTP R10B-9 or higher
+ - Libexpat 1.95 or higher
+ - Erlang/OTP R10B-9 or higher. The recommended version is R12B-5.
+ R13 is not supported yet.
- OpenSSL 0.9.6 or higher, for STARTTLS, SASL and SSL
encryption. Optional, highly recommended.
- Zlib 1.2.3 or higher, for Stream Compression support
(XEP-0138). Optional.
+ - Erlang mysql library. Optional. MySQL authentication/storage.
+ - Erlang pgsql library. Optional. PostgreSQL authentication/storage.
+ - PAM library. Optional. For Pluggable Authentication Modules (PAM).
- GNU Iconv 1.8 or higher, for the IRC Transport
(mod_irc). Optional. Not needed on systems with GNU Libc.
diff --git a/doc/guide.html b/doc/guide.html
index 631ae306d..a51a02a42 100644
--- a/doc/guide.html
+++ b/doc/guide.html
@@ -330,7 +330,7 @@ as long as your system have all the dependencies.
GNU Make
GCC
Libexpat 1.95 or higher
-Erlang/OTP R10B-9 or higher.
+Erlang/OTP R10B-9 or higher. The recommended version is R12B-5. R13 is not supported yet.
OpenSSL 0.9.6 or higher, for STARTTLS, SASL and SSL encryption. Optional, highly recommended.
Zlib 1.2.3 or higher, for Stream Compression support (XEP-0138). Optional.
Erlang mysql library. Optional. For MySQL authentication or storage. See section 3.2.1.
diff --git a/doc/guide.tex b/doc/guide.tex
index 1c3df924e..bae86295a 100644
--- a/doc/guide.tex
+++ b/doc/guide.tex
@@ -298,7 +298,7 @@ To compile \ejabberd{} on a `Unix-like' operating system, you need:
\item GNU Make
\item GCC
\item Libexpat 1.95 or higher
-\item Erlang/OTP R10B-9 or higher.
+\item Erlang/OTP R10B-9 or higher. The recommended version is R12B-5. R13 is not supported yet.
\item OpenSSL 0.9.6 or higher, for STARTTLS, SASL and SSL encryption. Optional, highly recommended.
\item Zlib 1.2.3 or higher, for Stream Compression support (\xepref{0138}). Optional.
\item Erlang mysql library. Optional. For MySQL authentication or storage. See section \ref{compilemysql}.