Merge branch 'master' into v7

administrator-manual/en/.tx/config

@@ -8,13 +8,6 @@ source_lang = en
 type = PO
 
 
-[docs-v7.pop3_connector]
-file_filter = locale/<lang>/LC_MESSAGES/pop3_connector.po
-source_file = _build/locale/pop3_connector.pot
-source_lang = en
-type = PO
-
-
 [docs-v7.snmp]
 file_filter = locale/<lang>/LC_MESSAGES/snmp.po
 source_file = _build/locale/snmp.pot
@@ -43,13 +36,6 @@ source_lang = en
 type = PO
 
 
-[docs-v7.virtual_hosts]
-file_filter = locale/<lang>/LC_MESSAGES/virtual_hosts.po
-source_file = _build/locale/virtual_hosts.pot
-source_lang = en
-type = PO
-
-
 [docs-v7.installation]
 file_filter = locale/<lang>/LC_MESSAGES/installation.po
 source_file = _build/locale/installation.pot
@@ -91,20 +77,6 @@ source_lang = en
 type = PO
 
 
-[docs-v7.proxy_pass]
-file_filter = locale/<lang>/LC_MESSAGES/proxy_pass.po
-source_file = _build/locale/proxy_pass.pot
-source_lang = en
-type = PO
-
-
-[docs-v7.ftp]
-file_filter = locale/<lang>/LC_MESSAGES/ftp.po
-source_file = _build/locale/ftp.pot
-source_lang = en
-type = PO
-
-
 [docs-v7.bandwidth_monitor]
 file_filter = locale/<lang>/LC_MESSAGES/bandwidth_monitor.po
 source_file = _build/locale/bandwidth_monitor.pot
@@ -147,13 +119,6 @@ source_lang = en
 type = PO
 
 
-[docs-v7.content_filter]
-file_filter = locale/<lang>/LC_MESSAGES/content_filter.po
-source_file = _build/locale/content_filter.pot
-source_lang = en
-type = PO
-
-
 [docs-v7.third_party]
 file_filter = locale/<lang>/LC_MESSAGES/third_party.po
 source_file = _build/locale/third_party.pot

administrator-manual/en/base_system2.rst

@@ -544,6 +544,7 @@ Authentication
 ==============
 
 The Server Manager can be always accessed from the following users:
+
 - ``root``
 - members of ``domain admins`` groups