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
Fix mounting engines inside a resources block

When a route is mounted inside a resources block, it's automatically
prefixed, so a following code:

    resources :users do
      mount Blog::Engine => '/blog'
    end

will generate a user_blog path helper.

In order to access engine helpers, we also use "mounted_helpers", a list
of helpers associated with each mounted engine, so a path to blog's post
can be generated using user_blog.post_path(user, post).

The problem I'm fixing here is that mount used a raw :as option, without
taking nestings into account. As a result, blog was added to a route set
as a `user_blog`, but helper was generated for just `blog`.

This commit applies the proper logic for defining a helper for a mounted
engine nested in resources or resource block.

(closes #8533)
Merge pull request #12699 from drogus/fix-mounting-engine-in-resources

Fix mounting engines inside a resources block
Using parallelize_me! to parallelize isolated test


As ParallelEach is no more available

related commit ec00442c10cb90796909e876fb1cc557ed7518bd
Merge pull request #13260 from arunagw/using-parallelize_me

Using parallelize_me! to parallelize isolated test
Prevent invalid code when using dynamic finders with Ruby's reserved words.

The dynamic finder was creating the method signature with the parameters name,
which may have reserved words and this way creating invalid Ruby code.

Closes: #13261

    Example:

        # Before
        Dog.find_by_alias('dog name')

        # Was creating this method
        def self.find_by_alias(alias, options = {})

        # After
        Dog.find_by_alias('dog name')

        # Will create this method
        def self.find_by_alias(_alias, options = {})
typo rectified [skip ci]