diff --git a/ChangeLog b/ChangeLog index ecbc4ea15..e0fcac544 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-03-20 Badlop + + * doc/guide.tex: Improve explanation of how to start ejabberd when + binary installer. Don't recommend R12 in Windows compilation. + Describe what happens if maxrate shaper is exceeded. + * doc/guide.html: Likewise + 2008-03-20 Mickael Remond * src/eldap.erl: Improved logging. We now use ejabberd logging diff --git a/doc/guide.html b/doc/guide.html index 5c6dda11c..5acec86be 100644 --- a/doc/guide.html +++ b/doc/guide.html @@ -299,14 +299,17 @@ are available in the Process-one ejabberd downloads page: server and does not require any extra dependencies.

In *nix systems, remember to set executable the binary installer before starting it. For example: 

  chmod +x ejabberd-2.0.0_1-linux-x86-installer.bin
   ./ejabberd-2.0.0_1-linux-x86-installer.bin
-

The installer generates desktop shortcuts to start and stop ejabberd.

The Windows installer also adds ejabberd as a system service, +

ejabberd can be started manually at any time, +or automatically by the operating system at system boot time.

To start and stop ejabberd manually, +use the desktop shortcuts created by the installer. +If the machine doesn’t have a graphical system, use the scripts ’start’ +and ’stop’ in the ’bin’ directory where ejabberd is installed.

The Windows installer also adds ejabberd as a system service, and a shortcut to a debug console for experienced administrators. -You can start ejabberd using the shortcut or the Windows service. -Note that the Windows service is a feature still in development, -and for example it doesn’t keep track of changes made manually in ejabberdctl.cfg. If you want ejabberd to be started automatically at boot time, -go to the Windows service settings and set ejabberd to be automatic started.

On a Linux system, if you want ejabberd to start as daemon at boot time, -copy ejabberd.init from the bin directory to something like /etc/init.d/ejabberd +go to the Windows service settings and set ejabberd to be automatically started. +Note that the Windows service is a feature still in development, +and for example it doesn’t read the file ejabberdctl.cfg.

On a *nix system, if you want ejabberd to be started as daemon at boot time, +copy ejabberd.init from the ’bin’ directory to something like /etc/init.d/ejabberd (depending on your distribution) and call /etc/inid.d/ejabberd start to start it.

The ejabberdctl administration script is included in the bin directory. Please refer to the section 4.1 for details about ejabberdctl, and configurable options to fine tune the Erlang runtime system.

@@ -423,7 +426,7 @@ and configurable options to fine tune the Erlang runtime system.