aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/docs/INSTALL.html
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2009-08-01 12:36:05 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2009-08-01 12:36:05 +0000
commit79406749622b816f569212ba89af1e27d1a7a772 (patch)
tree343d5e697cc95afb92928d2cfdc427bf2a0eaaaf /phpBB/docs/INSTALL.html
parent2958890439f29b9cf45997c52c8cfa57e0f16bc8 (diff)
downloadforums-79406749622b816f569212ba89af1e27d1a7a772.tar
forums-79406749622b816f569212ba89af1e27d1a7a772.tar.gz
forums-79406749622b816f569212ba89af1e27d1a7a772.tar.bz2
forums-79406749622b816f569212ba89af1e27d1a7a772.tar.xz
forums-79406749622b816f569212ba89af1e27d1a7a772.zip
change preferred to recommended in install.html file
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9906 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/docs/INSTALL.html')
-rw-r--r--phpBB/docs/INSTALL.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html
index 4eee4520dc..577bc99c6e 100644
--- a/phpBB/docs/INSTALL.html
+++ b/phpBB/docs/INSTALL.html
@@ -283,7 +283,7 @@
<p>The patch file package is for those wanting to update through the patch application, and being comfortable with it.</p>
- <p>The patch file is one solution for those with many Modifications (MODs) or other changes who do not want to re-add them back to all the changed files if they use the method explained above. To use this you will need command line access to a standard UNIX type <strong>patch</strong> application. If you do not have access to such an application but still want to use this update approach, we strongly recommend the <a href="#update_auto">Automatic update package</a> explained below. It is also the preferred update method.</p>
+ <p>The patch file is one solution for those with many Modifications (MODs) or other changes who do not want to re-add them back to all the changed files if they use the method explained above. To use this you will need command line access to a standard UNIX type <strong>patch</strong> application. If you do not have access to such an application but still want to use this update approach, we strongly recommend the <a href="#update_auto">Automatic update package</a> explained below. It is also the recommended update method.</p>
<p>A number of patch files are provided to allow you to update from previous stable releases. Select the correct patch, e.g. if your current version is 3.0.4 you need the phpBB-3.0.4_to_3.0.5.patch file. Place the correct patch in the parent directory containing the phpBB3 core files (i.e. index.php, viewforum.php, etc.). With this done you should run the following command: <strong>patch -cl -d [PHPBB DIRECTORY] -p1 &lt; [PATCH NAME]</strong> (where PHPBB DIRECTORY is the directory name your phpBB Installation resides in, for example phpBB3, and where PATCH NAME is the relevant filename of the selected patch file). This should complete quickly, hopefully without any HUNK FAILED comments.</p>
@@ -293,7 +293,7 @@
<a name="update_auto"></a><h3>4.iv. Automatic update package</h3>
- <p>This update method is the preferred method for updating. This package allows detecting changed files automatically and merges changes if needed.</p>
+ <p>This update method is the recommended method for updating. This package allows detecting changed files automatically and merges changes if needed.</p>
<p>The automatic update package contains - contrary to the others - only the information required to update the previous release version to the latest available version. These packages are meant for use with the automatic update tool.</p>