diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-09-27 14:04:46 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-09-27 14:04:46 +0100 |
| commit | fda846cf5ddf523b00a39c26591489794b5de568 (patch) | |
| tree | 00d4860d53e5c861fd9b3f483f04ff0d2db19307 /railties/doc/guides | |
| parent | df046298715b1927a832973c4c29955696fee02c (diff) | |
| parent | ea609b265ffc30cac00bf09a262027f96964ed6f (diff) | |
| download | rails-fda846cf5ddf523b00a39c26591489794b5de568.tar.gz rails-fda846cf5ddf523b00a39c26591489794b5de568.tar.bz2 rails-fda846cf5ddf523b00a39c26591489794b5de568.zip | |
Merge commit 'mainstream/master'
Conflicts:
activerecord/lib/active_record/base.rb
railties/Rakefile
railties/doc/guides/activerecord/association_basics.txt
railties/doc/guides/debugging/debugging_rails_applications.txt
railties/doc/guides/getting_started_with_rails/getting_started_with_rails.txt
railties/doc/guides/index.txt
railties/doc/guides/migrations/foreign_keys.txt
railties/doc/guides/migrations/migrations.txt
railties/doc/guides/migrations/writing_a_migration.txt
railties/doc/guides/routing/routing_outside_in.txt
Diffstat (limited to 'railties/doc/guides')
| -rw-r--r-- | railties/doc/guides/debugging/debugging_rails_applications.txt | 2 | ||||
| -rw-r--r-- | railties/doc/guides/migrations/migrations.txt | 2 | ||||
| -rw-r--r-- | railties/doc/guides/routing/routing_outside_in.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/railties/doc/guides/debugging/debugging_rails_applications.txt b/railties/doc/guides/debugging/debugging_rails_applications.txt index 37d4dd19d6..f7538cd08b 100644 --- a/railties/doc/guides/debugging/debugging_rails_applications.txt +++ b/railties/doc/guides/debugging/debugging_rails_applications.txt @@ -614,4 +614,4 @@ set listsize 25 http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/5[Lighthouse ticket] -* September 16, 2008: initial version by link:../authors.html#miloops[Emilio Tagua]
\ No newline at end of file +* September 16, 2008: initial version by link:../authors.html#miloops[Emilio Tagua] diff --git a/railties/doc/guides/migrations/migrations.txt b/railties/doc/guides/migrations/migrations.txt index 653fa818dd..be183e8597 100644 --- a/railties/doc/guides/migrations/migrations.txt +++ b/railties/doc/guides/migrations/migrations.txt @@ -19,4 +19,4 @@ include::rakeing_around.txt[] include::using_models_in_migrations.txt[] include::scheming.txt[] include::foreign_keys.txt[] -include::changelog.txt[]
\ No newline at end of file +include::changelog.txt[] diff --git a/railties/doc/guides/routing/routing_outside_in.txt b/railties/doc/guides/routing/routing_outside_in.txt index c04319496e..cef3c3b350 100644 --- a/railties/doc/guides/routing/routing_outside_in.txt +++ b/railties/doc/guides/routing/routing_outside_in.txt @@ -905,4 +905,4 @@ assert_routing { :path => "photos", :method => :post }, { :controller => "photos http://rails.lighthouseapp.com/projects/16213-rails-guides/tickets/3[Lighthouse ticket] * September 10, 2008: initial version by link:../authors.html#mgunderloy[Mike Gunderloy] -* September 23, 2008: Added section on namespaced controllers and routing, by link:../authors.html#mgunderloy[Mike Gunderloy]
\ No newline at end of file +* September 23, 2008: Added section on namespaced controllers and routing, by link:../authors.html#mgunderloy[Mike Gunderloy] |