v4.0.3

HiDPI (32x32px) favicon.ico - Issue #1285

.htaccess

@@ -21,7 +21,7 @@
 <IfModule mod_headers.c>
   Header set X-UA-Compatible "IE=Edge,chrome=1"
   # mod_headers can't match by content-type, but we don't want to send this header on *everything*...
-  <FilesMatch "\.(js|css|gif|png|jpe?g|pdf|xml|oga|ogg|m4a|ogv|mp4|m4v|webm|svg|svgz|eot|ttf|otf|woff|ico|webp|appcache|manifest|htc|crx|oex|xpi|safariextz|vcf)$" >
+  <FilesMatch "\.(appcache|crx|css|eot|gif|htc|ico|jpe?g|js|m4a|m4v|manifest|mp4|oex|oga|ogg|ogv|otf|pdf|png|safariextz|svg|svgz|ttf|vcf|webm|webp|woff|xml|xpi)$">
     Header unset X-UA-Compatible
   </FilesMatch>
 </IfModule>
@@ -53,7 +53,7 @@
 <IfModule mod_setenvif.c>
   <IfModule mod_headers.c>
     # mod_headers, y u no match by Content-Type?!
-    <FilesMatch "\.(gif|png|jpe?g|svg|svgz|ico|webp)$">
+    <FilesMatch "\.(gif|ico|jpe?g|png|svg|svgz|webp)$">
       SetEnvIf Origin ":" IS_CORS
       Header set Access-Control-Allow-Origin "*" env=IS_CORS
     </FilesMatch>
@@ -70,7 +70,7 @@
 # subdomains like "subdomain.example.com".
 
 <IfModule mod_headers.c>
-  <FilesMatch "\.(ttf|ttc|otf|eot|woff|font.css)$">
+  <FilesMatch "\.(eot|font.css|otf|ttc|ttf|woff)$">
     Header set Access-Control-Allow-Origin "*"
   </FilesMatch>
 </IfModule>
@@ -87,12 +87,12 @@ AddType application/javascript         js jsonp
 AddType application/json               json
 
 # Audio
-AddType audio/ogg                      oga ogg
 AddType audio/mp4                      m4a f4a f4b
+AddType audio/ogg                      oga ogg
 
 # Video
-AddType video/ogg                      ogv
 AddType video/mp4                      mp4 m4v f4v f4p
+AddType video/ogg                      ogv
 AddType video/webm                     webm
 AddType video/x-flv                    flv
 
@@ -105,23 +105,23 @@ AddEncoding gzip                       svgz
 # Webfonts
 AddType application/vnd.ms-fontobject  eot
 AddType application/x-font-ttf         ttf ttc
-AddType font/opentype                  otf
 AddType application/x-font-woff        woff
+AddType font/opentype                  otf
 
 # Assorted types
-AddType image/x-icon                        ico
-AddType image/webp                          webp
-AddType text/cache-manifest                 appcache manifest
-AddType text/x-component                    htc
-AddType application/xml                     rss atom xml rdf
+AddType application/octet-stream            safariextz
 AddType application/x-chrome-extension      crx
 AddType application/x-opera-extension       oex
-AddType application/x-xpinstall             xpi
-AddType application/octet-stream            safariextz
-AddType application/x-web-app-manifest+json webapp
-AddType text/x-vcard                        vcf
 AddType application/x-shockwave-flash       swf
+AddType application/x-web-app-manifest+json webapp
+AddType application/x-xpinstall             xpi
+AddType application/xml                     rss atom xml rdf
+AddType image/webp                          webp
+AddType image/x-icon                        ico
+AddType text/cache-manifest                 appcache manifest
 AddType text/vtt                            vtt
+AddType text/x-component                    htc
+AddType text/x-vcard                        vcf
 
 
 # ----------------------------------------------------------------------
@@ -164,6 +164,9 @@ AddType text/vtt                            vtt
   </IfModule>
 
   # Compress all output labeled with one of the following MIME-types
+  # (for Apache versions below 2.3.7, you don't need to enable `mod_filter`
+  # and can remove the `<IfModule mod_filter.c>` and `</IfModule>` lines as
+  # `AddOutputFilterByType` is still in the core directives)
   <IfModule mod_filter.c>
     AddOutputFilterByType DEFLATE application/atom+xml \
                                   application/javascript \
@@ -211,39 +214,39 @@ AddType text/vtt                            vtt
   ExpiresByType text/html                 "access plus 0 seconds"
 
 # Data
-  ExpiresByType text/xml                  "access plus 0 seconds"
-  ExpiresByType application/xml           "access plus 0 seconds"
   ExpiresByType application/json          "access plus 0 seconds"
+  ExpiresByType application/xml           "access plus 0 seconds"
+  ExpiresByType text/xml                  "access plus 0 seconds"
 
 # Feed
-  ExpiresByType application/rss+xml       "access plus 1 hour"
   ExpiresByType application/atom+xml      "access plus 1 hour"
+  ExpiresByType application/rss+xml       "access plus 1 hour"
 
 # Favicon (cannot be renamed)
   ExpiresByType image/x-icon              "access plus 1 week"
 
 # Media: images, video, audio
-  ExpiresByType image/gif                 "access plus 1 month"
-  ExpiresByType image/png                 "access plus 1 month"
-  ExpiresByType image/jpeg                "access plus 1 month"
-  ExpiresByType video/ogg                 "access plus 1 month"
   ExpiresByType audio/ogg                 "access plus 1 month"
+  ExpiresByType image/gif                 "access plus 1 month"
+  ExpiresByType image/jpeg                "access plus 1 month"
+  ExpiresByType image/png                 "access plus 1 month"
   ExpiresByType video/mp4                 "access plus 1 month"
+  ExpiresByType video/ogg                 "access plus 1 month"
   ExpiresByType video/webm                "access plus 1 month"
 
 # HTC files  (css3pie)
   ExpiresByType text/x-component          "access plus 1 month"
 
 # Webfonts
-  ExpiresByType application/x-font-ttf    "access plus 1 month"
-  ExpiresByType font/opentype             "access plus 1 month"
-  ExpiresByType application/x-font-woff   "access plus 1 month"
-  ExpiresByType image/svg+xml             "access plus 1 month"
   ExpiresByType application/vnd.ms-fontobject "access plus 1 month"
+  ExpiresByType application/x-font-ttf    "access plus 1 month"
+  ExpiresByType application/x-font-woff   "access plus 1 month"
+  ExpiresByType font/opentype             "access plus 1 month"
+  ExpiresByType image/svg+xml             "access plus 1 month"
 
 # CSS and JavaScript
-  ExpiresByType text/css                  "access plus 1 year"
   ExpiresByType application/javascript    "access plus 1 year"
+  ExpiresByType text/css                  "access plus 1 year"
 
 </IfModule>
 
@@ -326,7 +329,7 @@ FileETag None
 # 'foo' is your directory.
 
 # If your web host doesn't allow the FollowSymlinks option, you may need to
-# comment it out and use `Options +SymLinksOfOwnerMatch`, but be aware of the
+# comment it out and use `Options +SymLinksIfOwnerMatch`, but be aware of the
 # performance impact: http://goo.gl/Mluzd
 
 <IfModule mod_rewrite.c>
@@ -385,10 +388,10 @@ FileETag None
 
 # If you're not using the build script to manage your filename version revving,
 # you might want to consider enabling this, which will route requests for
-# /css/style.20110203.css to /css/style.css
+# `/css/style.20110203.css` to `/css/style.css`.
 
 # To understand why this is important and a better idea than all.css?v1231,
-# read: github.com/h5bp/html5-boilerplate/wiki/cachebusting
+# please refer to the bundled documentation about `.htaccess`.
 
 # <IfModule mod_rewrite.c>
 #   RewriteCond %{REQUEST_FILENAME} !-f
@@ -470,7 +473,7 @@ AddCharset utf-8 .atom .css .js .json .rss .vtt .xml
 # Block access to backup and source files. These files may be left by some
 # text/html editors and pose a great security danger, when anyone can access
 # them.
-<FilesMatch "(\.(bak|config|sql|fla|psd|ini|log|sh|inc|swp|dist)|~)$">
+<FilesMatch "(\.(bak|config|dist|fla|inc|ini|log|psd|sh|sql|swp)|~)$">
   Order allow,deny
   Deny from all
   Satisfy All
@@ -535,6 +538,6 @@ AddCharset utf-8 .atom .css .js .json .rss .vtt .xml
 # php_value error_append_string " "
 
 # Increase cookie security
-<IfModule php5_module>
+<IfModule mod_php5.c>
   php_value session.cookie_httponly true
 </IfModule>

CHANGELOG.md

@@ -1,5 +1,25 @@
 ### HEAD
 
+### 4.0.3 (12 January, 2013)
+
+* Use 32x32 favicon.ico ([#1286](https://github.com/h5bp/html5-boilerplate/pull/1286)).
+* Remove named function expression in plugins.js ([#1280](https://github.com/h5bp/html5-boilerplate/pull/1280)).
+* Adjust CSS image-replacement code ([#1239](https://github.com/h5bp/html5-boilerplate/issues/1239)).
+* Update HiDPI example media query ([#1127](https://github.com/h5bp/html5-boilerplate/issues/1127)).
+
+### 4.0.2 (9 December, 2012)
+
+* Update placeholder icons.
+* Update to Normalize.css 1.0.2.
+* Update to jQuery 1.8.3.
+
+### 4.0.1 (20 October, 2012)
+
+* Further improvements to `console` method stubbing ([#1206](https://github.com/h5bp/html5-boilerplate/issues/1206), [#1229](https://github.com/h5bp/html5-boilerplate/pull/1229)).
+* Update to jQuery 1.8.2.
+* Update to Modernizr 2.6.2.
+* Minor additions to the documentation.
+
 ### 4.0.0 (28 August, 2012)
 
 * Improve the Apache compression configuration ([#1012](https://github.com/h5bp/html5-boilerplate/issues/1012), [#1173](https://github.com/h5bp/html5-boilerplate/issues/1173)).

CONTRIBUTING.md

@@ -1,10 +1,7 @@
-[HTML5 Boilerplate homepage](http://html5boilerplate.com) | [Documentation
-table of contents](README.md)
-
 # Contributing to HTML5 Boilerplate
 
-♥ HTML5 Boilerplate and want to get involved? Thanks! There are plenty of ways
-you can help!
+♥ [HTML5 Boilerplate](http://html5boilerplate.com) and want to get involved?
+Thanks! There are plenty of ways you can help!
 
 
 ## Reporting issues

README.md

@@ -50,7 +50,7 @@ Choose one of the following options:
 ## Documentation
 
 Take a look at the [documentation table of
-contents](/h5bp/html5-boilerplate/blob/master/doc/README.md). This
+contents](/h5bp/html5-boilerplate/blob/master/doc/TOC.md). This
 documentation is bundled with the project, which makes it readily available for
 offline reading and provides a useful starting point for any documentation
 you want to write about your project.
@@ -59,5 +59,5 @@ you want to write about your project.
 ## Contributing
 
 Anyone and everyone is welcome to
-[contribute](/h5bp/html5-boilerplate/blob/master/doc/contribute.md). Hundreds
+[contribute](/h5bp/html5-boilerplate/blob/master/CONTRIBUTING.md). Hundreds
 of developers have helped make the HTML5 Boilerplate what it is today.

css/main.css

@@ -129,7 +129,7 @@ textarea {
     content: "";
     display: block;
     width: 0;
-    height: 100%;
+    height: 150%;
 }
 
 /*
@@ -220,8 +220,10 @@ textarea {
     /* Style adjustments for viewports that meet the condition */
 }
 
-@media only screen and (-webkit-min-device-pixel-ratio: 1.5),
-       only screen and (min-resolution: 144dpi) {
+@media print,
+       (-o-min-device-pixel-ratio: 5/4),
+       (-webkit-min-device-pixel-ratio: 1.25),
+       (min-resolution: 120dpi) {
     /* Style adjustments for high resolution devices */
 }
 
@@ -234,7 +236,7 @@ textarea {
     * {
         background: transparent !important;
         color: #000 !important; /* Black prints faster: h5bp.com/s */
-        box-shadow:none !important;
+        box-shadow: none !important;
         text-shadow: none !important;
     }
 

css/normalize.css

@@ -1,4 +1,4 @@
-/*! normalize.css v1.0.1 | MIT License | git.io/normalize */
+/*! normalize.css v1.0.2 | MIT License | git.io/normalize */
 
 /* ==========================================================================
    HTML5 display definitions
@@ -149,7 +149,7 @@ h5 {
 }
 
 h6 {
-    font-size: 0.75em;
+    font-size: 0.67em;
     margin: 2.33em 0;
 }
 

doc/TOC.md

@@ -20,8 +20,6 @@
 
 ## Development
 
-* [Contributing to HTML5 Boilerplate](contribute.md) — Guidelines on how to
-  contribute effectively.
 * [Extending and customizing HTML5 Boilerplate](extend.md) — Going further with
   the boilerplate.
 

doc/crossdomain.md

@@ -1,5 +1,5 @@
 [HTML5 Boilerplate homepage](http://html5boilerplate.com) | [Documentation
-table of contents](README.md)
+table of contents](TOC.md)
 
 # crossdomain.xml
 
@@ -14,8 +14,4 @@ custom headers in cross-domain requests, and are also used with sockets to
 grant permissions for socket-based connections.
 
 For full details, check out Adobe's article about the [cross-domain policy file
-specification](http://www.adobe.com/devnet/articles/crossdomain_policy_file_spec.html)
-
-Read the [Cross-domain policy file
-specification](http://learn.adobe.com/wiki/download/attachments/64389123/CrossDomain_PolicyFile_Specification.pdf?version=1)
-- (PDF, 129 KB)
+specification](http://www.adobe.com/devnet/articles/crossdomain_policy_file_spec.html).

doc/css.md

@@ -1,5 +1,5 @@
 [HTML5 Boilerplate homepage](http://html5boilerplate.com) | [Documentation
-table of contents](README.md)
+table of contents](TOC.md)
 
 # The CSS
 

doc/extend.md

@@ -1,5 +1,5 @@
 [HTML5 Boilerplate homepage](http://html5boilerplate.com) | [Documentation
-table of contents](README.md)
+table of contents](TOC.md)
 
 # Extend and customise HTML5 Boilerplate
 

doc/faq.md

@@ -1,5 +1,5 @@
 [HTML5 Boilerplate homepage](http://html5boilerplate.com) | [Documentation
-table of contents](README.md)
+table of contents](TOC.md)
 
 # Frequently asked questions
 

doc/htaccess.md

@@ -1,14 +1,14 @@
 [HTML5 Boilerplate homepage](http://html5boilerplate.com) | [Documentation
-table of contents](README.md)
+table of contents](TOC.md)
 
 # .htaccess
 
 In Apache HTTP server, `.htaccess` (hypertext access) is the configuration file
 that allows for web server configuration. HTML5 Boilerplate includes a number
 of best practice server rules for making web pages fast and secure, these rules
-can be applied by configuring `.htaccess` file.
+can be applied in the `.htaccess` file.
 
-**You'll want to have these modules enabled for optimum performance:**
+**First, you'll want to have these modules enabled for optimum performance:**
 
 * `mod_setenvif.c` (setenvif_module)
 * `mod_headers.c` (headers_module)
@@ -61,7 +61,17 @@ That's it, you're done!
 
 ## On Mac
 
-Coming soon...
+1. **MAMP PRO**. On the main screen, click the `Apache` tab and ensure that all
+   the required modules listed above are 'checked', indicating they are
+   enabled.
+
+2. **MAMP**. Locate the `httpd.conf` file, which is typically found in
+   `/Applications/MAMP/conf/apache/httpd.conf`. Open the file in a text editor
+   and uncomment all of the required modules listed above. Once you have done so,
+   reset MAMP.
+
+3. **XAMPP**. Follow the same steps as for MAMP, but look for `httpd.conf` in
+   `/Applications/XAMPP/etc/httpd.conf`.
 
 
 ## Security
@@ -85,7 +95,7 @@ FileETag None
 
 Entity tags (ETags) is a mechanism that web servers and browsers use to
 determine whether the component in the browser's cache matches the one on the
-origin server. (An "entity" is another word a "component": images, scripts,
+origin server. (An "entity" is another word for "component": images, scripts,
 stylesheets, etc.) ETags were added to provide a mechanism for validating
 entities that is more flexible than the last-modified date. An `ETag` is a
 string that uniquely identifies a specific version of a component. The only

doc/html.md

@@ -1,5 +1,5 @@
 [HTML5 Boilerplate homepage](http://html5boilerplate.com) | [Documentation
-table of contents](README.md)
+table of contents](TOC.md)
 
 # The HTML
 
@@ -144,7 +144,7 @@ you intended to support IE 6, then you should remove the snippet of code.
 
 The Google CDN version of the jQuery JavaScript library is referenced towards
 the bottom of the page using a protocol-independent path (read more about this
-in the [FAQ](faq.md). A local fallback of jQuery is included for rare instances
+in the [FAQ](faq.md)). A local fallback of jQuery is included for rare instances
 when the CDN version might not be available, and to facilitate offline
 development.
 

doc/js.md

@@ -1,5 +1,5 @@
 [HTML5 Boilerplate homepage](http://html5boilerplate.com) | [Documentation
-table of contents](README.md)
+table of contents](TOC.md)
 
 # The JavaScript
 

doc/misc.md

@@ -1,4 +1,5 @@
-[HTML5 Boilerplate homepage](http://html5boilerplate.com) | [Documentation table of contents](README.md)
+[HTML5 Boilerplate homepage](http://html5boilerplate.com) | [Documentation
+table of contents](TOC.md)
 
 # Miscellaneous
 

doc/usage.md

@@ -1,5 +1,5 @@
 [HTML5 Boilerplate homepage](http://html5boilerplate.com) | [Documentation
-table of contents](README.md)
+table of contents](TOC.md)
 
 # Usage
 

index.html

@@ -14,18 +14,18 @@
 
         <link rel="stylesheet" href="css/normalize.css">
         <link rel="stylesheet" href="css/main.css">
-        <script src="js/vendor/modernizr-2.6.1.min.js"></script>
+        <script src="js/vendor/modernizr-2.6.2.min.js"></script>
     </head>
     <body>
         <!--[if lt IE 7]>
-            <p class="chromeframe">You are using an outdated browser. <a href="http://browsehappy.com/">Upgrade your browser today</a> or <a href="http://www.google.com/chromeframe/?redirect=true">install Google Chrome Frame</a> to better experience this site.</p>
+            <p class="chromeframe">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> or <a href="http://www.google.com/chromeframe/?redirect=true">activate Google Chrome Frame</a> to improve your experience.</p>
         <![endif]-->
 
         <!-- Add your site or application content here -->
         <p>Hello world! This is HTML5 Boilerplate.</p>
 
-        <script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.0/jquery.min.js"></script>
-        <script>window.jQuery || document.write('<script src="js/vendor/jquery-1.8.0.min.js"><\/script>')</script>
+        <script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>
+        <script>window.jQuery || document.write('<script src="js/vendor/jquery-1.8.3.min.js"><\/script>')</script>
         <script src="js/plugins.js"></script>
         <script src="js/main.js"></script>
 

js/plugins.js

@@ -1,14 +1,24 @@
 // Avoid `console` errors in browsers that lack a console.
-if (!(window.console && console.log)) {
-    (function() {
-        var noop = function() {};
-        var methods = ['assert', 'clear', 'count', 'debug', 'dir', 'dirxml', 'error', 'exception', 'group', 'groupCollapsed', 'groupEnd', 'info', 'log', 'markTimeline', 'profile', 'profileEnd', 'markTimeline', 'table', 'time', 'timeEnd', 'timeStamp', 'trace', 'warn'];
-        var length = methods.length;
-        var console = window.console = {};
-        while (length--) {
-            console[methods[length]] = noop;
+(function() {
+    var method;
+    var noop = function () {};
+    var methods = [
+        'assert', 'clear', 'count', 'debug', 'dir', 'dirxml', 'error',
+        'exception', 'group', 'groupCollapsed', 'groupEnd', 'info', 'log',
+        'markTimeline', 'profile', 'profileEnd', 'table', 'time', 'timeEnd',
+        'timeStamp', 'trace', 'warn'
+    ];
+    var length = methods.length;
+    var console = (window.console = window.console || {});
+
+    while (length--) {
+        method = methods[length];
+
+        // Only stub undefined methods.
+        if (!console[method]) {
+            console[method] = noop;
         }
-    }());
-}
+    }
+}());
 
 // Place any jQuery/helper plugins in here.