* doc/guide.tex: Document how to insert a newline character in

welcome_message (EJAB-501)
* src/ejabberd.cfg.example: Likewise

SVN Revision: 1437

diff --git a/ChangeLog b/ChangeLog
index 2177e9afe0604dfe355a02ddbad4dd6a661a16ed..7d3a2e5bd70f4f8da0e2d712a001539be5e0835e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-11  Badlop  <badlop@process-one.net>
+
+       * doc/guide.tex: Document how to insert a newline character in
+       welcome_message (EJAB-501)
+       * src/ejabberd.cfg.example: Likewise
+
 2008-07-11  Christophe Romain  <christophe.romain@process-one.net>
 
        * src/ejabberd_c2s.erl: Backport C2S blacklist support from trunk

diff --git a/doc/guide.tex b/doc/guide.tex
index e2d72658a2ff60270231e8bb75d06c915cf03e11..eb22fc15d67645cd0ef9b24ea91902e4e3dd2276 100644 (file)
--- a/doc/guide.tex
+++ b/doc/guide.tex
@@ -2883,6 +2883,7 @@ Options:
 \titem{welcome\_message} \ind{options!welcomem}Set a welcome message that
   is sent to each newly registered account. The first string is the subject, and 
   the second string is the message body.
+  In the body you can set a newline with the characters: \verb|\n|
 \titem{registration\_watchers} \ind{options!rwatchers}This option defines a 
   list of JIDs which will be notified each time a new account is registered.
 \iqdiscitem{In-Band Registration (\ns{jabber:iq:register})}
@@ -2941,7 +2942,7 @@ Also define a registration timeout of one hour:
   ...
   {mod_register,
    [
-    {welcome_message, {"Welcome!", "Welcome to this Jabber server. Check http://www.jabber.org"}},
+    {welcome_message, {"Welcome!", "Hi.\nWelcome to this Jabber server.\n Check http://www.jabber.org\n\nBye"}},
     {registration_watchers, ["admin1@example.org", "boss@example.net"]}
    ]},
   ...

diff --git a/src/ejabberd.cfg.example b/src/ejabberd.cfg.example
index e1d63ed9ea5a716f420a10fa32e6cfe5238adba3..e86f9cb3f09ac0856d8a7fe8e345eec7a8be3caa 100644 (file)
--- a/src/ejabberd.cfg.example
+++ b/src/ejabberd.cfg.example
@@ -459,7 +459,7 @@
                  %% a message with this subject and body.
                  %%
                  {welcome_message, {"Welcome!", 
-                                    "Welcome to this Jabber server."}},
+                                    "Hi\nWelcome to this Jabber server."}},
 
                  %%
                  %% When a user registers, send a notification to