Merge branch 'master' of github.com:zurb/foundation

Gruntfile.js

@@ -151,10 +151,15 @@ module.exports = function(grunt) {
         options: {livereload:true}
       },
       dist_docs: {
-        files: ['doc/{includes,layouts,pages}/**/*.html'],
+        files: ['doc/{includes,layouts}/**/*.html'],
         tasks: ['assemble'],
         options: {livereload:true}
       },
+      dist_docs_pages: {
+        files: ['doc/pages/**/*.html'],
+        tasks: ['newer:assemble'],
+        options: {livereload:true}
+      },
       dist_download: {
         files: ['index.html'],
         tasks: ['assemble:dist_download']

doc/pages/components/clearing.html

@@ -64,7 +64,7 @@ <h4>SCSS</h4>
 ## Using the JavaScript
 
 <div class="panel">
-  Before you can use Clearing you'll want to verify that jQuery and `foundation.js` are available on your page. You can refer to the [JavaScript documentation](../JavaScript.html) on setting that up.
+  Before you can use Clearing you'll want to verify that jQuery and `foundation.js` are available on your page. You can refer to the [JavaScript documentation]({{relative absolute 'dist/docs/javascript.html'}}) on setting that up.
 </div>
 
 Just add `foundation.clearing.js` AFTER the `foundation.js` file. Your markup should look something like this:

doc/pages/components/grid.html

@@ -11,7 +11,7 @@ <h3 class="subheader">Create powerful multi-device layouts quickly and easily wi
 
 <h3>Basic</h3>
 
-Start by adding an element with a class of `row`. This will create a horizontal block to contain vertical columns. Then add divs with a `column` class within that row. You can use `column` or `column**s**` — the only difference is grammar. Specify the widths of each column with the small-#, medium-#, and large-# classes.
+Start by adding an element with a class of `row`. This will create a horizontal block to contain vertical columns. Then add divs with a `column` class within that row. You can use `column` or `columns` - the only difference is grammar. Specify the widths of each column with the small-#, medium-#, and large-# classes.
 
 **Foundation is mobile-first**. Code for small screens first, and larger devices will inherit those styles. Customize for larger screens as necessary.
 

doc/pages/components/visibility.html

@@ -33,7 +33,7 @@ <h3 class="subheader">Visibility classes let you show or hide elements based on
 
 ### Touch Detection
 
-Finally, there are visibility classes to hide or show content based on whether a device supports touch (as determined by Normalizr).
+Finally, there are visibility classes to hide or show content based on whether a device supports touch (as determined by Modernizr).
 
 {{> examples_visibility_touch}}