Merge branch 'master' into v7

administrator-manual/en/accounts.rst

@@ -456,7 +456,6 @@ Expiration
 ----------
 
 The  :index:`password expiration` is enabled by default to 6 months from the time when the password is set.
-The system will send an e-mail to inform the users when their password is about to expire.
 
 .. note:: The system will refer to the date of the last password change,
    if password is older than 6 months, the server will send an email to indicate that password has expired.

administrator-manual/en/mail2.rst

@@ -17,10 +17,12 @@ This new module provides the email filter engine for the
 therefore an upgrade for those modules is required. See
 :ref:`mail2-upgrade-procedures-section`.
 
-Features planned for final release
-==================================
-
-* Backward-compatible disclaimer signature (on development)
+The :guilabel:`Email > Domains > Append a legal note to sent messages` (also
+known as "Disclaimer") feature was split in a separate, optional package:
+``nethserver-mail2-disclaimer``. The upgrade procedures documented in this
+section install it for backward compatibility, however new installations should
+avoid it, as it relies on an old package [#ALTERMIME]_ that can be removed in
+future releases.
 
 Configuration options
 =====================
@@ -87,6 +89,9 @@ Upgrade procedures
 It is possible to switch a running system to this new module, starting from
 the **Email** module, **SMTP proxy** or **POP3 connector**  module.
 
+Make sure the system is updated with the latest packages before running the
+upgrade procedure.
+
 If something is wrong with ``rspamd``, please report the issue on
 `community.nethserver.org <https://community.nethserver.org>`_.
 
@@ -100,29 +105,29 @@ From Email module
 Upgrade: ::
 
     yum swap \
-        -- remove nethserver-mail-{common,filter,server} \
-        -- install nethserver-mail2-{common,filter,server}
+        -- remove nethserver-mail-{common,disclaimer,filter,server} \
+        -- install nethserver-mail2-{common,disclaimer,filter,server}
 
 Revert upgrade: ::
 
     yum swap \
-        -- install nethserver-mail-{common,filter,server} \
-        -- remove nethserver-mail2-{common,filter,server}
+        -- install nethserver-mail-{common,disclaimer,filter,server} \
+        -- remove nethserver-mail2-{common,disclaimer,filter,server}
 
 From SMTP proxy module
 ----------------------
 
 Upgrade: ::
 
     yum swap \
-        -- remove nethserver-mail-{common,filter} \
-        -- install nethserver-mail2-{common,filter}
+        -- remove nethserver-mail-{common,disclaimer,filter} \
+        -- install nethserver-mail2-{common,disclaimer,filter}
 
 Revert upgrade: ::
 
     yum swap \
-        -- install nethserver-mail-{common,filter} \
-        -- remove nethserver-mail2-{common,filter}
+        -- install nethserver-mail-{common,disclaimer,filter} \
+        -- remove nethserver-mail2-{common,disclaimer,filter}
 
 From POP3 connector module
 --------------------------
@@ -135,29 +140,29 @@ with email filter`.
 Upgrade: ::
 
     yum swap \
-        -- remove nethserver-mail-{common,filter,server} nethserver-getmail nethserver-spamd \
-        -- install nethserver-mail2-{common,filter,server,getmail}
+        -- remove nethserver-mail-{common,disclaimer,filter,server} nethserver-getmail nethserver-spamd \
+        -- install nethserver-mail2-{common,disclaimer,filter,server,getmail}
 
 Revert upgrade: ::
 
     yum swap \
-        -- install nethserver-mail-{common,filter,server} nethserver-getmail \
-        -- remove nethserver-mail2-{common,filter,server,getmail}
+        -- install nethserver-mail-{common,disclaimer,filter,server} nethserver-getmail \
+        -- remove nethserver-mail2-{common,disclaimer,filter,server,getmail}
 
 From POP3 proxy module
 ----------------------
 
 Upgrade: ::
 
     yum swap \
-        -- remove nethserver-mail-{common,filter} nethserver-p3scan nethserver-spamd \
-        -- install nethserver-mail2-{common,filter,p3scan}
+        -- remove nethserver-mail-{common,disclaimer,filter} nethserver-p3scan nethserver-spamd \
+        -- install nethserver-mail2-{common,disclaimer,filter,p3scan}
 
 Revert upgrade: ::
 
     yum swap \
-        -- install nethserver-mail-{common,filter} nethserver-p3scan nethserver-spamd \
-        -- remove nethserver-mail2-{common,filter,p3scan}
+        -- install nethserver-mail-{common,disclaimer,filter} nethserver-p3scan nethserver-spamd \
+        -- remove nethserver-mail2-{common,disclaimer,filter,p3scan}
 
 .. rubric:: References
 
@@ -175,3 +180,7 @@ Revert upgrade: ::
     transfer agent (MTA) using greylisting will "temporarily reject" any email from
     a sender it does not recognize -- `Wikipedia
     <https://en.wikipedia.org/wiki/Greylisting>`_
+
+.. [#ALTERMIME]
+    alterMIME is a small program which is used to alter your mime-encoded mailpack --
+    https://pldaniels.com/altermime/

developer-manual/en/templates.rst

@@ -356,6 +356,24 @@ full list of options can be seen with:
 
 ``perldoc esmith::templates``
 
+Template deletion: templates.metadata
+=====================================
+
+A template once expanded in the file system cannot be deleted automatically, 
+you can only change its content. The template will still exist until you delete 
+it by a ``templates.medata`` file.
+
+For example to delete ``/etc/myExample``, create the file 
+``/etc/e-smith/templates.metadata/etc/myExample`` with just the following line ::
+
+    DELETE=1
+
+Then ::
+
+    expand-template /etc/myExample
+   
+
+
 Perl API: processTemplate
 ==========================