TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:lifo/docrails

Browse Source 
Conflicts:
	railties/guides/source/3_0_release_notes.textile
This commit is contained in:
Mikel Lindsaar 2010-02-03 19:18:58 +11:00
commit 8d48c3b364
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
railties/guides/source/active_support_core_extensions.textile
View File

@ -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.

2
railties/guides/source/routing.textile
View File

@ -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>