diff --git a/ChangeLog b/ChangeLog index 352526ece..c96880811 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-06-08 Badlop + + * doc/guide.tex: Small fixes (thanks to Christoph Anton Mitterer) + * doc/introduction.tex: Likewise + * doc/guide.html: Likewise + 2008-06-05 Badlop * doc/guide.tex: Document ejabberdctl status code (EJAB-633) diff --git a/doc/guide.html b/doc/guide.html index caf9eb31a..7a2aa95a4 100644 --- a/doc/guide.html +++ b/doc/guide.html @@ -292,7 +292,7 @@ Support for virtual hosting.
  • Statistics via Statistics Gathering (XEP-0039).
  • IPv6 support both for c2s and s2s connections.
  • Multi-User Chat module with support for clustering and HTML logging.
  • Users Directory based on users vCards. -
  • Publish-Subscribe component with support for Personal Eventing via Pubsub. +
  • Publish-Subscribe component with support for Personal Eventing via Pubsub.
  • Support for web clients: HTTP Polling and HTTP Binding (BOSH) services.
  • IRC transport.
  • Component support: interface with networks such as AIM, ICQ and MSN installing special tranports. @@ -637,7 +637,7 @@ connections. access to the port. The default value is all.
    {certfile, Path}
    Full path to a file containing the default SSL certificate. To define a certificate file specific for a given domain, use the global option domain_certfile. -
    component_check_from
    +
    service_check_from
    This option can be used with ejabberd_service only. It is used to disable control on the from field on packets send by an external components. The option can be either true or @@ -652,9 +652,10 @@ do not allow outgoing sockets on port 5222.

    Remember that you must also instal http://server:port/http-bind/. Be aware that support for HTTP Bind is also needed in the Jabber client. Remark also that HTTP Bind can be interesting to host a web-based Jabber client such as -JWChat (there is a tutorial to -install JWChat with -instructions for ejabberd). +JWChat +(check the tutorials to install JWChat with ejabberd and an +embedded local web server +or Apache).

    http_poll
    This option enables HTTP Polling (XEP-0025) support. HTTP Polling enables access via HTTP requests to ejabberd from behind firewalls which @@ -662,9 +663,7 @@ do not allow outgoing sockets on port 5222.

    If HTTP Polling is enabled, it wil http://server:port/http-poll/. Be aware that support for HTTP Polling is also needed in the Jabber client. Remark also that HTTP Polling can be interesting to host a web-based Jabber client such as -JWChat (there is a tutorial to -install JWChat with -instructions for ejabberd). +JWChat.

    inet6
    Set up the socket for IPv6.
    {ip, IPAddress}
    This option specifies which network interface to listen for. For example {ip, {192, 168, 1, 1}}. @@ -727,7 +726,7 @@ The default policy for incoming and outgoing s2s connections to other Jabber ser The default value is allow.
    {{s2s_host, Host}, allow|deny}
    Defines if incoming and outgoing s2s connections with a specific remote host are allowed or denied. -This allows to restrict ejabberd to only stablish s2s connections +This allows to restrict ejabberd to only establish s2s connections with a small list of trusted servers, or to block some specific servers.
    {s2s_max_retry_delay, Seconds}
    The maximum allowed delay for retry to connect after a failed connection attempt. @@ -1080,7 +1079,7 @@ To limit the number of sessions per user to 10 for all users:

    Several connections to a remote Jabber server with ACL

    The special access max_s2s_connections specifies how many -simultaneus S2S connections can be stablished to a specific remote Jabber server. +simultaneus S2S connections can be established to a specific remote Jabber server. The default value is 1. There’s also available the access max_s2s_connections_per_node.

    The syntax is: 

      {access, max_s2s_connections, [{<maxnumber>, <aclname>},
diff --git a/doc/guide.tex b/doc/guide.tex
index 27925a917..dc76bc6cf 100644
--- a/doc/guide.tex
+++ b/doc/guide.tex
@@ -686,7 +686,7 @@ This is a detailed description of each option allowed by the listening modules:
     access to the port. The default value is \term{all}.
   \titem{\{certfile, Path\}} Full path to a file containing the default SSL certificate.
     To define a certificate file specific for a given domain, use the global option \term{domain\_certfile}.
-  \titem{component\_check\_from} \ind{options!service\_check\_from}
+  \titem{service\_check\_from} \ind{options!service\_check\_from}
     This option can be used with \term{ejabberd\_service} only. It is
     used to disable control on the from field on packets send by an
     external components. The option can be either \term{true} or
@@ -705,9 +705,10 @@ This is a detailed description of each option allowed by the listening modules:
     \verb|http://server:port/http-bind/|. Be aware that support for HTTP Bind
     is also needed in the \Jabber{} client. Remark also that HTTP Bind can be
     interesting to host a web-based \Jabber{} client such as
-    \footahref{http://jwchat.sourceforge.net/}{JWChat} (there is a tutorial to
-    \footahref{http://www.ejabberd.im/jwchat}{install JWChat} with
-    instructions for \ejabberd{}).
+    \footahref{http://jwchat.sourceforge.net/}{JWChat} 
+    (check the tutorials to install JWChat with ejabberd and an
+    \footahref{http://www.ejabberd.im/jwchat-localserver}{embedded local web server}
+    or \footahref{http://www.ejabberd.im/jwchat-apache}{Apache}).
   \titem{http\_poll} \ind{options!http\_poll}\ind{protocols!XEP-0025: HTTP Polling}\ind{JWChat}\ind{web-based Jabber client}
     This option enables HTTP Polling (\xepref{0025}) support. HTTP Polling
     enables access via HTTP requests to \ejabberd{} from behind firewalls which
@@ -717,9 +718,7 @@ This is a detailed description of each option allowed by the listening modules:
     \verb|http://server:port/http-poll/|. Be aware that support for HTTP Polling
     is also needed in the \Jabber{} client. Remark also that HTTP Polling can be
     interesting to host a web-based \Jabber{} client such as
-    \footahref{http://jwchat.sourceforge.net/}{JWChat} (there is a tutorial to
-    \footahref{http://www.ejabberd.im/jwchat}{install JWChat} with
-    instructions for \ejabberd{}).
+    \footahref{http://jwchat.sourceforge.net/}{JWChat}.
   \titem{inet6} \ind{options!inet6}\ind{IPv6}Set up the socket for IPv6.
   \titem{\{ip, IPAddress\}} \ind{options!ip}This option specifies which network
     interface to listen for. For example \verb|{ip, {192, 168, 1, 1}}|.
@@ -784,7 +783,7 @@ There are some additional global options:
   The default value is \term{allow}.
   \titem{\{\{s2s\_host, Host\}, allow|deny\}}
   Defines if incoming and outgoing s2s connections with a specific remote host are allowed or denied.
-  This allows to restrict ejabberd to only stablish s2s connections 
+  This allows to restrict ejabberd to only establish s2s connections 
   with a small list of trusted servers, or to block some specific servers.
   \titem{\{s2s\_max\_retry\_delay, Seconds\}} \ind{options!s2s\_max\_retry\_delay}
   The maximum allowed delay for retry to connect after a failed connection attempt.
@@ -1249,7 +1248,7 @@ Examples:
 \ind{options!max\_s2s\_connections}
 
 The special access \term{max\_s2s\_connections} specifies how many
-simultaneus S2S connections can be stablished to a specific remote Jabber server.
+simultaneus S2S connections can be established to a specific remote Jabber server.
 The default value is \term{1}.
 There's also available the access \term{max\_s2s\_connections\_per\_node}.
 
diff --git a/doc/introduction.tex b/doc/introduction.tex
index 92f6a4ec5..1991c93ec 100644
--- a/doc/introduction.tex
+++ b/doc/introduction.tex
@@ -125,7 +125,7 @@ Moreover, \ejabberd{} comes with a wide range of other state-of-the-art features
 \item IPv6 support both for c2s and s2s connections.
 \item \txepref{0045}{Multi-User Chat} module with support for clustering and HTML logging. %%\improved{}
 \item Users Directory based on users vCards.
-\item \txepref{0060}{Publish-Subscribe} component with support for \txepref{00163}{Personal Eventing via Pubsub}.
+\item \txepref{0060}{Publish-Subscribe} component with support for \txepref{0163}{Personal Eventing via Pubsub}.
 \item Support for web clients: \txepref{0025}{HTTP Polling} and \txepref{0206}{HTTP Binding (BOSH)} services.
 \item IRC transport.
 \item Component support: interface with networks such as AIM, ICQ and MSN installing special tranports.