diff --git a/phpBB/cache/.htaccess b/phpBB/cache/.htaccess
index 44242b5418..92e78ba1a7 100644
--- a/phpBB/cache/.htaccess
+++ b/phpBB/cache/.htaccess
@@ -1,33 +1,25 @@
# With Apache 2.4 the "Order, Deny" syntax has been deprecated and moved from
# module mod_authz_host to a new module called mod_access_compat (which may be
-# disabled) and a new "Require" syntax has been introduced to mod_authz_host.
+# disabled) and a new "Require" syntax has been introduced to mod_authz_core.
# We could just conditionally provide both versions, but unfortunately Apache
# does not explicitly tell us its version if the module mod_version is not
# available. In this case, we check for the availability of module
# mod_authz_core (which should be on 2.4 or higher only) as a best guess.
-
- Order Allow,Deny
- Deny from All
-
+ Order Allow,Deny
+ Deny from All
= 2.4>
-
- Require all denied
-
+ Require all denied
-
- Order Allow,Deny
- Deny from All
-
+ Order Allow,Deny
+ Deny from All
-
- Require all denied
-
+ Require all denied
diff --git a/phpBB/config/.htaccess b/phpBB/config/.htaccess
index 163ddd802f..92e78ba1a7 100644
--- a/phpBB/config/.htaccess
+++ b/phpBB/config/.htaccess
@@ -1,33 +1,25 @@
# With Apache 2.4 the "Order, Deny" syntax has been deprecated and moved from
# module mod_authz_host to a new module called mod_access_compat (which may be
-# disabled) and a new "Require" syntax has been introduced to mod_authz_host.
+# disabled) and a new "Require" syntax has been introduced to mod_authz_core.
# We could just conditionally provide both versions, but unfortunately Apache
# does not explicitly tell us its version if the module mod_version is not
# available. In this case, we check for the availability of module
# mod_authz_core (which should be on 2.4 or higher only) as a best guess.
-
- Order Allow,Deny
- Deny from All
-
+ Order Allow,Deny
+ Deny from All
= 2.4>
-
- Require all denied
-
+ Require all denied
-
- Order Allow,Deny
- Deny from All
-
+ Order Allow,Deny
+ Deny from All
-
- Require all denied
-
+ Require all denied
-
\ No newline at end of file
+
diff --git a/phpBB/files/.htaccess b/phpBB/files/.htaccess
index 163ddd802f..92e78ba1a7 100644
--- a/phpBB/files/.htaccess
+++ b/phpBB/files/.htaccess
@@ -1,33 +1,25 @@
# With Apache 2.4 the "Order, Deny" syntax has been deprecated and moved from
# module mod_authz_host to a new module called mod_access_compat (which may be
-# disabled) and a new "Require" syntax has been introduced to mod_authz_host.
+# disabled) and a new "Require" syntax has been introduced to mod_authz_core.
# We could just conditionally provide both versions, but unfortunately Apache
# does not explicitly tell us its version if the module mod_version is not
# available. In this case, we check for the availability of module
# mod_authz_core (which should be on 2.4 or higher only) as a best guess.
-
- Order Allow,Deny
- Deny from All
-
+ Order Allow,Deny
+ Deny from All
= 2.4>
-
- Require all denied
-
+ Require all denied
-
- Order Allow,Deny
- Deny from All
-
+ Order Allow,Deny
+ Deny from All
-
- Require all denied
-
+ Require all denied
-
\ No newline at end of file
+
diff --git a/phpBB/images/avatars/upload/.htaccess b/phpBB/images/avatars/upload/.htaccess
index 163ddd802f..92e78ba1a7 100644
--- a/phpBB/images/avatars/upload/.htaccess
+++ b/phpBB/images/avatars/upload/.htaccess
@@ -1,33 +1,25 @@
# With Apache 2.4 the "Order, Deny" syntax has been deprecated and moved from
# module mod_authz_host to a new module called mod_access_compat (which may be
-# disabled) and a new "Require" syntax has been introduced to mod_authz_host.
+# disabled) and a new "Require" syntax has been introduced to mod_authz_core.
# We could just conditionally provide both versions, but unfortunately Apache
# does not explicitly tell us its version if the module mod_version is not
# available. In this case, we check for the availability of module
# mod_authz_core (which should be on 2.4 or higher only) as a best guess.
-
- Order Allow,Deny
- Deny from All
-
+ Order Allow,Deny
+ Deny from All
= 2.4>
-
- Require all denied
-
+ Require all denied
-
- Order Allow,Deny
- Deny from All
-
+ Order Allow,Deny
+ Deny from All
-
- Require all denied
-
+ Require all denied
-
\ No newline at end of file
+
diff --git a/phpBB/includes/.htaccess b/phpBB/includes/.htaccess
index 163ddd802f..92e78ba1a7 100644
--- a/phpBB/includes/.htaccess
+++ b/phpBB/includes/.htaccess
@@ -1,33 +1,25 @@
# With Apache 2.4 the "Order, Deny" syntax has been deprecated and moved from
# module mod_authz_host to a new module called mod_access_compat (which may be
-# disabled) and a new "Require" syntax has been introduced to mod_authz_host.
+# disabled) and a new "Require" syntax has been introduced to mod_authz_core.
# We could just conditionally provide both versions, but unfortunately Apache
# does not explicitly tell us its version if the module mod_version is not
# available. In this case, we check for the availability of module
# mod_authz_core (which should be on 2.4 or higher only) as a best guess.
-
- Order Allow,Deny
- Deny from All
-
+ Order Allow,Deny
+ Deny from All
= 2.4>
-
- Require all denied
-
+ Require all denied
-
- Order Allow,Deny
- Deny from All
-
+ Order Allow,Deny
+ Deny from All
-
- Require all denied
-
+ Require all denied
-
\ No newline at end of file
+
diff --git a/phpBB/phpbb/db/migration/data/v30x/.htaccess b/phpBB/phpbb/db/migration/data/.htaccess
similarity index 76%
rename from phpBB/phpbb/db/migration/data/v30x/.htaccess
rename to phpBB/phpbb/db/migration/data/.htaccess
index 44242b5418..92e78ba1a7 100644
--- a/phpBB/phpbb/db/migration/data/v30x/.htaccess
+++ b/phpBB/phpbb/db/migration/data/.htaccess
@@ -1,33 +1,25 @@
# With Apache 2.4 the "Order, Deny" syntax has been deprecated and moved from
# module mod_authz_host to a new module called mod_access_compat (which may be
-# disabled) and a new "Require" syntax has been introduced to mod_authz_host.
+# disabled) and a new "Require" syntax has been introduced to mod_authz_core.
# We could just conditionally provide both versions, but unfortunately Apache
# does not explicitly tell us its version if the module mod_version is not
# available. In this case, we check for the availability of module
# mod_authz_core (which should be on 2.4 or higher only) as a best guess.
-
- Order Allow,Deny
- Deny from All
-
+ Order Allow,Deny
+ Deny from All
= 2.4>
-
- Require all denied
-
+ Require all denied
-
- Order Allow,Deny
- Deny from All
-
+ Order Allow,Deny
+ Deny from All
-
- Require all denied
-
+ Require all denied
diff --git a/phpBB/phpbb/db/migration/data/v310/.htaccess b/phpBB/phpbb/db/migration/data/v310/.htaccess
deleted file mode 100644
index 44242b5418..0000000000
--- a/phpBB/phpbb/db/migration/data/v310/.htaccess
+++ /dev/null
@@ -1,33 +0,0 @@
-# With Apache 2.4 the "Order, Deny" syntax has been deprecated and moved from
-# module mod_authz_host to a new module called mod_access_compat (which may be
-# disabled) and a new "Require" syntax has been introduced to mod_authz_host.
-# We could just conditionally provide both versions, but unfortunately Apache
-# does not explicitly tell us its version if the module mod_version is not
-# available. In this case, we check for the availability of module
-# mod_authz_core (which should be on 2.4 or higher only) as a best guess.
-
-
-
- Order Allow,Deny
- Deny from All
-
-
- = 2.4>
-
- Require all denied
-
-
-
-
-
-
- Order Allow,Deny
- Deny from All
-
-
-
-
- Require all denied
-
-
-
diff --git a/phpBB/phpbb/db/migration/data/v31x/.htaccess b/phpBB/phpbb/db/migration/data/v31x/.htaccess
deleted file mode 100644
index 44242b5418..0000000000
--- a/phpBB/phpbb/db/migration/data/v31x/.htaccess
+++ /dev/null
@@ -1,33 +0,0 @@
-# With Apache 2.4 the "Order, Deny" syntax has been deprecated and moved from
-# module mod_authz_host to a new module called mod_access_compat (which may be
-# disabled) and a new "Require" syntax has been introduced to mod_authz_host.
-# We could just conditionally provide both versions, but unfortunately Apache
-# does not explicitly tell us its version if the module mod_version is not
-# available. In this case, we check for the availability of module
-# mod_authz_core (which should be on 2.4 or higher only) as a best guess.
-
-
-
- Order Allow,Deny
- Deny from All
-
-
- = 2.4>
-
- Require all denied
-
-
-
-
-
-
- Order Allow,Deny
- Deny from All
-
-
-
-
- Require all denied
-
-
-
diff --git a/phpBB/phpbb/db/migration/data/v320/.htaccess b/phpBB/phpbb/db/migration/data/v320/.htaccess
deleted file mode 100644
index 44242b5418..0000000000
--- a/phpBB/phpbb/db/migration/data/v320/.htaccess
+++ /dev/null
@@ -1,33 +0,0 @@
-# With Apache 2.4 the "Order, Deny" syntax has been deprecated and moved from
-# module mod_authz_host to a new module called mod_access_compat (which may be
-# disabled) and a new "Require" syntax has been introduced to mod_authz_host.
-# We could just conditionally provide both versions, but unfortunately Apache
-# does not explicitly tell us its version if the module mod_version is not
-# available. In this case, we check for the availability of module
-# mod_authz_core (which should be on 2.4 or higher only) as a best guess.
-
-
-
- Order Allow,Deny
- Deny from All
-
-
- = 2.4>
-
- Require all denied
-
-
-
-
-
-
- Order Allow,Deny
- Deny from All
-
-
-
-
- Require all denied
-
-
-
diff --git a/phpBB/phpbb/db/migration/data/v32x/.htaccess b/phpBB/phpbb/db/migration/data/v32x/.htaccess
deleted file mode 100644
index 44242b5418..0000000000
--- a/phpBB/phpbb/db/migration/data/v32x/.htaccess
+++ /dev/null
@@ -1,33 +0,0 @@
-# With Apache 2.4 the "Order, Deny" syntax has been deprecated and moved from
-# module mod_authz_host to a new module called mod_access_compat (which may be
-# disabled) and a new "Require" syntax has been introduced to mod_authz_host.
-# We could just conditionally provide both versions, but unfortunately Apache
-# does not explicitly tell us its version if the module mod_version is not
-# available. In this case, we check for the availability of module
-# mod_authz_core (which should be on 2.4 or higher only) as a best guess.
-
-
-
- Order Allow,Deny
- Deny from All
-
-
- = 2.4>
-
- Require all denied
-
-
-
-
-
-
- Order Allow,Deny
- Deny from All
-
-
-
-
- Require all denied
-
-
-
diff --git a/phpBB/phpbb/db/migration/data/v330/.htaccess b/phpBB/phpbb/db/migration/data/v330/.htaccess
deleted file mode 100644
index 44242b5418..0000000000
--- a/phpBB/phpbb/db/migration/data/v330/.htaccess
+++ /dev/null
@@ -1,33 +0,0 @@
-# With Apache 2.4 the "Order, Deny" syntax has been deprecated and moved from
-# module mod_authz_host to a new module called mod_access_compat (which may be
-# disabled) and a new "Require" syntax has been introduced to mod_authz_host.
-# We could just conditionally provide both versions, but unfortunately Apache
-# does not explicitly tell us its version if the module mod_version is not
-# available. In this case, we check for the availability of module
-# mod_authz_core (which should be on 2.4 or higher only) as a best guess.
-
-
-
- Order Allow,Deny
- Deny from All
-
-
- = 2.4>
-
- Require all denied
-
-
-
-
-
-
- Order Allow,Deny
- Deny from All
-
-
-
-
- Require all denied
-
-
-
diff --git a/phpBB/phpbb/db/migration/data/v33x/.htaccess b/phpBB/phpbb/db/migration/data/v33x/.htaccess
deleted file mode 100644
index 44242b5418..0000000000
--- a/phpBB/phpbb/db/migration/data/v33x/.htaccess
+++ /dev/null
@@ -1,33 +0,0 @@
-# With Apache 2.4 the "Order, Deny" syntax has been deprecated and moved from
-# module mod_authz_host to a new module called mod_access_compat (which may be
-# disabled) and a new "Require" syntax has been introduced to mod_authz_host.
-# We could just conditionally provide both versions, but unfortunately Apache
-# does not explicitly tell us its version if the module mod_version is not
-# available. In this case, we check for the availability of module
-# mod_authz_core (which should be on 2.4 or higher only) as a best guess.
-
-
-
- Order Allow,Deny
- Deny from All
-
-
- = 2.4>
-
- Require all denied
-
-
-
-
-
-
- Order Allow,Deny
- Deny from All
-
-
-
-
- Require all denied
-
-
-
diff --git a/phpBB/store/.htaccess b/phpBB/store/.htaccess
index 163ddd802f..92e78ba1a7 100644
--- a/phpBB/store/.htaccess
+++ b/phpBB/store/.htaccess
@@ -1,33 +1,25 @@
# With Apache 2.4 the "Order, Deny" syntax has been deprecated and moved from
# module mod_authz_host to a new module called mod_access_compat (which may be
-# disabled) and a new "Require" syntax has been introduced to mod_authz_host.
+# disabled) and a new "Require" syntax has been introduced to mod_authz_core.
# We could just conditionally provide both versions, but unfortunately Apache
# does not explicitly tell us its version if the module mod_version is not
# available. In this case, we check for the availability of module
# mod_authz_core (which should be on 2.4 or higher only) as a best guess.
-
- Order Allow,Deny
- Deny from All
-
+ Order Allow,Deny
+ Deny from All
= 2.4>
-
- Require all denied
-
+ Require all denied
-
- Order Allow,Deny
- Deny from All
-
+ Order Allow,Deny
+ Deny from All
-
- Require all denied
-
+ Require all denied
-
\ No newline at end of file
+