Index: docs/src/_build/html/configuration.html
===================================================================
--- docs/src/_build/html/configuration.html	(revision 16)
+++ docs/src/_build/html/configuration.html	(revision 27)
@@ -53,52 +53,85 @@
             
   <div class="section" id="configuration">
-<h1><a class="toc-backref" href="#id9">Configuration</a><a class="headerlink" href="#configuration" title="Permalink to this headline">¶</a></h1>
+<h1><a class="toc-backref" href="#id28">Configuration</a><a class="headerlink" href="#configuration" title="Permalink to this headline">¶</a></h1>
+<p>Mailjam has separate configuration files for the different apps (the daemon and
+the variety of different clients available). Check below to read more about the
+configuration file you need to modify depending on what you want to do.</p>
 <div class="contents topic" id="contents">
 <p class="topic-title first">Contents</p>
 <ul class="simple">
-<li><a class="reference internal" href="#configuration" id="id9">Configuration</a><ul>
-<li><a class="reference internal" href="#mailjam-daemon-configuration-file" id="id10">Mailjam daemon configuration file</a><ul>
-<li><a class="reference internal" href="#xmlrpc-server" id="id11">xmlrpc_server</a><ul>
-<li><a class="reference internal" href="#address" id="id12">address</a></li>
-<li><a class="reference internal" href="#port" id="id13">port</a></li>
-<li><a class="reference internal" href="#ssl" id="id14">ssl</a></li>
-<li><a class="reference internal" href="#ssl-key" id="id15">ssl_key</a></li>
-<li><a class="reference internal" href="#ssl-crt" id="id16">ssl_crt</a></li>
-<li><a class="reference internal" href="#logfile" id="id17">logfile</a></li>
-</ul>
-</li>
-<li><a class="reference internal" href="#storage" id="id18">storage</a><ul>
-<li><a class="reference internal" href="#backend" id="id19">backend</a></li>
-<li><a class="reference internal" href="#path" id="id20">path</a></li>
-<li><a class="reference internal" href="#lists-db" id="id21">lists_db</a></li>
-<li><a class="reference internal" href="#members-db" id="id22">members_db</a></li>
-</ul>
-</li>
-<li><a class="reference internal" href="#archive" id="id23">archive</a><ul>
-<li><a class="reference internal" href="#enabled" id="id24">enabled</a></li>
-<li><a class="reference internal" href="#configuration-daemon-archive-backend" id="id25">backend</a></li>
-<li><a class="reference internal" href="#configuration-daemon-archive-path" id="id26">path</a></li>
-</ul>
-</li>
-<li><a class="reference internal" href="#mailing-lists" id="id27">mailing_lists</a><ul>
-<li><a class="reference internal" href="#private" id="id28">private</a></li>
-</ul>
-</li>
-<li><a class="reference internal" href="#members" id="id29">members</a><ul>
-<li><a class="reference internal" href="#auto-signup" id="id30">auto_signup</a></li>
-<li><a class="reference internal" href="#allow-chpasswd" id="id31">allow_chpasswd</a></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="section" id="mailjam-daemon-configuration-file">
-<span id="configuration-daemon"></span><h2><a class="toc-backref" href="#id10">Mailjam daemon configuration file</a><a class="headerlink" href="#mailjam-daemon-configuration-file" title="Permalink to this headline">¶</a></h2>
-<p>All the configurations that can be applied to the Mailjam daemon are registered
-in the <strong>mailjam.conf</strong> file. That file contains ini-style <a class="footnote-reference" href="#id6" id="id1">[1]</a> configuration
-parameters, separated in different <em>categories</em>.</p>
+<li><a class="reference internal" href="#configuration" id="id28">Configuration</a><ul>
+<li><a class="reference internal" href="#mailjam-daemon-configuration-file-mailjam-conf" id="id29">Mailjam daemon configuration file - mailjam.conf</a><ul>
+<li><a class="reference internal" href="#xmlrpc-server" id="id30">xmlrpc_server</a><ul>
+<li><a class="reference internal" href="#address" id="id31">address</a></li>
+<li><a class="reference internal" href="#port" id="id32">port</a></li>
+<li><a class="reference internal" href="#ssl" id="id33">ssl</a></li>
+<li><a class="reference internal" href="#ssl-key" id="id34">ssl_key</a></li>
+<li><a class="reference internal" href="#ssl-crt" id="id35">ssl_crt</a></li>
+<li><a class="reference internal" href="#logfile" id="id36">logfile</a></li>
+</ul>
+</li>
+<li><a class="reference internal" href="#storage" id="id37">storage</a><ul>
+<li><a class="reference internal" href="#backend" id="id38">backend</a></li>
+<li><a class="reference internal" href="#path" id="id39">path</a></li>
+<li><a class="reference internal" href="#lists-db" id="id40">lists_db</a></li>
+<li><a class="reference internal" href="#members-db" id="id41">members_db</a></li>
+</ul>
+</li>
+<li><a class="reference internal" href="#archive" id="id42">archive</a><ul>
+<li><a class="reference internal" href="#enabled" id="id43">enabled</a></li>
+<li><a class="reference internal" href="#configuration-daemon-archive-backend" id="id44">backend</a></li>
+<li><a class="reference internal" href="#configuration-daemon-archive-path" id="id45">path</a></li>
+</ul>
+</li>
+<li><a class="reference internal" href="#mailing-lists" id="id46">mailing_lists</a><ul>
+<li><a class="reference internal" href="#private" id="id47">private</a></li>
+</ul>
+</li>
+<li><a class="reference internal" href="#members" id="id48">members</a><ul>
+<li><a class="reference internal" href="#auto-signup" id="id49">auto_signup</a></li>
+<li><a class="reference internal" href="#allow-chpasswd" id="id50">allow_chpasswd</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li><a class="reference internal" href="#mailjam-mta-client-configuration-file-mailjam-mta-conf" id="id51">Mailjam MTA client configuration file - mailjam-mta.conf</a><ul>
+<li><a class="reference internal" href="#server" id="id52">server</a><ul>
+<li><a class="reference internal" href="#configuration-mta-client-server-address" id="id53">address</a></li>
+<li><a class="reference internal" href="#configuration-mta-client-server-port" id="id54">port</a></li>
+<li><a class="reference internal" href="#uri" id="id55">uri</a></li>
+<li><a class="reference internal" href="#configuration-mta-client-server-ssl" id="id56">ssl</a></li>
+</ul>
+</li>
+<li><a class="reference internal" href="#configuration-mta-client-archive" id="id57">archive</a><ul>
+<li><a class="reference internal" href="#persistent" id="id58">persistent</a></li>
+<li><a class="reference internal" href="#configuration-mta-client-archive-path" id="id59">path</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li><a class="reference internal" href="#mailjam-cli-client-configuration-file-mailjam-cli-conf" id="id60">Mailjam CLI client configuration file - mailjam-cli.conf</a><ul>
+<li><a class="reference internal" href="#configuration-cli-client-server" id="id61">server</a><ul>
+<li><a class="reference internal" href="#configuration-cli-client-server-address" id="id62">address</a></li>
+<li><a class="reference internal" href="#configuration-cli-client-server-port" id="id63">port</a></li>
+<li><a class="reference internal" href="#configuration-cli-client-server-uri" id="id64">uri</a></li>
+<li><a class="reference internal" href="#configuration-cli-client-server-ssl" id="id65">ssl</a></li>
+</ul>
+</li>
+<li><a class="reference internal" href="#history" id="id66">history</a><ul>
+<li><a class="reference internal" href="#configurtion-cli-client-archive-enabled" id="id67">enabled</a></li>
+<li><a class="reference internal" href="#configuration-cli-client-history-path" id="id68">path</a></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="mailjam-daemon-configuration-file-mailjam-conf">
+<span id="configuration-daemon"></span><h2><a class="toc-backref" href="#id29">Mailjam daemon configuration file - mailjam.conf</a><a class="headerlink" href="#mailjam-daemon-configuration-file-mailjam-conf" title="Permalink to this headline">¶</a></h2>
+<p>All the configurations that can be applied to the <a class="reference internal" href="overview.html#overview-mailjam-daemon"><em>Mailjam daemon</em></a>
+are registered in the <strong>mailjam.conf</strong> file. That file contains ini-style <a class="footnote-reference" href="#id24" id="id1">[1]</a>
+configuration parameters, separated in different <em>categories</em>.</p>
 <div class="admonition note">
 <p class="first admonition-title">Note</p>
@@ -106,8 +139,8 @@
 your setup. The usual locations are:</p>
 <ul class="simple">
-<li><em>/etc/mailjam.conf</em> - In most Linux systems (like archlinux, gentoo,
-fedora, debian, ubuntu, etc)</li>
-<li><em>/usr/local/etc/mailjam.conf</em> - In most BSD systems (like FreeBSD, OpenBSD,
-NetBSD, etc)</li>
+<li><em>/etc/mailjam/mailjam.conf</em> - In most Linux systems (like archlinux,
+gentoo, fedora, debian, ubuntu, etc)</li>
+<li><em>/usr/local/etc/mailjam/mailjam.conf</em> - In most BSD systems (like FreeBSD,
+OpenBSD, NetBSD, etc)</li>
 </ul>
 <p class="last">There is a copy of the configuration file in the <em>conf/</em> directory, within
@@ -115,10 +148,10 @@
 </div>
 <div class="section" id="xmlrpc-server">
-<span id="configuration-daemon-xmlrpc"></span><h3><a class="toc-backref" href="#id11">xmlrpc_server</a><a class="headerlink" href="#xmlrpc-server" title="Permalink to this headline">¶</a></h3>
+<span id="configuration-daemon-xmlrpc"></span><h3><a class="toc-backref" href="#id30">xmlrpc_server</a><a class="headerlink" href="#xmlrpc-server" title="Permalink to this headline">¶</a></h3>
 <p>This section contains the configuration parameters that modify the behaviour of
-the daemon when serving content through XMLRPC <a class="footnote-reference" href="#id7" id="id2">[2]</a>.</p>
+the daemon when serving content through XMLRPC <a class="footnote-reference" href="#id25" id="id2">[2]</a>.</p>
 <p>These are all the available parameters in this section:</p>
 <div class="section" id="address">
-<span id="configuration-daemon-xmlrpc-address"></span><h4><a class="toc-backref" href="#id12">address</a><a class="headerlink" href="#address" title="Permalink to this headline">¶</a></h4>
+<span id="configuration-daemon-xmlrpc-address"></span><h4><a class="toc-backref" href="#id31">address</a><a class="headerlink" href="#address" title="Permalink to this headline">¶</a></h4>
 <p>Default: <tt class="docutils literal"><span class="pre">localhost</span></tt></p>
 <p>The address where the daemon will be listening for XMLRPC requests. Use <tt class="docutils literal"><span class="pre">*</span></tt>
@@ -127,17 +160,17 @@
 </div>
 <div class="section" id="port">
-<span id="configuration-daemon-xmlrpc-port"></span><h4><a class="toc-backref" href="#id13">port</a><a class="headerlink" href="#port" title="Permalink to this headline">¶</a></h4>
+<span id="configuration-daemon-xmlrpc-port"></span><h4><a class="toc-backref" href="#id32">port</a><a class="headerlink" href="#port" title="Permalink to this headline">¶</a></h4>
 <p>Default: <tt class="docutils literal"><span class="pre">9876</span></tt></p>
 <p>The port where the daemon will be listening por XMLRPC requests.</p>
 </div>
 <div class="section" id="ssl">
-<span id="configuration-daemon-xmlrpc-ssl"></span><h4><a class="toc-backref" href="#id14">ssl</a><a class="headerlink" href="#ssl" title="Permalink to this headline">¶</a></h4>
-<p>Default: <tt class="docutils literal"><span class="pre">off</span></tt> (because ssl support hasn&#8217;t been added yet)</p>
-<p>Enables/disables SSL <a class="footnote-reference" href="#id8" id="id3">[3]</a> support in the daemon. If <tt class="docutils literal"><span class="pre">off</span></tt> all the traffic
-to/from the server will travel unencrypted. If <tt class="docutils literal"><span class="pre">on</span></tt> all the traffic will
+<span id="configuration-daemon-xmlrpc-ssl"></span><h4><a class="toc-backref" href="#id33">ssl</a><a class="headerlink" href="#ssl" title="Permalink to this headline">¶</a></h4>
+<p>Default: <tt class="docutils literal"><span class="pre">false</span></tt> (because ssl support hasn&#8217;t been added yet)</p>
+<p>Enables/disables SSL <a class="footnote-reference" href="#id26" id="id3">[3]</a> support in the daemon. If <tt class="docutils literal"><span class="pre">false</span></tt> all the traffic
+to/from the server will travel unencrypted. If <tt class="docutils literal"><span class="pre">true</span></tt> all the traffic will
 travel encrypted.</p>
 </div>
 <div class="section" id="ssl-key">
-<span id="configuration-daemon-xmlrpc-ssl-key"></span><h4><a class="toc-backref" href="#id15">ssl_key</a><a class="headerlink" href="#ssl-key" title="Permalink to this headline">¶</a></h4>
+<span id="configuration-daemon-xmlrpc-ssl-key"></span><h4><a class="toc-backref" href="#id34">ssl_key</a><a class="headerlink" href="#ssl-key" title="Permalink to this headline">¶</a></h4>
 <p>Default: <tt class="docutils literal"><span class="pre">/usr/local/etc/mailjam/ssl/mailjam.key</span></tt></p>
 <p>Path to the ssl key used for encrypted SSL sessions.</p>
@@ -148,5 +181,5 @@
 </div>
 <div class="section" id="ssl-crt">
-<span id="configuration-daemon-xmlrpc-ssl-crt"></span><h4><a class="toc-backref" href="#id16">ssl_crt</a><a class="headerlink" href="#ssl-crt" title="Permalink to this headline">¶</a></h4>
+<span id="configuration-daemon-xmlrpc-ssl-crt"></span><h4><a class="toc-backref" href="#id35">ssl_crt</a><a class="headerlink" href="#ssl-crt" title="Permalink to this headline">¶</a></h4>
 <p>Default: <tt class="docutils literal"><span class="pre">/usr/local/etc/mailjam/ssl/mailjam.crt</span></tt></p>
 <p>Path to the ssl certificate used for encrypted SSL sessions.</p>
@@ -157,5 +190,5 @@
 </div>
 <div class="section" id="logfile">
-<span id="configuration-daemon-xmlrpc-logfile"></span><h4><a class="toc-backref" href="#id17">logfile</a><a class="headerlink" href="#logfile" title="Permalink to this headline">¶</a></h4>
+<span id="configuration-daemon-xmlrpc-logfile"></span><h4><a class="toc-backref" href="#id36">logfile</a><a class="headerlink" href="#logfile" title="Permalink to this headline">¶</a></h4>
 <p>Default: <tt class="docutils literal"><span class="pre">/var/log/mailjam/xmlrpc_server.log</span></tt></p>
 <p>Path to the file where log messages will be saved</p>
@@ -163,10 +196,10 @@
 </div>
 <div class="section" id="storage">
-<span id="configuration-daemon-storage"></span><h3><a class="toc-backref" href="#id18">storage</a><a class="headerlink" href="#storage" title="Permalink to this headline">¶</a></h3>
+<span id="configuration-daemon-storage"></span><h3><a class="toc-backref" href="#id37">storage</a><a class="headerlink" href="#storage" title="Permalink to this headline">¶</a></h3>
 <p>This section contains the configuration parameters that modify the way the
 daemon saves data to disk, using one of the storage backends.</p>
 <p>These are all the available parameters in this section:</p>
 <div class="section" id="backend">
-<span id="configuration-daemon-storage-backend"></span><h4><a class="toc-backref" href="#id19">backend</a><a class="headerlink" href="#backend" title="Permalink to this headline">¶</a></h4>
+<span id="configuration-daemon-storage-backend"></span><h4><a class="toc-backref" href="#id38">backend</a><a class="headerlink" href="#backend" title="Permalink to this headline">¶</a></h4>
 <p>Default: <tt class="docutils literal"><span class="pre">json</span></tt></p>
 <p>Sets the type of backend the daemon is going to use. Right now the only backend
@@ -174,10 +207,10 @@
 </div>
 <div class="section" id="path">
-<span id="configuration-daemon-xmlrpc-path"></span><h4><a class="toc-backref" href="#id20">path</a><a class="headerlink" href="#path" title="Permalink to this headline">¶</a></h4>
+<span id="configuration-daemon-xmlrpc-path"></span><h4><a class="toc-backref" href="#id39">path</a><a class="headerlink" href="#path" title="Permalink to this headline">¶</a></h4>
 <p>Default: <tt class="docutils literal"><span class="pre">/usr/local/mailjam/storage</span></tt></p>
 <p>Path to the directory where the backend will save data.</p>
 </div>
 <div class="section" id="lists-db">
-<span id="configuration-daemon-storage-lists-db"></span><h4><a class="toc-backref" href="#id21">lists_db</a><a class="headerlink" href="#lists-db" title="Permalink to this headline">¶</a></h4>
+<span id="configuration-daemon-storage-lists-db"></span><h4><a class="toc-backref" href="#id40">lists_db</a><a class="headerlink" href="#lists-db" title="Permalink to this headline">¶</a></h4>
 <p>Default: <tt class="docutils literal"><span class="pre">/usr/local/mailjam/storage/mailings.json</span></tt></p>
 <p>Path to the file where the identifiers of existing mailing lists will be saved.</p>
@@ -200,5 +233,5 @@
 </div>
 <div class="section" id="members-db">
-<span id="configuration-daemon-xmlrpc-members-db"></span><h4><a class="toc-backref" href="#id22">members_db</a><a class="headerlink" href="#members-db" title="Permalink to this headline">¶</a></h4>
+<span id="configuration-daemon-xmlrpc-members-db"></span><h4><a class="toc-backref" href="#id41">members_db</a><a class="headerlink" href="#members-db" title="Permalink to this headline">¶</a></h4>
 <p>Default: <tt class="docutils literal"><span class="pre">/usr/local/mailjam/storage/members.json</span></tt></p>
 <p>Path to the file where the identifiers of existing members will be saved.</p>
@@ -211,10 +244,10 @@
 </div>
 <div class="section" id="archive">
-<span id="configuration-daemon-archive"></span><h3><a class="toc-backref" href="#id23">archive</a><a class="headerlink" href="#archive" title="Permalink to this headline">¶</a></h3>
+<span id="configuration-daemon-archive"></span><h3><a class="toc-backref" href="#id42">archive</a><a class="headerlink" href="#archive" title="Permalink to this headline">¶</a></h3>
 <p>This section contains the configuration parameters that modify the way the
 daemon saves data to disk, using one of the storage backends.</p>
 <p>These are all the available parameters in this section:</p>
 <div class="section" id="enabled">
-<span id="configuration-daemon-archive-enabled"></span><h4><a class="toc-backref" href="#id24">enabled</a><a class="headerlink" href="#enabled" title="Permalink to this headline">¶</a></h4>
+<span id="configuration-daemon-archive-enabled"></span><h4><a class="toc-backref" href="#id43">enabled</a><a class="headerlink" href="#enabled" title="Permalink to this headline">¶</a></h4>
 <p>Default: <tt class="docutils literal"><span class="pre">true</span></tt></p>
 <p>Enables/disables the <em>archives</em> feature. When enabled, Mailjam saves copies of
@@ -229,5 +262,5 @@
 </div>
 <div class="section" id="configuration-daemon-archive-backend">
-<span id="id4"></span><h4><a class="toc-backref" href="#id25">backend</a><a class="headerlink" href="#configuration-daemon-archive-backend" title="Permalink to this headline">¶</a></h4>
+<span id="id4"></span><h4><a class="toc-backref" href="#id44">backend</a><a class="headerlink" href="#configuration-daemon-archive-backend" title="Permalink to this headline">¶</a></h4>
 <p>Default: <tt class="docutils literal"><span class="pre">json</span></tt></p>
 <p>Sets the type of backend used to store messages into the archive.</p>
@@ -238,5 +271,5 @@
 </div>
 <div class="section" id="configuration-daemon-archive-path">
-<span id="id5"></span><h4><a class="toc-backref" href="#id26">path</a><a class="headerlink" href="#configuration-daemon-archive-path" title="Permalink to this headline">¶</a></h4>
+<span id="id5"></span><h4><a class="toc-backref" href="#id45">path</a><a class="headerlink" href="#configuration-daemon-archive-path" title="Permalink to this headline">¶</a></h4>
 <p>Default: <tt class="docutils literal"><span class="pre">/usr/local/mailjam/archives</span></tt></p>
 <p>Path to the directory where the archives will be saved.</p>
@@ -248,5 +281,5 @@
 </div>
 <div class="section" id="mailing-lists">
-<span id="configuration-daemon-mailing-lists"></span><h3><a class="toc-backref" href="#id27">mailing_lists</a><a class="headerlink" href="#mailing-lists" title="Permalink to this headline">¶</a></h3>
+<span id="configuration-daemon-mailing-lists"></span><h3><a class="toc-backref" href="#id46">mailing_lists</a><a class="headerlink" href="#mailing-lists" title="Permalink to this headline">¶</a></h3>
 <p>This section contains the configuration parameters that set the default
 behaviour for mailing lists.</p>
@@ -258,5 +291,5 @@
 <p>These are all the available parameters in this section:</p>
 <div class="section" id="private">
-<span id="configuration-daemon-mailing-lists-private"></span><h4><a class="toc-backref" href="#id28">private</a><a class="headerlink" href="#private" title="Permalink to this headline">¶</a></h4>
+<span id="configuration-daemon-mailing-lists-private"></span><h4><a class="toc-backref" href="#id47">private</a><a class="headerlink" href="#private" title="Permalink to this headline">¶</a></h4>
 <p>Default: <tt class="docutils literal"><span class="pre">true</span></tt></p>
 <p>Sets if a given mailing list is <em>private</em> (only registered members can send
@@ -266,5 +299,5 @@
 </div>
 <div class="section" id="members">
-<span id="configuration-daemon-members"></span><h3><a class="toc-backref" href="#id29">members</a><a class="headerlink" href="#members" title="Permalink to this headline">¶</a></h3>
+<span id="configuration-daemon-members"></span><h3><a class="toc-backref" href="#id48">members</a><a class="headerlink" href="#members" title="Permalink to this headline">¶</a></h3>
 <p>This section contains the configuration parameters that set the default
 behaviour for members.</p>
@@ -276,5 +309,5 @@
 <p>These are all the available parameters in this section:</p>
 <div class="section" id="auto-signup">
-<span id="configuration-daemon-members-auto-signup"></span><h4><a class="toc-backref" href="#id30">auto_signup</a><a class="headerlink" href="#auto-signup" title="Permalink to this headline">¶</a></h4>
+<span id="configuration-daemon-members-auto-signup"></span><h4><a class="toc-backref" href="#id49">auto_signup</a><a class="headerlink" href="#auto-signup" title="Permalink to this headline">¶</a></h4>
 <p>Default: <tt class="docutils literal"><span class="pre">false</span></tt></p>
 <p>Enables/disables auto-registration of members to mailing lists through a public
@@ -284,5 +317,5 @@
 </div>
 <div class="section" id="allow-chpasswd">
-<span id="configuration-daemon-members-allow-chpasswd"></span><h4><a class="toc-backref" href="#id31">allow_chpasswd</a><a class="headerlink" href="#allow-chpasswd" title="Permalink to this headline">¶</a></h4>
+<span id="configuration-daemon-members-allow-chpasswd"></span><h4><a class="toc-backref" href="#id50">allow_chpasswd</a><a class="headerlink" href="#allow-chpasswd" title="Permalink to this headline">¶</a></h4>
 <p>Default: <tt class="docutils literal"><span class="pre">false</span></tt></p>
 <p>Enables/disables the option to update passwords by the members themselves.</p>
@@ -290,11 +323,233 @@
 using a public web interface. If <tt class="docutils literal"><span class="pre">false</span></tt>, only mailing lists administrators
 will be able to reset those passwords.</p>
-<table class="docutils footnote" frame="void" id="id6" rules="none">
+</div>
+</div>
+</div>
+<div class="section" id="mailjam-mta-client-configuration-file-mailjam-mta-conf">
+<span id="configuration-mta-client"></span><h2><a class="toc-backref" href="#id51">Mailjam MTA client configuration file - mailjam-mta.conf</a><a class="headerlink" href="#mailjam-mta-client-configuration-file-mailjam-mta-conf" title="Permalink to this headline">¶</a></h2>
+<p>This file contains all the parameters to configure the
+<a class="reference internal" href="overview.html#overview-mailjam-mta-client"><em>MTA client</em></a> properly. It contains ini-style <a class="footnote-reference" href="#id24" id="id6">[1]</a>
+configuration parameters, separated in different <em>categories</em>.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p>The mailjam-mta.conf file will be installed in different locations
+depending on your setup. The usual locations are:</p>
+<ul class="simple">
+<li><em>/etc/mailjam/mailjam-mta.conf</em> - In most Linux systems (like archlinux,
+gentoo, fedora, debian, ubuntu, etc)</li>
+<li><em>/usr/local/etc/mailjam/mailjam-mta.conf</em> - In most BSD systems (like
+FreeBSD, OpenBSD, NetBSD, etc)</li>
+</ul>
+<p class="last">There is a copy of the configuration file in the <em>conf/</em> directory, within
+the sources.</p>
+</div>
+<div class="section" id="server">
+<span id="configuration-mta-client-server"></span><h3><a class="toc-backref" href="#id52">server</a><a class="headerlink" href="#server" title="Permalink to this headline">¶</a></h3>
+<p>This section contains the configuration parameters that tell the MTA client
+where to connect when trying to interact with the
+<a class="reference internal" href="overview.html#overview-mailjam-daemon"><em>Mailjam daemon</em></a>.</p>
+<p>These are all the available parameters in this section:</p>
+<div class="section" id="configuration-mta-client-server-address">
+<span id="id7"></span><h4><a class="toc-backref" href="#id53">address</a><a class="headerlink" href="#configuration-mta-client-server-address" title="Permalink to this headline">¶</a></h4>
+<p>Default: <tt class="docutils literal"><span class="pre">localhost</span></tt></p>
+<p>The address where the daemon is listening for XMLRPC requests. This is
+the address to where the client will try to connect to.</p>
+</div>
+<div class="section" id="configuration-mta-client-server-port">
+<span id="id8"></span><h4><a class="toc-backref" href="#id54">port</a><a class="headerlink" href="#configuration-mta-client-server-port" title="Permalink to this headline">¶</a></h4>
+<p>Default: <tt class="docutils literal"><span class="pre">9876</span></tt></p>
+<p>The port where the daemon accepts incoming XMLRPC requests. This is the
+port to where the client will try to connect to.</p>
+</div>
+<div class="section" id="uri">
+<span id="configuration-mta-client-server-uri"></span><h4><a class="toc-backref" href="#id55">uri</a><a class="headerlink" href="#uri" title="Permalink to this headline">¶</a></h4>
+<p>Default: <a class="reference external" href="http://localhost:9876">http://localhost:9876</a></p>
+<p>This is the URI <a class="footnote-reference" href="#id27" id="id9">[4]</a> to where the client will connect to. It is constructed
+based on the values of the <a class="reference internal" href="#configuration-mta-client-server-address"><em>address</em></a>
+and <a class="reference internal" href="#configuration-mta-client-server-port"><em>port</em></a> parameters.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p>The default configuration file contains a dynamic setting for this
+parameter:</p>
+<div class="highlight-python"><pre>uri = http://%(address)s:%(port)s</pre>
+</div>
+<p class="last">That means that the parameter will inherit the values from the
+<a class="reference internal" href="#configuration-mta-client-server-address"><em>address</em></a>
+and <a class="reference internal" href="#configuration-mta-client-server-port"><em>port</em></a> parameters.</p>
+</div>
+<div class="admonition-see-also admonition seealso">
+<p class="first admonition-title">See also</p>
+<p>More information about this (and other tricks) here:</p>
+<p><a class="reference external" href="http://docs.python.org/library/configparser.html">http://docs.python.org/library/configparser.html</a></p>
+<p class="last"><a class="reference external" href="http://www.doughellmann.com/PyMOTW/ConfigParser">http://www.doughellmann.com/PyMOTW/ConfigParser</a></p>
+</div>
+<div class="admonition warning">
+<p class="first admonition-title">Warning</p>
+<p class="last">You can replace this with any URI you would like, <strong>this is the parameter
+that is really used for establishing new connections</strong> so be aware that if
+you remove the references to the
+<a class="reference internal" href="#configuration-mta-client-server-address"><em>address</em></a> and
+<a class="reference internal" href="#configuration-mta-client-server-port"><em>port</em></a> parameters, the values you have
+provided for those parameters will be ignored.</p>
+</div>
+</div>
+<div class="section" id="configuration-mta-client-server-ssl">
+<span id="id10"></span><h4><a class="toc-backref" href="#id56">ssl</a><a class="headerlink" href="#configuration-mta-client-server-ssl" title="Permalink to this headline">¶</a></h4>
+<p>Default: <tt class="docutils literal"><span class="pre">false</span></tt> (because ssl support hasn&#8217;t been added yet)</p>
+<p>Enables/disables SSL <a class="footnote-reference" href="#id26" id="id11">[3]</a> connections to the daemon. If <tt class="docutils literal"><span class="pre">false</span></tt> all the
+traffic to/from the server will travel unencrypted. If <tt class="docutils literal"><span class="pre">true</span></tt> all the traffic
+will travel encrypted.</p>
+<div class="admonition warning">
+<p class="first admonition-title">Warning</p>
+<p class="last">In order to enable SSL support in the client, you have to be sure the
+<a class="reference internal" href="overview.html#overview-mailjam-daemon"><em>Mailjam daemon</em></a> supports SSL too (check the
+<a class="reference internal" href="#configuration-daemon-xmlrpc-ssl"><em>ssl</em></a> parameter in the
+<a class="reference internal" href="#configuration-daemon-xmlrpc"><em>xmlrpc_server</em></a> section of the
+<a class="reference internal" href="#configuration-daemon"><em>daemon configuration file</em></a>)</p>
+</div>
+</div>
+</div>
+<div class="section" id="configuration-mta-client-archive">
+<span id="id12"></span><h3><a class="toc-backref" href="#id57">archive</a><a class="headerlink" href="#configuration-mta-client-archive" title="Permalink to this headline">¶</a></h3>
+<p>This section contains the configuration parameters that set where the files
+generated by the client will be stored/saved.</p>
+<div class="admonition-see-also admonition seealso">
+<p class="first admonition-title">See also</p>
+<p class="last">For more information about the kind of files the client does generate,
+take a look at the
+<a class="reference internal" href="overview.html#overview-mailjam-mta-client"><em>MTA client documentation</em></a>.</p>
+</div>
+<p>These are all the available parameters in this section:</p>
+<div class="section" id="persistent">
+<span id="configurtion-mta-client-archive-persistent"></span><h4><a class="toc-backref" href="#id58">persistent</a><a class="headerlink" href="#persistent" title="Permalink to this headline">¶</a></h4>
+<p>Default: <tt class="docutils literal"><span class="pre">true</span></tt></p>
+<p>Enables/disables the local archive for the client. If <tt class="docutils literal"><span class="pre">true</span></tt>, the client
+will save a copy of every email sent to the list in an internal archive,
+that could be checked/queried later. If <tt class="docutils literal"><span class="pre">false</span></tt>, the emails will not be
+kept on disk after being processed.</p>
+<div class="admonition warning">
+<p class="first admonition-title">Warning</p>
+<p class="last">This feature is not ready yet.</p>
+</div>
+</div>
+<div class="section" id="configuration-mta-client-archive-path">
+<span id="id13"></span><h4><a class="toc-backref" href="#id59">path</a><a class="headerlink" href="#configuration-mta-client-archive-path" title="Permalink to this headline">¶</a></h4>
+<p>Default: <tt class="docutils literal"><span class="pre">/usr/local/mailjam/archive-mta</span></tt></p>
+<p>Path to the directory where the archives will be saved.</p>
+<div class="admonition warning">
+<p class="first admonition-title">Warning</p>
+<p class="last">This feature is not ready yet.</p>
+</div>
+</div>
+</div>
+</div>
+<div class="section" id="mailjam-cli-client-configuration-file-mailjam-cli-conf">
+<span id="configuration-cli-client"></span><h2><a class="toc-backref" href="#id60">Mailjam CLI client configuration file - mailjam-cli.conf</a><a class="headerlink" href="#mailjam-cli-client-configuration-file-mailjam-cli-conf" title="Permalink to this headline">¶</a></h2>
+<p>This file contains all the parameters to configure the
+<a class="reference internal" href="overview.html#overview-mailjam-cli-client"><em>CLI client</em></a> properly. It contains ini-style <a class="footnote-reference" href="#id24" id="id14">[1]</a>
+configuration parameters, separated in different <em>categories</em>.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p>The mailjam-cli.conf file will be installed in different locations
+depending on your setup. The usual locations are:</p>
+<ul class="simple">
+<li><em>/etc/mailjam/mailjam-cli.conf</em> - In most Linux systems (like archlinux,
+gentoo, fedora, debian, ubuntu, etc)</li>
+<li><em>/usr/local/etc/mailjam/mailjam-cli.conf</em> - In most BSD systems (like
+FreeBSD, OpenBSD, NetBSD, etc)</li>
+</ul>
+<p class="last">There is a copy of the configuration file in the <em>conf/</em> directory, within
+the sources.</p>
+</div>
+<div class="section" id="configuration-cli-client-server">
+<span id="id15"></span><h3><a class="toc-backref" href="#id61">server</a><a class="headerlink" href="#configuration-cli-client-server" title="Permalink to this headline">¶</a></h3>
+<p>This section contains the configuration parameters that tell the cli client
+where to connect when trying to interact with the
+<a class="reference internal" href="overview.html#overview-mailjam-daemon"><em>Mailjam daemon</em></a>.</p>
+<p>These are all the available parameters in this section:</p>
+<div class="section" id="configuration-cli-client-server-address">
+<span id="id16"></span><h4><a class="toc-backref" href="#id62">address</a><a class="headerlink" href="#configuration-cli-client-server-address" title="Permalink to this headline">¶</a></h4>
+<p>Default: <tt class="docutils literal"><span class="pre">localhost</span></tt></p>
+<p>The address where the daemon is listening for XMLRPC requests. This is
+the address to where the client will try to connect to.</p>
+</div>
+<div class="section" id="configuration-cli-client-server-port">
+<span id="id17"></span><h4><a class="toc-backref" href="#id63">port</a><a class="headerlink" href="#configuration-cli-client-server-port" title="Permalink to this headline">¶</a></h4>
+<p>Default: <tt class="docutils literal"><span class="pre">9876</span></tt></p>
+<p>The port where the daemon accepts incoming XMLRPC requests. This is the
+port to where the client will try to connect to.</p>
+</div>
+<div class="section" id="configuration-cli-client-server-uri">
+<span id="id18"></span><h4><a class="toc-backref" href="#id64">uri</a><a class="headerlink" href="#configuration-cli-client-server-uri" title="Permalink to this headline">¶</a></h4>
+<p>Default: <a class="reference external" href="http://localhost:9876">http://localhost:9876</a></p>
+<p>This is the URI <a class="footnote-reference" href="#id27" id="id19">[4]</a> to where the client will connect to. It is constructed
+based on the values of the <a class="reference internal" href="#configuration-cli-client-server-address"><em>address</em></a>
+and <a class="reference internal" href="#configuration-cli-client-server-port"><em>port</em></a> parameters.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p>The default configuration file contains a dynamic setting for this
+parameter:</p>
+<div class="highlight-python"><pre>uri = http://%(address)s:%(port)s</pre>
+</div>
+<p class="last">That means that the parameter will inherit the values from the
+<a class="reference internal" href="#configuration-cli-client-server-address"><em>address</em></a>
+and <a class="reference internal" href="#configuration-cli-client-server-port"><em>port</em></a> parameters.</p>
+</div>
+<div class="admonition-see-also admonition seealso">
+<p class="first admonition-title">See also</p>
+<p>More information about this (and other tricks) here:</p>
+<p><a class="reference external" href="http://docs.python.org/library/configparser.html">http://docs.python.org/library/configparser.html</a></p>
+<p class="last"><a class="reference external" href="http://www.doughellmann.com/PyMOTW/ConfigParser">http://www.doughellmann.com/PyMOTW/ConfigParser</a></p>
+</div>
+<div class="admonition warning">
+<p class="first admonition-title">Warning</p>
+<p class="last">You can replace this with any URI you would like, <strong>this is the parameter
+that is really used for establishing new connections</strong> so be aware that if
+you remove the references to the
+<a class="reference internal" href="#configuration-cli-client-server-address"><em>address</em></a> and
+<a class="reference internal" href="#configuration-cli-client-server-port"><em>port</em></a> parameters, the values you have
+provided for those parameters will be ignored.</p>
+</div>
+</div>
+<div class="section" id="configuration-cli-client-server-ssl">
+<span id="id20"></span><h4><a class="toc-backref" href="#id65">ssl</a><a class="headerlink" href="#configuration-cli-client-server-ssl" title="Permalink to this headline">¶</a></h4>
+<p>Default: <tt class="docutils literal"><span class="pre">false</span></tt> (because ssl support hasn&#8217;t been added yet)</p>
+<p>Enables/disables SSL <a class="footnote-reference" href="#id26" id="id21">[3]</a> connections to the daemon. If <tt class="docutils literal"><span class="pre">false</span></tt> all the
+traffic to/from the server will travel unencrypted. If <tt class="docutils literal"><span class="pre">true</span></tt> all the traffic
+will travel encrypted.</p>
+<div class="admonition warning">
+<p class="first admonition-title">Warning</p>
+<p class="last">In order to enable SSL support in the client, you have to be sure the
+<a class="reference internal" href="overview.html#overview-mailjam-daemon"><em>Mailjam daemon</em></a> supports SSL too (check the
+<a class="reference internal" href="#configuration-daemon-xmlrpc-ssl"><em>ssl</em></a> parameter in the
+<a class="reference internal" href="#configuration-daemon-xmlrpc"><em>xmlrpc_server</em></a> section of the
+<a class="reference internal" href="#configuration-daemon"><em>daemon configuration file</em></a>)</p>
+</div>
+</div>
+</div>
+<div class="section" id="history">
+<span id="configuration-cli-client-history"></span><h3><a class="toc-backref" href="#id66">history</a><a class="headerlink" href="#history" title="Permalink to this headline">¶</a></h3>
+<p>This section contains the configuration parameters that set the behaviour
+of the client feature that allows it to save a history of commands provided
+by the user.</p>
+<p>These are all the available parameters in this section:</p>
+<div class="section" id="configurtion-cli-client-archive-enabled">
+<span id="id22"></span><h4><a class="toc-backref" href="#id67">enabled</a><a class="headerlink" href="#configurtion-cli-client-archive-enabled" title="Permalink to this headline">¶</a></h4>
+<p>Default: <tt class="docutils literal"><span class="pre">true</span></tt></p>
+<p>Enables/disables history support in the client. If <tt class="docutils literal"><span class="pre">true</span></tt> all commands
+provided by an user will be saved to disk. If <tt class="docutils literal"><span class="pre">false</span></tt> nothing will be
+written to disk.</p>
+</div>
+<div class="section" id="configuration-cli-client-history-path">
+<span id="id23"></span><h4><a class="toc-backref" href="#id68">path</a><a class="headerlink" href="#configuration-cli-client-history-path" title="Permalink to this headline">¶</a></h4>
+<p>Default: <tt class="docutils literal"><span class="pre">~/.mailjam/cli/history</span></tt></p>
+<p>Path to the file where the list of executed commands will be saved.</p>
+<table class="docutils footnote" frame="void" id="id24" 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="http://en.wikipedia.org/wiki/INI_file">http://en.wikipedia.org/wiki/INI_file</a></td></tr>
+<tr><td class="label">[1]</td><td><em>(<a class="fn-backref" href="#id1">1</a>, <a class="fn-backref" href="#id6">2</a>, <a class="fn-backref" href="#id14">3</a>)</em> <a class="reference external" href="http://en.wikipedia.org/wiki/INI_file">http://en.wikipedia.org/wiki/INI_file</a></td></tr>
 </tbody>
 </table>
-<table class="docutils footnote" frame="void" id="id7" rules="none">
+<table class="docutils footnote" frame="void" id="id25" rules="none">
 <colgroup><col class="label" /><col /></colgroup>
 <tbody valign="top">
@@ -302,8 +557,14 @@
 </tbody>
 </table>
-<table class="docutils footnote" frame="void" id="id8" rules="none">
+<table class="docutils footnote" frame="void" id="id26" rules="none">
 <colgroup><col class="label" /><col /></colgroup>
 <tbody valign="top">
-<tr><td class="label"><a class="fn-backref" href="#id3">[3]</a></td><td><a class="reference external" href="http://en.wikipedia.org/wiki/Secure_Socket_Layer">http://en.wikipedia.org/wiki/Secure_Socket_Layer</a></td></tr>
+<tr><td class="label">[3]</td><td><em>(<a class="fn-backref" href="#id3">1</a>, <a class="fn-backref" href="#id11">2</a>, <a class="fn-backref" href="#id21">3</a>)</em> <a class="reference external" href="http://en.wikipedia.org/wiki/Secure_Socket_Layer">http://en.wikipedia.org/wiki/Secure_Socket_Layer</a></td></tr>
+</tbody>
+</table>
+<table class="docutils footnote" frame="void" id="id27" rules="none">
+<colgroup><col class="label" /><col /></colgroup>
+<tbody valign="top">
+<tr><td class="label">[4]</td><td><em>(<a class="fn-backref" href="#id9">1</a>, <a class="fn-backref" href="#id19">2</a>)</em> <a class="reference external" href="http://en.wikipedia.org/wiki/Uniform_resource_identifier">http://en.wikipedia.org/wiki/Uniform_resource_identifier</a></td></tr>
 </tbody>
 </table>
@@ -322,5 +583,5 @@
   <ul>
 <li><a class="reference internal" href="#">Configuration</a><ul>
-<li><a class="reference internal" href="#mailjam-daemon-configuration-file">Mailjam daemon configuration file</a><ul>
+<li><a class="reference internal" href="#mailjam-daemon-configuration-file-mailjam-conf">Mailjam daemon configuration file - mailjam.conf</a><ul>
 <li><a class="reference internal" href="#xmlrpc-server">xmlrpc_server</a><ul>
 <li><a class="reference internal" href="#address">address</a></li>
@@ -352,4 +613,34 @@
 <li><a class="reference internal" href="#auto-signup">auto_signup</a></li>
 <li><a class="reference internal" href="#allow-chpasswd">allow_chpasswd</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li><a class="reference internal" href="#mailjam-mta-client-configuration-file-mailjam-mta-conf">Mailjam MTA client configuration file - mailjam-mta.conf</a><ul>
+<li><a class="reference internal" href="#server">server</a><ul>
+<li><a class="reference internal" href="#configuration-mta-client-server-address">address</a></li>
+<li><a class="reference internal" href="#configuration-mta-client-server-port">port</a></li>
+<li><a class="reference internal" href="#uri">uri</a></li>
+<li><a class="reference internal" href="#configuration-mta-client-server-ssl">ssl</a></li>
+</ul>
+</li>
+<li><a class="reference internal" href="#configuration-mta-client-archive">archive</a><ul>
+<li><a class="reference internal" href="#persistent">persistent</a></li>
+<li><a class="reference internal" href="#configuration-mta-client-archive-path">path</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li><a class="reference internal" href="#mailjam-cli-client-configuration-file-mailjam-cli-conf">Mailjam CLI client configuration file - mailjam-cli.conf</a><ul>
+<li><a class="reference internal" href="#configuration-cli-client-server">server</a><ul>
+<li><a class="reference internal" href="#configuration-cli-client-server-address">address</a></li>
+<li><a class="reference internal" href="#configuration-cli-client-server-port">port</a></li>
+<li><a class="reference internal" href="#configuration-cli-client-server-uri">uri</a></li>
+<li><a class="reference internal" href="#configuration-cli-client-server-ssl">ssl</a></li>
+</ul>
+</li>
+<li><a class="reference internal" href="#history">history</a><ul>
+<li><a class="reference internal" href="#configurtion-cli-client-archive-enabled">enabled</a></li>
+<li><a class="reference internal" href="#configuration-cli-client-history-path">path</a></li>
 </ul>
 </li>
