Index: docs/src/_build/html/install.html
===================================================================
--- docs/src/_build/html/install.html	(revision 16)
+++ docs/src/_build/html/install.html	(revision 27)
@@ -53,24 +53,30 @@
             
   <div class="section" id="installation-instructions">
-<h1><a class="toc-backref" href="#id3">Installation instructions</a><a class="headerlink" href="#installation-instructions" title="Permalink to this headline">¶</a></h1>
+<h1><a class="toc-backref" href="#id9">Installation instructions</a><a class="headerlink" href="#installation-instructions" title="Permalink to this headline">¶</a></h1>
+<p>Installing Mailjam is quite easy. If you have some experience installing
+<a class="reference external" href="http://python.org">Python</a> packages <a class="footnote-reference" href="#id5" id="id1">[1]</a>, you already know how to do it. Mailjam is a standard
+<a class="reference external" href="http://python.org">Python</a> package available on <a class="reference external" href="http://pypi.python.org/pypi">pypi</a> <a class="footnote-reference" href="#id7" id="id2">[3]</a> so just use your favourite tool
+(<a class="reference external" href="http://www.pip-installer.org/en/latest/index.html">pip</a>, <a class="reference external" href="http://peak.telecommunity.com/DevCenter/EasyInstall">easy_install</a>, etc) to intall it.</p>
+<p>Keep reading if you want to learn more about the different options/choices
+you have when installing Mailjam.</p>
 <div class="contents topic" id="contents">
 <p class="topic-title first">Contents</p>
 <ul class="simple">
-<li><a class="reference internal" href="#installation-instructions" id="id3">Installation instructions</a><ul>
-<li><a class="reference internal" href="#first-install-dependencies" id="id4">First, install dependencies</a></li>
-<li><a class="reference internal" href="#second-install-mailjam" id="id5">Second, install Mailjam</a><ul>
-<li><a class="reference internal" href="#installing-using-pip" id="id6">Installing using pip</a></li>
-<li><a class="reference internal" href="#installing-using-easy-install" id="id7">Installing using easy_install</a></li>
-<li><a class="reference internal" href="#installing-inside-a-virtualenv" id="id8">Installing inside a virtualenv</a></li>
-<li><a class="reference internal" href="#installing-from-sources" id="id9">Installing from sources</a><ul>
-<li><a class="reference internal" href="#releases" id="id10">Releases</a></li>
-<li><a class="reference internal" href="#from-repository" id="id11">From repository</a></li>
-</ul>
-</li>
-</ul>
-</li>
-<li><a class="reference internal" href="#setting-up-mailjam" id="id12">Setting up Mailjam</a></li>
-<li><a class="reference internal" href="#running-mailjam" id="id13">Running Mailjam</a></li>
-<li><a class="reference internal" href="#running-tests-developers-only" id="id14">Running tests (developers only)</a></li>
+<li><a class="reference internal" href="#installation-instructions" id="id9">Installation instructions</a><ul>
+<li><a class="reference internal" href="#first-install-dependencies" id="id10">First, install dependencies</a></li>
+<li><a class="reference internal" href="#second-install-mailjam" id="id11">Second, install Mailjam</a><ul>
+<li><a class="reference internal" href="#installing-using-pip" id="id12">Installing using pip</a></li>
+<li><a class="reference internal" href="#installing-using-easy-install" id="id13">Installing using easy_install</a></li>
+<li><a class="reference internal" href="#installing-inside-a-virtualenv" id="id14">Installing inside a virtualenv</a></li>
+<li><a class="reference internal" href="#installing-from-sources" id="id15">Installing from sources</a><ul>
+<li><a class="reference internal" href="#releases" id="id16">Releases</a></li>
+<li><a class="reference internal" href="#from-repository" id="id17">From repository</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li><a class="reference internal" href="#setting-up-mailjam" id="id18">Setting up Mailjam</a></li>
+<li><a class="reference internal" href="#running-mailjam" id="id19">Running Mailjam</a></li>
+<li><a class="reference internal" href="#running-tests-developers-only" id="id20">Running tests (developers only)</a></li>
 </ul>
 </li>
@@ -78,31 +84,38 @@
 </div>
 <div class="section" id="first-install-dependencies">
-<span id="install-dependencies"></span><h2><a class="toc-backref" href="#id4">First, install dependencies</a><a class="headerlink" href="#first-install-dependencies" title="Permalink to this headline">¶</a></h2>
+<span id="install-dependencies"></span><h2><a class="toc-backref" href="#id10">First, install dependencies</a><a class="headerlink" href="#first-install-dependencies" title="Permalink to this headline">¶</a></h2>
 <p>So far, the only dependency you will need in order to run mailjam is <a class="reference external" href="http://python.org">Python</a></p>
 <p>Mailjam has been tested with python <em>2.7.x</em>, but it should work with versions
 <em>2.6.x</em> too.</p>
-<p>Please, refer to your operating system package system documentation to learn
-more about how to install python.</p>
+<p>Please, refer to your operating system documentation to learn more about how
+to install python.</p>
 </div>
 <div class="section" id="second-install-mailjam">
-<span id="install-mailjam"></span><h2><a class="toc-backref" href="#id5">Second, install Mailjam</a><a class="headerlink" href="#second-install-mailjam" title="Permalink to this headline">¶</a></h2>
+<span id="install-mailjam"></span><h2><a class="toc-backref" href="#id11">Second, install Mailjam</a><a class="headerlink" href="#second-install-mailjam" title="Permalink to this headline">¶</a></h2>
+<p>You can install Mailjam using one of the available tools for installing <a class="reference external" href="http://python.org">Python</a>
+packages, or you can install it from sources. Keep reading to learn more about
+it.</p>
 <div class="section" id="installing-using-pip">
-<span id="install-with-pip"></span><h3><a class="toc-backref" href="#id6">Installing using pip</a><a class="headerlink" href="#installing-using-pip" title="Permalink to this headline">¶</a></h3>
+<span id="install-with-pip"></span><h3><a class="toc-backref" href="#id12">Installing using pip</a><a class="headerlink" href="#installing-using-pip" title="Permalink to this headline">¶</a></h3>
 <p>You can install Mailjam using <a class="reference external" href="http://www.pip-installer.org/en/latest/index.html">pip</a>:</p>
-<div class="highlight-python"><pre>pip install -e https://bitbucket.org/codigo23/mailjam#egg=mailjam</pre>
-</div>
-<div class="admonition note">
-<p class="first admonition-title">Note</p>
-<p class="last">Mailjam has not been recorded/uploaded to <a class="reference external" href="http://pypi.python.org/pypi">pypi</a> yet, so, in order to install
-it using pip you will have to provide the URL for the public Mailjam repo.</p>
+<div class="highlight-python"><pre>pip install Mailjam</pre>
+</div>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p>The previous command will install the latest release from <a class="reference external" href="http://pypi.python.org/pypi">pypi</a>. If you
+would like to install the latest <em>bleeding edge</em> sources (unstable code),
+you can do it using <a class="reference external" href="http://www.pip-installer.org/en/latest/index.html">pip</a> too:</p>
+<div class="last highlight-python"><pre>pip install -e https://bitbucket.org/codigo23/mailjam#egg=mailjam</pre>
+</div>
 </div>
 </div>
 <div class="section" id="installing-using-easy-install">
-<span id="install-with-easy-install"></span><h3><a class="toc-backref" href="#id7">Installing using easy_install</a><a class="headerlink" href="#installing-using-easy-install" title="Permalink to this headline">¶</a></h3>
-<p>You can not install Mailjam using <a class="reference external" href="http://peak.telecommunity.com/DevCenter/EasyInstall">easy_install</a> yet (until we do record/upload
-it to pypi)</p>
+<span id="install-with-easy-install"></span><h3><a class="toc-backref" href="#id13">Installing using easy_install</a><a class="headerlink" href="#installing-using-easy-install" title="Permalink to this headline">¶</a></h3>
+<p>You can install Mailjam using <a class="reference external" href="http://peak.telecommunity.com/DevCenter/EasyInstall">easy_install</a>:</p>
+<div class="highlight-python"><pre>easy_install Mailjam</pre>
+</div>
 </div>
 <div class="section" id="installing-inside-a-virtualenv">
-<span id="install-inside-virtualenv"></span><h3><a class="toc-backref" href="#id8">Installing inside a virtualenv</a><a class="headerlink" href="#installing-inside-a-virtualenv" title="Permalink to this headline">¶</a></h3>
+<span id="install-inside-virtualenv"></span><h3><a class="toc-backref" href="#id14">Installing inside a virtualenv</a><a class="headerlink" href="#installing-inside-a-virtualenv" title="Permalink to this headline">¶</a></h3>
 <p>You can install Mailjam inside a <a class="reference external" href="http://www.virtualenv.org/en/latest/index.html">virtualenv</a>. Just create a virtualenv:</p>
 <div class="highlight-python"><div class="highlight"><pre><span class="n">virtualenv</span> <span class="o">/</span><span class="n">path</span><span class="o">/</span><span class="n">to</span><span class="o">/</span><span class="n">your</span><span class="o">/</span><span class="n">env</span>
@@ -122,24 +135,28 @@
 </div>
 <p>And, once the environment has been activated, use pip to install Mailjam:</p>
-<div class="highlight-python"><pre>env$ pip install -e https://bitbucket.org/codigo23/mailjam#egg=mailjam</pre>
+<div class="highlight-python"><pre>env$ pip install Mailjam</pre>
+</div>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p>Remember that you can install the latest <em>bleeding edge</em> version using
+<a class="reference external" href="http://www.pip-installer.org/en/latest/index.html">pip</a> too:</p>
+<div class="last highlight-python"><pre>env$ pip install -e https://bitbucket.org/codigo23/mailjam#egg=mailjam</pre>
+</div>
 </div>
 </div>
 <div class="section" id="installing-from-sources">
-<span id="install-from-sources"></span><h3><a class="toc-backref" href="#id9">Installing from sources</a><a class="headerlink" href="#installing-from-sources" title="Permalink to this headline">¶</a></h3>
+<span id="install-from-sources"></span><h3><a class="toc-backref" href="#id15">Installing from sources</a><a class="headerlink" href="#installing-from-sources" title="Permalink to this headline">¶</a></h3>
 <p>When installing from sources, you can download one of the official releases
 or you can go with the <em>bleeding edge</em> and get a copy of the official source
 code repository.</p>
 <div class="section" id="releases">
-<span id="install-from-release"></span><h4><a class="toc-backref" href="#id10">Releases</a><a class="headerlink" href="#releases" title="Permalink to this headline">¶</a></h4>
-<p><strong>There are no releases yet</strong>. You will have to install it from the repository.</p>
-</div>
-<div class="section" id="from-repository">
-<span id="install-from-repository"></span><h4><a class="toc-backref" href="#id11">From repository</a><a class="headerlink" href="#from-repository" title="Permalink to this headline">¶</a></h4>
-<p>The source code of Mailjam is hosted in <a class="reference external" href="https://bitbucket.org">bitbucket</a> <a class="footnote-reference" href="#id2" id="id1">[1]</a>. In order to grab
-the latest sources you need <a class="reference external" href="http://mercurial.selenic.com">Mercurial</a>.</p>
-<p>To get a copy of the sources, just <em>clone</em> the repository:</p>
-<div class="highlight-python"><pre>hg clone https://bitbucket.org/codigo23/mailjam mailjam-repo</pre>
-</div>
-<p>Then, go inside the <em>mailjam-repo</em> directory and run:</p>
+<span id="install-from-release"></span><h4><a class="toc-backref" href="#id16">Releases</a><a class="headerlink" href="#releases" title="Permalink to this headline">¶</a></h4>
+<p>You can grab a copy of the latest release from <a class="reference external" href="http://pypi.python.org/pypi">pypi</a>:</p>
+<p><a class="reference external" href="http://pypi.python.org/packages/source/m/mailjam/">http://pypi.python.org/packages/source/m/mailjam/</a></p>
+<p>After downloaded, you have to unpack the sources:</p>
+<div class="highlight-python"><pre>tar -zxvvf mailjam-0.1.0.tar.gz</pre>
+</div>
+<p>This will create a directory called <em>mailjam-0.1.0</em>, go inside that directory
+and run:</p>
 <div class="highlight-python"><pre>python setup.py install</pre>
 </div>
@@ -155,21 +172,129 @@
 </div>
 </div>
+<div class="section" id="from-repository">
+<span id="install-from-repository"></span><h4><a class="toc-backref" href="#id17">From repository</a><a class="headerlink" href="#from-repository" title="Permalink to this headline">¶</a></h4>
+<p>The source code of Mailjam is hosted in <a class="reference external" href="https://bitbucket.org">bitbucket</a> <a class="footnote-reference" href="#id6" id="id3">[2]</a>. In order to grab
+the latest sources you need <a class="reference external" href="http://mercurial.selenic.com">Mercurial</a>.</p>
+<p>To get a copy of the sources, just <em>clone</em> the repository:</p>
+<div class="highlight-python"><pre>hg clone https://bitbucket.org/codigo23/mailjam mailjam-repo</pre>
+</div>
+<p>Then, go inside the <em>mailjam-repo</em> directory and run:</p>
+<div class="highlight-python"><pre>python setup.py install</pre>
+</div>
+<div class="admonition warning">
+<p class="first admonition-title">Warning</p>
+<p class="last">If you want to install it <em>system-wide</em>, probably you will need <em>root</em>
+privileges (check your OS documentation to learn more about how to get
+<em>root</em> privileges - for example using <a class="reference external" href="http://sudo.ws">sudo</a>)</p>
+</div>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">This process will work inside a <a class="reference external" href="http://www.virtualenv.org/en/latest/index.html">virtualenv</a> too.</p>
+</div>
+</div>
 </div>
 </div>
 <div class="section" id="setting-up-mailjam">
-<span id="install-setting-up-mailjam"></span><h2><a class="toc-backref" href="#id12">Setting up Mailjam</a><a class="headerlink" href="#setting-up-mailjam" title="Permalink to this headline">¶</a></h2>
-<p>TBW</p>
+<span id="install-setting-up-mailjam"></span><h2><a class="toc-backref" href="#id18">Setting up Mailjam</a><a class="headerlink" href="#setting-up-mailjam" title="Permalink to this headline">¶</a></h2>
+<p>In order to setup Mailjam, you will have to create the needed
+<a class="reference internal" href="configuration.html"><em>configuration files</em></a>. Each component has its own
+configuration file:</p>
+<ul class="simple">
+<li>The <a class="reference internal" href="overview.html#overview-mailjam-daemon"><em>Mailjam daemon</em></a> configuration file is
+<a class="reference internal" href="configuration.html#configuration-daemon"><em>mailjam.conf</em></a></li>
+<li>The <a class="reference internal" href="overview.html#overview-mailjam-mta-client"><em>Mailjam MTA client</em></a> configuration
+file is <a class="reference internal" href="configuration.html#configuration-mta-client"><em>mailjam-mta.conf</em></a></li>
+<li>The <a class="reference internal" href="overview.html#overview-mailjam-cli-client"><em>Mailjam CLI client</em></a> configuration
+file is <a class="reference internal" href="configuration.html#configuration-cli-client"><em>mailjam-cli.conf</em></a></li>
+</ul>
+<p>Refer to each configuration file documentation to learn more about the different
+settings you can customize.</p>
+<p>Each component will search for its configuration file in a list of predefined
+locations, but you can override that behaviour using the <em>-c</em> parameter when
+starting the component.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p>Mailjam will search for the config files, in order, through the following
+paths:</p>
+<ol class="last arabic simple">
+<li>/etc/mailjam</li>
+<li>/etc</li>
+<li>/usr/local/etc/mailjam</li>
+<li>/usr/local/etc</li>
+<li>the <em>conf</em> directory within the sources (or the installed <em>egg</em> <a class="footnote-reference" href="#id8" id="id4">[4]</a>)</li>
+</ol>
+</div>
+<p>For example, you can start the <a class="reference internal" href="overview.html#overview-mailjam-daemon"><em>Mailjam daemon</em></a> passing
+<em>/var/db/mailjam/mailjam.conf</em> as its configuration file:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">mailjam</span><span class="o">-</span><span class="n">server</span> <span class="o">-</span><span class="n">c</span> <span class="o">/</span><span class="n">var</span><span class="o">/</span><span class="n">db</span><span class="o">/</span><span class="n">mailjam</span><span class="o">/</span><span class="n">mailjam</span><span class="o">.</span><span class="n">conf</span>
+</pre></div>
+</div>
+<div class="admonition-see-also admonition seealso">
+<p class="first admonition-title">See also</p>
+<p class="last"><a class="reference internal" href="running.html"><em>Running Mailjam</em></a> contains more information about how to run the different
+components.</p>
+</div>
+<p>If you have installed Mailjam using <a class="reference external" href="http://www.pip-installer.org/en/latest/index.html">pip</a>, <a class="reference external" href="http://peak.telecommunity.com/DevCenter/EasyInstall">easy_install</a> or even from sources,
+the setup process should have taken care of the configuration files, adding
+a copy of the default files included in the sources to the default
+destination.</p>
+<div class="admonition warning">
+<p class="first admonition-title">Warning</p>
+<p class="last">The default destination will be different based on your operating system.
+For example, in most linux servers it will copy the files to <em>/etc/mailjam</em>,
+while in BSD servers it will copy the files to <em>/usr/local/etc/mailjam</em>.</p>
+</div>
+<div class="admonition-see-also admonition seealso">
+<p class="first admonition-title">See also</p>
+<p class="last"><a class="reference internal" href="configuration.html"><em>Configuration files, settings and formats documentation</em></a></p>
+</div>
 </div>
 <div class="section" id="running-mailjam">
-<span id="install-running-mailjam"></span><h2><a class="toc-backref" href="#id13">Running Mailjam</a><a class="headerlink" href="#running-mailjam" title="Permalink to this headline">¶</a></h2>
-<p>TBW</p>
+<span id="install-running-mailjam"></span><h2><a class="toc-backref" href="#id19">Running Mailjam</a><a class="headerlink" href="#running-mailjam" title="Permalink to this headline">¶</a></h2>
+<p>In order to run a full Mailjam environment, you will have to start the different
+components separately:</p>
+<ol class="arabic simple">
+<li><a class="reference internal" href="running.html#running-daemon"><em>Start the daemon</em></a></li>
+<li><a class="reference internal" href="running.html#running-cli-client"><em>Run the cli client and manage your mailing lists</em></a></li>
+<li><a class="reference internal" href="running.html#running-mta-client"><em>Add as much MTA clients as you need to your mail server</em></a></li>
+</ol>
+<p>The daemon will have to be running all the time (it is the component responsible
+for providing information to the clients). You will need the CLI client to add,
+edit or delete mailing lists and each MTA client will be responsible to handle
+incoming emails for each mailing list.</p>
 </div>
 <div class="section" id="running-tests-developers-only">
-<span id="install-running-tests"></span><h2><a class="toc-backref" href="#id14">Running tests (developers only)</a><a class="headerlink" href="#running-tests-developers-only" title="Permalink to this headline">¶</a></h2>
-<p>TBW</p>
-<table class="docutils footnote" frame="void" id="id2" rules="none">
+<span id="install-running-tests"></span><h2><a class="toc-backref" href="#id20">Running tests (developers only)</a><a class="headerlink" href="#running-tests-developers-only" title="Permalink to this headline">¶</a></h2>
+<p>Just in case you were wondering, <strong>yes</strong>, Mailjam code has some tests you can
+run to check everything is ok and that the software should run smoothly on your
+server(s).</p>
+<p>To run the tests, simply get a copy of the sources from our public repository:</p>
+<div class="highlight-python"><pre>hg clone https://bitbucket.org/codigo23/mailjam mailjam-repo</pre>
+</div>
+<p>then run the tests:</p>
+<div class="highlight-python"><pre>cd mailjam-repo &amp;&amp; ./bin/run_tests</pre>
+</div>
+<table class="docutils footnote" frame="void" id="id5" rules="none">
 <colgroup><col class="label" /><col /></colgroup>
 <tbody valign="top">
-<tr><td class="label"><a class="fn-backref" href="#id1">[1]</a></td><td><a class="reference external" href="https://bitbucket.org/codigo23/mailjam">https://bitbucket.org/codigo23/mailjam</a></td></tr>
+<tr><td class="label"><a class="fn-backref" href="#id1">[1]</a></td><td><a class="reference external" href="http://docs.python.org/tutorial/modules.html#packages">http://docs.python.org/tutorial/modules.html#packages</a></td></tr>
+</tbody>
+</table>
+<table class="docutils footnote" frame="void" id="id6" rules="none">
+<colgroup><col class="label" /><col /></colgroup>
+<tbody valign="top">
+<tr><td class="label"><a class="fn-backref" href="#id3">[2]</a></td><td><a class="reference external" href="https://bitbucket.org/codigo23/mailjam">https://bitbucket.org/codigo23/mailjam</a></td></tr>
+</tbody>
+</table>
+<table class="docutils footnote" frame="void" id="id7" rules="none">
+<colgroup><col class="label" /><col /></colgroup>
+<tbody valign="top">
+<tr><td class="label"><a class="fn-backref" href="#id2">[3]</a></td><td><a class="reference external" href="http://pypi.python.org/pypi/mailjam">http://pypi.python.org/pypi/mailjam</a></td></tr>
+</tbody>
+</table>
+<table class="docutils footnote" frame="void" id="id8" rules="none">
+<colgroup><col class="label" /><col /></colgroup>
+<tbody valign="top">
+<tr><td class="label"><a class="fn-backref" href="#id4">[4]</a></td><td><a class="reference external" href="http://svn.python.org/projects/sandbox/trunk/setuptools/doc/formats.txt">http://svn.python.org/projects/sandbox/trunk/setuptools/doc/formats.txt</a></td></tr>
 </tbody>
 </table>
