diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-11-01 19:13:21 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-11-01 19:13:21 +0100 |
| commit | 45d054d295c1c007f558541299a3a0f0bcf482d5 (patch) | |
| tree | acdf880081c46a1c8d5cf1cf9342e6af0eff3621 /phpBB | |
| parent | 2cc9fe5267adb9c9ab5d8bd2180d9bf625d81f4f (diff) | |
| parent | 8bdbadabb23c0288ddb9af60c9883b6021d2c239 (diff) | |
| download | forums-45d054d295c1c007f558541299a3a0f0bcf482d5.tar forums-45d054d295c1c007f558541299a3a0f0bcf482d5.tar.gz forums-45d054d295c1c007f558541299a3a0f0bcf482d5.tar.bz2 forums-45d054d295c1c007f558541299a3a0f0bcf482d5.tar.xz forums-45d054d295c1c007f558541299a3a0f0bcf482d5.zip | |
Merge branch 'ticket/13267' into prep-release-3.1.1
* ticket/13267:
[ticket/13267] Update Automatic Update instructions to include vendor directory
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/INSTALL.html | 2 | ||||
| -rw-r--r-- | phpBB/language/en/install.php | 2 |
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 /> |