choe: merge master

* refs/remotes/origin/master:
  fix: to avoid confusion like in #1528, always report used extension
  fix: langauge around "watching" (#1591)
  docs: README Grammar (#1601)

README.md

@@ -347,9 +347,9 @@ The answer is simple, but possibly frustrating. I'm not saying (how I pronounce
 
 ## Design principles
 
-- Less flags is better
+- Fewer flags is better
 - Works across all platforms
-- Less features
+- Fewer features
 - Let individuals build on top of nodemon
 - Offer all CLI functionality as an API
 - Contributions must have and pass tests

lib/nodemon.js

@@ -180,11 +180,19 @@ function nodemon(settings) {
     }).filter(Boolean).join(' ');
     if (ignoring) utils.log.detail('ignoring: ' + ignoring);
 
-    utils.log.info('watching: ' + config.options.monitor.map(function (rule) {
-      return rule.slice(0, 1) !== '!' ? rule : false;
+    utils.log.info('watching dir(s): ' + config.options.monitor.map(function (rule) {
+      if (rule.slice(0, 1) !== '!') {
+        try {
+          rule = path.relative(process.cwd(), rule);
+        } catch (e) {}
+
+        return rule;
+      }
+
+      return false;
     }).filter(Boolean).join(' '));
 
-    utils.log.detail('watching extensions: ' + (config.options.execOptions.ext || '(all)'));
+    utils.log.info('watching extensions: ' + (config.options.execOptions.ext || '(all)'));
 
     if (config.options.dump) {
       utils.log._log('log', '--------------');