aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--guides/source/caching_with_rails.md2
-rw-r--r--railties/CHANGELOG.md4
2 files changed, 1 insertions, 5 deletions
diff --git a/guides/source/caching_with_rails.md b/guides/source/caching_with_rails.md
index af4ef6a58d..aa79f59e4f 100644
--- a/guides/source/caching_with_rails.md
+++ b/guides/source/caching_with_rails.md
@@ -574,7 +574,7 @@ Caching in Development
----------------------
It's common to want to test the caching strategy of your application
-in developement mode. Rails provides the rake task `dev:cache` to
+in development mode. Rails provides the rake task `dev:cache` to
easily toggle caching on/off.
```bash
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index f4d3529a37..fedac90fc8 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -192,10 +192,6 @@
*Kevin McPhillips*
-* Ensure `/rails/info` routes match in development for apps with a catch-all globbing route.
-
- *Nicholas Firth-McCoy*
-
* Added a shared section to `config/secrets.yml` that will be loaded for all environments.
*DHH*