Merge remote-tracking branch 'origin/next'

[people/pmueller/ipfire-2.x.git] / config / rootfiles / common / apache2

diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2
index 4866fb6bd31b85b501be0eb3c89ab052128f7b8b..8442446df27688ddf51df8e0c01858d66b4d2a5a 100644 (file)
--- a/config/rootfiles/common/apache2
+++ b/config/rootfiles/common/apache2
@@ -422,6 +422,7 @@ srv/web/ipfire/html/captive
 #srv/web/ipfire/manual/getting-started.html
 #srv/web/ipfire/manual/getting-started.html.en
 #srv/web/ipfire/manual/getting-started.html.fr.utf8
+#srv/web/ipfire/manual/getting-started.html.ru.utf8
 #srv/web/ipfire/manual/glossary.html
 #srv/web/ipfire/manual/glossary.html.de
 #srv/web/ipfire/manual/glossary.html.en
@@ -545,6 +546,7 @@ srv/web/ipfire/html/captive
 #srv/web/ipfire/manual/index.html.ja.utf8
 #srv/web/ipfire/manual/index.html.ko.euc-kr
 #srv/web/ipfire/manual/index.html.pt-br
+#srv/web/ipfire/manual/index.html.ru.utf8
 #srv/web/ipfire/manual/index.html.tr.utf8
 #srv/web/ipfire/manual/index.html.zh-cn.utf8
 #srv/web/ipfire/manual/install.html
@@ -918,6 +920,7 @@ srv/web/ipfire/html/captive
 #srv/web/ipfire/manual/mod/mod_macro.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_md.html
 #srv/web/ipfire/manual/mod/mod_md.html.en
+#srv/web/ipfire/manual/mod/mod_md.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_mime.html
 #srv/web/ipfire/manual/mod/mod_mime.html.en
 #srv/web/ipfire/manual/mod/mod_mime.html.fr.utf8
@@ -980,6 +983,7 @@ srv/web/ipfire/html/captive
 #srv/web/ipfire/manual/mod/mod_proxy_scgi.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_proxy_uwsgi.html
 #srv/web/ipfire/manual/mod/mod_proxy_uwsgi.html.en
+#srv/web/ipfire/manual/mod/mod_proxy_uwsgi.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_proxy_wstunnel.html
 #srv/web/ipfire/manual/mod/mod_proxy_wstunnel.html.en
 #srv/web/ipfire/manual/mod/mod_proxy_wstunnel.html.fr.utf8
@@ -1044,6 +1048,9 @@ srv/web/ipfire/html/captive
 #srv/web/ipfire/manual/mod/mod_socache_memcache.html
 #srv/web/ipfire/manual/mod/mod_socache_memcache.html.en
 #srv/web/ipfire/manual/mod/mod_socache_memcache.html.fr.utf8
+#srv/web/ipfire/manual/mod/mod_socache_redis.html
+#srv/web/ipfire/manual/mod/mod_socache_redis.html.en
+#srv/web/ipfire/manual/mod/mod_socache_redis.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_socache_shmcb.html
 #srv/web/ipfire/manual/mod/mod_socache_shmcb.html.en
 #srv/web/ipfire/manual/mod/mod_socache_shmcb.html.fr.utf8
@@ -1070,6 +1077,9 @@ srv/web/ipfire/html/captive
 #srv/web/ipfire/manual/mod/mod_suexec.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_suexec.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_suexec.html.tr.utf8
+#srv/web/ipfire/manual/mod/mod_systemd.html
+#srv/web/ipfire/manual/mod/mod_systemd.html.en
+#srv/web/ipfire/manual/mod/mod_systemd.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_unique_id.html
 #srv/web/ipfire/manual/mod/mod_unique_id.html.en
 #srv/web/ipfire/manual/mod/mod_unique_id.html.fr.utf8
@@ -1128,6 +1138,7 @@ srv/web/ipfire/html/captive
 #srv/web/ipfire/manual/mod/mpmt_os2.html.fr.utf8
 #srv/web/ipfire/manual/mod/overrides.html
 #srv/web/ipfire/manual/mod/overrides.html.en
+#srv/web/ipfire/manual/mod/overrides.html.fr.utf8
 #srv/web/ipfire/manual/mod/prefork.html
 #srv/web/ipfire/manual/mod/prefork.html.de
 #srv/web/ipfire/manual/mod/prefork.html.en
@@ -1165,7 +1176,6 @@ srv/web/ipfire/html/captive
 #srv/web/ipfire/manual/new_features_2_0.html.ja.utf8
 #srv/web/ipfire/manual/new_features_2_0.html.ko.euc-kr
 #srv/web/ipfire/manual/new_features_2_0.html.pt-br
-#srv/web/ipfire/manual/new_features_2_0.html.ru.koi8-r
 #srv/web/ipfire/manual/new_features_2_0.html.tr.utf8
 #srv/web/ipfire/manual/new_features_2_2.html
 #srv/web/ipfire/manual/new_features_2_2.html.en
@@ -1506,6 +1516,7 @@ usr/bin/htpasswd
 #usr/include/apache/http_main.h
 #usr/include/apache/http_protocol.h
 #usr/include/apache/http_request.h
+#usr/include/apache/http_ssl.h
 #usr/include/apache/http_vhost.h
 #usr/include/apache/httpd.h
 #usr/include/apache/mod_auth.h