Merge remote-tracking branch 'dslh/master'

korny · korny · commit 58cc6431ae7b · 2012-03-31T21:32:54.000+02:00
diff --git a/lib/coderay/helpers/file_type.rb b/lib/coderay/helpers/file_type.rb
@@ -90,8 +90,8 @@ def shebang filename
       'gvy'      => :groovy,
       'h'        => :c,
       'haml'     => :haml,
-      'htm'      => :page,
-      'html'     => :page,
+      'htm'      => :html,
+      'html'     => :html,
       'html.erb' => :erb,
       'java'     => :java,
       'js'       => :java_script,
@@ -120,7 +120,7 @@ def shebang filename
       'sql'      => :sql,
       # 'ss'       => :scheme,
       'tmproj'   => :xml,
-      'xhtml'    => :page,
+      'xhtml'    => :html,
       'xml'      => :xml,
       'yaml'     => :yaml,
       'yml'      => :yaml,
