diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2015-10-04 12:33:14 +0000 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2015-10-04 12:33:14 +0000 |
| commit | 7976b6d3069d18aa4279921e15d90ef13197fd78 (patch) | |
| tree | eed9a5c51c002f0864a2148b172c5238989e2eaa /guides/source | |
| parent | 67597e1719ec6af7e22964603cc77aa5b085a864 (diff) | |
| parent | e889a226fe8985a3403fea3e2f90ca75b52b8f17 (diff) | |
| download | rails-7976b6d3069d18aa4279921e15d90ef13197fd78.tar.gz rails-7976b6d3069d18aa4279921e15d90ef13197fd78.tar.bz2 rails-7976b6d3069d18aa4279921e15d90ef13197fd78.zip | |
Merge branch 'master' of github.com:rails/docrails
Diffstat (limited to 'guides/source')
| -rw-r--r-- | guides/source/contributing_to_ruby_on_rails.md | 2 | ||||
| -rw-r--r-- | guides/source/layouts_and_rendering.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/guides/source/contributing_to_ruby_on_rails.md b/guides/source/contributing_to_ruby_on_rails.md index 625299c113..f89ac81fd9 100644 --- a/guides/source/contributing_to_ruby_on_rails.md +++ b/guides/source/contributing_to_ruby_on_rails.md @@ -318,7 +318,7 @@ $ cd activerecord $ bundle exec rake test:sqlite3 ``` -You can now run the tests as you did for `sqlite3`. The tasks are respectively +You can now run the tests as you did for `sqlite3`. The tasks are respectively: ```bash test:mysql diff --git a/guides/source/layouts_and_rendering.md b/guides/source/layouts_and_rendering.md index b425eb126a..8dd7f396b8 100644 --- a/guides/source/layouts_and_rendering.md +++ b/guides/source/layouts_and_rendering.md @@ -781,7 +781,7 @@ The `javascript_include_tag` helper returns an HTML `script` tag for each source If you are using Rails with the [Asset Pipeline](asset_pipeline.html) enabled, this helper will generate a link to `/assets/javascripts/` rather than `public/javascripts` which was used in earlier versions of Rails. This link is then served by the asset pipeline. -A JavaScript file within a Rails application or Rails engine goes in one of three locations: `app/assets`, `lib/assets` or `vendor/assets`. These locations are explained in detail in the [Asset Organization section in the Asset Pipeline Guide](asset_pipeline.html#asset-organization) +A JavaScript file within a Rails application or Rails engine goes in one of three locations: `app/assets`, `lib/assets` or `vendor/assets`. These locations are explained in detail in the [Asset Organization section in the Asset Pipeline Guide](asset_pipeline.html#asset-organization). You can specify a full path relative to the document root, or a URL, if you prefer. For example, to link to a JavaScript file that is inside a directory called `javascripts` inside of one of `app/assets`, `lib/assets` or `vendor/assets`, you would do this: |