Merge branch 4-0-stable of github.com:lifo/docrails [ci skip]
Revert "Correct formatting for remaining booleans"

It is not in the contract that flags have to be singletons,
the use of regular font indicates that.

This reverts commit 80036f9a5341bd831d125dc684841a8433d92070.
Revert "Consistent use of code syntax formatting for boolean values"

Same rationale as previous revert.

This reverts commit 887225e69b6cdd27f00cf043c4ac918ca5e18cbf.
Fix generating route from engine to other engine

A regression was introduced in 5b3bb6, generating route from within an
engine to an another engine resulted in prefixing a path with the
SCRIPT_NAME value.

The regression was caused by the fact that SCRIPT_NAME should be
appended only if it's the SCRIPT_NAME for the application, not if it's
SCRIPT_NAME from the current engine.

closes #10409
Squashed commit of the following:

commit 2683de5da85135e8d9fe48593ff6167db9d64b18
Author: Aaron Patterson <aaron.patterson@gmail.com>
Date:   Fri May 3 11:29:20 2013 -0700

    cannot support infinite ranges right now

commit cebb6acef2c3957f975f6db4afd849e535126253
Author: Aaron Patterson <aaron.patterson@gmail.com>
Date:   Fri May 3 11:26:12 2013 -0700

    reverting infinity comparison

commit 385f7e6b4efd1bf9b89e8d607fcb13e5b03737ea
Author: Aaron Patterson <aaron.patterson@gmail.com>
Date:   Fri May 3 11:23:28 2013 -0700

    Revert "Added ability to compare date/time with infinity"

    This reverts commit 38f28dca3aa16efd6cc3af6453f2e6b9e9655ec1.

    Conflicts:
    	activesupport/CHANGELOG.md
    	activesupport/lib/active_support/core_ext/numeric/infinite_comparable.rb
    	activesupport/test/core_ext/date_ext_test.rb
    	activesupport/test/core_ext/date_time_ext_test.rb
    	activesupport/test/core_ext/numeric_ext_test.rb
    	activesupport/test/core_ext/time_ext_test.rb
    	activesupport/test/core_ext/time_with_zone_test.rb

commit 0d799a188dc12b18267fc8421675729917610047
Author: Aaron Patterson <aaron.patterson@gmail.com>
Date:   Fri May 3 11:18:53 2013 -0700

    Revert "Refactor infinite comparable definition a bit"

    This reverts commit dd3360e05e4909f2f0c74a624cccc2def688f828.

commit 42dec90e49745bbfae546f0560b8783f6b48b074
Author: Aaron Patterson <aaron.patterson@gmail.com>
Date:   Fri May 3 11:18:47 2013 -0700

    Revert "Require 'active_support/core_ext/module/aliasing' in the infinite_comparable module"

    This reverts commit 7003e71c13c53ec3d34250560fbf80b8381df693.
Remove CHANGELOG entry related with infinite comparison.

See 6c61dbf1d222ae626203a3b7921dadcabb44e25f
Merge pull request #10401 from frodsan/merge_docrails

Merge docrails in 4-0-stable
Merge pull request #10457 from zenspider/squishy_test_order_dependencies

Fixed bad tests to clean up after themselves.
Merge pull request #10461 from rwz/master

Relaxed jbuilder dependency in Gemfile template
Merge pull request #10436 from NARKOZ/keep-images

generate 'app/assets/images' directory when creating new rails app. Fixes #10434
Merge pull request #10458 from bwbuchanan/issue-10451

Make SchemaDumper emit "id: :uuid" when using UUID primary keys
Merge pull request #10404 from chadmoone/fix-pg-uuid-default

Allow override of PostgreSQL UUID primary key default
Merge pull request #10448 from arunagw/bug-fix-scaffold-generator-master

Fixes Scaffold generator with --assets=false
Conflicts:
	railties/CHANGELOG.md
Make rake install task depend on build instead of gem

The rake task doesn't build the Rails gem file so it couldn't be installed. The build task builds all the sub-gems and the Rails gem
Merge pull request #10465 from raphweiner/rake_install_depend_on_build

Make rake install task depend on build instead of gem
Merge pull request #10472 from prathamesh-sonpatki/github

Github -> GitHub [ci skip]
Merge pull request #10468 from rimidl/add-missing-require-to-actionview-lookupcontext

Added missing `require` to ActionView::LookupContext
Merge pull request #10466 from prathamesh-sonpatki/scaffold-assets

Fix tests related to scaffolding generator with --assets=false switch
Use Ruby 1.9 syntax
Updated link to to GitHub article about ignoring files [ci skip]

- http://help.github.com/ignore-files redirects to https://help.github.com/articles/ignoring-files