diff options
| author | Richard McGirr <rmcgirr83@gmail.com> | 2016-05-16 18:01:55 -0400 |
|---|---|---|
| committer | Richard McGirr <rmcgirr83@gmail.com> | 2016-05-16 18:01:55 -0400 |
| commit | 0d7625c534b87b5d27977c2baa5e5ada132f7280 (patch) | |
| tree | 4728498712704359ec006676dbe83fda47de5de4 | |
| parent | c93807717251464dd56dfc5b0bc0789bc78a6155 (diff) | |
| download | forums-0d7625c534b87b5d27977c2baa5e5ada132f7280.tar forums-0d7625c534b87b5d27977c2baa5e5ada132f7280.tar.gz forums-0d7625c534b87b5d27977c2baa5e5ada132f7280.tar.bz2 forums-0d7625c534b87b5d27977c2baa5e5ada132f7280.tar.xz forums-0d7625c534b87b5d27977c2baa5e5ada132f7280.zip | |
[ticket/13716] Remove extra br tag and correct missing closing a html tag
PHPBB3-13716
| -rw-r--r-- | phpBB/adm/style/acp_update.html | 2 | ||||
| -rw-r--r-- | phpBB/language/en/install.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/adm/style/acp_update.html b/phpBB/adm/style/acp_update.html index 68cce6265f..351a3ba26c 100644 --- a/phpBB/adm/style/acp_update.html +++ b/phpBB/adm/style/acp_update.html @@ -56,7 +56,7 @@ <!-- IF S_UPDATE_INCOMPLETE --> {INCOMPLETE_INSTRUCTIONS} - <br><br> + <br> <!-- ENDIF --> <!-- IF not S_UP_TO_DATE --> diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index 414ab34755..5a799ed548 100644 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -537,7 +537,7 @@ $lang = array_merge($lang, array( 'UPDATE_INCOMPLETE_MORE' => 'Please read the information below in order to fix this error.', 'UPDATE_INCOMPLETE_EXPLAIN' => '<h1>Incomplete update</h1> - <p>We noticed that the last update of your phpBB installation hasn’t been completed. Visit the <a href="%1$s" title="%1$s">database_update script</a> and run it. If it is missing, please <a href="https://www.phpbb.com/downloads/" title="phpBB downloads">download your package version</a>, upload the "install" folder to your phpBB root directory (where your config.php file is) and <a href="%1$s" title="%1$s">run the database update script.</p>', + <p>We noticed that the last update of your phpBB installation hasn’t been completed. Visit the <a href="%1$s" title="%1$s">database_update script</a> and run it. If it is missing, please <a href="https://www.phpbb.com/downloads/" title="phpBB downloads">download your package version</a>, upload the "install" folder to your phpBB root directory (where your config.php file is) and <a href="%1$s" title="%1$s">run the database update script</a>.</p>', 'UPDATE_INSTALLATION' => 'Update phpBB installation', 'UPDATE_INSTALLATION_EXPLAIN' => 'With this option, it is possible to update your phpBB installation to the latest version.<br />During the process all of your files will be checked for their integrity. You are able to review all differences and files before the update.<br /><br />The file update itself can be done in two different ways.</p><h2>Manual Update</h2><p>With this update you only download your personal set of changed files to make sure you do not lose your file modifications you may have done. After you downloaded this package you need to manually upload the files to their correct position under your phpBB root directory. Once done, you are able to do the file check stage again to see if you moved the files to their correct location.</p><h2>Automatic Update with FTP</h2><p>This method is similar to the first one but without the need to download the changed files and uploading them on your own. This will be done for you. In order to use this method you need to know your FTP login details since you will be asked for them. Once finished you will be redirected to the file check again to make sure everything got updated correctly.<br /><br />', |