Merge pull request #453 from NethServer/master

Update v7 branch
NethServer · Oct 8, 2019 · e90caca · e90caca
2 parents ea5b4a0 + 583ae82
commit e90caca
Show file tree

Hide file tree

Showing 12 changed files with 75 additions and 70 deletions.
diff --git a/administrator-manual/en/.tx/config b/administrator-manual/en/.tx/config
@@ -212,9 +212,9 @@ source_file = _build/locale/backup_legacy.pot
 source_lang = en
 type = PO
 
-[docs-v7.backup_advanced]
-file_filter = locale/<lang>/LC_MESSAGES/backup_advanced.po
-source_file = _build/locale/backup_advanced.pot
+[docs-v7.backup_customization]
+file_filter = locale/<lang>/LC_MESSAGES/backup_customization.po
+source_file = _build/locale/backup_customization.pot
 source_lang = en
 type = PO
 
@@ -266,9 +266,9 @@ source_file = _build/locale/base_system.pot
 source_lang = en
 type = PO
 
-[docs-v7.base2_system]
-file_filter = locale/<lang>/LC_MESSAGES/base2_system.po
-source_file = _build/locale/base2_system.pot
+[docs-v7.base_system2]
+file_filter = locale/<lang>/LC_MESSAGES/base_system2.po
+source_file = _build/locale/base_system2.pot
 source_lang = en
 type = PO
 

diff --git a/administrator-manual/en/backup_customization.rst b/administrator-manual/en/backup_customization.rst
@@ -359,8 +359,8 @@ In this scenario, the disk is accessibile as *sdc* device.
 
 * Create a Linux partition on the whole disk: ::
 
-  sgdisk --zap-all /dev/sdc
-  sgdisk --largest-new=1 /dev/sdc
+    sgdisk --zap-all /dev/sdc
+    sgdisk --largest-new=1 /dev/sdc
 
 * Create the filesystem on *sdc1* partition with a label named *backup* ::
 

diff --git a/administrator-manual/en/base_system2.rst b/administrator-manual/en/base_system2.rst
@@ -15,13 +15,14 @@ The default installation includes the following main modules:
 - :ref:`applications-section`
 - :ref:`software-center-section`
 - :ref:`terminal-section`
-.. only:: nscom
+-
+  .. only:: nscom
 
-  - :ref:`subscription-section`
+    :ref:`subscription-section`
 
-.. only:: nsent
+  .. only:: nsent
 
-  - :ref:`registration-section`
+    :ref:`registration-section`
 
 While the *root* user can see all configuration pages,
 access of each section and application may be also delegated to specific users.
@@ -188,17 +189,26 @@ Applications with a shortcut, will be linked to the left menu.
 
 Only *root* user has access to this feature.
 
-Add to home page
-----------------
+.. only:: nscom
 
-:index:`Launcher` is an application of the new Server Manager available to all users on HTTPS and HTTP ports.
-The launcher is accessible on the server FQDN (eg. ``https://my.server.com``) and it's enabled if
-there is no home page already configured inside the web server (no index page in :file:`/var/www/html`)
+  Add to home page
+  ----------------
 
-Installed applications can be added to the launcher by clicking on the :guilabel:`Add to home page` button.
-All users will be able to access the public link of the application.
+  :index:`Launcher` is an application of the new Server Manager available to all users on HTTPS and HTTP ports.
+  The launcher is accessible on the server FQDN (eg. ``https://my.server.com``) and it's enabled if
+  there is no home page already configured inside the web server (no index page in :file:`/var/www/html`)
 
-Only *root* user has access to this feature.
+  Installed applications can be added to the launcher by clicking on the :guilabel:`Add to home page` button.
+  All users will be able to access the public link of the application.
+
+  Only *root* user has access to this feature.
+
+.. only:: nsent
+
+  Launcher
+  --------
+
+  See :ref:`launcher-section`.
 
 Removing applications
 ---------------------

diff --git a/administrator-manual/en/conf.py b/administrator-manual/en/conf.py
@@ -138,7 +138,9 @@
         'weekly_report.rst',
         'nethvoice_intro.rst',
         'nethcti_intro.rst',
-        'phonebook-mysql.rst'
+        'phonebook-mysql.rst',
+        'registration.rst',
+        'launcher.rst'
     ])
     rst_prolog="""
 .. |product| replace:: NethServer

diff --git a/administrator-manual/en/disaster_recovery.rst b/administrator-manual/en/disaster_recovery.rst
@@ -27,9 +27,17 @@ Please, follow below steps:
 1. Install the new machine (refer to :ref:`installation <installation-manual>` section), access the 
    new Server Manager and make sure the machine is able to access the internet and resolve public names correctly 
 
-2. If the machine has an Enterprise entitlement, please follow :ref:`registration-section`,
-   if the machine has a Community subscription entitlement, please follow :ref:`subscription-section`.
-   Otherwise you can skip this step.
+2.
+
+  .. only:: nsent
+
+       Activate NethServer Enterprise following the :ref:`registration-section` procedure
+
+  .. only:: nscom
+
+       If the machine has a Community subscription entitlement, please follow :ref:`subscription-section`,
+       otherwise you can skip this step
+
 
 3. Install all the available core updates from the :ref:`software-updates-section`
 

diff --git a/administrator-manual/en/genindex.rst b/administrator-manual/en/genindex.rst
@@ -0,0 +1,2 @@
+Index
+=====
diff --git a/administrator-manual/en/index.rst b/administrator-manual/en/index.rst
@@ -26,19 +26,15 @@ Administrator Manual
 
         Official site: `www.nethesis.it <http://www.nethesis.it>`_
 
-Release notes |version|
------------------------
-
 .. toctree::
    :maxdepth: 2
+   :caption: Release notes
 
    release_notes
 
-Installation
-------------
-
 .. toctree::
    :maxdepth: 2
+   :caption: Installation
 
    installation
    access
@@ -51,11 +47,9 @@ Installation
 
        subscription
 
-Configuration
--------------
-
 .. toctree::
    :maxdepth: 2
+   :caption: Configuration
 
    packages
    base_system
@@ -71,11 +65,9 @@ Configuration
 
     launcher
 
-Modules
--------
-
 .. toctree::
    :maxdepth: 1
+   :caption: Modules
 
    backup
    disaster_recovery
@@ -124,45 +116,35 @@ Modules
 
 .. only:: nscom
 
-    NethForge modules
-    -----------------
-
     .. toctree::
        :maxdepth: 1
+       :caption: NethForge modules
 
        collabora
        sogo
        phpVirtualBox
 
-Best practices
---------------
-
 .. toctree::
    :maxdepth: 2
+   :caption: Best practices
 
    third_party
 
-Appendix
---------
-
 .. toctree::
    :maxdepth: 1
+   :caption: Appendix
 
    migration
    upgrade
    license
    nscom_releases
    issue_trackers
+   genindex
 
-.. only:: nscom
-
-    Indices
-    -------
-
-    * :ref:`General index <genindex>`
 
 .. toctree::
    :hidden:
+   :caption: Old Server Manager
    :glob:
 
    ui/*

diff --git a/administrator-manual/en/launcher.rst b/administrator-manual/en/launcher.rst
@@ -1,6 +1,8 @@
-==================
-Nethesis Launcher
-==================
+.. _launcher-section:
+
+========
+Launcher
+========
 
 Nethesis Launcher is a Cockpit app launcher available on HTTPS and HTTP ports.
 The launcher is enabled if:

diff --git a/administrator-manual/en/migration.rst b/administrator-manual/en/migration.rst
@@ -59,7 +59,7 @@ Email
 Before running |product| in production, some considerations about the
 network and existing mail client configurations are required: what
 ports are in use, if SMTPAUTH and TLS are enabled.  Refer to
-:ref:`email_clients` and :ref:`email_policies` sections for more
+mail client configuration and :ref:`email_policies` section for more
 information.
 
 In a mail server migration, the source mail server could be on

diff --git a/administrator-manual/en/nsent/_static/nethesis.css b/administrator-manual/en/nsent/_static/nethesis.css
@@ -18,14 +18,13 @@ h1, h2, h6, .h1, .h2, .h6 {
 h1 {
     padding-bottom: 15px;
 }
-h2 {
-    margin-top: 35px
+.caption-text, h2 {
     padding-top: 5px;
     margin-bottom: 25px;
     font-size: 30px;
 }
 
-.content > .section > .section {
+.toctree-wrapper > .caption, .content > .section > .section {
     margin-top: 35px;
     border-top: 1px solid #f4af1a;
 }
@@ -34,6 +33,13 @@ h2 {
     display: inline-block;
     margin-top: 0;
 }
+.caption-text {
+    border-top: 6px solid #f4af1a;
+    display: inline-block;
+    padding-top: 10px;;
+    font-weight: bold;
+}
+
 .section > span:empty {
     height: 0;
 }

diff --git a/administrator-manual/en/snmp.rst b/administrator-manual/en/snmp.rst
@@ -7,9 +7,8 @@ SNMP
   The configuration page of this module is available only in the old Server Manager
   and will not be ported to the new one.
 
-ntopng
-The SNMP (Simple Network Management Protocol) protocol allows to manage and monitor devices connected to the network.
-The :index:`SNMP` server can reply to specific queries about current system status.
+The :index:`SNMP` (Simple Network Management Protocol) protocol allows to manage and monitor devices connected to the network.
+The `SNMP <https://en.wikipedia.org/wiki/Simple_Network_Management_Protocol>`_ server can reply to specific queries about current system status.
 
 The server is disabled by default.
 
@@ -20,10 +19,4 @@ To enable it, you should set three main options:
 * the name and email address of system administrator
 
 The implementation is based on the Net-SNMP project. Please refer to the official project page for more information:
-
 http://www.net-snmp.org/
-
-.. rubric:: References
-
-.. [#SNMP] Simple Network Management Protocol https://en.wikipedia.org/wiki/Simple_Network_Management_Protocol
-
diff --git a/administrator-manual/en/subscription.rst b/administrator-manual/en/subscription.rst
@@ -1,8 +1,8 @@
 .. _subscription-section:
 
-======================
-|product| subscription
-======================
+============
+Subscription
+============
 
 A |product| installation can be registered to a public or private Dartagnan [#Dartagnan]_ instance,
 getting access to monitoring portal and stable update repositories.