From 2e6e2c46e0b2b67039de4fae51ea5bc59f59b761 Mon Sep 17 00:00:00 2001
From: Drew Llewellyn <drew@drew.pro>
Date: Tue, 3 Sep 2019 11:53:51 +0100
Subject: [PATCH 1/3] docs: README Grammar (#1601)

- `less` is used for singular mass nouns
- `fewer` when discussing countable things
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index b5b3c2b1..6f00bd9d 100644
--- a/README.md
+++ b/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

From 12b66cd492b4b06ffc91da57eca4794c25f05632 Mon Sep 17 00:00:00 2001
From: Remy Sharp <remy@remysharp.com>
Date: Tue, 3 Sep 2019 11:54:44 +0100
Subject: [PATCH 2/3] fix: langauge around "watching" (#1591)

ref: #1583

It was unclear whether it was listing files being watched when in fact
it was the list of directories (plus, make it cleaner)
---
 lib/nodemon.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/lib/nodemon.js b/lib/nodemon.js
index 1020f22d..042da842 100644
--- a/lib/nodemon.js
+++ b/lib/nodemon.js
@@ -180,8 +180,16 @@ 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)'));

From eead311749357d4809c0c8ba353e31376f2ea776 Mon Sep 17 00:00:00 2001
From: Tarmo Aidantausta <tarmo.aidantausta@firstbeat.com>
Date: Wed, 6 Mar 2019 17:24:41 +0200
Subject: [PATCH 3/3] fix: to avoid confusion like in #1528, always report used
 extension

---
 lib/nodemon.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/nodemon.js b/lib/nodemon.js
index 042da842..0f60e599 100644
--- a/lib/nodemon.js
+++ b/lib/nodemon.js
@@ -192,7 +192,7 @@ function nodemon(settings) {
       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', '--------------');