Normally I would have done this in master, but there was already
a guide with wrapped content, so worked here. I am going to
cross-merge now.

This reverts commit 6f29b356.

Reason: Changelogs are not meant to be changed in docrails.

This reverts commit 1e5fa59d.

Reason: It's somewhat a grey area. We don't really want to tell the
users how they want to use the terminal.

This reverts commit e3dbe66e.

Reason: Code changes are not allowed in docrails.

- includes 3 tests

Rewrote entire section including example code, error message, and work
around.

Conflicts:
	railties/guides/source/getting_started.textile

Conflicts:
	railties/guides/source/getting_started.textile

https://github.com/lifo/docrails/commit/3eb99aab77c04dbd95dfc9f73e03a667f114914f#commitcomment-493737

Add additional files generated by rails 3.1 generator.

Changed descriptino of Gemfile to add reference to Bundler
Changed description of README to add 'You should edit ...'
Changed description of Rakefile to reflect dynamic nature of Rakefile
and point to app/lib/tasks/ as the place to add app-specific rake tasks.

relationship.

changed wording 'one table ... corresponds to one model' to 'each table
...'