From 2bf29183f5c1a6424fe24b5f5f8eb03aa761ea7f Mon Sep 17 00:00:00 2001 From: Badlop Date: Mon, 26 Nov 2007 14:52:11 +0000 Subject: * doc/guide.tex: Describe how ejabberd treats ejabberd.cfg file (EJAB-384). SVN Revision: 983 --- ChangeLog | 24 ++++++++++++++++++------ doc/guide.tex | 13 ++++++++++--- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index bc2f7594f..d690fae7d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,16 +1,28 @@ 2007-11-26 Badlop - * src/ejabberd.cfg.example: Huge reorganization and grouping of options (EJAB-392). + * doc/guide.tex: Describe how ejabberd treats ejabberd.cfg file + (EJAB-384). - * doc/guide.tex: Describe in mod_muc: nick register and service admin message (EJAB-400). + * src/ejabberd.cfg.example: Huge reorganization and grouping of + options (EJAB-392). - * src/mod_echo.erl: Example function that demonstrates how to receive XMPP packets using Erlang's message passing mechanism (EJAB-247). + * doc/guide.tex: Describe in mod_muc: nick register and service + admin message (EJAB-400). - * src/ejabberdctl.template: Removed bashisms (EJAB-399). Set environment variables instead of passing parameters when calling erl (EJAB-421). Write erl_crash.dump in the log/ directory, with unique filename (EJAB-433). + * src/mod_echo.erl: Example function that demonstrates how to + receive XMPP packets using Erlang's message passing mechanism + (EJAB-247). - * src/ejabberd_ctl.erl: Improvements in the help messages (EJAB-399). + * src/ejabberdctl.template: Removed bashisms (EJAB-399). Set + environment variables instead of passing parameters when + calling erl (EJAB-421). Write erl_crash.dump in the log/ + directory, with unique filename (EJAB-433). - * doc/guide.tex: Improvements in sections ejabberdctl, and Install from Source (EJAB-399). + * src/ejabberd_ctl.erl: Improvements in the help messages + (EJAB-399). + + * doc/guide.tex: Improvements in sections ejabberdctl, and + Install from Source (EJAB-399). 2007-11-25 Alexey Shchepin diff --git a/doc/guide.tex b/doc/guide.tex index b299bae15..3ef458988 100644 --- a/doc/guide.tex +++ b/doc/guide.tex @@ -458,10 +458,17 @@ Instructions to create an initial administrator account: \ind{configuration file} The configuration file will be loaded the first time you start \ejabberd{}. The -content from this file will be parsed and stored in a database. Subsequently the +content from this file will be parsed and stored in the internal ejabberd database. Subsequently the configuration will be loaded from the database and any commands in the -configuration file are appended to the entries in the database. The -configuration file contains a sequence of Erlang terms. Lines beginning with a +configuration file are appended to the entries in the database. + +Note that ejabberd never edits the configuration file. +So, the configuration changes done using the web interface +are stored in the database, but are not reflected in the configuration file. +If you want those changes to be use after ejabberd restart, you can either +edit the configuration file, or remove all its content. + +The configuration file contains a sequence of Erlang terms. Lines beginning with a \term{`\%'} sign are ignored. Each term is a tuple of which the first element is the name of an option, and any further elements are that option's values. If the configuration file do not contain for instance the `hosts' option, the old -- cgit v1.2.3