1 files changed, 44 insertions, 3 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 953133d8ef..e9a69e5a0c 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,8 +1,51 @@
 ## Rails 4.0.0 (unreleased) ##
 
+*   The generated `README.rdoc` for new applications invites the user to
+    document the necessary steps to get the application up and running.
+
+    *Xavier Noria*
+
+*   Generated applications no longer get `doc/README_FOR_APP`. In consequence,
+    the `doc` directory is created on demand by documentation tasks rather than
+    generated by default.
+
+    *Xavier Noria*
+
+*   App executables now live in the `bin/` directory: `bin/bundle`,
+    `bin/rails`, `bin/rake`. Run `rake rails:update:bin` to add these
+    executables to your own app. `script/rails` is gone from new apps.
+
+    Running executables within your app ensures they use your app's Ruby
+    version and its bundled gems, and it ensures your production deployment
+    tools only need to execute a single script. No more having to carefully
+    `cd` to the app dir and run `bundle exec ...`.
+
+    Rather than treating `bin/` as a junk drawer for generated "binstubs",
+    bundler 1.3 adds support for generating stubs for just the executables
+    you actually use: `bundle binstubs unicorn` generates `bin/unicorn`.
+    Add that executable to git and version it just like any other app code.
+
+    *Jeremy Kemper*
+
+*   `config.assets.enabled` is now true by default. If you're upgrading from a Rails 3.x app
+    that does not use the asset pipeline, you'll be required to add `config.assets.enabled = false`
+    to your application.rb. If you don't want the asset pipeline on a new app use `--skip-sprockets`
+
+    *DHH*
+
+*   Environment name can be a start substring of the default environment names
+    (production, development, test). For example: tes, pro, prod, dev, devel.
+    Fix #8628.
+
+    *Mykola Kyryk*
+
+*   Add `-B` alias for `--skip-bundle` option in the rails new generators.
+
+    *Jiri Pospisil*
+
 *   Quote column names in generates fixture files. This prevents
     conflicts with reserved YAML keywords such as 'yes' and 'no'
-    Fix #8612
+    Fix #8612.
 
     *Yves Senn*
 
@@ -151,8 +194,6 @@
 *   Add convenience `hide!` method to Rails generators to hide current generator
     namespace from showing when running `rails generate`. *Carlos Antonio da Silva*
 
-*   Scaffold now uses `content_tag_for` in index.html.erb *José Valim*
-
 *   Rails::Plugin has gone. Instead of adding plugins to vendor/plugins use gems or bundler with path or git dependencies. *Santiago Pastorino*
 
 *   Set config.action_mailer.async = true to turn on asynchronous