summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog15
-rw-r--r--doc/Makefile6
-rw-r--r--doc/dev.html2
-rw-r--r--doc/disco.pngbin9360 -> 0 bytes
-rw-r--r--doc/features.html2
-rw-r--r--doc/guide.html15
-rw-r--r--doc/guide.tex13
-rw-r--r--doc/webadmmain.pngbin15813 -> 6542 bytes
-rw-r--r--doc/webadmmainru.pngbin16780 -> 13085 bytes
9 files changed, 33 insertions, 20 deletions
diff --git a/ChangeLog b/ChangeLog
index 03a68ba9..472653fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,20 @@
2008-03-31 Badlop <badlop@process-one.net>
+ * 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 311c6952..bab623dc 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 e7f57ad4..a979f874 100644
--- a/doc/dev.html
+++ b/doc/dev.html
@@ -46,7 +46,7 @@ TD P{margin:0px;}
</STYLE>
</HEAD>
<BODY >
-<!--HEVEA command line is: /usr/bin/hevea -fix -noiso -pedantic dev.tex -->
+<!--HEVEA command line is: /usr/bin/hevea -fix -pedantic dev.tex -->
<!--CUT DEF section 1 --><P><A NAME="titlepage"></A>
</P><TABLE CLASS="title"><TR><TD><H1 CLASS="titlemain">Ejabberd 2.1.0-alpha Developers Guide</H1><H3 CLASS="titlerest">Alexey Shchepin<BR>
diff --git a/doc/disco.png b/doc/disco.png
deleted file mode 100644
index 6e6d2a70..00000000
--- a/doc/disco.png
+++ /dev/null
Binary files differ
diff --git a/doc/features.html b/doc/features.html
index 8d33ca7c..f549848d 100644
--- a/doc/features.html
+++ b/doc/features.html
@@ -47,7 +47,7 @@ SPAN{width:20%; float:right; text-align:left; margin-left:auto;}
</STYLE>
</HEAD>
<BODY >
-<!--HEVEA command line is: /usr/bin/hevea -fix -noiso -pedantic features.tex -->
+<!--HEVEA command line is: /usr/bin/hevea -fix -pedantic features.tex -->
<!--CUT DEF section 1 --><P><A NAME="titlepage"></A>
</P><TABLE CLASS="title"><TR><TD><H1 CLASS="titlemain">Ejabberd 2.1.0-alpha Feature Sheet</H1><H3 CLASS="titlerest">Sander Devrieze<BR>
diff --git a/doc/guide.html b/doc/guide.html
index 5742b71e..b6e54c61 100644
--- a/doc/guide.html
+++ b/doc/guide.html
@@ -76,7 +76,7 @@ SPAN{width:20%; float:right; text-align:left; margin-left:auto;}
</STYLE>
</HEAD>
<BODY >
-<!--HEVEA command line is: /usr/bin/hevea -fix -noiso -pedantic guide.tex -->
+<!--HEVEA command line is: /usr/bin/hevea -fix -pedantic guide.tex -->
<!--CUT DEF chapter 1 --><P><A NAME="titlepage"></A>
</P><TABLE CLASS="title"><TR><TD><H1 CLASS="titlemain">
@@ -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".
</LI><LI CLASS="li-itemize">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&#XA0;<A HREF="#webinterface">??</A> shows how exactly this can be done.
+example in section&#XA0;<A HREF="#webadmin">4.2</A> shows how exactly this can be done.
</LI><LI CLASS="li-itemize">All users except for the administrators have a traffic of limit
1,000&#XA0;Bytes/second
</LI><LI CLASS="li-itemize">The
@@ -3118,14 +3118,13 @@ Figure&#XA0;<A HREF="#fig:discorus">A.1</A>, for example, shows the reply to the
<DIV CLASS="caption"><TABLE CELLSPACING=6 CELLPADDING=0><TR><TD VALIGN=top ALIGN=left>Figure A.1: Service Discovery when <TT>xml:lang=&#X2019;ru&#X2019;</TT></TD></TR>
</TABLE></DIV>
<A NAME="fig:discorus"></A>
-<DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV></DIV></BLOCKQUOTE><P>The Web Admin also supports the <CODE>Accept-Language</CODE> HTTP header (compare
-figure&#XA0;<A HREF="#fig:webadmmainru">A.2</A> with figure&#XA0;<A HREF="#fig:webadmmain">4.1</A>)</P><BLOCKQUOTE CLASS="figure"><DIV CLASS="center"><DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV>
+<DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV></DIV></BLOCKQUOTE><P>The Web Admin also supports the <CODE>Accept-Language</CODE> HTTP header.</P><BLOCKQUOTE CLASS="figure"><DIV CLASS="center"><DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV>
<IMG SRC="webadmmainru.png" ALT="webadmmainru.png">
-<DIV CLASS="caption"><TABLE CELLSPACING=6 CELLPADDING=0><TR><TD VALIGN=top ALIGN=left>Figure A.2: Top page from the Web Admin with HTTP header
-&#X2018;Accept-Language: ru&#X2019;</TD></TR>
+<DIV CLASS="caption"><TABLE CELLSPACING=6 CELLPADDING=0><TR><TD VALIGN=top ALIGN=left>Figure A.2: Web Admin showing a virtual host when the web browser provides the
+HTTP header &#X2018;Accept-Language: ru&#X2019;</TD></TR>
</TABLE></DIV>
<A NAME="fig:webadmmainru"></A>
<DIV CLASS="center"><HR WIDTH="80%" SIZE=2></DIV></DIV></BLOCKQUOTE><!--TOC chapter Release Notes-->
@@ -3141,8 +3140,8 @@ Alexey Shchepin (<A HREF="xmpp:aleksey@jabber.ru"><TT>xmpp:aleksey@jabber.ru</TT
</LI><LI CLASS="li-itemize">Evgeniy Khramtsov (<A HREF="xmpp:xram@jabber.ru"><TT>xmpp:xram@jabber.ru</TT></A>)
</LI><LI CLASS="li-itemize">Florian Zumbiehl (<A HREF="xmpp:florz@florz.de"><TT>xmpp:florz@florz.de</TT></A>)
</LI><LI CLASS="li-itemize">Michael Grigutsch (<A HREF="xmpp:migri@jabber.i-pobox.net"><TT>xmpp:migri@jabber.i-pobox.net</TT></A>)
-</LI><LI CLASS="li-itemize">Mickael Remond (<A HREF="xmpp:mremond@erlang-projects.org"><TT>xmpp:mremond@erlang-projects.org</TT></A>)
-</LI><LI CLASS="li-itemize">Sander Devrieze (<A HREF="xmpp:sander@devrieze.dyndns.org"><TT>xmpp:sander@devrieze.dyndns.org</TT></A>)
+</LI><LI CLASS="li-itemize">Mickael Remond (<A HREF="xmpp:mremond@process-one.net"><TT>xmpp:mremond@process-one.net</TT></A>)
+</LI><LI CLASS="li-itemize">Sander Devrieze (<A HREF="xmpp:s.devrieze@gmail.com"><TT>xmpp:s.devrieze@gmail.com</TT></A>)
</LI><LI CLASS="li-itemize">Sergei Golovan (<A HREF="xmpp:sgolovan@nes.ru"><TT>xmpp:sgolovan@nes.ru</TT></A>)
</LI><LI CLASS="li-itemize">Vsevolod Pelipas (<A HREF="xmpp:vsevoload@jabber.ru"><TT>xmpp:vsevoload@jabber.ru</TT></A>)
</LI></UL><!--TOC chapter Copyright Information-->
diff --git a/doc/guide.tex b/doc/guide.tex
index eedb6e04..d1f87a6f 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 fd7d50b1..2228dcd6 100644
--- a/doc/webadmmain.png
+++ b/doc/webadmmain.png
Binary files differ
diff --git a/doc/webadmmainru.png b/doc/webadmmainru.png
index 51fc2d8e..3fd34ae8 100644
--- a/doc/webadmmainru.png
+++ b/doc/webadmmainru.png
Binary files differ