Permalink
Browse files

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

  • Loading branch information...
2 parents 4b1ed1d + bb23d6f commit 7b1abe84ae84fc2a4a62cbec486df80000358d3d @shime shime committed Apr 2, 2012
Showing with 2 additions and 2 deletions.
  1. +1 −1 guides/rails_guides/textile_extensions.rb
  2. +1 −1 guides/source/engines.textile
@@ -47,7 +47,7 @@ def brush_for(code_type)
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">
@@ -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

0 comments on commit 7b1abe8

Please sign in to comment.