Merge branch 'master' of github.com:nethesis/nethserver-docs

Conflicts: administrator-manual/it/nethserver-enterprise/index.rst
NethServer · Mar 25, 2015 · 5648266 · 5648266
2 parents 9a7da33 + d449677
commit 5648266
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/administrator-manual/it/installation.rst b/administrator-manual/it/installation.rst
@@ -1,8 +1,8 @@
-.. _installation-section:
-
 .. index::
    single: installazione
 
+.. _installation-section:
+
 =============
 Installazione
 =============

diff --git a/administrator-manual/it/nethserver-enterprise/index.rst b/administrator-manual/it/nethserver-enterprise/index.rst
@@ -81,6 +81,8 @@ NethSecurity
 
    firewall
    web_proxy
+   content_filter
+   flashstart
    snort
    bandwidth_monitor
    pop3_proxy
@@ -89,8 +91,6 @@ NethSecurity
    owncloud
    weekly_report
    hotspot
-   content_filter
-   flashstart
 
 NethVoice
 ^^^^^^^^^