diff --git a/ChangeLog b/ChangeLog index 03a68ba93..472653fcd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,20 @@ 2008-03-31 Badlop + * doc/webadmmain.png: Updated to ejabberd 2.0.0 + * doc/webadmmainru.png: Likewise + + * doc/disco.png: Removed because not used + + * doc/guide.tex: Fix Latex reference to webadmin section. Update + explanation of screenshots. Update xmpp addresses of Mickael + Remond and Sander Devrieze. + * doc/guide.html: Likewise + + * doc/Makefile: Remove the Hevea deprecated option -noiso + * doc/guide.html: Likewise + * doc/dev.html: Likewise + * doc/features.html: Likewise + * src/ejabberd_listener.erl (start_listener): Start also the supervisor of the module diff --git a/doc/Makefile b/doc/Makefile index 311c69528..bab623dcf 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -43,13 +43,13 @@ clean: rm -f *.toc guide.html: guide.tex - hevea -fix -noiso -pedantic guide.tex + hevea -fix -pedantic guide.tex dev.html: dev.tex - hevea -fix -noiso -pedantic dev.tex + hevea -fix -pedantic dev.tex features.html: features.tex - hevea -fix -noiso -pedantic features.tex + hevea -fix -pedantic features.tex guide.pdf: guide.tex pdflatex guide.tex diff --git a/doc/dev.html b/doc/dev.html index e7f57ad4e..a979f874e 100644 --- a/doc/dev.html +++ b/doc/dev.html @@ -46,7 +46,7 @@ TD P{margin:0px;} - +

Ejabberd 2.1.0-alpha Developers Guide

Alexey Shchepin
diff --git a/doc/disco.png b/doc/disco.png deleted file mode 100644 index 6e6d2a702..000000000 Binary files a/doc/disco.png and /dev/null differ diff --git a/doc/features.html b/doc/features.html index 8d33ca7cb..f549848df 100644 --- a/doc/features.html +++ b/doc/features.html @@ -47,7 +47,7 @@ SPAN{width:20%; float:right; text-align:left; margin-left:auto;} - +

Ejabberd 2.1.0-alpha Feature Sheet

Sander Devrieze
diff --git a/doc/guide.html b/doc/guide.html index 5742b71e9..b6e54c610 100644 --- a/doc/guide.html +++ b/doc/guide.html @@ -76,7 +76,7 @@ SPAN{width:20%; float:right; text-align:left; margin-left:auto;} - +

@@ -773,7 +773,7 @@ Incoming and outgoing connections of remote Jabber servers are denied, only two servers can connect: "jabber.example.org" and "example.com".
  • Port 5280 is serving the Web Admin and the HTTP Polling service. Note that it is also possible to serve them on different ports. The second -example in section ?? shows how exactly this can be done. +example in section 4.2 shows how exactly this can be done.
  • All users except for the administrators have a traffic of limit 1,000 Bytes/second
  • The @@ -3118,14 +3118,13 @@ Figure A.1, for example, shows the reply to the
    Figure A.1: Service Discovery when xml:lang=’ru’
    -

    The Web Admin also supports the Accept-Language HTTP header (compare -figure A.2 with figure 4.1)

    +

    The Web Admin also supports the Accept-Language HTTP header.

    webadmmainru.png -
    +
    Figure A.2: Top page from the Web Admin with HTTP header -‘Accept-Language: ru’
    Figure A.2: Web Admin showing a virtual host when the web browser provides the +HTTP header ‘Accept-Language: ru’
    @@ -3141,8 +3140,8 @@ Alexey Shchepin (xmpp:aleksey@jabber.ru
  • Evgeniy Khramtsov (xmpp:xram@jabber.ru)
  • Florian Zumbiehl (xmpp:florz@florz.de)
  • Michael Grigutsch (xmpp:migri@jabber.i-pobox.net) -
  • Mickael Remond (xmpp:mremond@erlang-projects.org) -
  • Sander Devrieze (xmpp:sander@devrieze.dyndns.org) +
  • Mickael Remond (xmpp:mremond@process-one.net) +
  • Sander Devrieze (xmpp:s.devrieze@gmail.com)
  • Sergei Golovan (xmpp:sgolovan@nes.ru)
  • Vsevolod Pelipas (xmpp:vsevoload@jabber.ru)
    • diff --git a/doc/guide.tex b/doc/guide.tex index eedb6e044..d1f87a6f0 100644 --- a/doc/guide.tex +++ b/doc/guide.tex @@ -844,7 +844,7 @@ In this example, the following configuration defines that: only two servers can connect: "jabber.example.org" and "example.com". \item Port 5280 is serving the Web Admin and the HTTP Polling service. Note that it is also possible to serve them on different ports. The second - example in section~\ref{webinterface} shows how exactly this can be done. + example in section~\ref{webadmin} shows how exactly this can be done. \item All users except for the administrators have a traffic of limit 1,000\,Bytes/second \item \ind{transports!AIM}The @@ -3990,14 +3990,13 @@ Figure~\ref{fig:discorus}, for example, shows the reply to the following query: \label{fig:discorus} \end{figure} -The Web Admin also supports the \verb|Accept-Language| HTTP header (compare -figure~\ref{fig:webadmmainru} with figure~\ref{fig:webadmmain}) +The Web Admin also supports the \verb|Accept-Language| HTTP header. \begin{figure}[htbp] \centering \insimg{webadmmainru.png} - \caption{Top page from the Web Admin with HTTP header - `Accept-Language: ru'} + \caption{Web Admin showing a virtual host when the web browser provides the + HTTP header `Accept-Language: ru'} \label{fig:webadmmainru} \end{figure} @@ -4021,8 +4020,8 @@ Thanks to all people who contributed to this guide: \item Evgeniy Khramtsov (\ahrefurl{xmpp:xram@jabber.ru}) \item Florian Zumbiehl (\ahrefurl{xmpp:florz@florz.de}) \item Michael Grigutsch (\ahrefurl{xmpp:migri@jabber.i-pobox.net}) -\item Mickael Remond (\ahrefurl{xmpp:mremond@erlang-projects.org}) -\item Sander Devrieze (\ahrefurl{xmpp:sander@devrieze.dyndns.org}) +\item Mickael Remond (\ahrefurl{xmpp:mremond@process-one.net}) +\item Sander Devrieze (\ahrefurl{xmpp:s.devrieze@gmail.com}) \item Sergei Golovan (\ahrefurl{xmpp:sgolovan@nes.ru}) \item Vsevolod Pelipas (\ahrefurl{xmpp:vsevoload@jabber.ru}) \end{itemize} diff --git a/doc/webadmmain.png b/doc/webadmmain.png index fd7d50b19..2228dcd68 100644 Binary files a/doc/webadmmain.png and b/doc/webadmmain.png differ diff --git a/doc/webadmmainru.png b/doc/webadmmainru.png index 51fc2d8ea..3fd34ae8c 100644 Binary files a/doc/webadmmainru.png and b/doc/webadmmainru.png differ