diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-11-02 01:25:51 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-11-02 01:25:51 +0100 |
| commit | 0e772afb9db640e54e84cfccaddcf74f3edbb3fb (patch) | |
| tree | 4d944f0f6c18a369683e243bcc8b94ebdb6ae3d2 /phpBB/language/en | |
| parent | a61299a9408dd3ae4a2fa97fdc2df62ca41ee150 (diff) | |
| parent | b6a4f83c412d4db7596ad677eca5551a5fc715d8 (diff) | |
| download | forums-0e772afb9db640e54e84cfccaddcf74f3edbb3fb.tar forums-0e772afb9db640e54e84cfccaddcf74f3edbb3fb.tar.gz forums-0e772afb9db640e54e84cfccaddcf74f3edbb3fb.tar.bz2 forums-0e772afb9db640e54e84cfccaddcf74f3edbb3fb.tar.xz forums-0e772afb9db640e54e84cfccaddcf74f3edbb3fb.zip | |
Merge branch 'prep-release-3.1.1' into develop-ascraeus
* prep-release-3.1.1:
[ticket/13271] Disable CC sender feature for anonymous users
[prep-release-3.1.1] Add 3.1.1 CHANGELOG
[prep-release-3.1.1] Add 3.1.1 migration file
[ticket/13263] Make sure default style exists and clean up code
[ticket/13263] Only install/set prosilver if no style available
[ticket/13263] Use prosilver as default style if user's style doesn't exist
[ticket/security-164] Correctly format page_name
[ticket/security-164] Sanitize all global variables in symfony_request class
[ticket/13248] Use functional framework login method in tests
[ticket/13248] Correctly pass provider name
[ticket/13248] Always use provider collection for getting provider
[ticket/13248] Allow specifying different auth provider in provider collection
[ticket/13248] Use auth provider collection for getting provider
[ticket/13262] Mention htaccess file when updating from 3.0 to 3.1
[ticket/13267] Update Automatic Update instructions to include vendor directory
[ticket/13268] Properly append ternary result in get_existing_indexes()
[prep-release-3.1.1] Update version number to 3.1.1
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
Diffstat (limited to 'phpBB/language/en')
| -rw-r--r-- | phpBB/language/en/install.php | 2 |
1 files changed, 1 insertions, 1 deletions
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 /> |