summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatth?us G. Chajdas <dev@anteru.net>2019-04-30 18:06:37 +0200
committerMatth?us G. Chajdas <dev@anteru.net>2019-04-30 18:06:37 +0200
commit990cce13e011e8404ad8143ac2e36acbdf31f759 (patch)
treea54a3caeb36de538b16d0b76cdf56d88314059d6
parent92c0973a371e669f637710f7c70884f8171df1f4 (diff)
downloadpygments-990cce13e011e8404ad8143ac2e36acbdf31f759.tar.gz
Update apache2.conf sample, CHANGES.
-rw-r--r--CHANGES2
-rw-r--r--tests/examplefiles/apache2.conf5
2 files changed, 7 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index 1a5a359e..833c2250 100644
--- a/CHANGES
+++ b/CHANGES
@@ -30,8 +30,10 @@ Version 2.4.0
- Updated lexers:
+ * Apache2 (PR#766)
* Cypher (PR#746)
* LLVM (PR#792)
+ * Makefiles (PR#766)
* PHP (#1482)
* SQL (PR#672)
* Stan (PR#774)
diff --git a/tests/examplefiles/apache2.conf b/tests/examplefiles/apache2.conf
index d0e838e0..5db66b10 100644
--- a/tests/examplefiles/apache2.conf
+++ b/tests/examplefiles/apache2.conf
@@ -391,3 +391,8 @@ BrowserMatch "^WebDAVFS/1.[012]" redirect-carefully
# Include the virtual host configurations:
Include /etc/apache2/sites-enabled/[^.#]*
+
+# From PR#766
+<IfVersion >= 2.4>
+ErrorLogFormat "%{cu}t %M"
+</IfVersion> \ No newline at end of file