Updates for 1.17.0, release notes fixes for r90341 and r90492.1.17.0

2 files changed, 8 insertions, 8 deletions

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index ad5a890eecaf..6d2883079c73 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -3,13 +3,11 @@
 Security reminder: MediaWiki does not require PHP's register_globals
 setting since version 1.2.0. If you have it on, turn it '''off''' if you can.
 
-== MediaWiki 1.17.0rc1 ==
+== MediaWiki 1.17.0 ==
 
-2011-06-14
+2011-06-22
 
-This is a release candidate of the MediaWiki 1.17 branch. Please test it and 
-let us know what you think of it. Barring new bug reports, this release 
-candidate will soon be released as MediaWiki 1.17.0.
+This is the first stable release of the MediaWiki 1.17 branch.
 
 === Summary of selected changes in 1.17 ===
 
@@ -47,8 +45,10 @@ Selected changes since MediaWiki 1.16 that may be of interest:
 * (bug 29233) Fixed failover for DB slave servers. When a DB slave went down,
   an error was immediately shown to the user, instead of trying another slave. 
   Was broken since 1.17 beta 1.
-* (bug 29278) server error 500 when attempting to add text to a page via redirect
-  (redirect points to the page and page is edited)
+* (bug 29278) Fixed PHP fatal error when attempting to add text to a page via a 
+  redirect.
+* (bug 29408) Fixed uploads of files with MIME types that aren't detected by 
+  MediaWiki.
 
 === Changes since 1.17 beta 1 ===
 
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index d7f7c75120c0..ae6fc1b7aa5e 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -34,7 +34,7 @@ if ( !defined( 'MW_PHP4' ) ) {
 /** @endcond */
 
 /** MediaWiki version number */
-$wgVersion = '1.17.0rc1';
+$wgVersion = '1.17.0';
 
 /** Name of the site. It must be changed in LocalSettings.php */
 $wgSitename         = 'MediaWiki';