Merge pull request #467 from NethServer/master

Update V7 branch
NethServer · Dec 19, 2019 · 2791721 · 2791721
2 parents c927e53 + 35f8b44
commit 2791721
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 13 deletions.
diff --git a/administrator-manual/en/base_system.rst b/administrator-manual/en/base_system.rst
@@ -154,7 +154,8 @@ Private network   Subnet mask   IP addresses interval
 Network services
 ================
 
-A :index:`network service` is a service running on the firewall itself.
+A remote system can connect to a :index:`network service`, which is a software
+running on |product| itself.
 
 Each service has a list of "open" ports on which it answers to connections.
 Connections can be accepted from selected zones. Finer grained control of 

diff --git a/administrator-manual/en/base_system2.rst b/administrator-manual/en/base_system2.rst
@@ -80,7 +80,8 @@ this page allows to:
 Services
 --------
 
-A :index:`service` is a software running on the firewall itself.
+A remote system can connect to a :index:`network service`, which is a software
+running on |product| itself.
 
 Each service can have a list of "open" ports accepting local or remote connections.
 To control which zones or hosts can access a network service, see :ref:`firewall-section`.
@@ -243,7 +244,7 @@ A local user can be delegated to access:
 
 * one or more pages of the *System* section
 * one or more installed applications
-* one or more main sections between *Subscription*, *Software Center* or *Terminal*
+* one or more main sections between *Subscription*, *Software Center*
 
 Role delegation is based on local groups, each user belonging to the group will be delegated.
 Users inside the *domains admins* are automatically delegated to all panels.
@@ -255,3 +256,8 @@ Select one or more items from the :guilabel:`System views` and :guilabel:`Applic
 Even if a user has been delegated, it must be explicitly granted the shell access before
 being able to log into the Server Manager.
 
+The following pages are always accessible to all users:
+
+* dashboard
+* applications
+* terminal
diff --git a/administrator-manual/en/chat.rst b/administrator-manual/en/chat.rst
@@ -61,14 +61,14 @@ Administrators
 
 All users within the group ``jabberadmins`` are considered administrators of the chat server. 
 
+The group ``jabberadmins`` must be created and configured from the :ref:`groups-section` page.
+
 Administrators can: 
 
 * Send broadcast messages 
 * Check the status of connected users 
 
 
-The group ``jabberadmins`` is configurable from :ref:`groups-section` page.
-
 Message Archive Management
 ==========================
 

diff --git a/administrator-manual/en/disaster_recovery.rst b/administrator-manual/en/disaster_recovery.rst
@@ -19,8 +19,8 @@ Other restored configurations:
    installation, i.e., avoid restoring a configuration backup from a 7.4.1708 installation on a new 7.6.1810 system,
    as it may lead to unexpected results.
 
-New Server Manger
------------------
+New Server Manager
+------------------
 
 Please, follow below steps:
 
@@ -31,7 +31,7 @@ Please, follow below steps:
 
   .. only:: nsent
 
-       Activate NethServer Enterprise following the :ref:`registration-section` procedure
+       Activate NethServer Enterprise following the :ref:`registration <registration-section>` procedure
 
   .. only:: nscom
 
@@ -45,7 +45,7 @@ Please, follow below steps:
    the **Configuration Backup** section, then upload the configuration backup
    or download it directly from an HTTP/S URL.
 
-   For |product| Enterprise, all cloud backups will be automatically downloaded and ready
+   For NethServer Enterprise, all cloud backups will be automatically downloaded and ready
    to be restored directly from the :guilabel:`From backup` field.
 
 5. Map network interface names from the backup to the running system.
@@ -92,6 +92,8 @@ Please, follow below steps:
 
       restore-data -b <name>
 
+     where ``name`` is the name of the data backup you want to restore from.
+
 
 .. only:: nsent
 
@@ -117,6 +119,8 @@ Please, follow below steps:
 
       restore-data -b <name>
 
+     where ``name`` is the name of the data backup you want to restore from.
+
 
 Please note that the disaster recovery should be always performed from a local media (eg. NFS or USB) to speed up the process.
 

diff --git a/administrator-manual/en/hotsync.rst b/administrator-manual/en/hotsync.rst
@@ -4,6 +4,10 @@
 HotSync
 =======
 
+.. note::
+
+  This package is not supported in |product| Enterprise
+
 .. warning::
 
    HotSync should be considered a `beta release <https://en.wikipedia.org/wiki/Software_release_life_cycle#Beta>`_.

diff --git a/administrator-manual/en/index.rst b/administrator-manual/en/index.rst
@@ -123,6 +123,7 @@ Administrator Manual
        collabora
        sogo
        phpVirtualBox
+       hotsync
 
 .. toctree::
    :maxdepth: 2

diff --git a/administrator-manual/en/mail.rst b/administrator-manual/en/mail.rst
@@ -472,17 +472,31 @@ send or receive messages.
 The section :guilabel:`Rules by mail address` allows creating
 three types of rules:
 
-* :guilabel:`Block From`: any message from specified sender is blocked
-
 * :guilabel:`Allow From`: any message from specified sender is
   accepted
 
 * :guilabel:`Allow To`: any message to the specified recipient is
   accepted
 
-It's possible to create an 'Allow' or 'Block' rule even for a complete email domain, not just for a single email address : you just need to specify the desired domain (e.g. : nethserver.org).
+* :guilabel:`Block From`: any message from specified sender is blocked
+
+The *Allow* rules have higher precedence over the *Block* ones. As soon as an *Allow* rule
+matches, the antispam and antivirus checks are skipped, the *Block* rule is not
+evaluated and the message is accepted.
+
+.. warning::
+
+    **Antivirus and antispam checks are skipped** if an *Allow* rule matches
+
+It is possible to create an *Allow* or *Block* rule even for an entire 
+domain, not just for a single email address: you just need to specify the
+domain name (e.g. ``dev.nethserver.org``).
+
+When a second level domain domain name is specified it matches also its
+subdomains. For instance ``nethserver.org`` matches ``nethserver.org`` itself,
+``dev.nethserver.org``, ``demo.nethserver.org`` and so on.
+
 
-.. warning:: **Anti-virus checks are disabled** too, in case *whitelist* settings.
 
 .. _rspamd-web-interface-section:
 

diff --git a/administrator-manual/en/phone_home.rst b/administrator-manual/en/phone_home.rst
@@ -12,6 +12,7 @@ The phone home is enabled by default and it sends the following data:
 
  * UUID stored in ``/var/lib/yum/uuid``
  * RELEASE from ``/sbin/e-smith/config getprop sysconfig Version``
+ * TYPE of installation like ``subscription``, ``enterprise`` or ``community``
 
 Disabling
 =========

diff --git a/administrator-manual/en/team_chat.rst b/administrator-manual/en/team_chat.rst
@@ -17,6 +17,10 @@ Before proceeding with the configuration, make sure to create the corresponding
 
 If your server is using a Let's Encrypt certificate as default, make also sure to have a corresponding public DNS record. See :ref:`server_certificate-section` for more info.
 
+.. warning::
+
+   Please note that the mobile app **cannot connect to servers with self-signed certificates**!
+
 How to configure:
 
 1. Access :guilabel:`Team chat` page inside the Server Manager