From: Chad Horohoe <demon@users.mediawiki.org>
Date: Mon, 2 May 2011 16:40:44 +0000 (+0000)
Subject: Followup r87253, doc tweak for trunk (this is in 1.17 rel-notes now)
X-Git-Tag: 1.31.0-rc.0~30459
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=2c4e89a59395ee86b6685e8a9f2e55bee6fb2574;p=lhc%2Fweb%2Fwiklou.git

Followup r87253, doc tweak for trunk (this is in 1.17 rel-notes now)
---

diff --git a/HISTORY b/HISTORY
index 80634b3f2b..f2d00b41b4 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2,6 +2,10 @@ Change notes from older releases. For current info see RELEASE-NOTES.
 
 == MediaWiki 1.17 ==
 
+=== PHP 5.2 now required ==
+Since 1.17, the lowest supported version of MediaWiki is now 5.2.3. Please
+upgrade PHP if you have not done so prior to upgrading MediaWiki.
+
 === New installer in 1.17 ===
 MediaWiki 1.17 is shipping with a completely redesigned installer to fix
 a lot of outstanding bugs, cleanup the code quality, and make it easier to
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index e08dce9937..c9ccf94da7 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -18,10 +18,6 @@ will be made on the development trunk and appear in the next quarterly release.
 Those wishing to use the latest code instead of a branch release can obtain
 it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 
-=== PHP 5.2 now required ==
-In 1.18, the lowest supported version of MediaWiki is now 5.2.3. Please upgrade
-PHP if you have not done so prior to upgrading MediaWiki.
-
 === Configuration changes in 1.18 ===
 * The WantedPages::getSQL hook has been removed and replaced with
   WantedPages::getQueryInfo. This may break older extensions.