aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2014-11-01 19:14:11 +0100
committerNils Adermann <naderman@naderman.de>2014-11-01 19:14:11 +0100
commitf3588c66ec22b71e779da1497a690802e1c6b51a (patch)
tree4075eafc0b9daa21494adcaa6af0b39620bdcf95
parent45d054d295c1c007f558541299a3a0f0bcf482d5 (diff)
parenta269929f0ec40c3df9637ea4c3397fd6d0d8b01f (diff)
downloadforums-f3588c66ec22b71e779da1497a690802e1c6b51a.tar
forums-f3588c66ec22b71e779da1497a690802e1c6b51a.tar.gz
forums-f3588c66ec22b71e779da1497a690802e1c6b51a.tar.bz2
forums-f3588c66ec22b71e779da1497a690802e1c6b51a.tar.xz
forums-f3588c66ec22b71e779da1497a690802e1c6b51a.zip
Merge branch 'ticket/13262' into prep-release-3.1.1
* ticket/13262: [ticket/13262] Mention htaccess file when updating from 3.0 to 3.1
-rw-r--r--phpBB/docs/INSTALL.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html
index 92d4affb0e..80e09f1bf9 100644
--- a/phpBB/docs/INSTALL.html
+++ b/phpBB/docs/INSTALL.html
@@ -347,7 +347,7 @@
<li>The <code>store/</code> directory</li>
</ul></li>
- <li>Upload the contents of the 3.1.x Full Package into your forum's directory.</li>
+ <li>Upload the contents of the 3.1.x Full Package into your forum's directory. Make sure the root level .htaccess file is included in the upload.</li>
<li>Browse to install/database_update.php</li>
<li>Delete the <code>install/</code> directory</li>
</ol>
@@ -462,7 +462,7 @@
<hr />
<a name="anti_spam"></a><h2>8. Anti-Spam Measures</h2>
-
+
<div class="paragraph">
<div class="inner"><span class="corners-top"><span></span></span>