Merge pull request #523 from NethServer/master

Merge branch master in v7
NethServer · Sep 2, 2020 · 005b862 · 005b862
2 parents 9840eda + 2f7a620
commit 005b862
Show file tree

Hide file tree

Showing 3 changed files with 442 additions and 346 deletions.
diff --git a/administrator-manual/en/base_system2.rst b/administrator-manual/en/base_system2.rst
@@ -125,6 +125,8 @@ Settings
 
 The :index:`settings` page allows the configuration of some options which could impact multiple system applications.
 
+.. _smart-host:
+
 Smart host
 ^^^^^^^^^^
 

diff --git a/administrator-manual/en/index.rst b/administrator-manual/en/index.rst
@@ -71,6 +71,7 @@ Administrator Manual
 
    web_server
    firewall2
+   mail
 
 .. toctree::
    :maxdepth: 1
@@ -80,7 +81,6 @@ Administrator Manual
    disaster_recovery
    backup_customization
    backup_legacy
-   mail
    webmail
    webtop5
    pop3_connector