diff options
| author | Mikel Lindsaar <raasdnil@gmail.com> | 2010-02-03 19:18:58 +1100 |
|---|---|---|
| committer | Mikel Lindsaar <raasdnil@gmail.com> | 2010-02-03 19:18:58 +1100 |
| commit | 8d48c3b364e0c6a157d0921c82e8ad16deb9eea0 (patch) | |
| tree | f6cadcdadbbfc94c142dd394476a4db6e0903f30 /railties/guides/source | |
| parent | 2efd8dd6634fc742507d1a4fedaf758b3959c5e2 (diff) | |
| parent | 9c2170c1553542bece369b05d2c8d49f9803292a (diff) | |
| download | rails-8d48c3b364e0c6a157d0921c82e8ad16deb9eea0.tar.gz rails-8d48c3b364e0c6a157d0921c82e8ad16deb9eea0.tar.bz2 rails-8d48c3b364e0c6a157d0921c82e8ad16deb9eea0.zip | |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
railties/guides/source/3_0_release_notes.textile
Diffstat (limited to 'railties/guides/source')
| -rw-r--r-- | railties/guides/source/active_support_core_extensions.textile | 2 | ||||
| -rw-r--r-- | railties/guides/source/routing.textile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/guides/source/active_support_core_extensions.textile b/railties/guides/source/active_support_core_extensions.textile index 49d676f5be..fb4c42f118 100644 --- a/railties/guides/source/active_support_core_extensions.textile +++ b/railties/guides/source/active_support_core_extensions.textile @@ -1,6 +1,6 @@ h2. Active Support Core Extensions -Active Support is the Rails component responsible for providing Ruby language extensions, utilities, and other transversal stuff. It offers a richer bottom-line at the language level, targeted both at the development of Rails applications, and at the development of Rails itself. TEST 2. +Active Support is the Rails component responsible for providing Ruby language extensions, utilities, and other transversal stuff. It offers a richer bottom-line at the language level, targeted both at the development of Rails applications, and at the development of Rails itself. By referring to this guide you will learn the extensions to the Ruby core classes and modules provided by Rails. diff --git a/railties/guides/source/routing.textile b/railties/guides/source/routing.textile index c764597a65..96dbd0dcd0 100644 --- a/railties/guides/source/routing.textile +++ b/railties/guides/source/routing.textile @@ -271,7 +271,7 @@ This can be especially useful when map multiple namespaced routes together using <ruby> namespace :admin do - admin.resources :photos, :videos + resources :photos, :videos end </ruby> |