Fix yarn manpage to say DATADIR instead of TESTDIR

3 files changed, 13 insertions, 9 deletions

diff --git a/NEWS b/NEWS
index f699b4f..90af346 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,8 @@ This file summarizes changes between releases of cmdtest.
 Version 0.24+git, not yet released
 ----------------------------------
 
+* Fixed yarn manual page examples to say `DATADIR` instead of
+  `TESTDIR`. Thanks to John Kozak for reporting it.
 
 Version 0.24, released 2016-04-18
 ----------------------------------
diff --git a/debian/changelog b/debian/changelog
index ca2e117..aacfc39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 cmdtest (0.24+git-1) UNRELEASED; urgency=medium
 
   * New upstream version.
+    * Fix yarn manual page to use right env var in examples.
+      DATADIR, not TESTDIR. (Closes: #823912)
 
  -- Lars Wirzenius <liw@liw.fi>  Mon, 18 Apr 2016 22:03:19 +0300
 
diff --git a/yarn.1.in b/yarn.1.in
index f1708d9..6df8f15 100644
--- a/yarn.1.in
+++ b/yarn.1.in
@@ -62,21 +62,21 @@ The backup scenario from above might be implemented as follows:
 .IP
 .nf
 IMPLEMENTS GIVEN some live data in a directory
-rm -rf "$TESTDIR/data"
-mkdir "$TESTDIR/data"
-echo foo > "$TESTDIR/data/foo"
+rm -rf "$DATADIR/data"
+mkdir "$DATADIR/data"
+echo foo > "$DATADIR/data/foo"
 .IP
 IMPLEMENTS GIVEN an empty backup repository
-rm -rf "$TESTDIR/repo"
-mkdir "$TESTDIR/repo"
+rm -rf "$DATADIR/repo"
+mkdir "$DATADIR/repo"
 .IP
 IMPLEMENTS WHEN a backup is made
-backup-program -r "$TESTDIR/repo" "$TESTDIR/data"
+backup-program -r "$DATADIR/repo" "$DATADIR/data"
 .IP
 IMPLEMENTS THEN the data can be restored
-mkdir "$TESTDIR/restored"
-restore-program -r "$TESTDIR/repo" "$TESTDIR/restored"
-diff -rq "$TESTDIR/data" "$TESTDIR/restored"
+mkdir "$DATADIR/restored"
+restore-program -r "$DATADIR/repo" "$DATADIR/restored"
+diff -rq "$DATADIR/data" "$DATADIR/restored"
 .IP
 IMPLEMENTS FINALLY cleanup
 echo nothing to do, actually