Revert "Update master changelogs with rails 3.0-stable branch info"

This reverts commit 2bc8e5713764b2276036fecfd7f297132597fddb.

Reason: Changelogs are not meant to be changed in docrails.

7 files changed, 5 insertions, 273 deletions

diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
index 01aa0769dc..57af4ee6a4 100644
--- a/actionmailer/CHANGELOG.md
+++ b/actionmailer/CHANGELOG.md
@@ -2,37 +2,13 @@
 
 *   No changes
 
-## Rails 3.0.12 (unreleased) ##
-
-*   No changes.
-
-
-## Rails 3.0.11 (November 18, 2011) ##
-
-*   No changes.
-
-
-## Rails 3.0.10 (August 16, 2011) ##
-
-*   No changes.
-
-
-## Rails 3.0.9 (June 16, 2011) ##
-
-*   No changes.
-
-
-## Rails 3.0.8 (June 7, 2011) ##
-
-*   Mail dependency increased to 2.2.19
-
 
 ## Rails 3.0.7 (April 18, 2011) ##
 
 *   remove AM delegating register_observer and register_interceptor to Mail *Josh Kalderimis*
 
 
-## Rails 3.0.6 (April 5, 2011) ##
+*   Rails 3.0.6 (April 5, 2011)
 
 *   Don't allow i18n to change the minor version, version now set to ~> 0.5.0 *Santiago Pastorino*
 
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 008071b701..b753addef4 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -424,102 +424,12 @@
 *   Add Rack::Cache to the default stack. Create a Rails store that delegates to the Rails cache, so by default, whatever caching layer you are using will be used for HTTP caching. Note that Rack::Cache will be used if you use #expires_in, #fresh_when or #stale with :public => true. Otherwise, the caching rules will apply to the browser only. *Yehuda Katz, Carl Lerche*
 
 
-## Rails 3.0.12 (unreleased) ##
-
-* Fix using `tranlate` helper with a html translation which uses the `:count` option for
-  pluralization.
-
-  *Jon Leighton*
-
-
-## Rails 3.0.11 (November 18, 2011) ##
-
-*   Fix XSS security vulnerability in the `translate` helper method. When using interpolation
-    in combination with HTML-safe translations, the interpolated input would not get HTML
-    escaped. *GH 3664*
-
-    Before:
-
-      translate('foo_html', :something => '<script>') # => "...<script>..."
-
-    After:
-
-      translate('foo_html', :something => '<script>') # => "...&lt;script&gt;..."
-
-    *Sergey Nartimov*
-
-*   Implement a workaround for a bug in ruby-1.9.3p0 where an error would be
-    raised while attempting to convert a template from one encoding to another.
-
-    Please see http://redmine.ruby-lang.org/issues/5564 for details of the bug.
-
-    The workaround is to load all conversions into memory ahead of time, and will
-    only happen if the ruby version is exactly 1.9.3p0. The hope is obviously
-    that the underlying problem will be resolved in the next patchlevel release
-    of 1.9.3.
-
-*   Fix assert_select_email to work on multipart and non-multipart emails as the method stopped working correctly in Rails 3.x due to changes in the new mail gem.
-
-*   Fix url_for when passed a hash to prevent additional options (eg. :host, :protocol) from being added to the hash after calling it.
-
-
-## Rails 3.0.10 (August 16, 2011) ##
-
-*   Fixes an issue where cache sweepers with only after filters would have no
-    controller object, it would raise undefined method controller_name for nil [jeroenj]
-
-*   Ensure status codes are logged when exceptions are raised.
-
-*   Subclasses of OutputBuffer are respected.
-
-*   Fixed ActionView::FormOptionsHelper#select with :multiple => false
-
-*   Avoid extra call to Cache#read in case of a fragment cache hit
-
-
-## Rails 3.0.9 (June 16, 2011) ##
-
-*   json_escape will now return a SafeBuffer string if it receives SafeBuffer string [tenderlove]
-
-*   Make sure escape_js returns SafeBuffer string if it receives SafeBuffer string [Prem Sichanugrist]
-
-*   Fix text helpers to work correctly with the new SafeBuffer restriction [Paul Gallagher, Arun Agrawal, Prem Sichanugrist]
-
-
-## Rails 3.0.8 (June 7, 2011) ##
-
-*   It is prohibited to perform a in-place SafeBuffer mutation [tenderlove]
-
-    The old behavior of SafeBuffer allowed you to mutate string in place via
-    method like `sub!`. These methods can add unsafe strings to a safe buffer,
-    and the safe buffer will continue to be marked as safe.
-
-    An example problem would be something like this:
-
-      <%= link_to('hello world', @user).sub!(/hello/, params[:xss])  %>
-
-    In the above example, an untrusted string (`params[:xss]`) is added to the
-    safe buffer returned by `link_to`, and the untrusted content is successfully
-    sent to the client without being escaped.  To prevent this from happening
-    `sub!` and other similar methods will now raise an exception when they are called on a safe buffer.
-
-    In addition to the in-place versions, some of the versions of these methods which return a copy of the string will incorrectly mark strings as safe. For example:
-
-       <%= link_to('hello world', @user).sub(/hello/, params[:xss]) %>
-
-    The new versions will now ensure that *all* strings returned by these methods on safe buffers are marked unsafe.
-
-    You can read more about this change in http://groups.google.com/group/rubyonrails-security/browse_thread/thread/2e516e7acc96c4fb
-
-*   Fixed github issue #342 with asset paths and relative roots.
-
-
 ## Rails 3.0.7 (April 18, 2011) ##
 
 *   No changes.
 
 
-## Rails 3.0.6 (April 5, 2011) ##
+*   Rails 3.0.6 (April 5, 2011)
 
 *   Fixed XSS vulnerability in `auto_link`.  `auto_link` no longer marks input as
     html safe.  Please make sure that calls to auto_link() are wrapped in a
diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md
index afd2d28c9b..bd9ed996fe 100644
--- a/activemodel/CHANGELOG.md
+++ b/activemodel/CHANGELOG.md
@@ -36,31 +36,6 @@
 *   Add support for selectively enabling/disabling observers *Myron Marston*
 
 
-## Rails 3.0.12 (unreleased) ##
-
-*   No changes.
-
-
-## Rails 3.0.11 (November 18, 2011) ##
-
-*   No changes.
-
-
-## Rails 3.0.10 (August 16, 2011) ##
-
-*   No changes.
-
-
-## Rails 3.0.9 (June 16, 2011) ##
-
-*   No changes.
-
-
-## Rails 3.0.8 (June 7, 2011) ##
-
-*   No changes.
-
-
 ## Rails 3.0.7 (April 18, 2011) ##
 
 *   No changes.
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 578a7456a7..cd8e50b33a 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -583,58 +583,6 @@
     *Aaron Patterson*
 
 
-## Rails 3.0.12 (unreleased) ##
-
-*   No changes.
-
-
-## Rails 3.0.11 (November 18, 2011) ##
-
-*   Exceptions from database adapters should not lose their backtrace.
-
-*   Backport "ActiveRecord::Persistence#touch should not use default_scope" (GH #1519)
-
-*   Psych errors with poor yaml formatting are proxied. Fixes GH #2645 and
-    GH #2731
-
-*   Fix ActiveRecord#exists? when passsed a nil value
-
-
-## Rails 3.0.10 (August 16, 2011) ##
-
-*   Magic encoding comment added to schema.rb files
-
-*   schema.rb is written as UTF-8 by default.
-
-*   Ensuring an established connection when running `rake db:schema:dump`
-
-*   Association conditions will not clobber join conditions.
-
-*   Destroying a record will destroy the HABTM record before destroying itself.
-    GH #402.
-
-*   Make `ActiveRecord::Batches#find_each` to not return `self`.
-
-*   Update `table_exists?` in PG to to always use current search_path or schema if explictly set.
-
-
-## Rails 3.0.9 (June 16, 2011) ##
-
-*   No changes.
-
-
-## Rails 3.0.8 (June 7, 2011) ##
-
-*   Fix various problems with using :primary_key and :foreign_key options in conjunction with
-  :through associations. [Jon Leighton]
-
-*   Correctly handle inner joins on polymorphic relationships.
-
-*   Fixed infinity and negative infinity cases in PG date columns.
-
-*   Creating records with invalid associations via `create` or `save` will no longer raise exceptions.
-
-
 ## Rails 3.0.7 (April 18, 2011) ##
 
 *   Destroying records via nested attributes works independent of reject_if LH #6006 *Durran Jordan*
diff --git a/activeresource/CHANGELOG.md b/activeresource/CHANGELOG.md
index 833ac707bc..09d1eeb1c8 100644
--- a/activeresource/CHANGELOG.md
+++ b/activeresource/CHANGELOG.md
@@ -18,38 +18,12 @@
     class User < ActiveResource::Base    self.format = :xml
     end
 
-
-## Rails 3.0.12 (unreleased) ##
-
-*   No changes.
-
-
-## Rails 3.0.11 (November 18, 2011) ##
-
-*   No changes.
-
-
-## Rails 3.0.10 (August 16, 2011) ##
-
-*   No changes.
-
-
-## Rails 3.0.9 (June 16, 2011) ##
-
-*   No changes.
-
-
-## Rails 3.0.8 (June 7, 2011) ##
-
-*   No Changes
-
-
 ## Rails 3.0.7 (April 18, 2011) ##
 
 *   No changes.
 
 
-##   Rails 3.0.6 (April 5, 2011) ##
+*   Rails 3.0.6 (April 5, 2011)
 
 *   No changes.
 
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index 7739e96e80..1516472fed 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -111,38 +111,12 @@
 *   JSON decoding now uses the multi_json gem which also vendors a json engine called OkJson. The yaml backend has been removed in favor of OkJson as a default engine for 1.8.x, while the built in 1.9.x json implementation will be used by default. *Josh Kalderimis*
 
 
-## Rails 3.0.12 (unreleased) ##
-
-*   No changes.
-
-
-## Rails 3.0.11 (November 18, 2011) ##
-
-*   No changes.
-
-
-## Rails 3.0.10 (August 16, 2011) ##
-
-*  Delayed backtrace scrubbing in `load_missing_constant` until we actually
-   raise the exception
-
-
-## Rails 3.0.9 (June 16, 2011) ##
-
-*   No changes.
-
-
-## Rails 3.0.8 (June 7, 2011) ##
-
-*   No changes.
-
-
 ## Rails 3.0.7 (April 18, 2011) ##
 
 *   Hash.from_xml no longer loses attributes on tags containing only whitespace *André Arko*
 
 
-##   Rails 3.0.6 (April 5, 2011) ##
+*   Rails 3.0.6 (April 5, 2011)
 
 *   No changes.
 
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 377a4a2fd0..0bd76df6d7 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -148,37 +148,12 @@
 *   Include all helpers from plugins and shared engines in application *Piotr Sarnacki*
 
 
-## Rails 3.0.12 (unreleased) ##
-
-*   No changes.
-
-
-## Rails 3.0.11 (November 18, 2011) ##
-
-*   Updated Prototype UJS to lastest version fixing multiples errors in IE [Guillermo Iguaran]
-
-
-## Rails 3.0.10 (August 16, 2011) ##
-
-*   No changes.
-
-
-## Rails 3.0.9 (June 16, 2011) ##
-
-*   No changes.
-
-
-## Rails 3.0.8 (June 7, 2011) ##
-
-*   Fix Rake 0.9.0 support.
-
-
 ## Rails 3.0.7 (April 18, 2011) ##
 
 *   No changes.
 
 
-##   Rails 3.0.6 (April 5, 2011) ##
+*   Rails 3.0.6 (April 5, 2011)
 
 *   No changes.