bullets have fullstops too [ci skip]
copy editing [ci skip]
Merge branch 'master' of github.com:lifo/docrails

Conflicts:
	actionpack/lib/action_view/helpers/form_helper.rb
	railties/lib/rails/info_controller.rb
make an editing pass through the upgrading guide [ci skip]
Remove blank lines from generated Gemfile

Introduced by 059bdc3415b0f1fb436c56a399a41b90fe3e87f0
Merge pull request #8519 from rubys/master

 Remove blank lines from generated Gemfile
Add `ActiveModel::Validations::AbsenceValidator`, a validator to check the  absence of attributes.
Add `ActiveModel::Errors#add_on_present` method. Adds error messages to present attributes.
Merge pull request #8518 from rwz/inheritable-basic-object

Properly deprecate AS::BasicObject without breaking subclasses of it
Refactoring the token_and_options method to fix bugs

Adding a test for the equal trun bug

Adding a test for the after equal trunc bug

Adding a test for the slash bug

Adding a test for the slash quote bug

Adding a helper method for creating a sample request object with token

Writing a method to create params array from raw params

Writing a method to rewrite param values in the params

Writing a method to get the token params from an authorization value

Refactoring the token_and_options method to fix bugs

Removing unnessecary test

A constant for this shared regex seemed appropriate

Wanting to split up this logic

Adding small documentation pieces
AR supporting new intrange data type on PostgreSQL >= 9.2
Restored 'Working with Validation Errors'

Somehow this got lost in my PRs before. I'm going to re-check all the
guides to make sure this didn't happen again elsewhere.
DebugExceptions `File.join` => `File.expand_path`
Merge pull request #8529 from schneems/schneems/debug-exceptions-extend-path

DebugExceptions `File.join` => `File.expand_path`
Add missing requires to core_ext/integer/time
Merge pull request #8532 from ptn/add_missing_require

Add missing requires to core_ext/integer/time
Add script_name option description and example for #url_for options
 fix AS::BasicObject :nodoc: [ci skip]
Merge pull request #8539 from frodsan/fix_as_basic_object

Add nodoc to AS::BasicObject [ci skip]
Make conditional_layout? private and update documentation

The conditional_layout? method is not for public use and doesn't
actually do what the documentation suggested it does. It's actually
used to determine whether or not to use the explicit layout definition
defined in a controller or use the implicit layout definition.

Also documentation was added for the action_has_layout? method which
acts as a master switch for disabling the layout for the current
action. This method was added so that action caching didn't depend
on accessing layout internals but is also used by third-parties,
most notably the [Hobo][1] application.

[1]: https://github.com/hobo/hobo
HTML formatting to Rails::InfoController#routes

This PR adds formatting and meta-data to the display of the internal routes. Users can now toggle between showing helpers with the `_path` or _`url` suffix. 

There are multiple ways to achieve this, this method uses partials for formatting and meta-data. The partials can be re-used when rendering `routing_error.erb`, though that will need to be in a separate PR.

![](http://f.cl.ly/items/3A2p3c1T1t2f2X2R2K2S/Screen%20Shot%202012-12-12%20at%202.28.01%20PM.png)


ATP Railties