Merge pull request #6388 from kennyj/fix_warning_20120519

Fix warning: possibly useless use of % in void context
Merge pull request #6183 from nashby/fix-issue-6179

wrap time ranges with timezones
Added wrapper tag documentation to the simple_format method
Merge branch 'master' of github.com:lifo/docrails
Minor fix to the wrapper tag documentation, the options hash is the last one, added blank hash before that in the args list
You can add a custom primary key to a table
More DRY route inspect tests
Fix inspecting route redirections, closes #6369

This commit fixes route inspection in `rake routes`

Before:

  foo  /foo(.:format) :controller#:action"

After:

  foo  /foo(.:format)  Redirect (301)
Merge pull request #6391 from strzalek/redirect_route_inspect

Redirect route inspect
Tidied and standardised text_helper implementations.
minor fix wrapper tag documentation
Merge pull request #6384 from ihid/tidy_text_helpers

Tidied and standardised text_helper implementations.
Increase `AR#cache_key` precision to nanoseconds
add CollectionProxy#include? documentation
Merge pull request #6376 from jgaskins/timestamp-microseconds

Increase numeric-timestamp precision to nanoseconds
add CollectionProxy#clear documentation
add CollectionProxy#<< documentation
Make AC::LogSubscriber#send_file like #send_data
fix CollectionProxy#<< documentation
improve CollectionProxy#concat documentation