aboutsummaryrefslogtreecommitdiffstats
path: root/railties/guides/rails_guides
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2011-07-23 12:51:02 +0200
committerXavier Noria <fxn@hashref.com>2011-07-23 12:51:02 +0200
commitc300e13a9c4b38a6ddadc853f23f81effde42c42 (patch)
treeb2e990c01ae113eb4f70a0cbb37774f1760aa24b /railties/guides/rails_guides
parentace3723d2fcb1a96d51c2c82050594129328d7c0 (diff)
downloadrails-c300e13a9c4b38a6ddadc853f23f81effde42c42.tar.gz
rails-c300e13a9c4b38a6ddadc853f23f81effde42c42.tar.bz2
rails-c300e13a9c4b38a6ddadc853f23f81effde42c42.zip
Revert "notextile tag has been placed with ascii quotes"
Reason: <notextile> is an internal tag This reverts commit 01040b5dc990e79052627451603feea0f149fe41.
Diffstat (limited to 'railties/guides/rails_guides')
-rw-r--r--railties/guides/rails_guides/generator.rb5
-rw-r--r--railties/guides/rails_guides/textile_extensions.rb5
2 files changed, 4 insertions, 6 deletions
diff --git a/railties/guides/rails_guides/generator.rb b/railties/guides/rails_guides/generator.rb
index 2219fcea66..14d671c8f3 100644
--- a/railties/guides/rails_guides/generator.rb
+++ b/railties/guides/rails_guides/generator.rb
@@ -227,13 +227,13 @@ module RailsGuides
end
code_blocks.push(<<HTML)
-&lt;notextile&gt;
+<notextile>
<div class="code_container">
<pre class="brush: #{brush}; gutter: false; toolbar: false">
#{ERB::Util.h($2).strip}
</pre>
</div>
-&lt;/notextile&gt;
+</notextile>
HTML
"\ndirty_workaround_for_notextile_#{code_blocks.size - 1}\n"
end
@@ -280,4 +280,3 @@ HTML
end
end
end
-
diff --git a/railties/guides/rails_guides/textile_extensions.rb b/railties/guides/rails_guides/textile_extensions.rb
index dd51e0d66b..352c5e91dd 100644
--- a/railties/guides/rails_guides/textile_extensions.rb
+++ b/railties/guides/rails_guides/textile_extensions.rb
@@ -25,7 +25,7 @@ module RailsGuides
def plusplus(body)
body.gsub!(/\+(.*?)\+/) do |m|
- "&lt;notextile&gt;<tt>#{$1}</tt>&lt;/notextile&gt;"
+ "<notextile><tt>#{$1}</tt></notextile>"
end
# The real plus sign
@@ -36,9 +36,8 @@ module RailsGuides
body.gsub!(%r{<(yaml|shell|ruby|erb|html|sql|plain)>(.*?)</\1>}m) do |m|
es = ERB::Util.h($2)
css_class = $1.in?(['erb', 'shell']) ? 'html' : $1
- %{&lt;notextile&gt;<div class="code_container"><code class="#{css_class}">#{es}</code></div>&lt;/notextile&gt;}
+ %{<notextile><div class="code_container"><code class="#{css_class}">#{es}</code></div></notextile>}
end
end
end
end
-