From c3cbdeb8127407a632c086cc1b9342a2d471404c Mon Sep 17 00:00:00 2001
From: Adam Spiers <stow@adamspiers.org>
Date: Tue, 25 Jun 2019 17:25:33 +0100
Subject: [PATCH 1/2] Synchronise --verbose documentation

The man page was updated with regard to higher --verbose levels but
not the info manual, so fix that.
---
 doc/stow.texi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/stow.texi b/doc/stow.texi
index f7ae2d1..1042ad4 100644
--- a/doc/stow.texi
+++ b/doc/stow.texi
@@ -403,7 +403,7 @@ Do not perform any operations that modify the file system; in combination with
 @item -v
 @itemx --verbose[=@var{n}]
 Send verbose output to standard error describing what Stow is
-doing.  Verbosity levels are 0, 1, 2, and 3; 0 is the default.  Using
+doing.  Verbosity levels are from 0 to 5; 0 is the default.  Using
 @option{-v} or @option{--verbose} increases the verbosity by one; using
 @samp{--verbose=@var{n}} sets it to @var{n}.
 

From f6bf45af9c5f13be85b70085a508b55df8e35fc1 Mon Sep 17 00:00:00 2001
From: Adam Spiers <stow@adamspiers.org>
Date: Tue, 25 Jun 2019 17:21:53 +0100
Subject: [PATCH 2/2] Update NEWS and THANKS according to recent commits

---
 NEWS   | 36 ++++++++++++++++++++++++++++++++++++
 THANKS |  1 +
 2 files changed, 37 insertions(+)

diff --git a/NEWS b/NEWS
index 9178d23..cdb0f04 100644
--- a/NEWS
+++ b/NEWS
@@ -36,6 +36,42 @@ News file for Stow.
 
 ** Convert README and INSTALL to Markdown
 
+** Update documentation to reflect more modern use cases
+
+   The README.md, stow(8) man page, and info manual have been updated
+   to de-emphasise the package management use, since these days almost
+   everyone prefers to use modern package managers such as rpm / dpkg
+   / Nix for (system-wide) package management.
+
+   To compensate, more popular modern use cases for Stow have been
+   added, such as management of dotfiles and software compiled in the
+   user's $HOME directory.
+
+** Stow now has a non-zero exit code if option parsing failed
+
+   Thanks to Brice Waegeneire for reporting this.
+
+** chkstow now honours the $STOW_DIR environment variable
+
+   The stow script already honoured the $STOW_DIR environment
+   variable.  Now chkstow does too, for consistency.
+
+** Miscellaneous documentation fixes
+
+   - Various typos were fixed.
+
+   - The documentation for --verbose was updated to indicate that
+     verbosity levels now go up to 5.
+
+   - Erroneous glob examples in the --ignore documentation were fixed.
+
+   - The abbreviation "regex" was removed from the info manual for
+     consistency.
+
+   - INSTALL.md now also documents how to build directly from git.
+
+** aclocal.m4 was updated using aclocal 1.15.1.
+
 ** Add Docker files for convenient testing across multiple Perl versions
 
    This is the first release which has been tested across 5 different
diff --git a/THANKS b/THANKS
index 9a9072a..b038a32 100644
--- a/THANKS
+++ b/THANKS
@@ -32,6 +32,7 @@ Hongyi Zhao
 Jean Louis
 Daniel Shahaf
 Matan Nassau
+Brice Waegeneire
 
 Email addresses of new contributors are no longer being added by default
 for privacy reasons; however please contact the maintainer if you are