diff --git a/ChangeLog b/ChangeLog index a96dc6dad..688f4deba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,41 @@ +2009-03-03 Badlop + + * doc/Makefile: In Clean do not remove html. In new Distclean, + remove also html. + + * doc/Makefile: When cleaning, remove contributed_modules.tex + + * src/Makefile.in: Fix arguments to Install program + + * doc/guide.tex: Provide only an example of language option + * doc/guide.html: Likewise + + * doc/guide.tex: mod_muc can run in several nodes of cluster + * doc/guide.html: Likewise + + * doc/api/process-one.css: Add some style to HTML elements + + * src/ejabberd_listener.erl: Fix EDoc errors + * src/web/ejabberd_web_admin.erl: Likewise + + * src/ejabberd_hooks.erl: Explanation in EDoc of some functions + + * doc/guide.tex: Explain that account creation is only supported + by internal and odbc authentication methods + * doc/guide.html: Likewise + + * src/Makefile.in: The path to the installed copy of ejabberd + Guide is set in the environment variable + EJABBERD_DOC_PATH (EJAB-837). + * src/web/ejabberd_web_admin.erl: Likewise + * src/ejabberdctl.template: Likewise + * doc/guide.tex: Likewise + * doc/guide.html: Likewise + 2009-03-02 Pablo Polvorin * src/ejabberd_auth_anonymous.erl: Correct include declaration (thanks - to badlop). Bug was introduced in r1863. + to Badlop). Bug was introduced in r1863. * src/ejabberd_s2s_in.erl, src/ejabberd_s2s_out.erl: Serialize stanzas to iolist(). diff --git a/doc/Makefile b/doc/Makefile index 2fda395a0..3cc89b059 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -32,7 +32,6 @@ pdf: guide.pdf features.pdf clean: rm -f *.aux rm -f *.haux - rm -f *.html rm -f *.htoc rm -f *.idx rm -f *.ilg @@ -41,6 +40,10 @@ clean: rm -f *.out rm -f *.pdf rm -f *.toc + [ ! -f contributed_modules.tex ] || rm contributed_modules.tex + +distclean: clean + rm -f *.html guide.html: guide.tex hevea -fix -pedantic guide.tex diff --git a/doc/api/process-one.css b/doc/api/process-one.css index 793d717aa..5cd371e10 100644 --- a/doc/api/process-one.css +++ b/doc/api/process-one.css @@ -71,10 +71,22 @@ pre, tt, code { } pre { - margin-left: 1em; + margin:1ex 2ex; + border:1px dashed lightgrey; + background-color:#f9f9f9; + padding:0.5ex; } pre em { font-style: normal; font-weight: bold; } + +dt { + margin:0ex 2ex; + font-weight:bold; +} + +dd { + margin:0ex 0ex 1ex 4ex; +} diff --git a/doc/guide.html b/doc/guide.html index 3282fc3d8..645ae6d5c 100644 --- a/doc/guide.html +++ b/doc/guide.html @@ -476,7 +476,7 @@ variable.

  • Install OpenSSL in C:\sdk\OpenSSL and add C:\sdk\OpenSSL\lib\VC to your path or copy the binaries to your system directory.
  • Install ZLib in C:\sdk\gnuWin32. Copy C:\sdk\GnuWin32\bin\zlib1.dll to your system directory. If you change your path it should already be set after libiconv install. -
  • Make sure the you can access Erlang binaries from your path. For example: set PATH=%PATH%;"C:\sdk\erl5.5.5\bin" +
  • Make sure the you can access Erlang binaries from your path. For example: set PATH=%PATH%;"C:\sdk\erl5.6.5\bin"
  • Depending on how you end up actually installing the library you might need to check and tweak the paths in the file configure.erl.
  • While in the directory ejabberd\src run: 
    configure.bat
@@ -914,8 +914,8 @@ connected to port 5237 with password ‘ggsecret’.
 {s2s_default_policy, deny}.
 {{s2s_host,"jabber.example.org"}, allow}.
 {{s2s_host,"example.com"}, allow}.
-

    Note, that for jabberd 1.4- or WPJabber-based -services you have to make the transports log and do XDB by themselves: +

    Note, that for services based in jabberd14 or WPJabber +you have to make the transports log and do XDB by themselves: 

      <!--
      You have to add elogger and rlogger entries here when using ejabberd.
      In this case the transport will do the logging.
@@ -937,7 +937,7 @@ services you have to make the transports log and do XDB by themselves:
   <xdb id="xdb">
     <host/>
     <load>
-      <!-- this is a lib of wpjabber or jabberd -->
+      <!-- this is a lib of wpjabber or jabberd14 -->
       <xdb_file>/usr/lib/jabber/xdb_file.so</xdb_file>
       </load>
     <xdb_file xmlns="jabber:config:xdb_file">
@@ -959,7 +959,7 @@ example authentication scripts.
 3.2.2 and 3.2.4.
  • anonymous — See section 3.1.4.
  • pam — See section 3.1.4. -

    • +

    Account creation is only supported by internal and odbc methods.

    Internal

    ejabberd uses its internal Mnesia database as the default authentication method.