diff --git a/doc/conf.py b/doc/conf.py index 1bef7c83d..222d6759b 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -50,7 +50,7 @@ copyright = u'2014, Antoine Nguyen' # The short X.Y version. version = '1.1' # The full version, including alpha/beta/rc tags. -release = '1.1.6' +release = '1.1.7' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/doc/getting_started/plugins.rst b/doc/getting_started/plugins.rst index 6b7394c3f..7da7c5d40 100644 --- a/doc/getting_started/plugins.rst +++ b/doc/getting_started/plugins.rst @@ -307,11 +307,14 @@ Here is a link example:: http:///quarantine/%i/?rcpt=%R&secret_id=[:secret_id] +.. _sa_manual_learning: + Manual SpamAssassin learning ============================ -It is possible to manually train SpamAssassin (FIXME: URL) using -the quarantine's content. By train, we mean: +It is possible to manually train `SpamAssassin +`_ using the quarantine's content. By +train, we mean: * Mark message(s) as spam (false negative(s)) @@ -341,7 +344,7 @@ inside: Replace values between ``<>`` by yours. Possible values for ``Driver`` are ``PgSQL`` or ``MySQL`` (non exhaustive list). The syntax for ``DSN`` depends on the driver you choose. Please consult the official -documentation. (FIXME: URL) +documentation. Enable the feature through Modoboa ---------------------------------- diff --git a/doc/getting_started/upgrade.rst b/doc/getting_started/upgrade.rst index db1d0ec6b..35fab86a1 100644 --- a/doc/getting_started/upgrade.rst +++ b/doc/getting_started/upgrade.rst @@ -48,6 +48,14 @@ Finally, follow the common procedure:: $ python manage.py syncdb --migrate $ python manage.py collectstatic +1.1.7: manual learning for SpamAssassin +======================================= + +A new feature allows administrators and users to manually train +SpamAssassin in order to customize its behaviour. + +Check :ref:`sa_manual_learning` to know more about this feature. + 1.1.6: Few bugfixes =================== diff --git a/setup.py b/setup.py index 372d71e2e..926857f96 100644 --- a/setup.py +++ b/setup.py @@ -54,7 +54,7 @@ def read(fname): setup( name="modoboa", - version='1.1.6', + version='1.1.7', url='http://modoboa.org/', license='MIT', description="Mail hosting made simple",