fixed a typo
Merge branch 'master' of github.com:lifo/docrails
Globalize has moved to a new repository

From (svenfuchs/globalize3) to (globalize/globalize)
Underscore in markdown should be escaped with backslash [ci skip]

In the absence of proper escaping the first link was getting messed up and remaining part of the sentence (2nd link) was not displayed in the rendered markdown on the website though it was displaying correctly in the repository markdown file.
Fix on-site markdown rendering [ci skip]
Remove Rdoc formatting from markdown [ci skip]

Use markdown formatting instead
Update security.md

Add escape character for correct rendering
Update contributing_to_ruby_on_rails.md

Escape hyphen
Typos. return -> returns. [ci skip]
Remove an extra period

As a side not, the period after etc is not always
needed http://en.wiktionary.org/wiki/etc
Merge branch 'master' of github.com:lifo/docrails
fixed typo mistake time_formats.rb -> date_formats.rb [ci skip]
Merge branch 'master' of github.com:rails/docrails
[ci skip] add `assets.raise_runtime_errors` flag

The flag will be used in multiple places to check for errors during runtime if enabled.

Source:  https://github.com/rails/sprockets-rails/pull/100
Fix integration test to pass same-origin verification
Discuss Action Pack's new CSRF protection from remote script tags and what it means for your app. In short, update your tests if they don't already use the 'xhr :post' style.
Mention new CSRF protection gotcha in upgrade guide
Clearly limit new CSRF protection to GET requests
Remove the navigator for now. Its ugly and it promises more than it can deliver. These other views (properties, routes) are not designed to be loaded in isolation
Get ready to release 4.1.0.beta1