diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-10-11 12:06:21 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-10-11 12:06:21 +0200 |
| commit | 21a92b8d01eed34a6b26adb51139f1c40467409e (patch) | |
| tree | fe9673e3018b79031511098a7abf4930aaa807ab /railties | |
| parent | a8b1780410a86be58ac0f341ae6b079800783fcf (diff) | |
| parent | e6b45b8111cc375be57a1e1ca2b2b47eb21a2e01 (diff) | |
| download | rails-21a92b8d01eed34a6b26adb51139f1c40467409e.tar.gz rails-21a92b8d01eed34a6b26adb51139f1c40467409e.tar.bz2 rails-21a92b8d01eed34a6b26adb51139f1c40467409e.zip | |
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'railties')
3 files changed, 2 insertions, 5 deletions
diff --git a/railties/guides/source/action_view_overview.textile b/railties/guides/source/action_view_overview.textile index 843dfe530d..0e1a352ebd 100644 --- a/railties/guides/source/action_view_overview.textile +++ b/railties/guides/source/action_view_overview.textile @@ -253,9 +253,6 @@ javascript_include_tag :monkey # => <script type="text/javascript" src="/javascripts/tail.js"></script> </ruby> -h5. register_javascript_include_default - -Register one or more additional JavaScript files to be included when +javascript_include_tag :defaults+ is called. This method is typically intended to be called from plugin initialization to register additional +.js+ files that the plugin installed in +public/javascripts+. h5. register_stylesheet_expansion diff --git a/railties/guides/source/initialization.textile b/railties/guides/source/initialization.textile index 599ddccdd6..3e02bc0158 100644 --- a/railties/guides/source/initialization.textile +++ b/railties/guides/source/initialization.textile @@ -3070,7 +3070,7 @@ The +Rails::Plugin::Configuration+ class may be a bit difficult to find at first <ruby> module Rails - class Plugin < Railtie + class Plugin < Engine ... end end diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/oracle.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/oracle.yml index fddf8b8144..b661a60389 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/databases/oracle.yml +++ b/railties/lib/rails/generators/rails/app/templates/config/databases/oracle.yml @@ -10,7 +10,7 @@ # # By default prefetch_rows (OCI_ATTR_PREFETCH_ROWS) is set to 100. And # until true bind variables are supported, cursor_sharing is set by default -# to 'similar'. Both can be changed in the configation below; the defaults +# to 'similar'. Both can be changed in the configuration below; the defaults # are equivalent to specifying: # # prefetch_rows: 100 |