Merge branch 'develop-ascraeus' into develop

This commit is contained in:
Marc Alexander 2014-11-01 09:10:48 +01:00
commit 9908f8e3ea

View file

@ -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>