From c765bad219bd9c694e6c6d493813bd54af7c9f21 Mon Sep 17 00:00:00 2001
From: Russ Allbery <rra@debian.org>
Date: Tue, 26 May 2009 18:27:01 -0700
Subject: [PATCH] Apply STABLE14-man-page-vos-dump-flags-20090526

* Apply upstream CVS deltas:
  - STABLE14-man-page-vos-dump-flags-20090526: document the -clone and
    -omitdirs flags to vos dump.  (Closes: #502571)
---
 debian/changelog                |  2 ++
 doc/man-pages/pod1/vos_dump.pod | 25 ++++++++++++++++++++++---
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b17468851..e3ca20e1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ openafs (1.4.10+dfsg1-2) UNRELEASED; urgency=low
       pages on last store with memcache to avoid losing changes.
     - STABLE14-background-fsync-consistency-issues-20090522: file
       descriptor handling fixes for the file server.
+    - STABLE14-man-page-vos-dump-flags-20090526: document the -clone and
+      -omitdirs flags to vos dump.  (Closes: #502571)
   * Provide an openafs-modules-dkms package that uses DKMS to dynamically
     build kernel modules for the local kernel and document this option in
     README.modules.  This is an alternative to installing
diff --git a/doc/man-pages/pod1/vos_dump.pod b/doc/man-pages/pod1/vos_dump.pod
index 8fdbc7110..1902b0229 100644
--- a/doc/man-pages/pod1/vos_dump.pod
+++ b/doc/man-pages/pod1/vos_dump.pod
@@ -9,12 +9,14 @@ vos_dump - Converts a volume into ASCII format and writes it to a file
 
 B<vos dump> S<<< B<-id> <I<volume name or ID>> >>> S<<< [B<-time> <I<dump from time>>] >>>
     S<<< [B<-file> <I<dump file>>] >>> S<<< [B<-server> <I<server>>] >>>
-    S<<< [B<-partition> <I<partition>>] >>> S<<< [B<-cell> <I<cell name>>] >>>
-    [B<-noauth>] [B<-localauth>] [B<-verbose>] [B<-help>]
+    S<<< [B<-partition> <I<partition>>] >>> [B<-clone>] [B<-omitdirs>]
+    S<<< [B<-cell> <I<cell name>>] >>> [B<-noauth>] [B<-localauth>]
+    [B<-verbose>] [B<-help>]
 
 B<vos du> S<<< B<-i> <I<volume name or ID>> >>> S<<< [B<-t> <I<dump from time>>] >>>
     S<<< [B<-f> <I<dump file>>] >>> S<<< [B<-s> <I<server>>] >>> S<<< [B<-p> <I<partition>>] >>>
-    S<<< [B<-c> <I<cell name>>] >>> [B<-n>] [B<-l>] [B<-v>] [B<-h>]
+    [B<-cl>] [B<-o>] S<<< [B<-ce> <I<cell name>>] >>> [B<-n>] [B<-l>]
+    [B<-v>] [B<-h>]
 
 =for html
 </div>
@@ -130,6 +132,23 @@ the B<-partition> argument along with this one.
 Specifies the partition on which the volume resides. Provide the
 B<-server> argument along with this one.
 
+=item B<-clone>
+
+Normally, B<vos dump> locks the volume and dumps it, which blocks writes
+to the volume while the dump is in progress.  If this flag is given, B<vos
+dump> will instead clone the volume first (similar to what B<vos move>
+would do) and then dumps the clone.  This can significantly decrease the
+amount of time the volume is kept locked for dumps of large volumes.
+
+=item B<-omitdirs>
+
+By default, B<vos dump> includes all directory objects in an incremental
+dump whether they've been changed or not.  If this option is given,
+unchanged directories will be omitted.  This will reduce the size of the
+dump and not cause problems if the incremental is restored, as expected,
+on top of a volume containing the correct directory structure (such as one
+created by restoring previous full and incremental dumps).
+
 =item B<-cell> <I<cell name>
 
 Names the cell in which to run the command. Do not combine this argument
-- 
2.39.5