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
Add configuration option to optionally disable deep_munge
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
Warn about using `return` inside inline callback blocks [ci skip]

Closes #12981
Variants inline syntax documentation [ci skip]

  * Extend method documentation
  * Mention it in actionpack/CHANGELOG
  * Update release notes
Spelling and Grammar checks
Moving the common code of increment and decrement of cache file store into seprate function

Removing the double checking for the value of id

simplifying code for checking conditional code for key

Removing the default values for parameters

removing reduntant code and asiigning value of id in local variable

removing wrongly added line break[ci ckip]

reverting code
Translate new unique constraint for sqlite >= 3.8.2
Merge pull request #13291 from strzibny/new_unique_constraint

Translate new unique constraint error message for sqlite >= 3.8.2