From 13fcbd6413a830f99c0ac667aa84081effe7f5ec Mon Sep 17 00:00:00 2001
From: Badlop <badlop@process-one.net>
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         | 7 +++++--
 doc/guide.html | 2 +-
 doc/guide.tex  | 2 +-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 250dc4fd5..d7c9d8eb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2009-04-14  Badlop  <badlop@process-one.net>
 
+	* 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..09a4ef40f 100644
--- a/README
+++ b/README
@@ -8,12 +8,15 @@ 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 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..4723b9f0e 100644
--- a/doc/guide.html
+++ b/doc/guide.html
@@ -330,7 +330,7 @@ as long as your system have all the dependencies.</P><P> <A NAME="installreq"></
 GNU Make
 </LI><LI CLASS="li-itemize">GCC
 </LI><LI CLASS="li-itemize">Libexpat 1.95 or higher
-</LI><LI CLASS="li-itemize">Erlang/OTP R10B-9 or higher.
+</LI><LI CLASS="li-itemize">Erlang/OTP R12B-5. R13 is not supported yet.
 </LI><LI CLASS="li-itemize">OpenSSL 0.9.6 or higher, for STARTTLS, SASL and SSL encryption. Optional, highly recommended.
 </LI><LI CLASS="li-itemize">Zlib 1.2.3 or higher, for Stream Compression support (<A HREF="http://www.xmpp.org/extensions/xep-0138.html">XEP-0138</A>). Optional.
 </LI><LI CLASS="li-itemize">Erlang mysql library. Optional. For MySQL authentication or storage. See section <A HREF="#compilemysql">3.2.1</A>.
diff --git a/doc/guide.tex b/doc/guide.tex
index 1c3df924e..31481c1ef 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 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}.