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

7b1abe84 · Hrvoje Šimić · 4b1ed1d2 · bb23d6fb · 7b1abe84 · 7b1abe84
显示空白变更内容
内联并排

Showing with 2 addition and 2 deletion

guides/rails_guides/textile_extensions.rb guides/rails_guides/textile_extensions.rb +1 -1

guides/source/engines.textile guides/source/engines.textile +1 -1

未找到文件。
--- a/guides/rails_guides/textile_extensions.rb
+++ b/guides/rails_guides/textile_extensions.rb
@@ -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">

--- 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