diff options
| author | Hrvoje Šimić <shime.ferovac@gmail.com> | 2012-04-02 20:31:54 +0200 |
|---|---|---|
| committer | Hrvoje Šimić <shime.ferovac@gmail.com> | 2012-04-02 20:31:54 +0200 |
| commit | 7b1abe84ae84fc2a4a62cbec486df80000358d3d (patch) | |
| tree | fb9fdce1ea7dec1a59dd6ab400a07074d22c9b09 | |
| parent | 4b1ed1d29f9d42f6d52562778f35c3b0e2888b72 (diff) | |
| parent | bb23d6fb005edaf25f5b294f9215429fb44b3f3d (diff) | |
| download | rails-7b1abe84ae84fc2a4a62cbec486df80000358d3d.tar.gz rails-7b1abe84ae84fc2a4a62cbec486df80000358d3d.tar.bz2 rails-7b1abe84ae84fc2a4a62cbec486df80000358d3d.zip | |
Merge branch 'master' of github.com:lifo/docrails
| -rw-r--r-- | guides/rails_guides/textile_extensions.rb | 2 | ||||
| -rw-r--r-- | guides/source/engines.textile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/guides/rails_guides/textile_extensions.rb b/guides/rails_guides/textile_extensions.rb index 471d56eb8c..4677fae504 100644 --- a/guides/rails_guides/textile_extensions.rb +++ b/guides/rails_guides/textile_extensions.rb @@ -47,7 +47,7 @@ module RailsGuides end def code(body) - body.gsub!(%r{<(yaml|shell|ruby|erb|html|sql|css|plain)>(.*?)</\1>}m) do |m| + body.gsub!(%r{<(yaml|shell|ruby|erb|html|sql|plain)>(.*?)</\1>}m) do |m| <<HTML <notextile> <div class="code_container"> diff --git a/guides/source/engines.textile b/guides/source/engines.textile index 20df254950..3b0ab9f6d9 100644 --- a/guides/source/engines.textile +++ b/guides/source/engines.textile @@ -126,7 +126,7 @@ Also in the test directory is the +test/integration+ directory, where integratio h3. Providing engine functionality -The engine that this guide covers will provide posting and commenting functionality and follows a similar thread to the "Getting Started Guide":getting-started.html, with some new twists. +The engine that this guide covers will provide posting and commenting functionality and follows a similar thread to the "Getting Started Guide":getting_started.html, with some new twists. h4. Generating a post resource |