From 3d2c470cb38a60fe21001db0b9f0b5ef246d2c98 Mon Sep 17 00:00:00 2001
From: Tobias Oetiker <tobi@oetiker.ch>
Date: Tue, 16 Dec 2014 23:48:06 +0100
Subject: [PATCH] ready for 0.14.0

---
 CHANGES               |  6 ++++++
 Makefile.in           |  2 +-
 doc/znapzend.pod      |  8 ++++++++
 doc/znapzendzetup.pod | 46 ++++++++++++++++++++++++-------------------
 doc/znapzendztatz.pod |  2 ++
 5 files changed, 43 insertions(+), 21 deletions(-)

diff --git a/CHANGES b/CHANGES
index 51d889d5..1a7cd808 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+commit 3cdad5ed0bab8c99da972a18fbc122bb8520e6db
+Author: Tobias Oetiker <tobi@oetiker.ch>
+Date:   Tue Dec 16 23:47:24 2014 +0100
+
+    get ready for 0.14.0 release
+
 commit e01f921eebae630a3d97c23f4274e6ca209b0c5d
 Author: Tobias Oetiker <tobi@oetiker.ch>
 Date:   Tue Dec 16 21:24:26 2014 +0100
diff --git a/Makefile.in b/Makefile.in
index eb7f37ba..77a3d872 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -332,7 +332,7 @@ POD = doc/znapzend.pod doc/znapzendzetup.pod doc/znapzendztatz.pod
 THIRDPARTY_DIR := $(shell pwd)/thirdparty
 THIRDPARTY := $(shell test -d thirdparty && find thirdparty/lib/perl5 -type f)
 GENERATED_EXTRADIST = $(MAN)
-EXTRA_DIST = VERSION COPYRIGHT README.md LICENSE CHANGES AUTHORS setup/build-thirdparty.sh setup/sdbs.inc $(BIN) $(PM) $(GENERATED_EXTRADIST) init/znapzend.xml.in t/autoscrub.t t/ssh t/znapzend.t t/znapzendztatz.t t/mbuffer t/zfs t/znapzendzetup.t t/zpool
+EXTRA_DIST = VERSION COPYRIGHT README.md LICENSE CHANGES AUTHORS PERL_MODULES setup/sdbs.inc $(BIN) $(PM) $(GENERATED_EXTRADIST) init/znapzend.xml.in t/autoscrub.t t/ssh t/znapzend.t t/znapzendztatz.t t/mbuffer t/zfs t/znapzendzetup.t t/zpool
 YEAR := $(shell date +%Y)
 DATE := $(shell date +%Y-%m-%d)
 @ENABLE_SVCINSTALL_TRUE@svcdir = @SVCINSTALLDIR@
diff --git a/doc/znapzend.pod b/doc/znapzend.pod
index 1da855db..60ddd15d 100644
--- a/doc/znapzend.pod
+++ b/doc/znapzend.pod
@@ -105,6 +105,14 @@ can destroy. Logging an error about the problem
 use the -u option on the receive end, to keep the destination zfs
 filesystems unmounted.
 
+=item pfexec
+
+use 'pfexec' for zfs commands (e.g. when running znapzend as non-priviledged user)
+
+=item sudo
+
+use 'sudo' for zfs commands (e.g. when running znapzend as non-priviledged user)
+
 =back
 
 =item B<--connectTimeout>=I<timeout>
diff --git a/doc/znapzendzetup.pod b/doc/znapzendzetup.pod
index ba7b3956..5e4345d4 100644
--- a/doc/znapzendzetup.pod
+++ b/doc/znapzendzetup.pod
@@ -8,34 +8,36 @@ B<znapzendzetup> I<command> [I<options...>]
 
 where 'command' is one of the following:
 
-    create [--recursive] [--mbuffer=<path>[:<port>]] [--mbuffersize=<size>] \
-           [--pre-snap-command=<command>] \
-           [--post-snap-command=<command>] \
-           [--tsformat=<format>] --donotask \
-           SRC plan dataset \
-           [ DST[:key] plan [[user@]host:]dataset ]
+    create  [--pfexec|sudo] \
+            [--recursive] [--mbuffer=<path>[:<port>]] [--mbuffersize=<size>] \
+            [--pre-snap-command=<command>] \
+            [--post-snap-command=<command>] \
+            [--tsformat=<format>] --donotask \
+            SRC plan dataset \
+            [ DST[:key] plan [[user@]host:]dataset ]
 
-    delete [--dst=key] <src_dataset>
+    delete  [--pfexec|sudo] [--dst=key] <src_dataset>
 
-    edit   [--recursive=on|off] [--mbuffer=<path>[:<port>]|off] [--mbuffersize=<size>] \
-           [--pre-snap-command=<command>|off] \
-           [--post-snap-command=<command>|off] \
-           [--tsformat=<format>] --donotask \
-           SRC [plan] dataset \
-           [ DST:key [plan] [dataset] ]
+    edit    [--pfexec|sudo]
+            [--recursive=on|off] [--mbuffer=<path>[:<port>]|off] [--mbuffersize=<size>] \
+            [--pre-snap-command=<command>|off] \
+            [--post-snap-command=<command>|off] \
+            [--tsformat=<format>] --donotask \
+            SRC [plan] dataset \
+            [ DST:key [plan] [dataset] ]
 
-    edit <src_dataset>
+    edit    [--pfexec|sudo] <src_dataset>
 
-    enable <src_dataset>
+    enable  [--pfexec|sudo] <src_dataset>
 
-    disable <src_dataset>
+    disable [--pfexec|sudo] <src_dataset>
 
-    list [src_dataset]
+    list    [--pfexec|sudo] [src_dataset]
 
-    export <src_dataset>
+    export  [--pfexec|sudo] <src_dataset>
 
-    import [--write] [--prop <property>=<value>, [--prop ...] ...]
-           <src_dataset> [<prop_dump_file>]
+    import  [--pfexec|sudo] [--write] [--prop <property>=<value>, [--prop ...] ...]
+            <src_dataset> [<prop_dump_file>]
 
     help
 
@@ -108,6 +110,10 @@ If B<--tsformat> string is suffixed by a 'Z', times will be in UTC. E.g.:
 
  --tsformat='%Y-%m-%dT%H:%M:%SZ'
 
+NOTE: that windows will probably not like the C<:> characters. So if you
+intend to browse the snapshots with windos, you may want to use a different
+separator.
+
 =item B<--mbuffer>=I</usr/bin/mbuffer>
 
 Specify the path to your copy of the mbuffer utility.
diff --git a/doc/znapzendztatz.pod b/doc/znapzendztatz.pod
index e35b9715..82d2d687 100644
--- a/doc/znapzendztatz.pod
+++ b/doc/znapzendztatz.pod
@@ -8,6 +8,8 @@ B<znapzendztatz> [I<options>...] [src_dataset]
 
  -H             do not print headers
  -r,--recursive show statistics for dataset and sub datasets
+ --pfexec       use 'pfexec' for commands
+ --sudo         use 'sudo' for commands
  --man          show man-page and exit
  -h,--help      display this help and exit