Merge pull request #2628 from khueue/master

Cosmetic changes
balderdashy · Feb 8, 2015 · d20d5f8 · d20d5f8
2 parents b331a00 + 946b088
commit d20d5f8
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/lib/app/private/bootstrap.js b/lib/app/private/bootstrap.js
@@ -33,7 +33,7 @@ module.exports = function runBootstrap(cb) {
   var timeoutMs = sails.config.bootstrapTimeout || 2000;
   var timer = setTimeout(function bootstrapTookTooLong() {
     sails.log.warn(util.format(
-    'Bootstrap is taking unusually long to execute its callback (%d miliseconds).\n'+
+    'Bootstrap is taking unusually long to execute its callback (%d milliseconds).\n'+
     'Perhaps you forgot to call it?  The callback is the first argument of the function, `cb`.',
     timeoutMs));
   }, timeoutMs);

diff --git a/lib/hooks/cors/index.js b/lib/hooks/cors/index.js
@@ -5,7 +5,7 @@ module.exports = function(sails) {
 	 */
 
 	var _ = require('lodash'),
-		util = require('sails-util')
+		util = require('sails-util');
 
 	/**
 	 * Expose hook definition

diff --git a/lib/hooks/csrf/index.js b/lib/hooks/csrf/index.js
@@ -15,7 +15,7 @@ module.exports = function(sails) {
 
     defaults: {
 
-      // CSRF middleware protection, all non-GET requests must send '_csrf' parmeter
+      // CSRF middleware protection, all non-GET requests must send '_csrf' parameter
       // _csrf is a parameter for views, and is also available via GET at /csrfToken
       // TODO: move into csrf hook
       csrf: false

diff --git a/lib/hooks/views/consolidate.js b/lib/hooks/views/consolidate.js
@@ -548,7 +548,7 @@ module.exports = function(sailsAppPath) {
     } catch (err) {
       fn(err);
     }
-  }
+  };
 
   /**
    * Underscore support.

diff --git a/test/benchmarks/README.md b/test/benchmarks/README.md
@@ -8,7 +8,7 @@ From the root directory of sails:
 $ mocha test/benchmarks
 ```
 
-To get a more detailed report with milisecond timings for each benchmark, run:
+To get a more detailed report with millisecond timings for each benchmark, run:
 
 ```sh
 $ mocha test/benchmarks -v
@@ -30,7 +30,7 @@ Feature-wide benchmarks are the "lowest-hanging fruit", if you will.  We'll spen
 + Pick what you want to test.
 + Whatever you choose does not have to be atomic (see examples above)-- in an ideal world, we would have benchmarks for every single function in our apps, but that is not how things work today.
 + Write a benchmark test that isolates that functionality. (the hard part)
-+ Then see how many miliseconds it takes. (easy)
++ Then see how many milliseconds it takes. (easy)
 
 > **Advice from Felix Geisendörfer ([@felixge](https://github.com/felixge))**
 >