Moved backported RELEASE-NOTES items to HISTORY.

diff --git a/HISTORY b/HISTORY
index d53543b..7c3e415 100644 (file)
--- a/HISTORY
+++ b/HISTORY
@@ -321,6 +321,13 @@ Change notes from older releases. For current info see RELEASE-NOTES.
   a POST request
 * (bug 18099) Using appendtext to edit a non-existent page causes an interface
   message to be included in the page text
+* Fixed the circular template inclusion check, was broken when the loop 
+  involved redirects. Without this, infinite recursion within the parser is
+  possible.
+* (bug 18601) generator=backlinks returns invalid continue parameter
+* (bug 18597) Internal error with empty generator= parameter
+* (bug 18617) Add xml:space="preserve" attribute to relevant tags in XML output
+* Added PHP and database version to meta=siteinfo output
 
 === Languages updated in 1.15 ===
 

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index cf44aee..dded171 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -108,9 +108,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Removed float from the user login form in RTL interface - caused display
   problems in FF2
 * (bug 15008) Redirect images are now subject to Bad image list rules
-* Fixed the circular template inclusion check, was broken when the loop 
-  involved redirects. Without this, infinite recursion within the parser is
-  possible.
 * (bug 18677) Give proper error message when viewing &action=protect without
   sufficient rights
 * (bug 6802) profileinfo.php now also work on other database servers than MySQL
@@ -128,11 +125,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 18554) Also list hidden revisions in list=usercontribs for privileged
   users
 * (bug 13049) "API must be accessed from the primary script entry point" error
-* (bug 18601) generator=backlinks returns invalid continue parameter
-* (bug 18597) Internal error with empty generator= parameter
 * (bug 16422) Don't display help for format=jsonfm unless specifically requested
-* (bug 18617) Add xml:space="preserve" attribute to relevant tags in XML output
-* Added PHP and database version to meta=siteinfo output
 * (bug 18533) Add readonly message to meta=siteinfo output
 * (bug 18518) Add clprop=hidden to prop=categories