prep for 2.6.0

features/Changelog.md

@@ -1,29 +1,6 @@
-### dev
+### 2.6.0 / 2011-05-12
 
-[full changelog](http://github.com/rspec/rspec-core/compare/v2.6.0.rc6...master)
-
-* Bug fixes
-  * CommandLine returns exit status (0/1) instead of true/false
-  * Create path to formatter output file if it doesn't exist (marekj).
-
-### 2.6.0.rc6 / 2011-05-06
-
-[full changelog](http://github.com/rspec/rspec-core/compare/v2.6.0.rc4...v2.6.0.rc6)
-
-* Enhancements
-  * Restore --pattern/-P command line option from rspec-1
-  * Support false as well as true in config.full_backtrace= (Andreas Tolf Tolfsen)
-
-### 2.6.0.rc4 / 2011-05-01
-
-[full changelog](http://github.com/rspec/rspec-core/compare/v2.6.0.rc2...v2.6.0.rc4)
-
-* Enhancements
-  * Clean up messages for filters/tags.
-
-### 2.6.0.rc2 / 2011-04-18
-
-[full changelog](http://github.com/rspec/rspec-core/compare/v2.5.1...v2.6.0.rc2)
+[full changelog](http://github.com/rspec/rspec-core/compare/v2.5.1...v2.6.0)
 
 * Enhancements
   * `shared_context` (Damian Nurzynski)
@@ -39,8 +16,11 @@
     defined. (Myron Marston)
   * Pass the exit status of a DRb run to the invoking process. This causes
     specs run via DRb to not just return true or false. (Ilkka Laukkanen)
-  * Refactoring of ConfigurationOptions#parse_options (Rodrigo Rosenfeld Rosas)
+  * Refactoring of `ConfigurationOptions#parse_options` (Rodrigo Rosenfeld Rosas)
   * Report excluded filters in runner output (tip from andyl)
+  * Clean up messages for filters/tags.
+  * Restore --pattern/-P command line option from rspec-1
+  * Support false as well as true in config.full_backtrace= (Andreas Tolf Tolfsen)
 
 * Bug fixes
   * Don't stumble over an exception without a message (Hans Hasselberg)
@@ -51,12 +31,15 @@
   * Include RSpec::Matchers when first example group is defined, rather
     than just before running the examples.  This works around an obscure
     bug in ruby 1.9 that can cause infinite recursion. (Myron Marston)
-  * Don't send example_group_[started|finished] to formatters for empty groups.
+  * Don't send `example_group_[started|finished]` to formatters for empty groups.
   * Get specs passing on jruby (Sidu Ponnappa)
   * Fix bug where mixing nested groups and outer-level examples gave
     unpredictable :line_number behavior (Artur Małecki)
   * Regexp.escape the argument to --example (tip from Elliot Winkler)
   * Correctly pass/fail pending block with message expectations
+  * CommandLine returns exit status (0/1) instead of true/false
+  * Create path to formatter output file if it doesn't exist (marekj).
+
 
 ### 2.5.1 / 2011-02-06
 

lib/rspec/core/version.rb

@@ -1,7 +1,7 @@
 module RSpec # :nodoc:
   module Core # :nodoc:
     module Version # :nodoc:
-      STRING = '2.6.0.rc6'
+      STRING = '2.6.0'
     end
   end
 end