Explain that the example captcha.sh requires Bash because uses RANDOM feature.

SVN Revision: 2745

diff --git a/doc/guide.html b/doc/guide.html
index fdd0414ab1623f3682946f8fe78108ebc03ae29a..7bd7457e7d78483986ee986d926c35fa14440159 100644 (file)
--- a/doc/guide.html
+++ b/doc/guide.html
@@ -351,7 +351,7 @@ GNU Make
 </LI><LI CLASS="li-itemize">Erlang pgsql library. Optional. For PostgreSQL authentication or storage. See section <A HREF="#compilepgsql">3.2.3</A>.
 </LI><LI CLASS="li-itemize">PAM library. Optional. For Pluggable Authentication Modules (PAM). See section <A HREF="#pam">3.1.4</A>.
 </LI><LI CLASS="li-itemize">GNU Iconv 1.8 or higher, for the IRC Transport (mod_irc). Optional. Not needed on systems with GNU Libc. See section <A HREF="#modirc">3.3.8</A>.
-</LI><LI CLASS="li-itemize">ImageMagick&#X2019;s Convert program. Optional. For CAPTCHA challenges. See section <A HREF="#captcha">3.1.8</A>.
+</LI><LI CLASS="li-itemize">ImageMagick&#X2019;s Convert program, and Bash. Optional. For CAPTCHA challenges. See section <A HREF="#captcha">3.1.8</A>.
 </LI><LI CLASS="li-itemize">exmpp 0.9.1 or higher. Optional. For import/export user data with <A HREF="http://xmpp.org/extensions/xep-0227.html">XEP-0227</A> XML files.
 </LI></UL><P> <A NAME="download"></A> </P><!--TOC subsection Download Source Code-->
 <H3 CLASS="subsection"><!--SEC ANCHOR --><A NAME="htoc10">2.4.2</A>&#XA0;&#XA0;<A HREF="#download">Download Source Code</A></H3><!--SEC END --><P> <A NAME="download"></A> 
@@ -1243,7 +1243,7 @@ In order to take effect there must be a translation file
 <H3 CLASS="subsection"><!--SEC ANCHOR --><A NAME="htoc29">3.1.8</A>&#XA0;&#XA0;<A HREF="#captcha">CAPTCHA</A></H3><!--SEC END --><P> <A NAME="captcha"></A> 
 </P><P>Some <TT>ejabberd</TT> modules can be configured to require a CAPTCHA challenge on certain actions.
 If the client does not support CAPTCHA Forms (<A HREF="http://xmpp.org/extensions/xep-0158.html">XEP-0158</A>),
-a web link is provided so the user can fill the challenge in a web browser.</P><P>An example script is provided that generates the image
+a web link is provided so the user can fill the challenge in a web browser.</P><P>An example Bash script is provided that generates the image
 using ImageMagick&#X2019;s Convert program.</P><P>The configurable options are:
 </P><DL CLASS="description"><DT CLASS="dt-description">
 <B><TT>{captcha_cmd, Path}</TT></B></DT><DD CLASS="dd-description"> 

diff --git a/doc/guide.tex b/doc/guide.tex
index f4d5d0843da78f6e196b4b3960106781193b1369..6a967ae2c4e2e064d699677f01ddd030b0aff939 100644 (file)
--- a/doc/guide.tex
+++ b/doc/guide.tex
@@ -315,7 +315,7 @@ To compile \ejabberd{} on a `Unix-like' operating system, you need:
 \item Erlang pgsql library. Optional. For PostgreSQL authentication or storage. See section \ref{compilepgsql}.
 \item PAM library. Optional. For Pluggable Authentication Modules (PAM). See section \ref{pam}.
 \item GNU Iconv 1.8 or higher, for the IRC Transport (mod\_irc). Optional. Not needed on systems with GNU Libc. See section \ref{modirc}.
-\item ImageMagick's Convert program. Optional. For CAPTCHA challenges. See section \ref{captcha}.
+\item ImageMagick's Convert program, and Bash. Optional. For CAPTCHA challenges. See section \ref{captcha}.
 \item exmpp 0.9.1 or higher. Optional. For import/export user data with \xepref{0227} XML files.
 \end{itemize}
 
@@ -1546,7 +1546,7 @@ Some \ejabberd{} modules can be configured to require a CAPTCHA challenge on cer
 If the client does not support CAPTCHA Forms (\xepref{0158}),
 a web link is provided so the user can fill the challenge in a web browser.
 
-An example script is provided that generates the image
+An example Bash script is provided that generates the image
 using ImageMagick's Convert program.
 
 The configurable options are:

diff --git a/tools/captcha.sh b/tools/captcha.sh
index 4d405673a9c72fbc9dbf4bef904ed9686aea08d1..d68edfa03b3fa098454c3ca4213106014d61f812 100755 (executable)
--- a/tools/captcha.sh
+++ b/tools/captcha.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 INPUT=$1