html5-boilerplate 1.0.0 → 2.1.0

data/README.md

@@ -1,5 +1,23 @@
-Compass Html5 Boilerplate
-=========================
+NOTICE!!! (And Now for Something Completely Different)
+=========================================================
+
+If you are using Rails, you should now be using [html5-rails](https://github.com/sporkd/html5-rails) instead of this gem.
+It has all you need to get Html5Boilerplate up and running with the Rails 3 asset pipeline, plus a bunch of other nice new conventions.
+
+For the rest of you who still want to use this gem for standalone projects or for older verisons of Rails, here's what you need to know:
+
+* The compass CSS library has been moved out of this gem and into the [compass-h5bp](https://github.com/sporkd/compass-h5bp) gem. This allows both gems to benifit from updates to the compass library.
+* The newest version of [compass-h5bp](https://github.com/sporkd/compass-h5bp) uses normalize.css instead of reset, just like current Html5Boilerplate. So upgrading might be a pain.
+
+So in short, I have shifted my efforts to [html5-rails](https://github.com/sporkd/html5-rails), and I now view this gem
+as the first standalone implementation of [compass-h5bp](https://github.com/sporkd/compass-h5bp).
+To this end I will continue to merge pull requests for those who want to continue using it.
+
+Of course, I encourage anyone to create other implementations of [compass-h5bp](https://github.com/sporkd/compass-h5bp) for [insert your framework here].
+
+
+About
+==========
 
 HTML5 Boilerplate is a Compass extension based on HTML5 Boilerplate by Paul Irish.
 You can use it to kick-start fully compliant HTML5 applications. Setup your Rails
@@ -16,104 +34,17 @@ Features
 * Lets you pick and choose only the Boilerplate mixins and includes you want
 * Generates sass/scss partials to keep your stylesheets organized
 * Generates modularized haml layouts for Rails apps (header, footer, flashes, etc.)
-* Rails helpers to cleanly hide a little of Boilerplate's html complexity
-* Loads minified jQuery in production envs, but uncompressed version in development
-* Rails jquery-ujs driver installed and loaded along with jQuery and Modernizr
-* Setting API Key in google.yml will auto-load jquery from google (async)
-* Setting Analytics ID in google.yml will auto-load google analytics (async)
-* Uses content_for hooks to keep all your javascript and stylesheets in one place
-* Falls back to native Compass for stuff like clearfix and image replacement
 * Fully commented source, but the haml/sass output remains comment free
 * Not tested on animals
 
-Rails Installation
-==================
-
-First, make sure the following gems are in your Gemfile
-
-    gem "compass"
-    gem "haml"
-    gem "html5-boilerplate"
-
-Then run the following
-
-    bundle install
-    compass init rails -r html5-boilerplate -u html5-boilerplate --force
-
-(Using `--force` flag will overwrite any files that may already exist. In most cases this is probably what you want.)
-
-(For a new project, I answer "Yes" to keep my stylesheets in app/stylesheets, but "No" for compiling them into public/stylesheets/compiled.)
-
-Now remove your application.html.erb so that Haml can do its thing
-
-    mv app/views/layouts/application.html.erb app/views/layouts/application.html.old
-
-Start your Rails server, and you're done!
-
-
-**Here's a list of the files that compass init installed in your Rails project:**
-
-    app/views/layouts/application.html.haml
-    app/views/layouts/_flashes.html.haml
-    app/views/layouts/_footer.html.haml
-    app/views/layouts/_head.html.haml
-    app/views/layouts/_header.html.haml
-    app/views/layouts/_javascripts.html.haml
-    app/views/layouts/_stylesheets.html.haml
-    
-    app/stylesheets/style.scss
-    app/stylesheets/partials/_base.scss
-    app/stylesheets/partials/_overrides.scss
-    app/stylesheets/partials/_page.scss
-    app/stylesheets/partials/_fonts.scss
-    app/stylesheets/partials/_media.scss
-    
-    public/404.html
-    public/.htaccess
-    public/crossdomain.xml
-    public/robots.txt
-    public/humans.txt
-    public/apple-touch-icon.png
-    public/favicon.ico
-    
-    public/javascripts/jquery.min.js
-    public/javascripts/modernizr.min.js
-    public/javascripts/plugins.js
-    public/javascripts/rails.js
-    
-    config/compass.rb
-    config/initializers/compass.rb
-    config/google.yml
-
-The Scss files above will automatically get compiled to your Sass compilation directory:
-
-    public/stylesheets/style.css
-
-**Note:** If you already have a config/compass.rb file in your project, you may need to
-manually add the following line to the top:
-
-    require 'html5-boilerplate'
-
-### A few more points...
-
-The haml will compile to the equivalent of html5-boilerplate's index.html,
-but with all comments stripped out, and some additional rails stuff
-like csrf_meta_tags, flashes and the Rails jquery-ujs driver.
-
-You can set your own Google Analytics Account ID and your Google API Key
-either as ENV variables, or inside config/google.yml. (see that file)
-
-This extension has only been tested on Rails3.
-
 
-Stand Alone Installation
+Installation
 ========================
 
-Use this if you're not using Rails, but still want compass and the html5-boilerplate sass libraries,
-It will create a simplified index.html (with haml source), but without the nice Rails helpers.
+(This is for stand-alone. Rails install instructions live on only in the git history)
 
     gem install html5-boilerplate
-    compass create my_project -r html5-boilerplate -u html5-boilerplate --javascripts-dir js --css-dir css
+    compass create my_project -r compass-h5bp -r html5-boilerplate -u html5-boilerplate --javascripts-dir js --css-dir css
 
 The `--javascripts-dir` and `--css-dir` flags are to keep consistent with the original project layout.
 If you omit them, be sure to edit your javascript and style tags accordingly in index.html.
@@ -127,6 +58,10 @@ If you omit them, be sure to edit your javascript and style tags accordingly in
     robots.txt
     humans.txt
     apple-touch-icon.png
+    apple-touch-icon-57x57-precomposed.png
+    apple-touch-icon-72x72-precomposed.png
+    apple-touch-icon-114x114-precomposed.png
+    apple-touch-icon-precomposed.png
     favicon.ico
     
     src/style.scss
@@ -136,9 +71,10 @@ If you omit them, be sure to edit your javascript and style tags accordingly in
     src/partials/_fonts.scss
     src/partials/_media.scss
     
-    js/jquery.min.js
-    js/modernizr.min.js
+    js/jquery-1.6.2.min.js
+    js/modernizr-2.0.6.min.js
     js/plugins.js
+    js/script.js
     
     .htaccess
     config.rb

data/VERSION

@@ -1 +1 @@
-1.0.0
+2.1.0

data/lib/app/helpers/html5_boilerplate_helper.rb

@@ -1,6 +1,7 @@
 module Html5BoilerplateHelper
   # Create a named haml tag to wrap IE conditional around a block
   # http://paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-neither
+  # Consider adding an manifest.appcache: h5bp.com/d/Offline
   def ie_tag(name=:body, attrs={}, &block)
     attrs.symbolize_keys!
     haml_concat("<!--[if lt IE 7]> #{ tag(name, add_class('ie6', attrs), true) } <![endif]-->".html_safe)

data/lib/html5-boilerplate.rb

@@ -1,4 +1,4 @@
-Compass::Frameworks.register("html5-boilerplate", :path => "#{File.dirname(__FILE__)}/..")
+Compass::Frameworks.register("html5-boilerplate", :path => "#{File.dirname(__FILE__)}/..") if defined?(Compass)
 
 if defined?(ActionController)
   require File.join(File.dirname(__FILE__), 'app', 'helpers', 'html5_boilerplate_helper')

data/templates/project/_head.html.haml

@@ -1,7 +1,8 @@
 %meta{ :charset => "utf-8" }/
 
--# Always force latest IE rendering engine (even in intranet) & Chrome Frame
--# Remove this if you use the .htaccess
+-#
+  Use the .htaccess and remove these lines to avoid edge case issues.
+  More info: h5bp.com/b/378
 %meta{ "http-equiv" => "X-UA-Compatible", :content => "IE=edge,chrome=1" }/
 
 %title
@@ -19,8 +20,10 @@
 - if local_assigns[:stylesheet_partial]
   = render :partial => local_assigns[:stylesheet_partial]
 
--# All JavaScript at the bottom, except for Modernizr and Respond.
--# Modernizr enables HTML5 elements & feature detects; Respond is a polyfill for min/max-width CSS3 Media Queries
-= javascript_include_tag 'modernizr.min', 'respond.min'
+-# 
+  All JavaScript at the bottom, except for Modernizr / Respond.
+  Modernizr enables HTML5 elements & feature detects; Respond is a polyfill for min/max-width CSS3 Media Queries
+  For optimal performance, use a custom Modernizr build: www.modernizr.com/download/
+= javascript_include_tag 'modernizr.min'
 
 = csrf_meta_tag

data/templates/project/_javascripts.html.haml

@@ -3,13 +3,13 @@
 -# remote_jquery and local_jquery helpers use minified jquery unless Rails.env is development
 - if !google_api_key.blank?
   = javascript_include_tag "//www.google.com/jsapi?key=#{google_api_key}"
-  :javascript
-    google.load(#{ remote_jquery("1.6") });
+  %script
+    google.load(#{ remote_jquery("1.6.2") });
 - else
-  = javascript_include_tag "//ajax.googleapis.com/ajax/libs/jquery/#{ local_jquery("1.6") }"
+  = javascript_include_tag "//ajax.googleapis.com/ajax/libs/jquery/#{ local_jquery("1.6.2") }"
 
 -# fall back to local jQuery if necessary
-:javascript
+%script
   window.jQuery || document.write("<script src='/javascripts/jquery.min.js'>\x3C/script>")
   
 = javascript_include_tag 'rails', 'plugins', 'application'
@@ -20,8 +20,18 @@
 -# asynchronous google analytics: mathiasbynens.be/notes/async-analytics-snippet
 -# Looks for google_account_id first in ENV['GOOGLE_ACCOUNT_ID'] then in config/google.yml
 - if !google_account_id.blank?
-  :javascript
+  %script
     var _gaq=[["_setAccount","#{google_account_id}"],["_trackPageview"],["_trackPageLoadTime"]];
     (function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];g.async=1;
     g.src=("https:"==location.protocol?"//ssl":"//www")+".google-analytics.com/ga.js";
-    s.parentNode.insertBefore(g,s)}(document,"script"));
+    s.parentNode.insertBefore(g,s)}(document,"script"));
+
+-# 
+  Prompt IE 6 users to install Chrome Frame. Remove this if you want to support IE 6.
+  chromium.org/developers/how-tos/chrome-frame-getting-started
+
+<!--[if lt IE 7]>
+%script{ :src => "//ajax.googleapis.com/ajax/libs/chrome-frame/1.0.3/CFInstall.min.js" }
+%script
+  window.attachEvent('onload',function(){CFInstall.check({mode:'overlay'})})
+<![endif]-->

data/templates/project/_stylesheets.html.haml

@@ -1,5 +1,5 @@
 -# CSS: implied media="all"
-= stylesheet_link_tag 'style', :media => 'all'
+= stylesheet_link_tag 'style'
 
 -# Append your own using content_for :stylesheets
 = yield :stylesheets

data/templates/project/application.html.haml

@@ -1,6 +1,6 @@
 !!! 5
 -# http://paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-neither
--ie_html :class => 'no-js', :lang => 'en' do
+-ie_html :class => 'no-js oldie', :lang => 'en' do
   %head
     -# To render a different stylesheet partial inside the head (i.e. for admin layout)
     -# just copy _stylesheets.html.haml, and point to that partial instead.

data/templates/project/files/htaccess

@@ -25,18 +25,12 @@
 #  github.com/rails/rails/commit/123eb25#commitcomment-118920
 # Use ChromeFrame if it's installed for a better experience for the poor IE folk
 
-<IfModule mod_setenvif.c>
-  <IfModule mod_headers.c>
-    BrowserMatch MSIE ie
-    Header set X-UA-Compatible "IE=Edge,chrome=1" env=ie
-  </IfModule>
-</IfModule>
-
 <IfModule mod_headers.c>
-# Because X-UA-Compatible isn't sent to non-IE (to save header bytes),
-#   We need to inform proxies that content changes based on UA
-  Header append Vary User-Agent
-# Cache control is set only if mod_headers is enabled, so that's unncessary to declare
+    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|xpi|safariextz|vcf)$" >
+      Header unset X-UA-Compatible
+    </FilesMatch>
 </IfModule>
 
 
@@ -58,11 +52,11 @@
 # Webfont access
 # ----------------------------------------------------------------------
 
-# allow access from all domains for webfonts
-# alternatively you could only whitelist
-#   your subdomains like "sub.domain.com"
+# Allow access from all domains for webfonts.
+# Alternatively you could only whitelist your
+# subdomains like "subdomain.example.com".
 
-<FilesMatch "\.(ttf|otf|eot|woff|font.css)$">
+<FilesMatch "\.(ttf|ttc|otf|eot|woff|font.css)$">
   <IfModule mod_headers.c>
     Header set Access-Control-Allow-Origin "*"
   </IfModule>
@@ -74,26 +68,34 @@
 # Proper MIME type for all files
 # ----------------------------------------------------------------------
 
-# audio
+
+# JavaScript
+#   Normalize to standard type (it's sniffed in IE anyways) 
+#   tools.ietf.org/html/rfc4329#section-7.2
+AddType application/javascript         js
+
+# Audio
 AddType audio/ogg                      oga ogg
+AddType audio/mp4                      m4a
 
-# video
+# Video
 AddType video/ogg                      ogv
-AddType video/mp4                      mp4
+AddType video/mp4                      mp4 m4v
 AddType video/webm                     webm
 
-# Proper svg serving. Required for svg webfonts on iPad
+# SVG.
+#   Required for svg webfonts on iPad
 #   twitter.com/FontSquirrel/status/14855840545
 AddType     image/svg+xml              svg svgz 
 AddEncoding gzip                       svgz
                                        
-# webfonts                             
+# Webfonts                             
 AddType application/vnd.ms-fontobject  eot
-AddType font/truetype                  ttf
+AddType application/x-font-ttf    ttf ttc
 AddType font/opentype                  otf
 AddType application/x-font-woff        woff
 
-# assorted types                                      
+# Assorted types                                      
 AddType image/x-icon                   ico
 AddType image/webp                     webp
 AddType text/cache-manifest            appcache manifest
@@ -101,6 +103,7 @@ AddType text/x-component               htc
 AddType application/x-chrome-extension crx
 AddType application/x-xpinstall        xpi
 AddType application/octet-stream       safariextz
+AddType text/x-vcard                   vcf
 
 
 
@@ -111,54 +114,69 @@ AddType application/octet-stream       safariextz
 # e.g. Inside of script.combined.js you could have
 #   <!--#include file="libs/jquery-1.5.0.min.js" -->
 #   <!--#include file="plugins/jquery.idletimer.js" -->
-# and they would be included into this single file
+# and they would be included into this single file.
 
-# this is not in use in the boilerplate as it stands. you may
-#   choose to name your files in this way for this advantage
-#   or concatenate and minify them manually.
+# This is not in use in the boilerplate as it stands. You may
+# choose to name your files in this way for this advantage or
+# concatenate and minify them manually.
 # Disabled by default.
 
-# <FilesMatch "\.combined\.(js|css)$">
-#         Options +Includes
-#         SetOutputFilter INCLUDES
-# </FilesMatch>
-
+#<FilesMatch "\.combined\.js$">
+#  Options +Includes
+#  AddOutputFilterByType INCLUDES application/javascript application/json
+#  SetOutputFilter INCLUDES
+#</FilesMatch>
+#<FilesMatch "\.combined\.css$">
+#  Options +Includes
+#  AddOutputFilterByType INCLUDES text/css
+#  SetOutputFilter INCLUDES
+#</FilesMatch>
 
 
 # ----------------------------------------------------------------------
-# gzip compression
+# Gzip compression
 # ----------------------------------------------------------------------
 
 <IfModule mod_deflate.c>
 
-
-# force deflate for mangled headers developer.yahoo.com/blogs/ydn/posts/2010/12/pushing-beyond-gzipping/
+# Force deflate for mangled headers developer.yahoo.com/blogs/ydn/posts/2010/12/pushing-beyond-gzipping/
 <IfModule mod_setenvif.c>
   <IfModule mod_headers.c>
-    SetEnvIfNoCase ^(Accept-EncodXng|X-cept-Encoding|X{15}|~{15}|-{15})$ ^((gzip|deflate)\s,?\s(gzip|deflate)?|X{4,13}|~{4,13}|-{4,13})$ HAVE_Accept-Encoding
+    SetEnvIfNoCase ^(Accept-EncodXng|X-cept-Encoding|X{15}|~{15}|-{15})$ ^((gzip|deflate)\s*,?\s*)+|[X~-]{4,13}$ HAVE_Accept-Encoding
     RequestHeader append Accept-Encoding "gzip,deflate" env=HAVE_Accept-Encoding
   </IfModule>
 </IfModule>
-# html, txt, css, js, json, xml, htc:
+
+# HTML, TXT, CSS, JavaScript, JSON, XML, HTC:
 <IfModule filter_module>
   FilterDeclare   COMPRESS
-  FilterProvider  COMPRESS  DEFLATE resp=Content-Type /text/(html|css|javascript|plain|x(ml|-component))/
-  FilterProvider  COMPRESS  DEFLATE resp=Content-Type /application/(javascript|json|xml|x-javascript)/
+  FilterProvider  COMPRESS  DEFLATE resp=Content-Type $text/html
+  FilterProvider  COMPRESS  DEFLATE resp=Content-Type $text/css
+  FilterProvider  COMPRESS  DEFLATE resp=Content-Type $text/plain
+  FilterProvider  COMPRESS  DEFLATE resp=Content-Type $text/xml
+  FilterProvider  COMPRESS  DEFLATE resp=Content-Type $text/x-component
+  FilterProvider  COMPRESS  DEFLATE resp=Content-Type $application/javascript
+  FilterProvider  COMPRESS  DEFLATE resp=Content-Type $application/json
+  FilterProvider  COMPRESS  DEFLATE resp=Content-Type $application/xml
+  FilterProvider  COMPRESS  DEFLATE resp=Content-Type $application/xhtml+xml
+  FilterProvider  COMPRESS  DEFLATE resp=Content-Type $application/rss+xml
+  FilterProvider  COMPRESS  DEFLATE resp=Content-Type $application/atom+xml
+  FilterProvider  COMPRESS  DEFLATE resp=Content-Type $application/vnd.ms-fontobject
+  FilterProvider  COMPRESS  DEFLATE resp=Content-Type $image/svg+xml
+  FilterProvider  COMPRESS  DEFLATE resp=Content-Type $application/x-font-ttf
+  FilterProvider  COMPRESS  DEFLATE resp=Content-Type $font/opentype
   FilterChain     COMPRESS
-  FilterProtocol  COMPRESS  change=yes;byteranges=no
+  FilterProtocol  COMPRESS  DEFLATE change=yes;byteranges=no
 </IfModule>
 
 <IfModule !mod_filter.c>
   # Legacy versions of Apache
   AddOutputFilterByType DEFLATE text/html text/plain text/css application/json
-  AddOutputFilterByType DEFLATE text/javascript application/javascript application/x-javascript 
+  AddOutputFilterByType DEFLATE application/javascript
   AddOutputFilterByType DEFLATE text/xml application/xml text/x-component
+  AddOutputFilterByType DEFLATE application/xhtml+xml application/rss+xml application/atom+xml
+  AddOutputFilterByType DEFLATE image/svg+xml application/vnd.ms-fontobject application/x-font-ttf font/opentype
 </IfModule>
-
-# webfonts and svg:
-  <FilesMatch "\.(ttf|otf|eot|svg)$" >
-    SetOutputFilter DEFLATE
-  </FilesMatch>
 </IfModule>
 
 
@@ -167,14 +185,14 @@ AddType application/octet-stream       safariextz
 # Expires headers (for better cache control)
 # ----------------------------------------------------------------------
 
-# these are pretty far-future expires headers
-# they assume you control versioning with cachebusting query params like
+# These are pretty far-future expires headers.
+# They assume you control versioning with cachebusting query params like
 #   <script src="application.js?20100608">
-# additionally, consider that outdated proxies may miscache 
+# Additionally, consider that outdated proxies may miscache 
 #   www.stevesouders.com/blog/2008/08/23/revving-filenames-dont-use-querystring/
 
-# if you don't use filenames to version, lower the css and js to something like
-#   "access plus 1 week" or so
+# If you don't use filenames to version, lower the CSS  and JS to something like
+#   "access plus 1 week" or so.
 
 <IfModule mod_expires.c>
   ExpiresActive on
@@ -182,24 +200,25 @@ AddType application/octet-stream       safariextz
 # Perhaps better to whitelist expires rules? Perhaps.
   ExpiresDefault                          "access plus 1 month"
 
-# cache.appcache needs re-requests in FF 3.6 (thx Remy ~Introducing HTML5)
+# cache.appcache needs re-requests in FF 3.6 (thanks Remy ~Introducing HTML5)
   ExpiresByType text/cache-manifest       "access plus 0 seconds"
 
-# your document html 
+# Your document html 
   ExpiresByType text/html                 "access plus 0 seconds"
   
-# data
+# Data
   ExpiresByType text/xml                  "access plus 0 seconds"
   ExpiresByType application/xml           "access plus 0 seconds"
   ExpiresByType application/json          "access plus 0 seconds"
 
-# rss feed
+# Feed
   ExpiresByType application/rss+xml       "access plus 1 hour"
+  ExpiresByType application/atom+xml      "access plus 1 hour"
 
-# favicon (cannot be renamed)
+# Favicon (cannot be renamed)
   ExpiresByType image/x-icon              "access plus 1 week" 
 
-# media: images, video, audio
+# Media: images, video, audio
   ExpiresByType image/gif                 "access plus 1 month"
   ExpiresByType image/png                 "access plus 1 month"
   ExpiresByType image/jpg                 "access plus 1 month"
@@ -209,20 +228,19 @@ AddType application/octet-stream       safariextz
   ExpiresByType video/mp4                 "access plus 1 month"
   ExpiresByType video/webm                "access plus 1 month"
   
-# htc files  (css3pie)
+# HTC files  (css3pie)
   ExpiresByType text/x-component          "access plus 1 month"
   
-# webfonts
+# Webfonts
   ExpiresByType font/truetype             "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"
     
-# css and javascript
-  ExpiresByType text/css                  "access plus 2 months"
-  ExpiresByType application/javascript    "access plus 2 months"
-  ExpiresByType text/javascript           "access plus 2 months"
+# CSS and JavaScript
+  ExpiresByType text/css                  "access plus 1 year"
+  ExpiresByType application/javascript    "access plus 1 year"
   
   <IfModule mod_headers.c>
     Header append Cache-Control "public"
@@ -236,6 +254,11 @@ AddType application/octet-stream       safariextz
 # ETag removal
 # ----------------------------------------------------------------------
 
+# FileETag None is not enough for every server.
+<IfModule mod_headers.c>
+  Header unset ETag
+</IfModule>
+
 # Since we're sending far-future expires, we don't need ETags for
 # static content.
 #   developer.yahoo.com/performance/rules.html#etags
@@ -278,8 +301,10 @@ FileETag None
 # ----------------------------------------------------------------------
 
 # Turning on the rewrite engine is necessary for the following rules and features.
+# FollowSymLinks must be enabled for this to work.
 
 <IfModule mod_rewrite.c>
+  Options +FollowSymlinks
   RewriteEngine On
 </IfModule>
 
@@ -303,65 +328,29 @@ FileETag None
 # ----------------------------------------------------------------------
 
 # Option 1:
-# Rewrite "www.domain.com -> domain.com" 
+# Rewrite "www.example.com -> example.com" 
 
 <IfModule mod_rewrite.c>
   RewriteCond %{HTTPS} !=on
   RewriteCond %{HTTP_HOST} ^www\.(.+)$ [NC]
-  RewriteRule ^(.*)$ http://%1/$1 [R=301,L]
+  RewriteRule ^ http://%1%{REQUEST_URI} [R=301,L]
 </IfModule>
 
 # ----------------------------------------------------------------------
 
 # Option 2:
-# To rewrite "domain.com -> www.domain.com" uncomment the following lines.
+# To rewrite "example.com -> www.example.com" uncomment the following lines.
 # Be aware that the following rule might not be a good idea if you
 # use "real" subdomains for certain parts of your website.
 
 # <IfModule mod_rewrite.c>
 #   RewriteCond %{HTTPS} !=on
 #   RewriteCond %{HTTP_HOST} !^www\..+$ [NC]
-#   RewriteCond %{HTTP_HOST} (.+)$ [NC]
-#   RewriteRule ^(.*)$ http://www.%1/$1 [R=301,L]
+#   RewriteRule ^ http://www.%{HTTP_HOST}%{REQUEST_URI} [R=301,L]
 # </IfModule>
 
 
 
-# ----------------------------------------------------------------------
-# Add/remove trailing slash to (non-file) URLs
-# ----------------------------------------------------------------------
-
-# Google treats URLs with and without trailing slashes separately.
-# Forcing a trailing slash is usually preferred, but all that's really
-# important is that one correctly redirects to the other.
-
-# By default option 1 (force trailing slash) is activated.
-# http://googlewebmastercentral.blogspot.com/2010/04/to-slash-or-not-to-slash.html
-# http://www.alistapart.com/articles/slashforward/
-# http://httpd.apache.org/docs/2.0/misc/rewriteguide.html#url Trailing Slash Problem
-
-# ----------------------------------------------------------------------
-
-# Option 1:
-# Rewrite "domain.com/foo -> domain.com/foo/"
-
-<IfModule mod_rewrite.c>
-  RewriteCond %{REQUEST_FILENAME} !-f
-  RewriteCond %{REQUEST_URI} !(\.[a-zA-Z0-9]{1,5}|/|#(.*))$
-  RewriteRule ^(.*)$ /$1/ [R=301,L]
-</IfModule>
-
-# ----------------------------------------------------------------------
-
-# Option 2:
-# Rewrite "domain.com/foo/ -> domain.com/foo"
-
-#<IfModule mod_rewrite.c>
-#  RewriteRule ^(.*)/$ /$1 [R=301,L]
-#</IfModule>
-
-
-
 # ----------------------------------------------------------------------
 # Built-in filename-based cache busting
 # ----------------------------------------------------------------------
@@ -387,12 +376,12 @@ FileETag None
 # ----------------------------------------------------------------------
 
 # Rewrite secure requests properly to prevent SSL cert warnings, e.g. prevent 
-# https://www.domain.com when your cert only allows https://secure.domain.com
+# https://www.example.com when your cert only allows https://secure.example.com
 # Uncomment the following lines to use this feature.
 
 # <IfModule mod_rewrite.c>
 #   RewriteCond %{SERVER_PORT} !^443
-#   RewriteRule (.*) https://example-domain-please-change-me.com/$1 [R=301,L]
+#   RewriteRule ^ https://example-domain-please-change-me.com%{REQUEST_URI} [R=301,L]
 # </IfModule>
 
 
@@ -409,7 +398,7 @@ Options -MultiViews
 
 
 # ----------------------------------------------------------------------
-# custom 404 page
+# Custom 404 page
 # ----------------------------------------------------------------------
 
 # You can add custom pages to handle 500 or 403 pretty easily, if you like.
@@ -421,11 +410,11 @@ ErrorDocument 404 /404.html
 # UTF-8 encoding
 # ----------------------------------------------------------------------
 
-# use utf-8 encoding for anything served text/plain or text/html
+# Use UTF-8 encoding for anything served text/plain or text/html
 AddDefaultCharset utf-8
 
-# force utf-8 for a number of file formats
-AddCharset utf-8 .html .css .js .xml .json .rss
+# Force UTF-8 for a number of file formats
+AddCharset utf-8 .html .css .js .xml .json .rss .atom
 
 
 
@@ -470,9 +459,45 @@ Options -Indexes
 
 # php_flag register_globals Off
 
+# Rename session cookie to something else, than PHPSESSID
+# php_value session.name sid
+
+# Do not show you are using PHP
+# Note: Move this line to php.ini since it won't work in .htaccess
+# php_flag expose_php Off
+
+# Level of log detail - log all errors
+# php_value error_reporting -1
+
+# Write errors to log file
+# php_flag log_errors On
+
+# Do not display errors in browser (production - Off, development - On)
+# php_flag display_errors Off
+
+# Do not display startup errors (production - Off, development - On)
+# php_flag display_startup_errors Off
+
+# Format errors in plain text
+# Note: Leave this setting 'On' for xdebug's var_dump() output
+# php_flag html_errors Off
+
+# Show multiple occurrence of error
+# php_flag ignore_repeated_errors Off
+
+# Show same errors from different sources
+# php_flag ignore_repeated_source Off
+
+# Size limit for error messages
+# php_value log_errors_max_len 1024
+
+# Don't precede error with string (doesn't accept empty string, use whitespace if you need)
+# php_value error_prepend_string " "
+
+# Don't prepend to error (doesn't accept empty string, use whitespace if you need)
+# php_value error_append_string " "
 
 # Increase cookie security
 <IfModule php5_module>
-php_value session.cookie_httponly true
+	php_value session.cookie_httponly true
 </IfModule>
-