From cdcc3a2520832aa1ec12f612fb4e76158200e4cb Mon Sep 17 00:00:00 2001 From: Badlop Date: Fri, 11 Jul 2008 13:47:15 +0000 Subject: [PATCH] * doc/guide.tex: Document how to insert a newline character in welcome_message (EJAB-501) * src/ejabberd.cfg.example: Likewise SVN Revision: 1437 --- ChangeLog | 6 ++++++ doc/guide.tex | 3 ++- src/ejabberd.cfg.example | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2177e9afe..7d3a2e5bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-07-11 Badlop + + * 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 * src/ejabberd_c2s.erl: Backport C2S blacklist support from trunk diff --git a/doc/guide.tex b/doc/guide.tex index e2d72658a..eb22fc15d 100644 --- 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 e1d63ed9e..e86f9cb3f 100644 --- 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