Merge branch 'master' of https://github.com/paulirish/html5-boilerplate

paulirish · Nov 19, 2010 · 9c90898 · 9c90898
2 parents 11aec5b + 379d923
commit 9c90898
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/css/style.css b/css/style.css
@@ -12,7 +12,7 @@
 
 /* 
   html5doctor.com Reset Stylesheet (Eric Meyer's Reset Reloaded + HTML5 baseline)
-  v1.4 2009-07-27 | Authors: Eric Meyer & Richard Clark
+  v1.6.1 2010-09-17 | Authors: Eric Meyer & Richard Clark
   html5doctor.com/html-5-reset-stylesheet/
 */
 

diff --git a/index.html b/index.html
@@ -12,6 +12,12 @@
        Remove this if you use the .htaccess -->
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 
+  <!-- encoding must be specified within the first 512 bytes www.whatwg.org/specs/web-apps/current-work/multipage/semantics.html#charset -->
+
+  <!-- meta element for compatibility mode needs to be before all elements except title & meta msdn.microsoft.com/en-us/library/cc288325(VS.85).aspx --> 
+  <!-- Chrome Frame is only invoked if meta element for compatibility mode is within the first 1K bytes code.google.com/p/chromium/issues/detail?id=23003 -->    
+
+
   <title></title>
   <meta name="description" content="">
   <meta name="author" content="">