This reverts commit 5d2ffbb992b4ab875a121761fc0cf14dcaa12033.

"updated the ajax_on_rails.textile for rails3"

Replace the reference to the annotate_models plugin (unchanged since 2008) with more current annotate_models gem

asset pipeline guide: removes Apache config for serving pre-compressed assets, and expands the information about nginx support for this

A robust Apache configuration for this feature seems to be tricky,
one that takes into account Accept-Encoding, sets Vary, ensures
Content-Type is right, etc.

QueryCache/ConnectionPool thread fix (was #1670)

use thread locals and an instance variable within QueryCache#BodyProxy to maintain appropriate linkage with AR database connection across threads

Use the schema_search_path in prepared statements.

Rewrite the warning about local_constant_names in Ruby 1.8 to make it more understandable. Word ordering fixes in the same section.

Undid previous change which violated the convention regarding output (use "# =>") used in these guides. Corrected typo in previous correction. (Thanks for pointing this out, vijaydev.)

revises the precompilation section of the asset pipeline guide (web server configuration for gzipped assets pending)

Fixed test_nonexisting_method_with_arguments to revert commit 29a5aeaa

db:test:clone_structure if path to .sql file contains spaces or dashes

* 'master' of github.com:lifo/docrails:
  use Rails.root.join for assets guide

[config guide] mention that to_prepare hooks are called upon every request in dev, but only once in production

You can use multiple databases in your tests without disabling transactional fixtures.

This reverts commit 29a5aeaa.