saving uncommitted changes in /etc prior to emerge run

diff --git a/apache2/modules.d/00_apache_manual.conf b/apache2/modules.d/00_apache_manual.conf
index fcd0e0101b3acf6eb937c15c881d32a2dd8b7fc8..208d1c26d95498257210600145309688baa0274f 100644 (file)
--- a/apache2/modules.d/00_apache_manual.conf
+++ b/apache2/modules.d/00_apache_manual.conf
@@ -5,9 +5,9 @@
 <IfModule negotiation_module>
 <IfModule setenvif_module>
 <IfDefine MANUAL>
-AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.4.27-r1/manual$1"
+AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.4.29-r1/manual$1"
 
-<Directory "/usr/share/doc/apache-2.4.27-r1/manual">
+<Directory "/usr/share/doc/apache-2.4.29-r1/manual">
        Options Indexes
        AllowOverride None
        Require all granted

diff --git a/apache2/modules.d/41_mod_http2.conf b/apache2/modules.d/41_mod_http2.conf
index 68b4838c8e3489c389b4f7dc0570961a514ea616..e4c9454e0127f75a4892d258db6b6a6d1f14968b 100644 (file)
--- a/apache2/modules.d/41_mod_http2.conf
+++ b/apache2/modules.d/41_mod_http2.conf
@@ -4,6 +4,6 @@
     #LogLevel http2:info
 
     #Enable HTTP/2 support
-    Protocols h2 http/1.1
+    Protocols h2 h2c http/1.1
   </IfModule>
 </IfDefine>