Merge branch 'master' of github.com:rails/rails

3 files changed, 13 insertions, 12 deletions

diff --git a/railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb b/railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb
index 0615a34a85..9b83207b3f 100644
--- a/railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb
+++ b/railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb
@@ -1,13 +1,14 @@
 <%%= form_for(@<%= singular_name %>) do |f| %>
   <%% if @<%= singular_name %>.errors.any? %>
-  <div id="errorExplanation">
-    <h2><%%= pluralize(@<%= singular_name %>.errors.count, "error") %> prohibited this <%= singular_name %> from being saved:</h2>
-    <ul>
-    <%% @<%= singular_name %>.errors.full_messages.each do |msg| %>
-      <li><%%= msg %></li>
-    <%% end %>
-    </ul>
-  </div>
+    <div id="error_explanation">
+      <h2><%%= pluralize(@<%= singular_name %>.errors.count, "error") %> prohibited this <%= singular_name %> from being saved:</h2>
+
+      <ul>
+      <%% @<%= singular_name %>.errors.full_messages.each do |msg| %>
+        <li><%%= msg %></li>
+      <%% end %>
+      </ul>
+    </div>
   <%% end %>
 
 <% for attribute in attributes -%>
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index bb2a080286..6818fafbe9 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -265,7 +265,7 @@ module Rails::Generators
           "/opt/local/var/run/mysql4/mysqld.sock",  # mac + darwinports + mysql4
           "/opt/local/var/run/mysql5/mysqld.sock",  # mac + darwinports + mysql5
           "/opt/lampp/var/mysql/mysql.sock"         # xampp for linux
-        ].find { |f| File.exist?(f) } unless RUBY_PLATFORM =~ /(:?mswin|mingw)/
+        ].find { |f| File.exist?(f) } unless RUBY_PLATFORM =~ /mswin|mingw/
       end
 
       def empty_directory_with_gitkeep(destination, config = {})
diff --git a/railties/lib/rails/generators/rails/stylesheets/templates/scaffold.css b/railties/lib/rails/generators/rails/stylesheets/templates/scaffold.css
index f3f46d8b98..9f2056a702 100644
--- a/railties/lib/rails/generators/rails/stylesheets/templates/scaffold.css
+++ b/railties/lib/rails/generators/rails/stylesheets/templates/scaffold.css
@@ -34,7 +34,7 @@ div.field, div.actions {
   display: table;
 }
 
-#errorExplanation {
+#error_explanation {
   width: 450px;
   border: 2px solid red;
   padding: 7px;
@@ -43,7 +43,7 @@ div.field, div.actions {
   background-color: #f0f0f0;
 }
 
-#errorExplanation h2 {
+#error_explanation h2 {
   text-align: left;
   font-weight: bold;
   padding: 5px 5px 5px 15px;
@@ -54,7 +54,7 @@ div.field, div.actions {
   color: #fff;
 }
 
-#errorExplanation ul li {
+#error_explanation ul li {
   font-size: 12px;
   list-style: square;
 }