diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2015-01-21 16:03:23 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2015-01-21 16:07:12 +0100 |
| commit | 7ed065a630abab7ca1978e23eaa393130ed2c550 (patch) | |
| tree | 3d636fb02a8b0f7afca4081e8a88e2eb25a16686 /phpBB/docs/INSTALL.html | |
| parent | ddeb696b25da56eba61f777f4e3c9a4706089a8c (diff) | |
| parent | 14585fcb4f1d6238a188089891a11895a557f99e (diff) | |
| download | forums-7ed065a630abab7ca1978e23eaa393130ed2c550.tar forums-7ed065a630abab7ca1978e23eaa393130ed2c550.tar.gz forums-7ed065a630abab7ca1978e23eaa393130ed2c550.tar.bz2 forums-7ed065a630abab7ca1978e23eaa393130ed2c550.tar.xz forums-7ed065a630abab7ca1978e23eaa393130ed2c550.zip | |
Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
[develop-olympus] Increment version number to 3.0.14-dev.
[develop-olympus] Add changelog for 3.0.13 release.
[develop-olympus] Bump version numbers for 3.0.13-RC1 release.
[develop-olympus] Bumping version numbers to final for 3.0.13 releases.
Conflicts:
build/build.xml
phpBB/docs/CHANGELOG.html
phpBB/docs/INSTALL.html
phpBB/includes/constants.php
phpBB/install/convertors/convert_phpbb20.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
phpBB/styles/prosilver/imageset/imageset.cfg
phpBB/styles/prosilver/style.cfg
phpBB/styles/prosilver/template/template.cfg
phpBB/styles/prosilver/theme/theme.cfg
phpBB/styles/subsilver2/imageset/imageset.cfg
phpBB/styles/subsilver2/style.cfg
phpBB/styles/subsilver2/template/template.cfg
phpBB/styles/subsilver2/theme/theme.cfg
Diffstat (limited to 'phpBB/docs/INSTALL.html')
| -rw-r--r-- | phpBB/docs/INSTALL.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html index 534d9eff73..df863917e2 100644 --- a/phpBB/docs/INSTALL.html +++ b/phpBB/docs/INSTALL.html @@ -297,7 +297,7 @@ <p>This update method is the recommended method for updating. This package detects changed files automatically and merges in changes if needed.</p> - <p>The automatic update package will update the board from a given version to the latest version. A number of automatic update files are available, and you should choose the one that corresponds to the version of the board that you are currently running. For example, if your current version is <strong>3.0.10</strong>, you need the <code>phpBB-3.0.10_to_3.0.11.zip/tar.bz2</code> file.</p> + <p>The automatic update package will update the board from a given version to the latest version. A number of automatic update files are available, and you should choose the one that corresponds to the version of the board that you are currently running. For example, if your current version is <strong>3.0.12</strong>, you need the <code>phpBB-3.0.12_to_3.0.13.zip/tar.bz2</code> file.</p> <p>To perform the update, either follow the instructions from the <strong>Administration Control Panel->System</strong> Tab - this should point out that you are running an outdated version and will guide you through the update - or follow the instructions listed below.</p> |