aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--actionpack/lib/action_controller/layout.rb8
-rw-r--r--activesupport/lib/active_support/vendor/builder/xmlmarkup.rb1
2 files changed, 4 insertions, 5 deletions
diff --git a/actionpack/lib/action_controller/layout.rb b/actionpack/lib/action_controller/layout.rb
index 0d0a843e33..82c7180a52 100644
--- a/actionpack/lib/action_controller/layout.rb
+++ b/actionpack/lib/action_controller/layout.rb
@@ -27,9 +27,9 @@ module ActionController #:nodoc:
# With layouts, you can flip it around and have the common structure know where to insert changing content. This means
# that the header and footer are only mentioned in one place, like this:
#
- # <!-- The header part of this layout -->
+ # // The header part of this layout
# <%= yield %>
- # <!-- The footer part of this layout -->
+ # // The footer part of this layout -->
#
# And then you have content pages that look like this:
#
@@ -38,9 +38,9 @@ module ActionController #:nodoc:
# Not a word about common structures. At rendering time, the content page is computed and then inserted in the layout,
# like this:
#
- # <!-- The header part of this layout -->
+ # // The header part of this layout
# hello world
- # <!-- The footer part of this layout -->
+ # // The footer part of this layout -->
#
# == Accessing shared variables
#
diff --git a/activesupport/lib/active_support/vendor/builder/xmlmarkup.rb b/activesupport/lib/active_support/vendor/builder/xmlmarkup.rb
index 12b6ff9828..4cdcedb4a1 100644
--- a/activesupport/lib/active_support/vendor/builder/xmlmarkup.rb
+++ b/activesupport/lib/active_support/vendor/builder/xmlmarkup.rb
@@ -38,7 +38,6 @@ module Builder
# xm.title("History") # <title>History</title>
# } # </head>
# xm.body { # <body>
- # xm.comment! "HI" # <!-- HI -->
# xm.h1("Header") # <h1>Header</h1>
# xm.p("paragraph") # <p>paragraph</p>
# } # </body>