aboutsummaryrefslogtreecommitdiffstats
path: root/guides
diff options
context:
space:
mode:
authorPrathamesh Sonpatki <csonpatki@gmail.com>2015-04-28 13:41:44 +0530
committerPrathamesh Sonpatki <csonpatki@gmail.com>2015-04-28 13:41:44 +0530
commita9319713685b73316e99459c7d32dcbe58aebb1d (patch)
tree47cfd5ce9f2911731f29f88eb94cd2af8e9756aa /guides
parent1b61fb44e4e7d373cd63a51e04e683df77263f09 (diff)
downloadrails-a9319713685b73316e99459c7d32dcbe58aebb1d.tar.gz
rails-a9319713685b73316e99459c7d32dcbe58aebb1d.tar.bz2
rails-a9319713685b73316e99459c7d32dcbe58aebb1d.zip
Replaced Javascript with JavaScript in guides
Diffstat (limited to 'guides')
-rw-r--r--guides/source/getting_started.md2
-rw-r--r--guides/source/upgrading_ruby_on_rails.md2
2 files changed, 2 insertions, 2 deletions
diff --git a/guides/source/getting_started.md b/guides/source/getting_started.md
index db4e81e32e..f5bf89c56d 100644
--- a/guides/source/getting_started.md
+++ b/guides/source/getting_started.md
@@ -1491,7 +1491,7 @@ appear.
![Confirm Dialog](images/getting_started/confirm_dialog.png)
TIP: Learn more about jQuery Unobtrusive Adapter (jQuery UJS) on
-[Working With Javascript in Rails](working_with_javascript_in_rails.html) guide.
+[Working With JavaScript in Rails](working_with_javascript_in_rails.html) guide.
Congratulations, you can now create, show, list, update and destroy
articles.
diff --git a/guides/source/upgrading_ruby_on_rails.md b/guides/source/upgrading_ruby_on_rails.md
index 7666601bd7..863af4771b 100644
--- a/guides/source/upgrading_ruby_on_rails.md
+++ b/guides/source/upgrading_ruby_on_rails.md
@@ -912,7 +912,7 @@ Rails 4.0 extracted Active Resource to its own gem. If you still need the featur
Please note that you should wait to set `secret_key_base` until you have 100% of your userbase on Rails 4.x and are reasonably sure you will not need to rollback to Rails 3.x. This is because cookies signed based on the new `secret_key_base` in Rails 4.x are not backwards compatible with Rails 3.x. You are free to leave your existing `secret_token` in place, not set the new `secret_key_base`, and ignore the deprecation warnings until you are reasonably sure that your upgrade is otherwise complete.
-If you are relying on the ability for external applications or Javascript to be able to read your Rails app's signed session cookies (or signed cookies in general) you should not set `secret_key_base` until you have decoupled these concerns.
+If you are relying on the ability for external applications or JavaScript to be able to read your Rails app's signed session cookies (or signed cookies in general) you should not set `secret_key_base` until you have decoupled these concerns.
* Rails 4.0 encrypts the contents of cookie-based sessions if `secret_key_base` has been set. Rails 3.x signed, but did not encrypt, the contents of cookie-based session. Signed cookies are "secure" in that they are verified to have been generated by your app and are tamper-proof. However, the contents can be viewed by end users, and encrypting the contents eliminates this caveat/concern without a significant performance penalty.