From 5e88123ec937ab48a2c9e1fe7ffeb85c5277cd76 Mon Sep 17 00:00:00 2001 From: Badlop Date: Wed, 30 Jan 2008 17:51:09 +0000 Subject: [PATCH] * doc/guide.tex: Removed the option served_hosts in mod_pubsub because it does not work correctly yet (EJAB-504) * doc/guide.html: Likewise SVN Revision: 1167 --- ChangeLog | 4 ++++ doc/guide.html | 15 ++++++--------- doc/guide.tex | 8 ++++---- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index e26e9a35d..6335d870d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2008-01-30 Badlop + * doc/guide.tex: Removed the option served_hosts in mod_pubsub + because it does not work correctly yet (EJAB-504) + * doc/guide.html: Likewise + * src/mod_echo.erl: Put in comments the call to the educational function do_client_version diff --git a/doc/guide.html b/doc/guide.html index d2fa642bd..30cc3a863 100644 --- a/doc/guide.html +++ b/doc/guide.html @@ -243,7 +243,7 @@ Comprehensive documentation.
  • Capability to send announce messages.
  • Internationalized: ejabberd leads in internationalization. Hence it is very well suited in a globalized world. Related features are:
    • -Translated to 22 languages.
    • Support for IDNA. +Translated to 24 languages.
    • Support for IDNA.
  • Open Standards: ejabberd is the first Open Source Jabber server claiming to fully comply to the XMPP standard.
    • Fully XMPP compliant. @@ -2193,16 +2193,13 @@ pubsub plugin is always used.
      nodetree
      To specify which nodetree to use. If not defined, the default pubsub nodetree is used. Nodetrees are default and virtual. Only one nodetree can be used and is shared by all node plugins. -
      served_hosts
      -This option allows to create additional pubsub virtual hosts in a single module instance.

      Example: 

        {modules,
    [
     ...
     {mod_pubsub, [
                   {access_createnode, pubsub_createnode},
-                  {plugins, ["default", "pep"]},
-                  {served_hosts, ["example.com", "example.org"]}
+                  {plugins, ["default", "pep"]}
                  ]}
     ...
    ]}.
@@ -3016,12 +3013,12 @@ Example configuration:
 
      {watchdog_admins, ["admin2@localhost", "admin2@example.org"]}.
 
      
 
      7.2  Log Files
      
-
      ejabberd writes messages in two log files:
+
      An ejabberd node writes two log files:
 
      
-	ejabberd.log
       Messages reported by ejabberd code
-	
      sasl.log
       Messages reported by Erlang/OTP using SASL (System Architecture Support Libraries)
+	ejabberd.log
       is the ejabberd service log, with the messages reported by ejabberd code
+	
      sasl.log
       is the Erlang/OTP system log, with the messages reported by Erlang/OTP using SASL (System Architecture Support Libraries)
 
      The option loglevel modifies the verbosity of the file ejabberd.log.
-There possible levels are:
+The possible levels are:
 
      
 	0
       No ejabberd log at all (not recommended)
 	
      1
       Critical
diff --git a/doc/guide.tex b/doc/guide.tex
index 02aa1455c..630fb7fde 100644
--- a/doc/guide.tex
+++ b/doc/guide.tex
@@ -2708,8 +2708,8 @@ Options:
 \titem{nodetree} To specify which nodetree to use. If not defined, the default pubsub
   nodetree is used. Nodetrees are default and virtual. Only one nodetree can be used
   and is shared by all node plugins. 
-\titem{served\_hosts} \ind{options!served\_hosts}
-  This option allows to create additional pubsub virtual hosts in a single module instance.
+%\titem{served\_hosts} \ind{options!served\_hosts}
+%  This option allows to create additional pubsub virtual hosts in a single module instance.
 \end{description}
 
 Example:
@@ -2719,12 +2719,12 @@ Example:
     ...
     {mod_pubsub, [
                   {access_createnode, pubsub_createnode},
-                  {plugins, ["default", "pep"]},
-                  {served_hosts, ["example.com", "example.org"]}
+                  {plugins, ["default", "pep"]}
                  ]}
     ...
    ]}.
 \end{verbatim}
+%                  {served_hosts, ["example.com", "example.org"]}
 
 \subsection{\modregister{}}
 \label{modregister}