diff --git a/ChangeLog b/ChangeLog index cc076ff61..687e90161 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2005-05-23 Alexey Shchepin + * doc/guide.tex: Updated (thanks to Sergei Golovan) + * doc/dev.tex: Likewise + * doc/disco.png: Likewise + * doc/discorus.png: Likewise + * doc/webadmin.png: Likewise + * doc/webadminru.png: Likewise + * src/msgs/ru.msg: Updated (thanks to Sergei Golovan) * src/msgs/uk.msg: Likewise diff --git a/doc/confacls.png b/doc/confacls.png deleted file mode 100644 index 8c69984f9..000000000 Binary files a/doc/confacls.png and /dev/null differ diff --git a/doc/confhostname.png b/doc/confhostname.png deleted file mode 100644 index c740cb861..000000000 Binary files a/doc/confhostname.png and /dev/null differ diff --git a/doc/dev.tex b/doc/dev.tex index af9340f15..fcfc1ee73 100644 --- a/doc/dev.tex +++ b/doc/dev.tex @@ -31,7 +31,9 @@ \newcommand{\modprivate}{\texttt{mod\_private}} \newcommand{\modtime}{\texttt{mod\_time}} \newcommand{\modversion}{\texttt{mod\_version}} -c + +\newcommand{\tjepref}[2]{\footahref{http://www.jabber.org/jeps/jep-#1.html}{#2}} +\newcommand{\jepref}[1]{\tjepref{#1}{JEP-#1}} %\setcounter{tocdepth}{3} @@ -58,36 +60,37 @@ c \label{sec:intro} \ejabberd{} is a Free and Open Source fault-tolerant distributed \Jabber{} -server. It is writen mostly in Erlang. +server. It is written mostly in Erlang. -The main features of \ejabberd{} is: +The main features of \ejabberd{} are: \begin{itemize} -\item Works on most of popular platforms: *nix (tested on Linux and FreeBSD) - and Win32 -\item Distributed: You can run \ejabberd{} on a cluster of machines and all of - them will serve one Jabber domain. +\item Works on most of popular platforms: *nix (tested on Linux, FreeBSD and + NetBSD) and Win32 +\item Distributed: You can run \ejabberd{} on a cluster of machines to let all of + them serve one Jabber domain. \item Fault-tolerance: You can setup an \ejabberd{} cluster so that all the information required for a properly working service will be stored permanently on more than one node. This means that if one of the nodes crashes, then the others will continue working without disruption. - You can also add or replace more nodes ``on the fly''. -\item Built-in \footahref{http://www.jabber.org/jeps/jep-0045.html}{Multi-User - Chat} service + You can also add or replace nodes ``on the fly''. +\item Support for virtual hosting +\item Built-in \tjepref{0045}{Multi-User Chat} service \item Built-in IRC transport -\item Built-in - \footahref{http://www.jabber.org/jeps/jep-0060.html}{Publish-Subscribe} - service +\item Built-in \tjepref{0060}{Publish-Subscribe} service \item Built-in Jabber Users Directory service based on users vCards -\item Support for - \footahref{http://www.jabber.org/jeps/jep-0030.html}{JEP-0030} - (Service Discovery). -\item Support for - \footahref{http://www.jabber.org/jeps/jep-0039.html}{JEP-0039} - (Statistics Gathering). -\item Support for \ns{xml:lang} attribute in many XML elements +\item Built-in web-based administration interface +\item Built-in \tjepref{0025}{HTTP Polling} service +\item SSL support +\item Support for LDAP authentication +\item Ability to interface with external components (JIT, MSN-t, Yahoo-t, etc.) +\item Migration from jabberd14 is possible +\item Mostly XMPP-compliant +\item Support for \tjepref{0030}{Service Discovery}. +\item Support for \tjepref{0039}{Statistics Gathering}. +\item Support for \ns{xml:lang} \end{itemize} - - +\ejabberd{} is a Free and Open Source fault-tolerant distributed \Jabber{} +server. It is written mostly in Erlang. @@ -95,7 +98,6 @@ The main features of \ejabberd{} is: \label{sec:howitworks} - A \Jabber{} domain is served by one or more \ejabberd{} nodes. These nodes can be run on different machines that are connected via a network. They all must have the ability to connect to port 4369 of all another nodes, and must have @@ -169,14 +171,14 @@ XMLElement = {xmlelement, Name, Attrs, [ElementOrCDATA]} \end{verbatim} E.\,g. this stanza: \begin{verbatim} - + test \end{verbatim} represented as following structure: \begin{verbatim} {xmlelement, "message", - [{"to", "test@conference.e.localhost"}, + [{"to", "test@conference.example.org"}, {"type", "groupchat"}], [{xmlelement, "body", [], diff --git a/doc/disco.png b/doc/disco.png index 2a4ba3b66..6e6d2a702 100644 Binary files a/doc/disco.png and b/doc/disco.png differ diff --git a/doc/discoallusers.png b/doc/discoallusers.png deleted file mode 100644 index b3d80b425..000000000 Binary files a/doc/discoallusers.png and /dev/null differ diff --git a/doc/discorunnodes.png b/doc/discorunnodes.png deleted file mode 100644 index 2eb4f6c3d..000000000 Binary files a/doc/discorunnodes.png and /dev/null differ diff --git a/doc/discorus.png b/doc/discorus.png index 17370eac2..982f88182 100644 Binary files a/doc/discorus.png and b/doc/discorus.png differ diff --git a/doc/guide.tex b/doc/guide.tex index f44570a38..487906d78 100644 --- a/doc/guide.tex +++ b/doc/guide.tex @@ -126,8 +126,8 @@ The main features of \ejabberd{} are: \item Ability to interface with external components (JIT, MSN-t, Yahoo-t, etc.) \item Migration from jabberd14 is possible \item Mostly XMPP-compliant -\item Support for \jepref{0030} (Service Discovery). -\item Support for \jepref{0039} (Statistics Gathering). +\item Support for \tjepref{0030}{Service Discovery}. +\item Support for \tjepref{0039}{Statistics Gathering}. \item Support for \ns{xml:lang} \end{itemize} @@ -164,7 +164,7 @@ To compile \ejabberd{} in MS Windows environment, you will need the following packages: \begin{itemize} \item MS Visual C++ 6.0 Compiler -\item \footahref{http://erlang.org/download/otp_win32_R10B-1a.exe}{Erlang/OTP R10B-1a} +\item \footahref{http://erlang.org/download/otp\_win32\_R10B-1a.exe}{Erlang/OTP R10B-1a} \item \footahref{http://prdownloads.sourceforge.net/expat/expat\_win32bin\_1\_95\_7.exe?download}{Expat 1.95.7} \item \footahref{http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.9.1.tar.gz}{Iconv 1.9.1} @@ -387,7 +387,7 @@ declarations of ACL in config file have following syntax: \titem{\{user\_regexp, , \}} Matches user with name that matches \term{} and from server \term{}. Example: \begin{verbatim} -{acl, tests, {user, "^test", "localhost"}}. +{acl, tests, {user, "^test", "example.org"}}. \end{verbatim} \titem{\{server\_regexp, \}} Matches any JID from server that matches \term{}. Example: @@ -524,7 +524,7 @@ Currently these modules are implemented: The following options are defined: \begin{description} - \titem{http\_poll} This option enables \tjepref{0025}{HTTP Polling} + \titem{http\_poll} This option enables \jepref{0025} (HTTP Polling) support. It is available then at \verb|http://server:port/http-poll/|. \titem{web\_admin} This option enables web-based interface for \ejabberd{} @@ -637,7 +637,7 @@ Example: {mod_vcard, []}, {mod_offline, []}, {mod_announce, [{access, announce}]}, - {mod_echo, [{host, "echo.localhost"}]}, + {mod_echo, [{host, "echo.example.org"}]}, {mod_private, []}, {mod_irc, []}, {mod_muc, []}, @@ -830,9 +830,9 @@ mnesia:change_table_copy_type(schema, node(), disc_copies). but writing will be slower. And of course if machine with one of replicas is down, other replicas will be used. - Also section ``5.3 Table Fragmentation'' - \footahref{http://www.erlang.se/doc/doc-5.4/lib/mnesia-4.2/doc/html/index.html}{here} - can be useful. + Also section 5.3 (Table Fragmentation) of + \footahref{http://www.erlang.se/doc/doc-5.4/lib/mnesia-4.2/doc/html/index.html} + {Mnesia Reference Manual} can be useful. (alt) Same as in previous item, but for other tables. @@ -1377,7 +1377,7 @@ All built-in modules support \texttt{xml:lang} attribute inside IQ queries. E.\,g.\ on figure~\ref{fig:discorus} showed the reply on the following query: \begin{verbatim} diff --git a/doc/webadmmain.png b/doc/webadmmain.png index 6e47a51aa..fd7d50b19 100644 Binary files a/doc/webadmmain.png and b/doc/webadmmain.png differ diff --git a/doc/webadmmainru.png b/doc/webadmmainru.png index cf911cedc..51fc2d8ea 100644 Binary files a/doc/webadmmainru.png and b/doc/webadmmainru.png differ