aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorPatrick Webster <noxwizard@gmail.com>2014-11-01 10:53:57 -0500
committerNils Adermann <naderman@naderman.de>2014-11-01 19:13:09 +0100
commit8bdbadabb23c0288ddb9af60c9883b6021d2c239 (patch)
tree54003c2c6790176916eb01204c08760d1d4e56e3 /phpBB
parent3f3c8d74e8501e59e4e6ace3fa87ef3d29b78117 (diff)
downloadforums-8bdbadabb23c0288ddb9af60c9883b6021d2c239.tar
forums-8bdbadabb23c0288ddb9af60c9883b6021d2c239.tar.gz
forums-8bdbadabb23c0288ddb9af60c9883b6021d2c239.tar.bz2
forums-8bdbadabb23c0288ddb9af60c9883b6021d2c239.tar.xz
forums-8bdbadabb23c0288ddb9af60c9883b6021d2c239.zip
[ticket/13267] Update Automatic Update instructions to include vendor directory
PHPBB3-13267
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/docs/INSTALL.html2
-rw-r--r--phpBB/language/en/install.php2
2 files changed, 2 insertions, 2 deletions
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>
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index a2b27f0a60..107de9c64f 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -547,7 +547,7 @@ $lang = array_merge($lang, array(
<ul style="margin-left: 20px; font-size: 1.1em;">
<li>Go to the <a href="https://www.phpbb.com/downloads/" title="https://www.phpbb.com/downloads/">phpBB.com downloads page</a> and download the "Automatic Update Package" archive.<br /><br /></li>
<li>Unpack the archive.<br /><br /></li>
- <li>Upload the complete uncompressed install folder to your phpBB root directory (where your config.php file is).<br /><br /></li>
+ <li>Upload the complete uncompressed "install" and "vendor" folders to your phpBB root directory (where your config.php file is).<br /><br /></li>
</ul>
<p>Once uploaded your board will be offline for normal users due to the install directory you uploaded now present.<br /><br />