Merge branch 'master' into filippocarletti-patch-2

administrator-manual/en/.tx/config

@@ -299,3 +299,8 @@ source_file = _build/locale/webtop5.pot
 source_lang = en
 type = PO
 
+[docs-v7.upgrade]
+file_filter = ./locale/<lang>/LC_MESSAGES/upgrade.po
+source_file = _build/locale/upgrade.pot
+source_lang = en
+type = PO

administrator-manual/en/accounts.rst

@@ -66,6 +66,7 @@ configure.
 In the end, if the SMB file sharing protocol support is not required, an
 LDAP provider is the best choice.
 
+.. _ldap-local-accounts-provider-section:
 
 OpenLDAP local provider installation
 ------------------------------------
@@ -75,7 +76,7 @@ From the :guilabel:`Software Center` install the module named
 package is automatically configured and the administrator will be able to manage
 users and groups from the :guilabel:`User and groups` page.
 
-
+.. _ad-local-accounts-provider-section:
 
 Samba Active Directory local provider installation
 --------------------------------------------------
@@ -168,7 +169,7 @@ Configure MAC Address Spoofing for Virtual Network Adapters
 
 https://technet.microsoft.com/en-us/library/ff458341.aspx
 
-
+.. _join-existing-ad-section:
 
 Join an existing Active Directory domain
 ----------------------------------------
@@ -287,6 +288,8 @@ Long user name form
 Short user name form
     *goofy*
 
+To access a shared folder, see also :ref:`smb-access-section`.
+
 .. _groups-section:
 
 Groups

administrator-manual/en/backup.rst

@@ -125,13 +125,12 @@ Steps to be executed:
 
 1. Install the new machine with the same host name as the old one
 2. Configure a data backup, so the system can retrieve saved data and configuration
-3. If the old machine was the network gateway, remember to re-install firewall module
-4. Restore the configuration backup from page :guilabel:`Backup
+3. Restore the configuration backup from page :guilabel:`Backup
    (configuration) > Restore` in Server Manager, or executing:
    :command:`restore-config`
-5. If a warning message requires it, reconfigure the network roles assignment. See :ref:`restore-roles-section` below.
-6. Verify the system is functional
-7. Restore data backup executing: :command:`restore-data`
+4. If a warning message requires it, reconfigure the network roles assignment. See :ref:`restore-roles-section` below.
+5. Verify the system is functional
+6. Restore data backup executing: :command:`restore-data`
 
 
 .. _restore-roles-section:
@@ -179,10 +178,11 @@ Restore installed modules
 
 By default the process of configuration restore will also restore all previously installed modules.
 
-To avoid the reinstallation, execute this command before the restore: ::
+To skip the automatic installation, execute the command with the
+``--no-reinstall`` argument: ::
+
+    restore-config --no-reinstall
 
-  config setprop backup-config reinstall disabled
-     
 .. _backup_customization-section:
 
 Data backup customization

administrator-manual/en/firewall.rst

@@ -144,7 +144,8 @@ The term :dfn:`WAN` (Wide Area Network) refers to a public network outside the s
 A :dfn:`provider` is the company who actually manage the :index:`WAN` link.
 
 The system supports up to 15 WAN connections. 
-If the server has two or more configured red cards, it is required to proceed with :index:`provider` configuration from :guilabel:`Multi WAN` page. 
+If the server has two or more configured red cards, it is required to correctly fill :guilabel:`Link weight`, 
+:guilabel:`Inbound bandwidth` and :guilabel:`Outbound bandwidth` fields from the :guilabel:`Network` page. 
 
 Each provider represents a WAN connection and is associated with a network adapter. 
 Each provider defines a :dfn:`weight`: higher the :index:`weight`, higher the priority of the network card associated with the provider. 

administrator-manual/en/index.rst

@@ -18,8 +18,8 @@ Administrator Manual
 
         Official site: `www.nethesis.it <http://www.nethesis.it>`_
 
-Release notes 7
----------------
+Release notes |version|
+-----------------------
 
 .. toctree::
    :maxdepth: 2
@@ -68,7 +68,6 @@ Modules
    web_proxy
    content_filter
    suricata
-   firewall
    proxy_pass
    virtual_hosts
    shared_folder
@@ -110,6 +109,7 @@ Appendix
    :maxdepth: 1
 
    migration
+   upgrade
    license
 
 

administrator-manual/en/locale/es/LC_MESSAGES/access.po

@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NethServer Enterprise 7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-08 15:42+0100\n"
+"POT-Creation-Date: 2017-03-21 11:43+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Adrián Prado <adrian.prado@gmail.com>, 2017\n"
 "Language-Team: Spanish (https://www.transifex.com/nethserver/teams/35834/es/)\n"