aboutsummaryrefslogtreecommitdiffstats
path: root/guides/source
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2014-05-17 00:24:50 +0200
committerYves Senn <yves.senn@gmail.com>2014-05-17 00:24:50 +0200
commite83a6ff5b75fa8407fa8f3733a39b365dace141a (patch)
tree64a441017db2da76580c421bbd44f95746a8d007 /guides/source
parent9c4d31f601e692e27ce039492e5617f57177a844 (diff)
downloadrails-e83a6ff5b75fa8407fa8f3733a39b365dace141a.tar.gz
rails-e83a6ff5b75fa8407fa8f3733a39b365dace141a.tar.bz2
rails-e83a6ff5b75fa8407fa8f3733a39b365dace141a.zip
remove trailing whitespace. [ci skip]
Diffstat (limited to 'guides/source')
-rw-r--r--guides/source/caching_with_rails.md2
-rw-r--r--guides/source/upgrading_ruby_on_rails.md6
2 files changed, 4 insertions, 4 deletions
diff --git a/guides/source/caching_with_rails.md b/guides/source/caching_with_rails.md
index b6423dd44e..c652aa6a80 100644
--- a/guides/source/caching_with_rails.md
+++ b/guides/source/caching_with_rails.md
@@ -105,7 +105,7 @@ This method generates a cache key that depends on all products and can be used i
<% end %>
```
-If you want to cache a fragment under certain condition you can use `cache_if` or `cache_unless`
+If you want to cache a fragment under certain condition you can use `cache_if` or `cache_unless`
```erb
<% cache_if (condition, cache_key_for_products) do %>
diff --git a/guides/source/upgrading_ruby_on_rails.md b/guides/source/upgrading_ruby_on_rails.md
index da161f84c9..bb194d667e 100644
--- a/guides/source/upgrading_ruby_on_rails.md
+++ b/guides/source/upgrading_ruby_on_rails.md
@@ -82,10 +82,10 @@ secrets, you need to:
2. Use your existing `secret_key_base` from the `secret_token.rb` initializer to
set the SECRET_KEY_BASE environment variable for whichever users run the Rails
- app in production mode. Alternately, you can simply copy the existing
- `secret_key_base` from the `secret_token.rb` initializer to `secrets.yml`
+ app in production mode. Alternately, you can simply copy the existing
+ `secret_key_base` from the `secret_token.rb` initializer to `secrets.yml`
under the `production` section, replacing '<%= ENV["SECRET_KEY_BASE"] %>'.
-
+
3. Remove the `secret_token.rb` initializer.
4. Use `rake secret` to generate new keys for the `development` and `test` sections.