diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-05-01 02:23:47 -0700 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-05-01 02:23:47 -0700 |
| commit | efba1d4227514a6ce4880910a6531b0a6c3c75aa (patch) | |
| tree | daff4155b8c19b915125ac0b0da458279358e743 /railties/guides/source/index.html.erb | |
| parent | 81807e0fe2879e08563c91ee6809ab6d1d0bd081 (diff) | |
| parent | 6c280f3398966ffba45069500ff43d632513fe44 (diff) | |
| download | rails-efba1d4227514a6ce4880910a6531b0a6c3c75aa.tar.gz rails-efba1d4227514a6ce4880910a6531b0a6c3c75aa.tar.bz2 rails-efba1d4227514a6ce4880910a6531b0a6c3c75aa.zip | |
Merge commit 'rails/master'
Conflicts:
railties/guides/source/index.html.erb
Diffstat (limited to 'railties/guides/source/index.html.erb')
| -rw-r--r-- | railties/guides/source/index.html.erb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/guides/source/index.html.erb b/railties/guides/source/index.html.erb index f47975917c..5a715cf9f7 100644 --- a/railties/guides/source/index.html.erb +++ b/railties/guides/source/index.html.erb @@ -143,7 +143,7 @@ Ruby on Rails Guides <%= guide("Adding Generators", 'generators.html') do %> <p>This guide covers the process of adding a brand new generator to your extension or providing an alternative to an element of a built-in Rails generator (such as - providing alternative test stubs for the scaffold generator)</p> + providing alternative test stubs for the scaffold generator).</p> <% end %> </dl> |