From 8bdbadabb23c0288ddb9af60c9883b6021d2c239 Mon Sep 17 00:00:00 2001
From: Patrick Webster <noxwizard@gmail.com>
Date: Sat, 1 Nov 2014 10:53:57 -0500
Subject: [ticket/13267] Update Automatic Update instructions to include vendor
 directory

PHPBB3-13267
---
 phpBB/docs/INSTALL.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/docs/INSTALL.html')

diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html
index 4bde6c01ea..92d4affb0e 100644
--- a/phpBB/docs/INSTALL.html
+++ b/phpBB/docs/INSTALL.html
@@ -303,7 +303,7 @@
 
 	<ul>
 		<li>Go to the <a href="https://www.phpbb.com/downloads/">downloads page</a> and download the latest update package listed there, matching your current version.</li>
-		<li>Upload the uncompressed archive contents to your phpBB installation - only the install folder is required. Upload the whole install folder, retaining the file structure.</li>
+		<li>Upload the uncompressed archive contents to your phpBB installation - only the <code>install/</code> and <code>vendor/</code> folders are required. Upload these folders in their entirety, retaining the file structure.</li>
 		<li>After the install folder is present, phpBB will go offline automatically.</li>
 		<li>Point your browser to the install directory, for example <code>http://www.example.com/phpBB3/install/</code></li>
 		<li>Choose the "Update" Tab and follow the instructions</li>
-- 
cgit v1.2.1


From a269929f0ec40c3df9637ea4c3397fd6d0d8b01f Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Fri, 31 Oct 2014 13:08:36 -0700
Subject: [ticket/13262] Mention htaccess file when updating from 3.0 to 3.1

PHPBB3-13262
---
 phpBB/docs/INSTALL.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/docs/INSTALL.html')

diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html
index 4bde6c01ea..9bd530918b 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>
 
-- 
cgit v1.2.1