Index: docs/src/_build/html/_sources/configuration.txt
===================================================================
--- docs/src/_build/html/_sources/configuration.txt	(revision 16)
+++ docs/src/_build/html/_sources/configuration.txt	(revision 27)
@@ -2,14 +2,18 @@
 =============
 
+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.
+
 .. contents::
 
 .. _configuration_daemon:
 
-Mailjam daemon configuration file
----------------------------------
-
-All the configurations that can be applied to the Mailjam daemon are registered
-in the **mailjam.conf** file. That file contains ini-style [1]_ configuration 
-parameters, separated in different *categories*.
+Mailjam daemon configuration file - mailjam.conf
+------------------------------------------------
+
+All the configurations that can be applied to the :ref:`overview_mailjam_daemon`
+are registered in the **mailjam.conf** file. That file contains ini-style [1]_ 
+configuration parameters, separated in different *categories*.
 
 .. note::
@@ -18,9 +22,9 @@
    your setup. The usual locations are:
 
-   - */etc/mailjam.conf* - In most Linux systems (like archlinux, gentoo, 
-     fedora, debian, ubuntu, etc)
-
-   - */usr/local/etc/mailjam.conf* - In most BSD systems (like FreeBSD, OpenBSD,
-     NetBSD, etc)
+   - */etc/mailjam/mailjam.conf* - In most Linux systems (like archlinux, 
+     gentoo, fedora, debian, ubuntu, etc)
+
+   - */usr/local/etc/mailjam/mailjam.conf* - In most BSD systems (like FreeBSD, 
+     OpenBSD, NetBSD, etc)
 
    There is a copy of the configuration file in the *conf/* directory, within
@@ -62,8 +66,8 @@
 ***
 
-Default: ``off`` (because ssl support hasn't been added yet)
-
-Enables/disables SSL [3]_ support in the daemon. If ``off`` all the traffic 
-to/from the server will travel unencrypted. If ``on`` all the traffic will
+Default: ``false`` (because ssl support hasn't been added yet)
+
+Enables/disables SSL [3]_ support in the daemon. If ``false`` all the traffic 
+to/from the server will travel unencrypted. If ``true`` all the traffic will
 travel encrypted.
 
@@ -295,6 +299,309 @@
 will be able to reset those passwords.
 
+.. _configuration_mta_client:
+
+Mailjam MTA client configuration file - mailjam-mta.conf
+--------------------------------------------------------
+
+This file contains all the parameters to configure the 
+:ref:`overview_mailjam_mta_client` properly. It contains ini-style [1]_ 
+configuration parameters, separated in different *categories*.
+
+.. note::
+
+   The mailjam-mta.conf file will be installed in different locations 
+   depending on your setup. The usual locations are:
+
+   - */etc/mailjam/mailjam-mta.conf* - In most Linux systems (like archlinux, 
+     gentoo, fedora, debian, ubuntu, etc)
+
+   - */usr/local/etc/mailjam/mailjam-mta.conf* - In most BSD systems (like 
+     FreeBSD, OpenBSD, NetBSD, etc)
+
+   There is a copy of the configuration file in the *conf/* directory, within
+   the sources.
+
+.. _configuration_mta_client_server:
+
+server
+++++++
+
+This section contains the configuration parameters that tell the MTA client 
+where to connect when trying to interact with the 
+:ref:`overview_mailjam_daemon`.
+
+These are all the available parameters in this section:
+
+.. _configuration_mta_client_server_address:
+
+address
+*******
+
+Default: ``localhost``
+
+The address where the daemon is listening for XMLRPC requests. This is
+the address to where the client will try to connect to.
+
+.. _configuration_mta_client_server_port:
+
+port
+****
+
+Default: ``9876``
+
+The port where the daemon accepts incoming XMLRPC requests. This is the 
+port to where the client will try to connect to.
+
+.. _configuration_mta_client_server_uri:
+
+uri
+***
+
+Default: http://localhost:9876
+
+This is the URI [4]_ to where the client will connect to. It is constructed
+based on the values of the :ref:`configuration_mta_client_server_address`
+and :ref:`configuration_mta_client_server_port` parameters.
+
+.. note::
+
+   The default configuration file contains a dynamic setting for this 
+   parameter::
+
+     uri = http://%(address)s:%(port)s
+
+   That means that the parameter will inherit the values from the
+   :ref:`configuration_mta_client_server_address`
+   and :ref:`configuration_mta_client_server_port` parameters.
+
+.. seealso::
+
+   More information about this (and other tricks) here:
+
+   http://docs.python.org/library/configparser.html
+
+   http://www.doughellmann.com/PyMOTW/ConfigParser
+
+.. warning::
+
+   You can replace this with any URI you would like, **this is the parameter
+   that is really used for establishing new connections** so be aware that if
+   you remove the references to the 
+   :ref:`configuration_mta_client_server_address` and 
+   :ref:`configuration_mta_client_server_port` parameters, the values you have
+   provided for those parameters will be ignored.
+
+.. _configuration_mta_client_server_ssl:
+
+ssl
+***
+
+Default: ``false`` (because ssl support hasn't been added yet)
+
+Enables/disables SSL [3]_ connections to the daemon. If ``false`` all the 
+traffic to/from the server will travel unencrypted. If ``true`` all the traffic 
+will travel encrypted.
+
+.. warning::
+
+   In order to enable SSL support in the client, you have to be sure the
+   :ref:`overview_mailjam_daemon` supports SSL too (check the 
+   :ref:`configuration_daemon_xmlrpc_ssl` parameter in the 
+   :ref:`configuration_daemon_xmlrpc` section of the 
+   :ref:`daemon configuration file <configuration_daemon>`)
+
+.. _configuration_mta_client_archive:
+
+archive
++++++++
+
+This section contains the configuration parameters that set where the files 
+generated by the client will be stored/saved.
+
+.. seealso::
+
+   For more information about the kind of files the client does generate,
+   take a look at the 
+   :ref:`MTA client documentation <overview_mailjam_mta_client>`.
+
+These are all the available parameters in this section:
+
+.. _configurtion_mta_client_archive_persistent:
+
+persistent
+**********
+
+Default: ``true``
+
+Enables/disables the local archive for the client. If ``true``, the client
+will save a copy of every email sent to the list in an internal archive, 
+that could be checked/queried later. If ``false``, the emails will not be
+kept on disk after being processed.
+ 
+.. warning::
+
+   This feature is not ready yet.
+
+
+.. _configuration_mta_client_archive_path:
+
+path
+****
+
+Default: ``/usr/local/mailjam/archive-mta``
+
+Path to the directory where the archives will be saved.
+
+.. warning::
+
+   This feature is not ready yet.
+
+
+.. _configuration_cli_client:
+
+Mailjam CLI client configuration file - mailjam-cli.conf
+--------------------------------------------------------
+
+This file contains all the parameters to configure the 
+:ref:`overview_mailjam_cli_client` properly. It contains ini-style [1]_ 
+configuration parameters, separated in different *categories*.
+
+.. note::
+
+   The mailjam-cli.conf file will be installed in different locations 
+   depending on your setup. The usual locations are:
+
+   - */etc/mailjam/mailjam-cli.conf* - In most Linux systems (like archlinux, 
+     gentoo, fedora, debian, ubuntu, etc)
+
+   - */usr/local/etc/mailjam/mailjam-cli.conf* - In most BSD systems (like 
+     FreeBSD, OpenBSD, NetBSD, etc)
+
+   There is a copy of the configuration file in the *conf/* directory, within
+   the sources.
+
+.. _configuration_cli_client_server:
+
+server
+++++++
+
+This section contains the configuration parameters that tell the cli client 
+where to connect when trying to interact with the 
+:ref:`overview_mailjam_daemon`.
+
+These are all the available parameters in this section:
+
+.. _configuration_cli_client_server_address:
+
+address
+*******
+
+Default: ``localhost``
+
+The address where the daemon is listening for XMLRPC requests. This is
+the address to where the client will try to connect to.
+
+.. _configuration_cli_client_server_port:
+
+port
+****
+
+Default: ``9876``
+
+The port where the daemon accepts incoming XMLRPC requests. This is the 
+port to where the client will try to connect to.
+
+.. _configuration_cli_client_server_uri:
+
+uri
+***
+
+Default: http://localhost:9876
+
+This is the URI [4]_ to where the client will connect to. It is constructed
+based on the values of the :ref:`configuration_cli_client_server_address`
+and :ref:`configuration_cli_client_server_port` parameters.
+
+.. note::
+
+   The default configuration file contains a dynamic setting for this 
+   parameter::
+
+     uri = http://%(address)s:%(port)s
+
+   That means that the parameter will inherit the values from the
+   :ref:`configuration_cli_client_server_address`
+   and :ref:`configuration_cli_client_server_port` parameters.
+
+.. seealso::
+
+   More information about this (and other tricks) here:
+
+   http://docs.python.org/library/configparser.html
+
+   http://www.doughellmann.com/PyMOTW/ConfigParser
+
+.. warning::
+
+   You can replace this with any URI you would like, **this is the parameter
+   that is really used for establishing new connections** so be aware that if
+   you remove the references to the 
+   :ref:`configuration_cli_client_server_address` and 
+   :ref:`configuration_cli_client_server_port` parameters, the values you have
+   provided for those parameters will be ignored.
+
+.. _configuration_cli_client_server_ssl:
+
+ssl
+***
+
+Default: ``false`` (because ssl support hasn't been added yet)
+
+Enables/disables SSL [3]_ connections to the daemon. If ``false`` all the 
+traffic to/from the server will travel unencrypted. If ``true`` all the traffic 
+will travel encrypted.
+
+.. warning::
+
+   In order to enable SSL support in the client, you have to be sure the
+   :ref:`overview_mailjam_daemon` supports SSL too (check the 
+   :ref:`configuration_daemon_xmlrpc_ssl` parameter in the 
+   :ref:`configuration_daemon_xmlrpc` section of the 
+   :ref:`daemon configuration file <configuration_daemon>`)
+
+.. _configuration_cli_client_history:
+
+history
++++++++
+
+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. 
+
+These are all the available parameters in this section:
+
+.. _configurtion_cli_client_archive_enabled:
+
+enabled
+*******
+
+Default: ``true``
+
+Enables/disables history support in the client. If ``true`` all commands 
+provided by an user will be saved to disk. If ``false`` nothing will be
+written to disk.
+
+.. _configuration_cli_client_history_path:
+
+path
+****
+
+Default: ``~/.mailjam/cli/history``
+
+Path to the file where the list of executed commands will be saved.
+
 
 .. [1] http://en.wikipedia.org/wiki/INI_file
 .. [2] http://en.wikipedia.org/wiki/XML-RPC
 .. [3] http://en.wikipedia.org/wiki/Secure_Socket_Layer
+.. [4] http://en.wikipedia.org/wiki/Uniform_resource_identifier
Index: docs/src/_build/html/_sources/examples.txt
===================================================================
--- docs/src/_build/html/_sources/examples.txt	(revision 13)
+++ docs/src/_build/html/_sources/examples.txt	(revision 27)
@@ -3,2 +3,4 @@
 
 .. contents::
+
+TBW
Index: docs/src/_build/html/_sources/install.txt
===================================================================
--- docs/src/_build/html/_sources/install.txt	(revision 16)
+++ docs/src/_build/html/_sources/install.txt	(revision 27)
@@ -2,4 +2,12 @@
 =========================
 
+Installing Mailjam is quite easy. If you have some experience installing 
+Python_ packages [1]_, you already know how to do it. Mailjam is a standard
+Python_ package available on pypi_ [3]_ so just use your favourite tool
+(pip_, easy_install_, etc) to intall it.
+
+Keep reading if you want to learn more about the different options/choices
+you have when installing Mailjam.
+
 .. contents::
 
@@ -14,6 +22,6 @@
 *2.6.x* too.
 
-Please, refer to your operating system package system documentation to learn
-more about how to install python.
+Please, refer to your operating system documentation to learn more about how 
+to install python.
 
 .. _install_mailjam:
@@ -22,4 +30,8 @@
 -----------------------
 
+You can install Mailjam using one of the available tools for installing Python_
+packages, or you can install it from sources. Keep reading to learn more about
+it.
+
 .. _install_with_pip:
 
@@ -29,10 +41,13 @@
 You can install Mailjam using pip_::
 
-  pip install -e https://bitbucket.org/codigo23/mailjam#egg=mailjam
-
-.. note::
-
-   Mailjam has not been recorded/uploaded to pypi_ yet, so, in order to install 
-   it using pip you will have to provide the URL for the public Mailjam repo.
+  pip install Mailjam
+
+.. note::
+
+   The previous command will install the latest release from pypi_. If you
+   would like to install the latest *bleeding edge* sources (unstable code),
+   you can do it using pip_ too::
+
+     pip install -e https://bitbucket.org/codigo23/mailjam#egg=mailjam
 
 .. _install_with_easy_install:
@@ -41,6 +56,7 @@
 +++++++++++++++++++++++++++++
 
-You can not install Mailjam using easy_install_ yet (until we do record/upload 
-it to pypi)
+You can install Mailjam using easy_install_::
+
+  easy_install Mailjam
 
 .. _install_inside_virtualenv:
@@ -66,5 +82,12 @@
 And, once the environment has been activated, use pip to install Mailjam::
 
-  env$ pip install -e https://bitbucket.org/codigo23/mailjam#egg=mailjam
+  env$ pip install Mailjam
+
+.. note::
+
+   Remember that you can install the latest *bleeding edge* version using 
+   pip_ too::
+   
+     env$ pip install -e https://bitbucket.org/codigo23/mailjam#egg=mailjam
 
 .. _install_from_sources:
@@ -82,19 +105,14 @@
 ********
 
-**There are no releases yet**. You will have to install it from the repository.
-
-.. _install_from_repository:
-
-From repository
-***************
-
-The source code of Mailjam is hosted in bitbucket_ [1]_. In order to grab
-the latest sources you need Mercurial_.
-
-To get a copy of the sources, just *clone* the repository::
-
-  hg clone https://bitbucket.org/codigo23/mailjam mailjam-repo
-
-Then, go inside the *mailjam-repo* directory and run::
+You can grab a copy of the latest release from pypi_:
+
+http://pypi.python.org/packages/source/m/mailjam/
+
+After downloaded, you have to unpack the sources::
+
+  tar -zxvvf mailjam-0.1.0.tar.gz
+
+This will create a directory called *mailjam-0.1.0*, go inside that directory
+and run::
 
   python setup.py install
@@ -110,4 +128,30 @@
    This process will work inside a virtualenv_ too.
 
+.. _install_from_repository:
+
+From repository
+***************
+
+The source code of Mailjam is hosted in bitbucket_ [2]_. In order to grab
+the latest sources you need Mercurial_.
+
+To get a copy of the sources, just *clone* the repository::
+
+  hg clone https://bitbucket.org/codigo23/mailjam mailjam-repo
+
+Then, go inside the *mailjam-repo* directory and run::
+
+  python setup.py install
+
+.. warning::
+
+   If you want to install it *system-wide*, probably you will need *root*
+   privileges (check your OS documentation to learn more about how to get
+   *root* privileges - for example using sudo_)
+
+.. note::
+
+   This process will work inside a virtualenv_ too.
+
 .. _install_setting_up_mailjam:
 
@@ -115,5 +159,64 @@
 ------------------
 
-TBW
+In order to setup Mailjam, you will have to create the needed 
+:doc:`configuration files <configuration>`. Each component has its own
+configuration file:
+
+- The :ref:`Mailjam daemon <overview_mailjam_daemon>` configuration file is 
+  :ref:`mailjam.conf <configuration_daemon>`
+
+- The :ref:`Mailjam MTA client <overview_mailjam_mta_client>` configuration 
+  file is :ref:`mailjam-mta.conf <configuration_mta_client>`
+
+- The :ref:`Mailjam CLI client <overview_mailjam_cli_client>` configuration 
+  file is :ref:`mailjam-cli.conf <configuration_cli_client>`
+
+Refer to each configuration file documentation to learn more about the different
+settings you can customize.
+
+Each component will search for its configuration file in a list of predefined
+locations, but you can override that behaviour using the *-c* parameter when
+starting the component. 
+
+.. note::
+
+   Mailjam will search for the config files, in order, through the following 
+   paths:
+
+   1. /etc/mailjam
+
+   2. /etc
+
+   3. /usr/local/etc/mailjam
+
+   4. /usr/local/etc
+
+   5. the *conf* directory within the sources (or the installed *egg* [4]_)
+
+For example, you can start the :ref:`overview_mailjam_daemon` passing 
+*/var/db/mailjam/mailjam.conf* as its configuration file::
+
+  mailjam-server -c /var/db/mailjam/mailjam.conf
+
+.. seealso::
+
+   :doc:`running` contains more information about how to run the different 
+   components.
+
+If you have installed Mailjam using pip_, easy_install_ 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.
+
+.. warning::
+
+   The default destination will be different based on your operating system.
+   For example, in most linux servers it will copy the files to */etc/mailjam*,
+   while in BSD servers it will copy the files to */usr/local/etc/mailjam*.
+
+.. seealso::
+
+   :doc:`Configuration files, settings and formats documentation <configuration>`
+
 
 .. _install_running_mailjam:
@@ -122,5 +225,17 @@
 ---------------
 
-TBW
+In order to run a full Mailjam environment, you will have to start the different
+components separately:
+
+1. :ref:`Start the daemon <running_daemon>`
+
+2. :ref:`Run the cli client and manage your mailing lists <running_cli_client>`
+
+3. :ref:`Add as much MTA clients as you need to your mail server<running_mta_client>`
+
+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.
 
 .. _install_running_tests:
@@ -129,5 +244,16 @@
 -------------------------------
 
-TBW
+Just in case you were wondering, **yes**, Mailjam code has some tests you can 
+run to check everything is ok and that the software should run smoothly on your
+server(s).
+
+To run the tests, simply get a copy of the sources from our public repository::
+
+  hg clone https://bitbucket.org/codigo23/mailjam mailjam-repo
+
+then run the tests::
+
+  cd mailjam-repo && ./bin/run_tests
+
 
 .. _Python: http://python.org
@@ -140,3 +266,6 @@
 .. _sudo: http://sudo.ws
 
-.. [1] https://bitbucket.org/codigo23/mailjam
+.. [1] http://docs.python.org/tutorial/modules.html#packages
+.. [2] https://bitbucket.org/codigo23/mailjam
+.. [3] http://pypi.python.org/pypi/mailjam
+.. [4] http://svn.python.org/projects/sandbox/trunk/setuptools/doc/formats.txt
Index: docs/src/_build/html/_sources/overview.txt
===================================================================
--- docs/src/_build/html/_sources/overview.txt	(revision 16)
+++ docs/src/_build/html/_sources/overview.txt	(revision 27)
@@ -18,4 +18,15 @@
    :class: open_fancybox
 
+This architecture works for small setups (everything running on a single server)
+but it works for bigger/larger installations with up to N mail servers, running
+each server its own :ref:`overview_mailjam_mta_client` (or multiple instances
+of it) to connect to N :ref:`overview_mailjam_daemon` servers (managed locally 
+or remotely using up to N :ref:`overview_mailjam_cli_client` or
+:ref:`overview_mailjam_web_client` instances).
+
+.. seealso::
+
+   :doc:`The examples documentation <examples>` contains some useful examples
+   about different kinds of setups.
 
 .. _overview_mailjam_daemon:
Index: docs/src/_build/html/_sources/running.txt
===================================================================
--- docs/src/_build/html/_sources/running.txt	(revision 16)
+++ docs/src/_build/html/_sources/running.txt	(revision 27)
@@ -2,3 +2,353 @@
 ===============
 
+In order to run Mailjam, you have to run the different components, depending on
+what you want to do. Basically, you will need to run a server 
+(:ref:`overview_mailjam_daemon`) all the time, then you will need one 
+:ref:`overview_mailjam_mta_client` per mailing list. 
+
+Ocasionally, you will need to add or delete a mailing list, or edit its 
+information, members list, etc. To do that, you will have to run a Mailjam 
+client (either the :ref:`CLI client <overview_mailjam_cli_client>` or the
+:ref:`Web client <overview_mailjam_web_client>`).
+
+Keep reading if you want to learn more about the way you can start each 
+component, the different arguments/parameters you can provide on startup, etc.
+
+.. warning::
+
+   Remember that, before being able to run any component, you have to 
+   :ref:`set up proper configuration files <install_setting_up_mailjam>`. You
+   can learn more about Mailjam configuration files in the 
+   :doc:`configuration files documentation <configuration>`.
+
 .. contents::
+
+.. _running_daemon:
+
+The daemon
+----------
+
+First component you should start is the :ref:`overview_mailjam_daemon`. It is
+quite easy, just run this command from a shell/console::
+
+  mailjam-server
+
+The server process will read the :ref:`mailjam.conf <configuration_daemon>` 
+configuration file, will prepare everything and will start listening for XMLRPC
+requests on *localhost:9876*
+
+.. warning::
+
+   *localhost:9876* is the default value provided by the default configuration
+   files. If you have modified that, it will be a different *address:port* 
+   combination.
+
+.. warning::
+
+   If you didn't add a valid configuration file to one of the 
+   :ref:`default paths <install_setting_up_mailjam>`, the server will refuse to
+   start, giving you an error message.
+
+.. warning::
+
+   As of the current version of Mailjam, there are no pre-made init scripts that
+   can handle the start/stop/restart of the daemon, but those will be added in
+   one of the future releases.
+
+.. _running_daemon_parameters:
+
+Additional parameters
++++++++++++++++++++++
+
+You can pass some parameters to *mailjam-server* to modify the behaviour of
+the daemon or get more information.
+
+.. note::
+
+   Remember that the proper way to modify the behaviour of the daemon is 
+   editing its configuration file, :ref:`mailjam.conf <configuration_daemon>`
+
+.. _running_daemon_help:
+
+--help
+******
+
+You can get some help by passing the *-h* or *--help* parameters::
+
+  mailjam-server -h
+
+::
+
+  mailjam-server --help
+
+.. _running_daemon_config:
+
+--config
+********
+
+You can set the path to the config file the server will load on startup,
+passing the *-c* or *--config* parameters::
+
+  mailjam-server -c /home/mailjam/mailjam.conf
+
+::
+
+  mailjam-server --config /home/mailjam/mailjam.conf
+  
+.. warning::
+
+   If the file does not exist, or if it is not a valid configuration file,
+   an error will be shown and the daemon will refuse to start.
+
+.. _running_daemon_version:
+
+--version
+*********
+
+You can check the version of the mailjam server you are trying to run by
+passing the *-v* or *--version* parameters::
+
+  mailjam-server -v
+
+::
+
+  mailjam-server --version
+
+
+.. _running_cli_client:
+
+The CLI client
+--------------
+
+
+
+.. _running_mta_client:
+
+The MTA client
+--------------
+
+Once you have your :ref:`daemon running <running_daemon>`, you have to add
+as many :ref:`MTA clients <overview_mailjam_mta_client>` as mailing lists you
+want to manage to your mail server.
+
+.. _running_mta_client_quick:
+
+Quick configuration (you are a mail-servers-master)
++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+Edit your mail server aliases file [1]_ (probably */etc/aliases* or 
+*/etc/mail/aliases*) and add an entry like::
+
+  list@mydomain.com: "|/usr/local/bin/mailjam-mta -a list@mydomain.com -i -"
+
+.. warning::
+   
+   replace *list@mydomain.com* with the real address of your mailing list
+
+.. warning::
+
+   replace */usr/local/bin/mailjam-mta* with the real path to your mailjam-mta
+   installation
+
+Rebuild your *aliases* database::
+
+  newaliases
+
+.. warning::
+
+   Refer to your OS documentation to see how you can rebuild *aliases*. In most
+   unix-like systems it is done by the newaliases [2]_ command.
+
+.. _running_mta_client_explained:
+
+Explained configuration (you really want to know what's happening here)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+When new messages arrive at your mail server for your mailing list address 
+(let's use the example address *list@mydomain.com*) one of the steps in the
+process that checks the message, it's origin, destination, contents, etc is
+the step where the mail server checks its internal *aliases* database, that is,
+a list of *special* addresses that, instead of being *real* addresses, they are
+related to some other addresses in some way.
+
+Most MTAs out there support one very *convenient* feature that is to *pipe* the
+contents of the message (headers and body) to a given shell command. That means
+that the all the received data will be sent to an external command for it to 
+process such data.
+
+**Here is where mailjam-mta comes in**.
+
+What you have to do is just tell your mail server that all messages with 
+destination *list@mydomain.com* (to keep using the same example address) will be
+*piped* to mailman-mta. The Mailjam MTA client will then know what to do with 
+the message, performing some checks and re-sending it to the proper destinations
+(the members/suscriptors of the given mailing list).
+
+So, first thing you have to find out is **where is your aliases file?**.
+
+In unix-like systems, like the different Linux distributions or the different 
+BSD flavours, that file is */etc/mail/aliases* or */etc/aliases* (usually one is
+a simbolic link to the other).
+
+.. note::
+
+   Usually the aliases file contains some lines like::
+
+     MAILER-DAEMON: postmaster
+     postmaster: root
+
+Once you've found out where the file is, edit it and add this line to the bottom
+of the file::
+
+  list@mydomain.com: "|/usr/local/bin/mailjam-mta -a list@mydomain.com -i -"
+
+.. warning::
+   
+   replace *list@mydomain.com* with the real address of your mailing list
+
+.. warning::
+
+   replace */usr/local/bin/mailjam-mta* with the real path to your mailjam-mta
+   installation
+
+There you are telling your mail server that any message coming **to** 
+*list@mydomain.com* will be passed to the mailjam-mta command, passing some 
+parameters to it:
+
+- **-a list@mydomain.com** tells mailjam-mta that the message is actually for
+  that mailing list. The MTA client will then use that value to check (against
+  the mailjam daemon) if it is a valid mailing list.
+
+- **-i -** tells mailjam-mta that the message will be *piped* directly. This is
+  important, as mailjam-mta can read the messages from files, but in this case
+  the mail server will *pipe* the data directly to mailjam-mta.
+
+Once you've added that line to your *aliases* file, you have to rebuild your 
+*aliases* database::
+
+  newaliases
+
+.. warning::
+
+   Refer to your OS documentation to see how you can rebuild *aliases*. In most
+   unix-like systems it is done by the newaliases [2]_ command.
+
+And you are done. Everything is ready now.
+
+.. _running_mta_client_parameters:
+
+Additional parameters
++++++++++++++++++++++
+
+You can pass some parameters to *mailjam-mta* to modify the behaviour of
+the client or get more information.
+
+.. note::
+
+   Remember that the proper way to modify the behaviour of the client is 
+   editing its configuration file, 
+   :ref:`mailjam-mta.conf <configuration_mta_client>`
+
+.. _running_mta_client_help:
+
+--help
+******
+
+You can get some help by passing the *-h* or *--help* parameters::
+
+  mailjam-mta -h
+
+::
+
+  mailjam-mta --help
+
+.. _running_mta_client_config:
+
+--config
+********
+
+You can set the path to the config file the client will load on startup,
+passing the *-c* or *--config* parameters::
+
+  mailjam-mta -c /home/mailjam/mailjam-mta.conf
+
+::
+
+  mailjam-mta --config /home/mailjam/mailjam-mta.conf
+  
+.. warning::
+
+   If the file does not exist, or if it is not a valid configuration file,
+   an error will be shown and the client will refuse to start.
+
+.. _running_mta_client_version:
+
+--version
+*********
+
+You can check the version of the mailjam client you are trying to run by
+passing the *-v* or *--version* parameters::
+
+  mailjam-mta -v
+
+::
+
+  mailjam-mta --version
+
+.. _running_mta_client_address:
+
+--address (required)
+********************
+
+This parameter is required (you have to provide it with a value in order to
+run the mailjam-mta). It sets the address of the mailing list managed by this
+MTA client instance.
+
+The MTA client will use the provided value to do some checks on the daemon,
+retrieving all the needed data to perform its tasks.
+
+You can pass a valid address using both the *-a* and *--address* parameters::
+
+  mailjam-mta -a list@mydomain.com
+
+::
+
+  mailjam-mta --address list@mydomain.com
+
+.. _running_mta_client_input:
+
+--input
+*******
+
+This parameter tells mailjam-mta from where it has to read the message sent 
+to the mailing list. That could be a local file (to be readed from disk) or
+a stream of data coming directly from the standard input (*stdin*).
+
+For a regular configuration/setup, the second option is preferred, as the mail
+server will send the stream of data directly to mailjam-mta (as 
+:ref:`explained before <running_mta_client_explained>`)::
+
+  mailjam-mta -i -
+
+::
+
+  mailjam-mta --input -
+
+But perhaps some time you would like to send (again) a message you have on disk,
+that could be done easily, passing the path to the file containing that message
+to mailjam-mta::
+
+  mailjam-mta -i /home/backups/mail/that-important-mail.txt
+
+::
+
+  mailjam-mta -input /home/backups/mail/that-important-mail.txt
+
+
+.. _running_web_client:
+
+The Web client
+--------------
+
+.. [1] http://en.wikipedia.org/wiki/Email_alias
+.. [2] http://www.freebsd.org/cgi/man.cgi?query=newaliases
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>
Index: docs/src/_build/html/examples.html
===================================================================
--- docs/src/_build/html/examples.html	(revision 16)
+++ docs/src/_build/html/examples.html	(revision 27)
@@ -60,4 +60,5 @@
 </ul>
 </div>
+<p>TBW</p>
 </div>
 
Index: docs/src/_build/html/index.html
===================================================================
--- docs/src/_build/html/index.html	(revision 16)
+++ docs/src/_build/html/index.html	(revision 27)
@@ -72,8 +72,16 @@
 </li>
 <li class="toctree-l1"><a class="reference internal" href="configuration.html">Configuration</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="configuration.html#mailjam-daemon-configuration-file">Mailjam daemon configuration file</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration.html#mailjam-daemon-configuration-file-mailjam-conf">Mailjam daemon configuration file - mailjam.conf</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration.html#mailjam-mta-client-configuration-file-mailjam-mta-conf">Mailjam MTA client configuration file - mailjam-mta.conf</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuration.html#mailjam-cli-client-configuration-file-mailjam-cli-conf">Mailjam CLI client configuration file - mailjam-cli.conf</a></li>
 </ul>
 </li>
-<li class="toctree-l1"><a class="reference internal" href="running.html">Running Mailjam</a></li>
+<li class="toctree-l1"><a class="reference internal" href="running.html">Running Mailjam</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="running.html#the-daemon">The daemon</a></li>
+<li class="toctree-l2"><a class="reference internal" href="running.html#the-cli-client">The CLI client</a></li>
+<li class="toctree-l2"><a class="reference internal" href="running.html#the-mta-client">The MTA client</a></li>
+<li class="toctree-l2"><a class="reference internal" href="running.html#the-web-client">The Web client</a></li>
+</ul>
+</li>
 <li class="toctree-l1"><a class="reference internal" href="examples.html">Some examples</a></li>
 <li class="toctree-l1"><a class="reference internal" href="development.html">Developers documentation</a></li>
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>
Index: docs/src/_build/html/overview.html
===================================================================
--- docs/src/_build/html/overview.html	(revision 16)
+++ docs/src/_build/html/overview.html	(revision 27)
@@ -75,4 +75,15 @@
 <p>This is the scheme of the architecture:</p>
 <img alt="Scheme of the architecture behind Mailjam" class="open-fancybox" src="_images/mailjam_architecture.png" />
+<p>This architecture works for small setups (everything running on a single server)
+but it works for bigger/larger installations with up to N mail servers, running
+each server its own <a class="reference internal" href="#overview-mailjam-mta-client"><em>MTA client</em></a> (or multiple instances
+of it) to connect to N <a class="reference internal" href="#overview-mailjam-daemon"><em>Mailjam daemon</em></a> servers (managed locally
+or remotely using up to N <a class="reference internal" href="#overview-mailjam-cli-client"><em>CLI client</em></a> or
+<a class="reference internal" href="#overview-mailjam-web-client"><em>Web client</em></a> instances).</p>
+<div class="admonition-see-also admonition seealso">
+<p class="first admonition-title">See also</p>
+<p class="last"><a class="reference internal" href="examples.html"><em>The examples documentation</em></a> contains some useful examples
+about different kinds of setups.</p>
+</div>
 </div>
 <div class="section" id="mailjam-daemon">
Index: docs/src/_build/html/running.html
===================================================================
--- docs/src/_build/html/running.html	(revision 16)
+++ docs/src/_build/html/running.html	(revision 27)
@@ -53,10 +53,326 @@
             
   <div class="section" id="running-mailjam">
-<h1><a class="toc-backref" href="#id1">Running Mailjam</a><a class="headerlink" href="#running-mailjam" title="Permalink to this headline">¶</a></h1>
+<h1><a class="toc-backref" href="#id10">Running Mailjam</a><a class="headerlink" href="#running-mailjam" title="Permalink to this headline">¶</a></h1>
+<p>In order to run Mailjam, you have to run the different components, depending on
+what you want to do. Basically, you will need to run a server
+(<a class="reference internal" href="overview.html#overview-mailjam-daemon"><em>Mailjam daemon</em></a>) all the time, then you will need one
+<a class="reference internal" href="overview.html#overview-mailjam-mta-client"><em>MTA client</em></a> per mailing list.</p>
+<p>Ocasionally, you will need to add or delete a mailing list, or edit its
+information, members list, etc. To do that, you will have to run a Mailjam
+client (either the <a class="reference internal" href="overview.html#overview-mailjam-cli-client"><em>CLI client</em></a> or the
+<a class="reference internal" href="overview.html#overview-mailjam-web-client"><em>Web client</em></a>).</p>
+<p>Keep reading if you want to learn more about the way you can start each
+component, the different arguments/parameters you can provide on startup, etc.</p>
+<div class="admonition warning">
+<p class="first admonition-title">Warning</p>
+<p class="last">Remember that, before being able to run any component, you have to
+<a class="reference internal" href="install.html#install-setting-up-mailjam"><em>set up proper configuration files</em></a>. You
+can learn more about Mailjam configuration files in the
+<a class="reference internal" href="configuration.html"><em>configuration files documentation</em></a>.</p>
+</div>
 <div class="contents topic" id="contents">
 <p class="topic-title first">Contents</p>
 <ul class="simple">
-<li><a class="reference internal" href="#running-mailjam" id="id1">Running Mailjam</a></li>
-</ul>
+<li><a class="reference internal" href="#running-mailjam" id="id10">Running Mailjam</a><ul>
+<li><a class="reference internal" href="#the-daemon" id="id11">The daemon</a><ul>
+<li><a class="reference internal" href="#additional-parameters" id="id12">Additional parameters</a><ul>
+<li><a class="reference internal" href="#help" id="id13">&#8211;help</a></li>
+<li><a class="reference internal" href="#config" id="id14">&#8211;config</a></li>
+<li><a class="reference internal" href="#version" id="id15">&#8211;version</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li><a class="reference internal" href="#the-cli-client" id="id16">The CLI client</a></li>
+<li><a class="reference internal" href="#the-mta-client" id="id17">The MTA client</a><ul>
+<li><a class="reference internal" href="#quick-configuration-you-are-a-mail-servers-master" id="id18">Quick configuration (you are a mail-servers-master)</a></li>
+<li><a class="reference internal" href="#explained-configuration-you-really-want-to-know-what-s-happening-here" id="id19">Explained configuration (you really want to know what&#8217;s happening here)</a></li>
+<li><a class="reference internal" href="#running-mta-client-parameters" id="id20">Additional parameters</a><ul>
+<li><a class="reference internal" href="#running-mta-client-help" id="id21">&#8211;help</a></li>
+<li><a class="reference internal" href="#running-mta-client-config" id="id22">&#8211;config</a></li>
+<li><a class="reference internal" href="#running-mta-client-version" id="id23">&#8211;version</a></li>
+<li><a class="reference internal" href="#address-required" id="id24">&#8211;address (required)</a></li>
+<li><a class="reference internal" href="#input" id="id25">&#8211;input</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li><a class="reference internal" href="#the-web-client" id="id26">The Web client</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="the-daemon">
+<span id="running-daemon"></span><h2><a class="toc-backref" href="#id11">The daemon</a><a class="headerlink" href="#the-daemon" title="Permalink to this headline">¶</a></h2>
+<p>First component you should start is the <a class="reference internal" href="overview.html#overview-mailjam-daemon"><em>Mailjam daemon</em></a>. It is
+quite easy, just run this command from a shell/console:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">mailjam</span><span class="o">-</span><span class="n">server</span>
+</pre></div>
+</div>
+<p>The server process will read the <a class="reference internal" href="configuration.html#configuration-daemon"><em>mailjam.conf</em></a>
+configuration file, will prepare everything and will start listening for XMLRPC
+requests on <em>localhost:9876</em></p>
+<div class="admonition warning">
+<p class="first admonition-title">Warning</p>
+<p class="last"><em>localhost:9876</em> is the default value provided by the default configuration
+files. If you have modified that, it will be a different <em>address:port</em>
+combination.</p>
+</div>
+<div class="admonition warning">
+<p class="first admonition-title">Warning</p>
+<p class="last">If you didn&#8217;t add a valid configuration file to one of the
+<a class="reference internal" href="install.html#install-setting-up-mailjam"><em>default paths</em></a>, the server will refuse to
+start, giving you an error message.</p>
+</div>
+<div class="admonition warning">
+<p class="first admonition-title">Warning</p>
+<p class="last">As of the current version of Mailjam, there are no pre-made init scripts that
+can handle the start/stop/restart of the daemon, but those will be added in
+one of the future releases.</p>
+</div>
+<div class="section" id="additional-parameters">
+<span id="running-daemon-parameters"></span><h3><a class="toc-backref" href="#id12">Additional parameters</a><a class="headerlink" href="#additional-parameters" title="Permalink to this headline">¶</a></h3>
+<p>You can pass some parameters to <em>mailjam-server</em> to modify the behaviour of
+the daemon or get more information.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">Remember that the proper way to modify the behaviour of the daemon is
+editing its configuration file, <a class="reference internal" href="configuration.html#configuration-daemon"><em>mailjam.conf</em></a></p>
+</div>
+<div class="section" id="help">
+<span id="running-daemon-help"></span><h4><a class="toc-backref" href="#id13">&#8211;help</a><a class="headerlink" href="#help" title="Permalink to this headline">¶</a></h4>
+<p>You can get some help by passing the <em>-h</em> or <em>&#8211;help</em> parameters:</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">h</span>
+</pre></div>
+</div>
+<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">help</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="config">
+<span id="running-daemon-config"></span><h4><a class="toc-backref" href="#id14">&#8211;config</a><a class="headerlink" href="#config" title="Permalink to this headline">¶</a></h4>
+<p>You can set the path to the config file the server will load on startup,
+passing the <em>-c</em> or <em>&#8211;config</em> parameters:</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">home</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="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">config</span> <span class="o">/</span><span class="n">home</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 warning">
+<p class="first admonition-title">Warning</p>
+<p class="last">If the file does not exist, or if it is not a valid configuration file,
+an error will be shown and the daemon will refuse to start.</p>
+</div>
+</div>
+<div class="section" id="version">
+<span id="running-daemon-version"></span><h4><a class="toc-backref" href="#id15">&#8211;version</a><a class="headerlink" href="#version" title="Permalink to this headline">¶</a></h4>
+<p>You can check the version of the mailjam server you are trying to run by
+passing the <em>-v</em> or <em>&#8211;version</em> parameters:</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">v</span>
+</pre></div>
+</div>
+<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">version</span>
+</pre></div>
+</div>
+</div>
+</div>
+</div>
+<div class="section" id="the-cli-client">
+<span id="running-cli-client"></span><h2><a class="toc-backref" href="#id16">The CLI client</a><a class="headerlink" href="#the-cli-client" title="Permalink to this headline">¶</a></h2>
+</div>
+<div class="section" id="the-mta-client">
+<span id="running-mta-client"></span><h2><a class="toc-backref" href="#id17">The MTA client</a><a class="headerlink" href="#the-mta-client" title="Permalink to this headline">¶</a></h2>
+<p>Once you have your <a class="reference internal" href="#running-daemon"><em>daemon running</em></a>, you have to add
+as many <a class="reference internal" href="overview.html#overview-mailjam-mta-client"><em>MTA clients</em></a> as mailing lists you
+want to manage to your mail server.</p>
+<div class="section" id="quick-configuration-you-are-a-mail-servers-master">
+<span id="running-mta-client-quick"></span><h3><a class="toc-backref" href="#id18">Quick configuration (you are a mail-servers-master)</a><a class="headerlink" href="#quick-configuration-you-are-a-mail-servers-master" title="Permalink to this headline">¶</a></h3>
+<p>Edit your mail server aliases file <a class="footnote-reference" href="#id8" id="id1">[1]</a> (probably <em>/etc/aliases</em> or
+<em>/etc/mail/aliases</em>) and add an entry like:</p>
+<div class="highlight-python"><pre>list@mydomain.com: "|/usr/local/bin/mailjam-mta -a list@mydomain.com -i -"</pre>
+</div>
+<div class="admonition warning">
+<p class="first admonition-title">Warning</p>
+<p class="last">replace <em>list&#64;mydomain.com</em> with the real address of your mailing list</p>
+</div>
+<div class="admonition warning">
+<p class="first admonition-title">Warning</p>
+<p class="last">replace <em>/usr/local/bin/mailjam-mta</em> with the real path to your mailjam-mta
+installation</p>
+</div>
+<p>Rebuild your <em>aliases</em> database:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">newaliases</span>
+</pre></div>
+</div>
+<div class="admonition warning">
+<p class="first admonition-title">Warning</p>
+<p class="last">Refer to your OS documentation to see how you can rebuild <em>aliases</em>. In most
+unix-like systems it is done by the newaliases <a class="footnote-reference" href="#id9" id="id2">[2]</a> command.</p>
+</div>
+</div>
+<div class="section" id="explained-configuration-you-really-want-to-know-what-s-happening-here">
+<span id="running-mta-client-explained"></span><h3><a class="toc-backref" href="#id19">Explained configuration (you really want to know what&#8217;s happening here)</a><a class="headerlink" href="#explained-configuration-you-really-want-to-know-what-s-happening-here" title="Permalink to this headline">¶</a></h3>
+<p>When new messages arrive at your mail server for your mailing list address
+(let&#8217;s use the example address <em>list&#64;mydomain.com</em>) one of the steps in the
+process that checks the message, it&#8217;s origin, destination, contents, etc is
+the step where the mail server checks its internal <em>aliases</em> database, that is,
+a list of <em>special</em> addresses that, instead of being <em>real</em> addresses, they are
+related to some other addresses in some way.</p>
+<p>Most MTAs out there support one very <em>convenient</em> feature that is to <em>pipe</em> the
+contents of the message (headers and body) to a given shell command. That means
+that the all the received data will be sent to an external command for it to
+process such data.</p>
+<p><strong>Here is where mailjam-mta comes in</strong>.</p>
+<p>What you have to do is just tell your mail server that all messages with
+destination <em>list&#64;mydomain.com</em> (to keep using the same example address) will be
+<em>piped</em> to mailman-mta. The Mailjam MTA client will then know what to do with
+the message, performing some checks and re-sending it to the proper destinations
+(the members/suscriptors of the given mailing list).</p>
+<p>So, first thing you have to find out is <strong>where is your aliases file?</strong>.</p>
+<p>In unix-like systems, like the different Linux distributions or the different
+BSD flavours, that file is <em>/etc/mail/aliases</em> or <em>/etc/aliases</em> (usually one is
+a simbolic link to the other).</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p>Usually the aliases file contains some lines like:</p>
+<div class="last highlight-python"><pre>MAILER-DAEMON: postmaster
+postmaster: root</pre>
+</div>
+</div>
+<p>Once you&#8217;ve found out where the file is, edit it and add this line to the bottom
+of the file:</p>
+<div class="highlight-python"><pre>list@mydomain.com: "|/usr/local/bin/mailjam-mta -a list@mydomain.com -i -"</pre>
+</div>
+<div class="admonition warning">
+<p class="first admonition-title">Warning</p>
+<p class="last">replace <em>list&#64;mydomain.com</em> with the real address of your mailing list</p>
+</div>
+<div class="admonition warning">
+<p class="first admonition-title">Warning</p>
+<p class="last">replace <em>/usr/local/bin/mailjam-mta</em> with the real path to your mailjam-mta
+installation</p>
+</div>
+<p>There you are telling your mail server that any message coming <strong>to</strong>
+<em>list&#64;mydomain.com</em> will be passed to the mailjam-mta command, passing some
+parameters to it:</p>
+<ul class="simple">
+<li><strong>-a list&#64;mydomain.com</strong> tells mailjam-mta that the message is actually for
+that mailing list. The MTA client will then use that value to check (against
+the mailjam daemon) if it is a valid mailing list.</li>
+<li><strong>-i -</strong> tells mailjam-mta that the message will be <em>piped</em> directly. This is
+important, as mailjam-mta can read the messages from files, but in this case
+the mail server will <em>pipe</em> the data directly to mailjam-mta.</li>
+</ul>
+<p>Once you&#8217;ve added that line to your <em>aliases</em> file, you have to rebuild your
+<em>aliases</em> database:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">newaliases</span>
+</pre></div>
+</div>
+<div class="admonition warning">
+<p class="first admonition-title">Warning</p>
+<p class="last">Refer to your OS documentation to see how you can rebuild <em>aliases</em>. In most
+unix-like systems it is done by the newaliases <a class="footnote-reference" href="#id9" id="id3">[2]</a> command.</p>
+</div>
+<p>And you are done. Everything is ready now.</p>
+</div>
+<div class="section" id="running-mta-client-parameters">
+<span id="id4"></span><h3><a class="toc-backref" href="#id20">Additional parameters</a><a class="headerlink" href="#running-mta-client-parameters" title="Permalink to this headline">¶</a></h3>
+<p>You can pass some parameters to <em>mailjam-mta</em> to modify the behaviour of
+the client or get more information.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">Remember that the proper way to modify the behaviour of the client is
+editing its configuration file,
+<a class="reference internal" href="configuration.html#configuration-mta-client"><em>mailjam-mta.conf</em></a></p>
+</div>
+<div class="section" id="running-mta-client-help">
+<span id="id5"></span><h4><a class="toc-backref" href="#id21">&#8211;help</a><a class="headerlink" href="#running-mta-client-help" title="Permalink to this headline">¶</a></h4>
+<p>You can get some help by passing the <em>-h</em> or <em>&#8211;help</em> parameters:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">mailjam</span><span class="o">-</span><span class="n">mta</span> <span class="o">-</span><span class="n">h</span>
+</pre></div>
+</div>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">mailjam</span><span class="o">-</span><span class="n">mta</span> <span class="o">--</span><span class="n">help</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="running-mta-client-config">
+<span id="id6"></span><h4><a class="toc-backref" href="#id22">&#8211;config</a><a class="headerlink" href="#running-mta-client-config" title="Permalink to this headline">¶</a></h4>
+<p>You can set the path to the config file the client will load on startup,
+passing the <em>-c</em> or <em>&#8211;config</em> parameters:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">mailjam</span><span class="o">-</span><span class="n">mta</span> <span class="o">-</span><span class="n">c</span> <span class="o">/</span><span class="n">home</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">mta</span><span class="o">.</span><span class="n">conf</span>
+</pre></div>
+</div>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">mailjam</span><span class="o">-</span><span class="n">mta</span> <span class="o">--</span><span class="n">config</span> <span class="o">/</span><span class="n">home</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">mta</span><span class="o">.</span><span class="n">conf</span>
+</pre></div>
+</div>
+<div class="admonition warning">
+<p class="first admonition-title">Warning</p>
+<p class="last">If the file does not exist, or if it is not a valid configuration file,
+an error will be shown and the client will refuse to start.</p>
+</div>
+</div>
+<div class="section" id="running-mta-client-version">
+<span id="id7"></span><h4><a class="toc-backref" href="#id23">&#8211;version</a><a class="headerlink" href="#running-mta-client-version" title="Permalink to this headline">¶</a></h4>
+<p>You can check the version of the mailjam client you are trying to run by
+passing the <em>-v</em> or <em>&#8211;version</em> parameters:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">mailjam</span><span class="o">-</span><span class="n">mta</span> <span class="o">-</span><span class="n">v</span>
+</pre></div>
+</div>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">mailjam</span><span class="o">-</span><span class="n">mta</span> <span class="o">--</span><span class="n">version</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="address-required">
+<span id="running-mta-client-address"></span><h4><a class="toc-backref" href="#id24">&#8211;address (required)</a><a class="headerlink" href="#address-required" title="Permalink to this headline">¶</a></h4>
+<p>This parameter is required (you have to provide it with a value in order to
+run the mailjam-mta). It sets the address of the mailing list managed by this
+MTA client instance.</p>
+<p>The MTA client will use the provided value to do some checks on the daemon,
+retrieving all the needed data to perform its tasks.</p>
+<p>You can pass a valid address using both the <em>-a</em> and <em>&#8211;address</em> parameters:</p>
+<div class="highlight-python"><pre>mailjam-mta -a list@mydomain.com</pre>
+</div>
+<div class="highlight-python"><pre>mailjam-mta --address list@mydomain.com</pre>
+</div>
+</div>
+<div class="section" id="input">
+<span id="running-mta-client-input"></span><h4><a class="toc-backref" href="#id25">&#8211;input</a><a class="headerlink" href="#input" title="Permalink to this headline">¶</a></h4>
+<p>This parameter tells mailjam-mta from where it has to read the message sent
+to the mailing list. That could be a local file (to be readed from disk) or
+a stream of data coming directly from the standard input (<em>stdin</em>).</p>
+<p>For a regular configuration/setup, the second option is preferred, as the mail
+server will send the stream of data directly to mailjam-mta (as
+<a class="reference internal" href="#running-mta-client-explained"><em>explained before</em></a>):</p>
+<div class="highlight-python"><pre>mailjam-mta -i -</pre>
+</div>
+<div class="highlight-python"><pre>mailjam-mta --input -</pre>
+</div>
+<p>But perhaps some time you would like to send (again) a message you have on disk,
+that could be done easily, passing the path to the file containing that message
+to mailjam-mta:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">mailjam</span><span class="o">-</span><span class="n">mta</span> <span class="o">-</span><span class="n">i</span> <span class="o">/</span><span class="n">home</span><span class="o">/</span><span class="n">backups</span><span class="o">/</span><span class="n">mail</span><span class="o">/</span><span class="n">that</span><span class="o">-</span><span class="n">important</span><span class="o">-</span><span class="n">mail</span><span class="o">.</span><span class="n">txt</span>
+</pre></div>
+</div>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">mailjam</span><span class="o">-</span><span class="n">mta</span> <span class="o">-</span><span class="nb">input</span> <span class="o">/</span><span class="n">home</span><span class="o">/</span><span class="n">backups</span><span class="o">/</span><span class="n">mail</span><span class="o">/</span><span class="n">that</span><span class="o">-</span><span class="n">important</span><span class="o">-</span><span class="n">mail</span><span class="o">.</span><span class="n">txt</span>
+</pre></div>
+</div>
+</div>
+</div>
+</div>
+<div class="section" id="the-web-client">
+<span id="running-web-client"></span><h2><a class="toc-backref" href="#id26">The Web client</a><a class="headerlink" href="#the-web-client" title="Permalink to this headline">¶</a></h2>
+<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="#id1">[1]</a></td><td><a class="reference external" href="http://en.wikipedia.org/wiki/Email_alias">http://en.wikipedia.org/wiki/Email_alias</a></td></tr>
+</tbody>
+</table>
+<table class="docutils footnote" frame="void" id="id9" rules="none">
+<colgroup><col class="label" /><col /></colgroup>
+<tbody valign="top">
+<tr><td class="label">[2]</td><td><em>(<a class="fn-backref" href="#id2">1</a>, <a class="fn-backref" href="#id3">2</a>)</em> <a class="reference external" href="http://www.freebsd.org/cgi/man.cgi?query=newaliases">http://www.freebsd.org/cgi/man.cgi?query=newaliases</a></td></tr>
+</tbody>
+</table>
 </div>
 </div>
@@ -68,4 +384,35 @@
       <div class="sphinxsidebar">
         <div class="sphinxsidebarwrapper">
+  <h3><a href="index.html">Table Of Contents</a></h3>
+  <ul>
+<li><a class="reference internal" href="#">Running Mailjam</a><ul>
+<li><a class="reference internal" href="#the-daemon">The daemon</a><ul>
+<li><a class="reference internal" href="#additional-parameters">Additional parameters</a><ul>
+<li><a class="reference internal" href="#help">&#8211;help</a></li>
+<li><a class="reference internal" href="#config">&#8211;config</a></li>
+<li><a class="reference internal" href="#version">&#8211;version</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li><a class="reference internal" href="#the-cli-client">The CLI client</a></li>
+<li><a class="reference internal" href="#the-mta-client">The MTA client</a><ul>
+<li><a class="reference internal" href="#quick-configuration-you-are-a-mail-servers-master">Quick configuration (you are a mail-servers-master)</a></li>
+<li><a class="reference internal" href="#explained-configuration-you-really-want-to-know-what-s-happening-here">Explained configuration (you really want to know what&#8217;s happening here)</a></li>
+<li><a class="reference internal" href="#running-mta-client-parameters">Additional parameters</a><ul>
+<li><a class="reference internal" href="#running-mta-client-help">&#8211;help</a></li>
+<li><a class="reference internal" href="#running-mta-client-config">&#8211;config</a></li>
+<li><a class="reference internal" href="#running-mta-client-version">&#8211;version</a></li>
+<li><a class="reference internal" href="#address-required">&#8211;address (required)</a></li>
+<li><a class="reference internal" href="#input">&#8211;input</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li><a class="reference internal" href="#the-web-client">The Web client</a></li>
+</ul>
+</li>
+</ul>
+
   <h4>Previous topic</h4>
   <p class="topless"><a href="configuration.html"
Index: docs/src/_build/html/searchindex.js
===================================================================
--- docs/src/_build/html/searchindex.js	(revision 16)
+++ docs/src/_build/html/searchindex.js	(revision 27)
@@ -1,1 +1,1 @@
-Search.setIndex({objects:{},terms:{all:[2,6],code:5,identifi:6,edg:5,just:5,tcsh:5,wikipedia:6,offici:[1,5],becaus:6,tcp:2,ssl_kei:6,session:6,through:6,url:5,ini_fil:6,follow:2,netbsd:6,disk:6,ssl_crt:6,dynam:6,paramet:6,xml:6,categori:6,privat:6,password:6,locat:6,cli:[1,2],how:5,configur:[1,6],activ:5,send:6,should:5,add:[2,6],archlinux:6,overview:[1,2],mail:[1,6,2],tell:2,save:[2,6],local:6,latest:5,bin:5,applic:6,them:2,sourc:[6,5],rememb:5,xmlrpc:[2,6],get:5,read:[2,6],auto:6,pypi:5,kind:2,tbw:5,repo:5,ssl:6,traffic:6,enabl:6,now:6,mailing_list:6,introduct:[1,2],daemon:[1,6,2],like:[2,6],specif:6,edit:2,list:[1,6,2],upload:5,server:[2,6],separ:6,provid:5,achiev:2,have:5,contain:6,small:2,privileg:5,grab:5,secure_socket_lay:6,where:6,manag:[1,2],mean:6,wiki:6,certif:6,www:6,set:[1,6,5],members_db:6,some:[1,4,2],see:6,member:[2,6],design:2,download:5,run:[1,3,5],port:[2,6],librari:6,virtualenv:5,index:1,what:2,still:6,postman:[],record:5,freebsd:6,section:6,abl:6,per:6,yet:[6,5],content:[0,1,2,3,4,5,6],delet:2,written:1,version:5,"new":6,"public":[6,5],localhost:6,refer:5,hasn:6,more:[6,5],themselv:6,insid:5,web:[1,6,2],pleas:5,style:6,here:6,behaviour:6,extens:6,host:5,base:6,repositori:5,ubuntu:6,releas:5,depend:[1,6,5],modifi:6,bleed:5,valu:6,about:[6,5],architectur:[1,2],pymotw:6,current:[2,6],doughellmann:6,page:1,configpars:6,etc:[2,6],fals:6,com:6,disabl:6,user:6,oper:[2,5],softwar:1,client:[1,2],note:[6,5],appli:6,modul:1,within:6,por:6,easy_instal:5,three:2,email:[2,6],instruct:[1,5],alreadi:2,messag:6,right:6,linux:6,instal:[1,6,5],storag:[2,6],your:[6,5],backend:[2,6],kei:6,mercuri:5,differ:[2,6],from:[2,6,5],log:6,wai:[6,5],attach:2,interact:2,support:6,regist:6,system:[6,5],been:[2,6,5],avail:6,mailjam:[1,3,6,5,2],json:6,interfac:[2,6],usr:6,"var":6,call:2,scheme:2,type:6,administr:6,store:6,listen:[2,6],shell:[2,5],option:6,python:[1,6,5],copi:[6,5],search:1,warn:[6,5],allow_chpasswd:6,link:2,too:[2,5],webapp:2,given:[2,6],"true":6,those:6,serv:6,wide:5,multi:2,onli:[1,6,5],"default":6,setup:[6,5],work:[6,5],onc:5,second:[1,5],structur:2,until:5,trick:6,matter:6,itself:2,can:[2,6,5],learn:5,mta:[1,2],root:5,html:6,address:6,unencrypt:6,featur:6,openbsd:6,conf:6,creat:5,process:5,sudo:5,ani:6,doesn:6,compon:2,packag:5,archiv:6,exist:6,ini:6,file:[1,6],tabl:1,pip:5,incom:2,path:[6,5],check:[2,5],probabl:5,readi:6,encrypt:6,thei:6,want:5,inform:[2,6],perform:2,allow:2,travel:6,when:[2,6,5],same:[2,6],reset:6,lists_db:6,also:6,need:5,xmlrpc_server:6,anyon:6,env:5,test:[1,5],environ:5,you:[2,6,5],document:[0,1,5],updat:[2,6],regard:2,http:[6,5],hostnam:6,gentoo:6,clone:5,auto_signup:6,most:6,rpc:6,logfil:6,crt:6,bsd:6,develop:[0,1,5],data:[2,6],debian:6,org:[6,5],csh:5,other:6,bitbucket:5,receiv:2,off:6,directori:[6,5],doc:6,later:6,request:[2,6],inherit:6,fedora:6,registr:6,exampl:[1,4,5],codigo23:5,thi:[1,6,5,2],indic:1,far:5,first:[1,5],egg:5,order:5,usual:6},objtypes:{},titles:["Developers documentation","Mailjam official documentation","Overview of mailjam&#8217;s architecture","Running Mailjam","Some examples","Installation instructions","Configuration"],objnames:{},filenames:["development","index","overview","running","examples","install","configuration"]})
+Search.setIndex({objects:{},terms:{mydomain:3,code:5,edg:5,queri:[3,6],all:[2,3,6,5],follow:[2,5],netbsd:6,disk:[3,6],ssl_crt:6,categori:6,privat:6,depend:[1,3,6,5],newalias:3,send:[3,6],init:3,archlinux:6,sent:[3,6],sourc:[6,5],everi:6,fals:6,simbol:3,veri:3,run_test:5,administr:6,list:[1,3,6,5,2],upload:[],"try":[3,6],small:2,prepar:3,pleas:5,pasa:[],second:[1,3,5],design:2,pass:[3,5],download:5,port:[2,3,6],even:5,index:1,what:[2,3,6],postman:[],section:6,abl:[3,6],current:[2,3,6],delet:[2,3,5],version:[3,5],"new":[3,6],"public":[6,5],hasn:6,full:5,themselv:6,gener:6,here:[3,6],behaviour:[3,6,5],let:3,trunk:5,path:[3,6,5],modifi:[3,6],valu:[3,6],overview_mailjam_cli_cli:[],search:[1,5],larger:2,host:5,appli:6,app:6,prefer:3,unix:3,instal:[1,3,6,5,2],txt:[3,5],establish:6,from:[2,3,6,5],stream:3,would:[3,6,5],regist:6,call:[2,5],usr:[3,6,5],taken:5,type:6,tell:[2,3,6],more:[3,6,5],registr:6,relat:3,warn:[3,6,5],indic:1,unpack:5,retriev:3,setup:[2,3,6,5],work:[2,6,5],histori:6,archiv:6,can:[2,3,6,5],learn:[3,5],root:[3,5],overrid:5,favourit:5,tar:5,give:3,process:[3,6,5],sudo:5,accept:6,want:[3,6,5],multipl:2,csh:5,travel:6,how:[3,5],anyon:6,env:5,instead:3,config:[3,5],updat:[2,6],gentoo:6,stop:3,clone:5,after:[6,5],befor:3,data:[2,3,6],man:3,stdin:3,combin:3,alias:3,sandbox:5,codigo23:5,allow:[2,6],egg:5,order:[3,6,5],origin:3,help:3,offici:[1,5],becaus:6,through:[6,5],still:6,dynam:6,paramet:[3,6,5],style:6,cli:[1,3,6,5,2],mailing_list:6,persist:6,mail:[1,3,6,5,2],them:2,thei:[3,6],uniform_resource_identifi:6,handl:[3,5],auto:6,now:[3,6],bigger:2,introduct:[1,2],choic:5,edit:[2,3,5],didn:3,separ:[6,5],easili:3,achiev:2,each:[2,3,5],found:3,secure_socket_lay:6,mean:[3,6],mailjam:[1,3,6,5,2],replac:[3,6],realli:[3,6],connect:[2,6],our:5,happen:3,special:3,out:3,shown:3,tcsh:5,suscriptor:3,overview_mailjam_mta_cli:[],content:[0,1,2,3,4,5,6],insid:5,given:[2,3,6],standard:[3,5],quick:3,base:[6,5],releas:[3,5],org:[3,6,5],bleed:5,care:5,could:[3,6],refus:3,keep:[3,5],thing:3,perhap:3,first:[1,3,5],oper:[2,5],softwar:[1,5],directli:3,onc:[3,5],instruct:[1,5],alreadi:[2,5],done:3,messag:[3,6],predefin:5,differ:[2,3,6,5],script:3,interact:[2,6],system:[3,6,5],construct:6,mercuri:5,attach:2,master:3,too:[2,6,5],conveni:3,store:6,listen:[2,3,6],shell:[2,3,5],consol:3,option:[3,6,5],tool:5,copi:[6,5],setuptool:5,allow_chpasswd:6,kept:6,zxvvf:5,serv:6,wide:5,kind:[2,6],scheme:2,instanc:[2,3],remot:2,remov:6,requir:3,structur:2,project:5,matter:6,were:5,pre:3,unencrypt:6,argument:3,packag:5,have:[3,6,5],tabl:1,need:[3,6,5],inform:[2,3,6,5],note:[3,6,5],also:[2,6,5],client:[1,3,6,5,2],take:6,environ:5,noth:6,singl:2,sure:6,freebsd:[3,6],previou:5,auto_signup:6,most:[3,6,5],regular:3,bsd:[3,6,5],url:[],doc:[6,5],later:6,request:[2,3,6],uri:6,configguration_xmlrpc:[],pipe:3,latest:5,ssl_kei:6,session:6,find:3,xml:6,configuration_xmlrpc:[],onli:[1,6,5],locat:[6,5],execut:6,explain:3,configur:[1,3,6,5],activ:5,should:[3,5],local:[2,3,6,5],get:[3,5],pypi:5,tbw:4,repo:5,ssl:6,restart:3,enabl:6,crt:6,provid:[3,6,5],contain:[2,3,6,5],privileg:5,grab:5,where:[3,6],wiki:[3,6],certif:6,set:[1,3,6,5],startup:3,see:[2,3,6,5],respons:5,wonder:5,awar:6,databas:3,user:6,wikipedia:[3,6],email_alia:3,written:[1,6],"import":3,experi:5,email:[2,6,5],kei:6,extens:6,webapp:2,come:3,addit:3,bodi:3,pymotw:6,doughellmann:6,against:3,configpars:6,etc:[2,3,6,5],tutori:5,mani:3,com:[3,6],load:3,simpli:5,overview:[1,2],address:[3,6],por:6,arriv:3,header:3,rpc:6,linux:[3,6,5],backend:[2,6],quit:[3,5],mailman:3,rebuild:3,three:2,been:[2,6,5],compon:[2,3,5],json:6,much:5,basic:3,both:3,ani:[3,6],those:[3,6],"case":[3,5],multi:2,look:6,intal:5,trick:6,"while":5,error:3,overview_mailjam_daemon:[],bin:[3,5],readi:[3,6],destin:[3,5],itself:2,conf:[1,3,6,5],incom:[2,6,5],develop:[0,1,5],fedora:6,perform:[2,3],same:[2,3,6],member:[2,3,6],python:[1,6,5],html:[6,5],document:[0,1,2,3,5,6],http:[3,6,5],hostnam:6,logfil:6,extern:3,task:3,off:[],entri:3,inherit:6,exampl:[1,3,4,5,2],command:[3,6,5],thi:[1,3,6,5,2],everyth:[2,3,5],ubuntu:6,usual:[3,6],identifi:6,just:[3,5],tcp:2,yet:6,ocasion:3,web:[1,3,6,2],easi:[3,5],add:[2,3,6,5],valid:3,input:3,save:[2,6],modul:[1,5],real:3,applic:6,xmlrpc:[2,3,6],format:5,read:[2,3,6,5],traffic:6,know:[3,5],password:6,daemon:[1,3,6,5,2],like:[2,3,6,5],specif:6,server:[2,3,6,5],unstabl:5,either:3,manag:[1,3,5,2],www:[3,6],right:6,members_db:6,some:[1,3,4,5,2],intern:[3,6],smoothli:5,proper:3,home:3,librari:6,distribut:3,virtualenv:5,bottom:3,per:[3,6],localhost:[3,6],refer:[3,6,5],cgi:3,run:[1,3,5,2],step:3,repositori:5,about:[2,3,6,5],actual:3,page:1,backup:3,disabl:6,own:[2,5],within:[6,5],easy_instal:5,storag:[2,6],your:[3,6,5],log:6,wai:[3,6,5],support:[3,6],custom:5,avail:[6,5],start:[3,5],interfac:[2,6],includ:5,"var":[6,5],mailer:3,properli:6,regard:2,link:[2,3],line:3,"true":6,reset:6,made:3,flavour:3,"default":[3,6,5],until:[],record:[],below:6,mta:[1,3,6,5,2],postmast:3,featur:[3,6],openbsd:6,ini_fil:6,creat:5,doesn:6,exist:[3,6],ini:6,file:[1,3,6,5],pip:5,doe:[3,6],check:[2,3,6,5],probabl:[3,5],again:3,encrypt:6,when:[2,3,6,5],lists_db:6,other:[3,6],futur:3,rememb:[3,5],varieti:6,test:[1,5],you:[2,3,6,5],architectur:[1,2],debian:6,svn:5,bitbucket:5,receiv:[2,3],directori:[6,5],xmlrpc_server:6,ignor:6,time:[3,5],far:5},objtypes:{},titles:["Developers documentation","Mailjam official documentation","Overview of mailjam&#8217;s architecture","Running Mailjam","Some examples","Installation instructions","Configuration"],objnames:{},filenames:["development","index","overview","running","examples","install","configuration"]})
Index: docs/src/configuration.rst
===================================================================
--- docs/src/configuration.rst	(revision 16)
+++ docs/src/configuration.rst	(revision 27)
@@ -2,14 +2,18 @@
 =============
 
+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.
+
 .. contents::
 
 .. _configuration_daemon:
 
-Mailjam daemon configuration file
----------------------------------
-
-All the configurations that can be applied to the Mailjam daemon are registered
-in the **mailjam.conf** file. That file contains ini-style [1]_ configuration 
-parameters, separated in different *categories*.
+Mailjam daemon configuration file - mailjam.conf
+------------------------------------------------
+
+All the configurations that can be applied to the :ref:`overview_mailjam_daemon`
+are registered in the **mailjam.conf** file. That file contains ini-style [1]_ 
+configuration parameters, separated in different *categories*.
 
 .. note::
@@ -18,9 +22,9 @@
    your setup. The usual locations are:
 
-   - */etc/mailjam.conf* - In most Linux systems (like archlinux, gentoo, 
-     fedora, debian, ubuntu, etc)
-
-   - */usr/local/etc/mailjam.conf* - In most BSD systems (like FreeBSD, OpenBSD,
-     NetBSD, etc)
+   - */etc/mailjam/mailjam.conf* - In most Linux systems (like archlinux, 
+     gentoo, fedora, debian, ubuntu, etc)
+
+   - */usr/local/etc/mailjam/mailjam.conf* - In most BSD systems (like FreeBSD, 
+     OpenBSD, NetBSD, etc)
 
    There is a copy of the configuration file in the *conf/* directory, within
@@ -62,8 +66,8 @@
 ***
 
-Default: ``off`` (because ssl support hasn't been added yet)
-
-Enables/disables SSL [3]_ support in the daemon. If ``off`` all the traffic 
-to/from the server will travel unencrypted. If ``on`` all the traffic will
+Default: ``false`` (because ssl support hasn't been added yet)
+
+Enables/disables SSL [3]_ support in the daemon. If ``false`` all the traffic 
+to/from the server will travel unencrypted. If ``true`` all the traffic will
 travel encrypted.
 
@@ -295,6 +299,309 @@
 will be able to reset those passwords.
 
+.. _configuration_mta_client:
+
+Mailjam MTA client configuration file - mailjam-mta.conf
+--------------------------------------------------------
+
+This file contains all the parameters to configure the 
+:ref:`overview_mailjam_mta_client` properly. It contains ini-style [1]_ 
+configuration parameters, separated in different *categories*.
+
+.. note::
+
+   The mailjam-mta.conf file will be installed in different locations 
+   depending on your setup. The usual locations are:
+
+   - */etc/mailjam/mailjam-mta.conf* - In most Linux systems (like archlinux, 
+     gentoo, fedora, debian, ubuntu, etc)
+
+   - */usr/local/etc/mailjam/mailjam-mta.conf* - In most BSD systems (like 
+     FreeBSD, OpenBSD, NetBSD, etc)
+
+   There is a copy of the configuration file in the *conf/* directory, within
+   the sources.
+
+.. _configuration_mta_client_server:
+
+server
+++++++
+
+This section contains the configuration parameters that tell the MTA client 
+where to connect when trying to interact with the 
+:ref:`overview_mailjam_daemon`.
+
+These are all the available parameters in this section:
+
+.. _configuration_mta_client_server_address:
+
+address
+*******
+
+Default: ``localhost``
+
+The address where the daemon is listening for XMLRPC requests. This is
+the address to where the client will try to connect to.
+
+.. _configuration_mta_client_server_port:
+
+port
+****
+
+Default: ``9876``
+
+The port where the daemon accepts incoming XMLRPC requests. This is the 
+port to where the client will try to connect to.
+
+.. _configuration_mta_client_server_uri:
+
+uri
+***
+
+Default: http://localhost:9876
+
+This is the URI [4]_ to where the client will connect to. It is constructed
+based on the values of the :ref:`configuration_mta_client_server_address`
+and :ref:`configuration_mta_client_server_port` parameters.
+
+.. note::
+
+   The default configuration file contains a dynamic setting for this 
+   parameter::
+
+     uri = http://%(address)s:%(port)s
+
+   That means that the parameter will inherit the values from the
+   :ref:`configuration_mta_client_server_address`
+   and :ref:`configuration_mta_client_server_port` parameters.
+
+.. seealso::
+
+   More information about this (and other tricks) here:
+
+   http://docs.python.org/library/configparser.html
+
+   http://www.doughellmann.com/PyMOTW/ConfigParser
+
+.. warning::
+
+   You can replace this with any URI you would like, **this is the parameter
+   that is really used for establishing new connections** so be aware that if
+   you remove the references to the 
+   :ref:`configuration_mta_client_server_address` and 
+   :ref:`configuration_mta_client_server_port` parameters, the values you have
+   provided for those parameters will be ignored.
+
+.. _configuration_mta_client_server_ssl:
+
+ssl
+***
+
+Default: ``false`` (because ssl support hasn't been added yet)
+
+Enables/disables SSL [3]_ connections to the daemon. If ``false`` all the 
+traffic to/from the server will travel unencrypted. If ``true`` all the traffic 
+will travel encrypted.
+
+.. warning::
+
+   In order to enable SSL support in the client, you have to be sure the
+   :ref:`overview_mailjam_daemon` supports SSL too (check the 
+   :ref:`configuration_daemon_xmlrpc_ssl` parameter in the 
+   :ref:`configuration_daemon_xmlrpc` section of the 
+   :ref:`daemon configuration file <configuration_daemon>`)
+
+.. _configuration_mta_client_archive:
+
+archive
++++++++
+
+This section contains the configuration parameters that set where the files 
+generated by the client will be stored/saved.
+
+.. seealso::
+
+   For more information about the kind of files the client does generate,
+   take a look at the 
+   :ref:`MTA client documentation <overview_mailjam_mta_client>`.
+
+These are all the available parameters in this section:
+
+.. _configurtion_mta_client_archive_persistent:
+
+persistent
+**********
+
+Default: ``true``
+
+Enables/disables the local archive for the client. If ``true``, the client
+will save a copy of every email sent to the list in an internal archive, 
+that could be checked/queried later. If ``false``, the emails will not be
+kept on disk after being processed.
+ 
+.. warning::
+
+   This feature is not ready yet.
+
+
+.. _configuration_mta_client_archive_path:
+
+path
+****
+
+Default: ``/usr/local/mailjam/archive-mta``
+
+Path to the directory where the archives will be saved.
+
+.. warning::
+
+   This feature is not ready yet.
+
+
+.. _configuration_cli_client:
+
+Mailjam CLI client configuration file - mailjam-cli.conf
+--------------------------------------------------------
+
+This file contains all the parameters to configure the 
+:ref:`overview_mailjam_cli_client` properly. It contains ini-style [1]_ 
+configuration parameters, separated in different *categories*.
+
+.. note::
+
+   The mailjam-cli.conf file will be installed in different locations 
+   depending on your setup. The usual locations are:
+
+   - */etc/mailjam/mailjam-cli.conf* - In most Linux systems (like archlinux, 
+     gentoo, fedora, debian, ubuntu, etc)
+
+   - */usr/local/etc/mailjam/mailjam-cli.conf* - In most BSD systems (like 
+     FreeBSD, OpenBSD, NetBSD, etc)
+
+   There is a copy of the configuration file in the *conf/* directory, within
+   the sources.
+
+.. _configuration_cli_client_server:
+
+server
+++++++
+
+This section contains the configuration parameters that tell the cli client 
+where to connect when trying to interact with the 
+:ref:`overview_mailjam_daemon`.
+
+These are all the available parameters in this section:
+
+.. _configuration_cli_client_server_address:
+
+address
+*******
+
+Default: ``localhost``
+
+The address where the daemon is listening for XMLRPC requests. This is
+the address to where the client will try to connect to.
+
+.. _configuration_cli_client_server_port:
+
+port
+****
+
+Default: ``9876``
+
+The port where the daemon accepts incoming XMLRPC requests. This is the 
+port to where the client will try to connect to.
+
+.. _configuration_cli_client_server_uri:
+
+uri
+***
+
+Default: http://localhost:9876
+
+This is the URI [4]_ to where the client will connect to. It is constructed
+based on the values of the :ref:`configuration_cli_client_server_address`
+and :ref:`configuration_cli_client_server_port` parameters.
+
+.. note::
+
+   The default configuration file contains a dynamic setting for this 
+   parameter::
+
+     uri = http://%(address)s:%(port)s
+
+   That means that the parameter will inherit the values from the
+   :ref:`configuration_cli_client_server_address`
+   and :ref:`configuration_cli_client_server_port` parameters.
+
+.. seealso::
+
+   More information about this (and other tricks) here:
+
+   http://docs.python.org/library/configparser.html
+
+   http://www.doughellmann.com/PyMOTW/ConfigParser
+
+.. warning::
+
+   You can replace this with any URI you would like, **this is the parameter
+   that is really used for establishing new connections** so be aware that if
+   you remove the references to the 
+   :ref:`configuration_cli_client_server_address` and 
+   :ref:`configuration_cli_client_server_port` parameters, the values you have
+   provided for those parameters will be ignored.
+
+.. _configuration_cli_client_server_ssl:
+
+ssl
+***
+
+Default: ``false`` (because ssl support hasn't been added yet)
+
+Enables/disables SSL [3]_ connections to the daemon. If ``false`` all the 
+traffic to/from the server will travel unencrypted. If ``true`` all the traffic 
+will travel encrypted.
+
+.. warning::
+
+   In order to enable SSL support in the client, you have to be sure the
+   :ref:`overview_mailjam_daemon` supports SSL too (check the 
+   :ref:`configuration_daemon_xmlrpc_ssl` parameter in the 
+   :ref:`configuration_daemon_xmlrpc` section of the 
+   :ref:`daemon configuration file <configuration_daemon>`)
+
+.. _configuration_cli_client_history:
+
+history
++++++++
+
+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. 
+
+These are all the available parameters in this section:
+
+.. _configurtion_cli_client_archive_enabled:
+
+enabled
+*******
+
+Default: ``true``
+
+Enables/disables history support in the client. If ``true`` all commands 
+provided by an user will be saved to disk. If ``false`` nothing will be
+written to disk.
+
+.. _configuration_cli_client_history_path:
+
+path
+****
+
+Default: ``~/.mailjam/cli/history``
+
+Path to the file where the list of executed commands will be saved.
+
 
 .. [1] http://en.wikipedia.org/wiki/INI_file
 .. [2] http://en.wikipedia.org/wiki/XML-RPC
 .. [3] http://en.wikipedia.org/wiki/Secure_Socket_Layer
+.. [4] http://en.wikipedia.org/wiki/Uniform_resource_identifier
Index: docs/src/examples.rst
===================================================================
--- docs/src/examples.rst	(revision 13)
+++ docs/src/examples.rst	(revision 27)
@@ -3,2 +3,4 @@
 
 .. contents::
+
+TBW
Index: docs/src/install.rst
===================================================================
--- docs/src/install.rst	(revision 16)
+++ docs/src/install.rst	(revision 27)
@@ -2,4 +2,12 @@
 =========================
 
+Installing Mailjam is quite easy. If you have some experience installing 
+Python_ packages [1]_, you already know how to do it. Mailjam is a standard
+Python_ package available on pypi_ [3]_ so just use your favourite tool
+(pip_, easy_install_, etc) to intall it.
+
+Keep reading if you want to learn more about the different options/choices
+you have when installing Mailjam.
+
 .. contents::
 
@@ -14,6 +22,6 @@
 *2.6.x* too.
 
-Please, refer to your operating system package system documentation to learn
-more about how to install python.
+Please, refer to your operating system documentation to learn more about how 
+to install python.
 
 .. _install_mailjam:
@@ -22,4 +30,8 @@
 -----------------------
 
+You can install Mailjam using one of the available tools for installing Python_
+packages, or you can install it from sources. Keep reading to learn more about
+it.
+
 .. _install_with_pip:
 
@@ -29,10 +41,13 @@
 You can install Mailjam using pip_::
 
-  pip install -e https://bitbucket.org/codigo23/mailjam#egg=mailjam
-
-.. note::
-
-   Mailjam has not been recorded/uploaded to pypi_ yet, so, in order to install 
-   it using pip you will have to provide the URL for the public Mailjam repo.
+  pip install Mailjam
+
+.. note::
+
+   The previous command will install the latest release from pypi_. If you
+   would like to install the latest *bleeding edge* sources (unstable code),
+   you can do it using pip_ too::
+
+     pip install -e https://bitbucket.org/codigo23/mailjam#egg=mailjam
 
 .. _install_with_easy_install:
@@ -41,6 +56,7 @@
 +++++++++++++++++++++++++++++
 
-You can not install Mailjam using easy_install_ yet (until we do record/upload 
-it to pypi)
+You can install Mailjam using easy_install_::
+
+  easy_install Mailjam
 
 .. _install_inside_virtualenv:
@@ -66,5 +82,12 @@
 And, once the environment has been activated, use pip to install Mailjam::
 
-  env$ pip install -e https://bitbucket.org/codigo23/mailjam#egg=mailjam
+  env$ pip install Mailjam
+
+.. note::
+
+   Remember that you can install the latest *bleeding edge* version using 
+   pip_ too::
+   
+     env$ pip install -e https://bitbucket.org/codigo23/mailjam#egg=mailjam
 
 .. _install_from_sources:
@@ -82,19 +105,14 @@
 ********
 
-**There are no releases yet**. You will have to install it from the repository.
-
-.. _install_from_repository:
-
-From repository
-***************
-
-The source code of Mailjam is hosted in bitbucket_ [1]_. In order to grab
-the latest sources you need Mercurial_.
-
-To get a copy of the sources, just *clone* the repository::
-
-  hg clone https://bitbucket.org/codigo23/mailjam mailjam-repo
-
-Then, go inside the *mailjam-repo* directory and run::
+You can grab a copy of the latest release from pypi_:
+
+http://pypi.python.org/packages/source/m/mailjam/
+
+After downloaded, you have to unpack the sources::
+
+  tar -zxvvf mailjam-0.1.0.tar.gz
+
+This will create a directory called *mailjam-0.1.0*, go inside that directory
+and run::
 
   python setup.py install
@@ -110,4 +128,30 @@
    This process will work inside a virtualenv_ too.
 
+.. _install_from_repository:
+
+From repository
+***************
+
+The source code of Mailjam is hosted in bitbucket_ [2]_. In order to grab
+the latest sources you need Mercurial_.
+
+To get a copy of the sources, just *clone* the repository::
+
+  hg clone https://bitbucket.org/codigo23/mailjam mailjam-repo
+
+Then, go inside the *mailjam-repo* directory and run::
+
+  python setup.py install
+
+.. warning::
+
+   If you want to install it *system-wide*, probably you will need *root*
+   privileges (check your OS documentation to learn more about how to get
+   *root* privileges - for example using sudo_)
+
+.. note::
+
+   This process will work inside a virtualenv_ too.
+
 .. _install_setting_up_mailjam:
 
@@ -115,5 +159,64 @@
 ------------------
 
-TBW
+In order to setup Mailjam, you will have to create the needed 
+:doc:`configuration files <configuration>`. Each component has its own
+configuration file:
+
+- The :ref:`Mailjam daemon <overview_mailjam_daemon>` configuration file is 
+  :ref:`mailjam.conf <configuration_daemon>`
+
+- The :ref:`Mailjam MTA client <overview_mailjam_mta_client>` configuration 
+  file is :ref:`mailjam-mta.conf <configuration_mta_client>`
+
+- The :ref:`Mailjam CLI client <overview_mailjam_cli_client>` configuration 
+  file is :ref:`mailjam-cli.conf <configuration_cli_client>`
+
+Refer to each configuration file documentation to learn more about the different
+settings you can customize.
+
+Each component will search for its configuration file in a list of predefined
+locations, but you can override that behaviour using the *-c* parameter when
+starting the component. 
+
+.. note::
+
+   Mailjam will search for the config files, in order, through the following 
+   paths:
+
+   1. /etc/mailjam
+
+   2. /etc
+
+   3. /usr/local/etc/mailjam
+
+   4. /usr/local/etc
+
+   5. the *conf* directory within the sources (or the installed *egg* [4]_)
+
+For example, you can start the :ref:`overview_mailjam_daemon` passing 
+*/var/db/mailjam/mailjam.conf* as its configuration file::
+
+  mailjam-server -c /var/db/mailjam/mailjam.conf
+
+.. seealso::
+
+   :doc:`running` contains more information about how to run the different 
+   components.
+
+If you have installed Mailjam using pip_, easy_install_ 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.
+
+.. warning::
+
+   The default destination will be different based on your operating system.
+   For example, in most linux servers it will copy the files to */etc/mailjam*,
+   while in BSD servers it will copy the files to */usr/local/etc/mailjam*.
+
+.. seealso::
+
+   :doc:`Configuration files, settings and formats documentation <configuration>`
+
 
 .. _install_running_mailjam:
@@ -122,5 +225,17 @@
 ---------------
 
-TBW
+In order to run a full Mailjam environment, you will have to start the different
+components separately:
+
+1. :ref:`Start the daemon <running_daemon>`
+
+2. :ref:`Run the cli client and manage your mailing lists <running_cli_client>`
+
+3. :ref:`Add as much MTA clients as you need to your mail server<running_mta_client>`
+
+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.
 
 .. _install_running_tests:
@@ -129,5 +244,16 @@
 -------------------------------
 
-TBW
+Just in case you were wondering, **yes**, Mailjam code has some tests you can 
+run to check everything is ok and that the software should run smoothly on your
+server(s).
+
+To run the tests, simply get a copy of the sources from our public repository::
+
+  hg clone https://bitbucket.org/codigo23/mailjam mailjam-repo
+
+then run the tests::
+
+  cd mailjam-repo && ./bin/run_tests
+
 
 .. _Python: http://python.org
@@ -140,3 +266,6 @@
 .. _sudo: http://sudo.ws
 
-.. [1] https://bitbucket.org/codigo23/mailjam
+.. [1] http://docs.python.org/tutorial/modules.html#packages
+.. [2] https://bitbucket.org/codigo23/mailjam
+.. [3] http://pypi.python.org/pypi/mailjam
+.. [4] http://svn.python.org/projects/sandbox/trunk/setuptools/doc/formats.txt
Index: docs/src/overview.rst
===================================================================
--- docs/src/overview.rst	(revision 16)
+++ docs/src/overview.rst	(revision 27)
@@ -18,4 +18,15 @@
    :class: open_fancybox
 
+This architecture works for small setups (everything running on a single server)
+but it works for bigger/larger installations with up to N mail servers, running
+each server its own :ref:`overview_mailjam_mta_client` (or multiple instances
+of it) to connect to N :ref:`overview_mailjam_daemon` servers (managed locally 
+or remotely using up to N :ref:`overview_mailjam_cli_client` or
+:ref:`overview_mailjam_web_client` instances).
+
+.. seealso::
+
+   :doc:`The examples documentation <examples>` contains some useful examples
+   about different kinds of setups.
 
 .. _overview_mailjam_daemon:
Index: docs/src/running.rst
===================================================================
--- docs/src/running.rst	(revision 16)
+++ docs/src/running.rst	(revision 27)
@@ -2,3 +2,353 @@
 ===============
 
+In order to run Mailjam, you have to run the different components, depending on
+what you want to do. Basically, you will need to run a server 
+(:ref:`overview_mailjam_daemon`) all the time, then you will need one 
+:ref:`overview_mailjam_mta_client` per mailing list. 
+
+Ocasionally, you will need to add or delete a mailing list, or edit its 
+information, members list, etc. To do that, you will have to run a Mailjam 
+client (either the :ref:`CLI client <overview_mailjam_cli_client>` or the
+:ref:`Web client <overview_mailjam_web_client>`).
+
+Keep reading if you want to learn more about the way you can start each 
+component, the different arguments/parameters you can provide on startup, etc.
+
+.. warning::
+
+   Remember that, before being able to run any component, you have to 
+   :ref:`set up proper configuration files <install_setting_up_mailjam>`. You
+   can learn more about Mailjam configuration files in the 
+   :doc:`configuration files documentation <configuration>`.
+
 .. contents::
+
+.. _running_daemon:
+
+The daemon
+----------
+
+First component you should start is the :ref:`overview_mailjam_daemon`. It is
+quite easy, just run this command from a shell/console::
+
+  mailjam-server
+
+The server process will read the :ref:`mailjam.conf <configuration_daemon>` 
+configuration file, will prepare everything and will start listening for XMLRPC
+requests on *localhost:9876*
+
+.. warning::
+
+   *localhost:9876* is the default value provided by the default configuration
+   files. If you have modified that, it will be a different *address:port* 
+   combination.
+
+.. warning::
+
+   If you didn't add a valid configuration file to one of the 
+   :ref:`default paths <install_setting_up_mailjam>`, the server will refuse to
+   start, giving you an error message.
+
+.. warning::
+
+   As of the current version of Mailjam, there are no pre-made init scripts that
+   can handle the start/stop/restart of the daemon, but those will be added in
+   one of the future releases.
+
+.. _running_daemon_parameters:
+
+Additional parameters
++++++++++++++++++++++
+
+You can pass some parameters to *mailjam-server* to modify the behaviour of
+the daemon or get more information.
+
+.. note::
+
+   Remember that the proper way to modify the behaviour of the daemon is 
+   editing its configuration file, :ref:`mailjam.conf <configuration_daemon>`
+
+.. _running_daemon_help:
+
+--help
+******
+
+You can get some help by passing the *-h* or *--help* parameters::
+
+  mailjam-server -h
+
+::
+
+  mailjam-server --help
+
+.. _running_daemon_config:
+
+--config
+********
+
+You can set the path to the config file the server will load on startup,
+passing the *-c* or *--config* parameters::
+
+  mailjam-server -c /home/mailjam/mailjam.conf
+
+::
+
+  mailjam-server --config /home/mailjam/mailjam.conf
+  
+.. warning::
+
+   If the file does not exist, or if it is not a valid configuration file,
+   an error will be shown and the daemon will refuse to start.
+
+.. _running_daemon_version:
+
+--version
+*********
+
+You can check the version of the mailjam server you are trying to run by
+passing the *-v* or *--version* parameters::
+
+  mailjam-server -v
+
+::
+
+  mailjam-server --version
+
+
+.. _running_cli_client:
+
+The CLI client
+--------------
+
+
+
+.. _running_mta_client:
+
+The MTA client
+--------------
+
+Once you have your :ref:`daemon running <running_daemon>`, you have to add
+as many :ref:`MTA clients <overview_mailjam_mta_client>` as mailing lists you
+want to manage to your mail server.
+
+.. _running_mta_client_quick:
+
+Quick configuration (you are a mail-servers-master)
++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+Edit your mail server aliases file [1]_ (probably */etc/aliases* or 
+*/etc/mail/aliases*) and add an entry like::
+
+  list@mydomain.com: "|/usr/local/bin/mailjam-mta -a list@mydomain.com -i -"
+
+.. warning::
+   
+   replace *list@mydomain.com* with the real address of your mailing list
+
+.. warning::
+
+   replace */usr/local/bin/mailjam-mta* with the real path to your mailjam-mta
+   installation
+
+Rebuild your *aliases* database::
+
+  newaliases
+
+.. warning::
+
+   Refer to your OS documentation to see how you can rebuild *aliases*. In most
+   unix-like systems it is done by the newaliases [2]_ command.
+
+.. _running_mta_client_explained:
+
+Explained configuration (you really want to know what's happening here)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+When new messages arrive at your mail server for your mailing list address 
+(let's use the example address *list@mydomain.com*) one of the steps in the
+process that checks the message, it's origin, destination, contents, etc is
+the step where the mail server checks its internal *aliases* database, that is,
+a list of *special* addresses that, instead of being *real* addresses, they are
+related to some other addresses in some way.
+
+Most MTAs out there support one very *convenient* feature that is to *pipe* the
+contents of the message (headers and body) to a given shell command. That means
+that the all the received data will be sent to an external command for it to 
+process such data.
+
+**Here is where mailjam-mta comes in**.
+
+What you have to do is just tell your mail server that all messages with 
+destination *list@mydomain.com* (to keep using the same example address) will be
+*piped* to mailman-mta. The Mailjam MTA client will then know what to do with 
+the message, performing some checks and re-sending it to the proper destinations
+(the members/suscriptors of the given mailing list).
+
+So, first thing you have to find out is **where is your aliases file?**.
+
+In unix-like systems, like the different Linux distributions or the different 
+BSD flavours, that file is */etc/mail/aliases* or */etc/aliases* (usually one is
+a simbolic link to the other).
+
+.. note::
+
+   Usually the aliases file contains some lines like::
+
+     MAILER-DAEMON: postmaster
+     postmaster: root
+
+Once you've found out where the file is, edit it and add this line to the bottom
+of the file::
+
+  list@mydomain.com: "|/usr/local/bin/mailjam-mta -a list@mydomain.com -i -"
+
+.. warning::
+   
+   replace *list@mydomain.com* with the real address of your mailing list
+
+.. warning::
+
+   replace */usr/local/bin/mailjam-mta* with the real path to your mailjam-mta
+   installation
+
+There you are telling your mail server that any message coming **to** 
+*list@mydomain.com* will be passed to the mailjam-mta command, passing some 
+parameters to it:
+
+- **-a list@mydomain.com** tells mailjam-mta that the message is actually for
+  that mailing list. The MTA client will then use that value to check (against
+  the mailjam daemon) if it is a valid mailing list.
+
+- **-i -** tells mailjam-mta that the message will be *piped* directly. This is
+  important, as mailjam-mta can read the messages from files, but in this case
+  the mail server will *pipe* the data directly to mailjam-mta.
+
+Once you've added that line to your *aliases* file, you have to rebuild your 
+*aliases* database::
+
+  newaliases
+
+.. warning::
+
+   Refer to your OS documentation to see how you can rebuild *aliases*. In most
+   unix-like systems it is done by the newaliases [2]_ command.
+
+And you are done. Everything is ready now.
+
+.. _running_mta_client_parameters:
+
+Additional parameters
++++++++++++++++++++++
+
+You can pass some parameters to *mailjam-mta* to modify the behaviour of
+the client or get more information.
+
+.. note::
+
+   Remember that the proper way to modify the behaviour of the client is 
+   editing its configuration file, 
+   :ref:`mailjam-mta.conf <configuration_mta_client>`
+
+.. _running_mta_client_help:
+
+--help
+******
+
+You can get some help by passing the *-h* or *--help* parameters::
+
+  mailjam-mta -h
+
+::
+
+  mailjam-mta --help
+
+.. _running_mta_client_config:
+
+--config
+********
+
+You can set the path to the config file the client will load on startup,
+passing the *-c* or *--config* parameters::
+
+  mailjam-mta -c /home/mailjam/mailjam-mta.conf
+
+::
+
+  mailjam-mta --config /home/mailjam/mailjam-mta.conf
+  
+.. warning::
+
+   If the file does not exist, or if it is not a valid configuration file,
+   an error will be shown and the client will refuse to start.
+
+.. _running_mta_client_version:
+
+--version
+*********
+
+You can check the version of the mailjam client you are trying to run by
+passing the *-v* or *--version* parameters::
+
+  mailjam-mta -v
+
+::
+
+  mailjam-mta --version
+
+.. _running_mta_client_address:
+
+--address (required)
+********************
+
+This parameter is required (you have to provide it with a value in order to
+run the mailjam-mta). It sets the address of the mailing list managed by this
+MTA client instance.
+
+The MTA client will use the provided value to do some checks on the daemon,
+retrieving all the needed data to perform its tasks.
+
+You can pass a valid address using both the *-a* and *--address* parameters::
+
+  mailjam-mta -a list@mydomain.com
+
+::
+
+  mailjam-mta --address list@mydomain.com
+
+.. _running_mta_client_input:
+
+--input
+*******
+
+This parameter tells mailjam-mta from where it has to read the message sent 
+to the mailing list. That could be a local file (to be readed from disk) or
+a stream of data coming directly from the standard input (*stdin*).
+
+For a regular configuration/setup, the second option is preferred, as the mail
+server will send the stream of data directly to mailjam-mta (as 
+:ref:`explained before <running_mta_client_explained>`)::
+
+  mailjam-mta -i -
+
+::
+
+  mailjam-mta --input -
+
+But perhaps some time you would like to send (again) a message you have on disk,
+that could be done easily, passing the path to the file containing that message
+to mailjam-mta::
+
+  mailjam-mta -i /home/backups/mail/that-important-mail.txt
+
+::
+
+  mailjam-mta -input /home/backups/mail/that-important-mail.txt
+
+
+.. _running_web_client:
+
+The Web client
+--------------
+
+.. [1] http://en.wikipedia.org/wiki/Email_alias
+.. [2] http://www.freebsd.org/cgi/man.cgi?query=newaliases