From a6e8e10a3d6ea25382b40001a33c0bf2c28cacc9 Mon Sep 17 00:00:00 2001 From: Badlop Date: Wed, 17 Jun 2009 09:06:57 +0000 Subject: [PATCH] Erlang/OTP R13B can be used, but its support is still experimental. SVN Revision: 2327 --- README | 2 +- doc/guide.html | 6 +++--- doc/guide.tex | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README b/README index ac5986191..c76f3188a 100644 --- a/README +++ b/README @@ -9,7 +9,7 @@ To compile ejabberd you need: - GNU Make - GCC - Libexpat 1.95 or higher - - Erlang/OTP R12B-5. R13 is not supported yet. + - Erlang/OTP R12B-5. Support for R13 or higher is experimental. - 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 diff --git a/doc/guide.html b/doc/guide.html index f33925a41..0589a6e83 100644 --- a/doc/guide.html +++ b/doc/guide.html @@ -336,7 +336,7 @@ as long as your system have all the dependencies.

  • GCC
  • Libexpat 1.95 or higher -
  • Erlang/OTP R12B-5. R13 is not supported yet. +
  • Erlang/OTP R12B-5. Support for R13 or higher is experimental.
  • 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. @@ -457,14 +457,14 @@ for example:

    Requirements

    To compile ejabberd on a Microsoft Windows system, you need:

    Compilation

    We assume that we will try to put as much library as possible into C:\sdk\ to make it easier to track what is install for ejabberd.

    1. -Install Erlang emulator (for example, into C:\sdk\erl5.5.5). +Install Erlang emulator (for example, into C:\sdk\erl5.6.5).
    2. Install Expat library into C:\sdk\Expat-2.0.0 directory.

      Copy file C:\sdk\Expat-2.0.0\Libs\libexpat.dll to your Windows system directory (for example, C:\WINNT or diff --git a/doc/guide.tex b/doc/guide.tex index 7b0b46c47..ee2c5909d 100644 --- a/doc/guide.tex +++ b/doc/guide.tex @@ -300,7 +300,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 R12B-5. R13 is not supported yet. +\item Erlang/OTP R12B-5. Support for R13 or higher is experimental. \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}. @@ -485,7 +485,7 @@ gmake -f Makefile.gi ginstall To compile \ejabberd{} on a Microsoft Windows system, you need: \begin{itemize} \item MS Visual C++ 6.0 Compiler -\item \footahref{http://www.erlang.org/download.html}{Erlang/OTP R11B-5} +\item \footahref{http://www.erlang.org/download.html}{Erlang/OTP R12B-5}. Support for R13 or higher is experimental. \item \footahref{http://sourceforge.net/project/showfiles.php?group\_id=10127\&package\_id=11277}{Expat 2.0.0 or higher} \item \footahref{http://www.slproweb.com/products/Win32OpenSSL.html}{Shining Light OpenSSL 0.9.8d or higher} (to enable SSL connections) @@ -498,7 +498,7 @@ To compile \ejabberd{} on a Microsoft Windows system, you need: We assume that we will try to put as much library as possible into \verb|C:\sdk\| to make it easier to track what is install for \ejabberd{}. \begin{enumerate} -\item Install Erlang emulator (for example, into \verb|C:\sdk\erl5.5.5|). +\item Install Erlang emulator (for example, into \verb|C:\sdk\erl5.6.5|). \item Install Expat library into \verb|C:\sdk\Expat-2.0.0| directory.