Merge branch 'master' into sass_docs

Gruntfile.js

@@ -316,9 +316,8 @@ module.exports = function (grunt) {
 
     // Use any line that starts with ".glyphicon-" and capture the class name
     var iconClassName = /^\.(glyphicon-[^\s]+)/
-    var glyphiconsData = '# Generated on ' + (new Date()) + '\n' +
-                         '# **Don\'t edit this directly!**\n' +
-                         '# Look at the \'build-glyphicons-data\' task in Gruntfile.js\n\n';
+    var glyphiconsData = '# This file is generated via Grunt task. **Do not edit directly.** \n' +
+                         '# See the \'build-glyphicons-data\' task in Gruntfile.js.\n\n';
     for (var i = 0, len = glpyhiconsLines.length; i < len; i++) {
       var match = glpyhiconsLines[i].match(iconClassName)
 

README.md

@@ -97,10 +97,10 @@ When completed, you'll be able to run the various Grunt commands provided from t
 ### Available Grunt commands
 
 #### Build - `grunt`
-Run `grunt` to run tests locally and compile the CSS and JavaScript into `/dist`. **Uses [recess](http://twitter.github.io/recess/) and [UglifyJS](http://lisperator.net/uglifyjs/).**
+Run `grunt` to run tests locally and compile the CSS and JavaScript into `/dist`. **Uses [Less](http://lesscss.org/) and [UglifyJS](http://lisperator.net/uglifyjs/).**
 
 #### Only compile CSS and JavaScript - `grunt dist`
-`grunt dist` creates the `/dist` directory with compiled files. **Uses [recess](http://twitter.github.io/recess/) and [UglifyJS](http://lisperator.net/uglifyjs/).**
+`grunt dist` creates the `/dist` directory with compiled files. **Uses [Less](http://lesscss.org/) and [UglifyJS](http://lisperator.net/uglifyjs/).**
 
 #### Tests - `grunt test`
 Runs [JSHint](http://jshint.com) and [QUnit](http://qunitjs.com/) tests headlessly in [PhantomJS](http://phantomjs.org/) (used for CI).

_data/glyphicons.yml

-# Generated on Wed Dec 18 2013 20:14:37 GMT-0800 (PST)
-# **Don't edit this directly!**
-# Look at the 'build-glyphicons-data' task in Gruntfile.js
+# This file is generated via Grunt task. **Do not edit directly.** 
+# See the 'build-glyphicons-data' task in Gruntfile.js.
 
 - glyphicon-asterisk
 - glyphicon-plus

package.json

@@ -21,25 +21,25 @@
   ],
   "devDependencies": {
     "btoa": "~1.1.1",
-    "grunt": "~0.4.1",
+    "grunt": "~0.4.2",
     "grunt-banner": "~0.2.0",
     "grunt-contrib-clean": "~0.5.0",
     "grunt-contrib-concat": "~0.3.0",
     "grunt-contrib-connect": "~0.5.0",
     "grunt-contrib-copy": "~0.4.1",
     "grunt-contrib-csslint": "~0.2.0",
-    "grunt-contrib-jshint": "~0.7.0",
-    "grunt-contrib-less": "~0.8.0",
+    "grunt-contrib-jshint": "~0.7.2",
+    "grunt-contrib-less": "~0.8.3",
     "grunt-contrib-qunit": "~0.3.0",
-    "grunt-contrib-uglify": "~0.2.4",
+    "grunt-contrib-uglify": "~0.2.7",
     "grunt-contrib-watch": "~0.5.3",
-    "grunt-csscomb": "~1.2.1",
-    "grunt-html-validation": "~0.1.11",
+    "grunt-csscomb": "~1.1.0",
+    "grunt-html-validation": "~0.1.12",
     "grunt-jekyll": "~0.4.0",
-    "grunt-jscs-checker": "~0.2.5",
+    "grunt-jscs-checker": "~0.2.6",
     "grunt-saucelabs": "~4.1.2",
     "grunt-sed": "~0.1.1",
-    "load-grunt-tasks": "~0.2.0"
+    "load-grunt-tasks": "~0.2.1"
   },
   "jspm": {
     "main": "js/bootstrap",