Conflicts:
	railties/guides/source/ajax_on_rails.textile
	railties/guides/source/generators.textile

No need to change this formatting.

This reverts commit 9c861e8a.

remove unwanted Example headers as per the guidelines, s/instaces of NilClass/nil/ and friends, completes some rdocs

Reason: "To be blank" and "to be empty" belongs to our everyday
terminology, they go in regular font.

This reverts commit 280a8709.

Set a default precompile target to be the application.js, application.css, and all non-css/js files (images etc)

Switch to asset_path and make it available in the Sprockets::Context (now you can do asset_path("logo.png") in a stylesheet.css.erb file and get fingerprinting)

Cleanup compute_sprockets_path -- when you are reaching for code comments, the method could be simpler

The purpose of this regexp is to detect strings that
are valid identifiers to be used as method names.
The anchor $ allows a trailing newline, and both ^
and $ may be bypassed because Ruby regexps are
multiline always. The anchors \A and \z are the
proper ones to ensure string boundaries.

Currently, we output:

  "><script type="text/javascript">window.location = "/500.html"</script></html>

Update link to Rails 2.3 guides from 2.3.8 to last release 2.3.11. Maybe someone could regenerate the guides

Bring back support for passing a callable object to the default_scope macro. You can also just use a block.

Un-deprecate using 'default_scope' as a macro, but if you are calling the macro multiple times that will give deprecation warnings, and in 3.2 we will simply overwrite the default scope when you call the macro multiple times.

AS Json parse_error makes a return for backwards compatibility, although it will return MultiJson::DecodeError