Merge commit 'mainstream/master'

Conflicts:
	railties/guides/images/fxn.jpg
	railties/guides/rails_guides/generator.rb

1 files changed, 2 insertions, 2 deletions

diff --git a/railties/guides/rails_guides/generator.rb b/railties/guides/rails_guides/generator.rb
index 7807c2c565..f93282db2e 100644
--- a/railties/guides/rails_guides/generator.rb
+++ b/railties/guides/rails_guides/generator.rb
@@ -57,7 +57,7 @@ module RailsGuides
 
           result = view.render(:layout => 'layout', :text => textile(body))
           f.write result
-          warn_about_broken_links(result)
+          warn_about_broken_links(result) if ENV.key?("WARN_BROKEN_LINKS")
         end
       end
     end
@@ -164,7 +164,7 @@ module RailsGuides
           guess = anchors.min { |a, b|
             Levenshtein.distance(fragment_identifier, a) <=> Levenshtein.distance(fragment_identifier, b)
           }
-          puts "*** BROKEN LINK: ##{fragment_identifier}, perhaps you meant ##{guess}." if ENV.key?("WARN_BROKEN_LINKS")
+          puts "*** BROKEN LINK: ##{fragment_identifier}, perhaps you meant ##{guess}."
         end
       end
     end