X-Git-Url: http://git.tuebingen.mpg.de/?p=dss.git;a=blobdiff_plain;f=dss.ggo;h=f2901638b5e362e8c9ad19e14cd20eaa42e1a382;hp=23f268580313a6d3437ef75f1ab8a4cf9fa6c839;hb=117c2aab1ca6d5918a39e65dd9581545c3dc95b9;hpb=04bcb8e95d4afd843bcbb98cb01eb6c19a990446

diff --git a/dss.ggo b/dss.ggo
index 23f2685..f290163 100644
--- a/dss.ggo
+++ b/dss.ggo
@@ -1,9 +1,9 @@
-# Copyright (C) 2008-2009 Andre Noll <maan@systemlinux.org>
+# Copyright (C) 2008-2010 Andre Noll <maan@systemlinux.org>
 #
 # Licensed under the GPL v2. For licencing details see COPYING.
 
 package "dss"
-version "0.1.3"
+version "0.1.4"
 purpose "the dyadic snapshot scheduler
 
 dss creates hardlink-based snapshots of a given directory on a remote
@@ -110,11 +110,17 @@ groupoption "prune" P
 "Remove redundant and outdated snapshots"
 group="command"
 details="
-	A snapshot is considered outdated if it belongs to an interval
-	greater than the maximum number of intervals. It is said to be
-	redundant if it belongs to an interval that already contains
-	more than the desired number of snapshots. This command gets
-	rid of such snapshots.
+	A snapshot is considered outdated if its interval number
+	is greater or equal than the specified number of unit
+	intervals. See the \"Intervals\" section below for the precise
+	definition of these terms.
+
+	A snapshot is said to be redundant if it belongs to an
+	interval that already contains more than the desired number
+	of snapshots.
+
+	The prune command gets rid of both outdated and redundant
+	snapshots.
 "
 
 groupoption "ls" L
@@ -188,6 +194,21 @@ details="
 	dss.
 "
 
+option "no-resume" -
+#~~~~~~~~~~~~~~~~~~~
+"Do not try to resume from previous runs"
+flag off
+details = "
+	Starting from version 0.1.4, dss tries to resume from a
+	previously cancelled dss instance by default. It does so by
+	looking at the status of the most recently created snapshot. If
+	this snapshot status is incomplete, its directory is reused
+	as the destination directory for a subsequent rsync run.
+
+	The --no-resume option deactivates this feature so that a new
+	directory is always used as the rsync destination directory.
+"
+
 option "rsync-option" O
 #~~~~~~~~~~~~~~~~~~~~~~
 "Further rsync options"
@@ -247,6 +268,7 @@ option "pre-create-hook" r
 #~~~~~~~~~~~~~~~~~~~~~~~~~~
 "Executed before snapshot creation"
 string typestr="command"
+default = "true"
 optional
 details="
 	Execute this command before trying to create a new snapshot.
@@ -265,6 +287,7 @@ option "post-create-hook" o
 #~~~~~~~~~~~~~~~~~~~~~~~~~~
 "Executed after snapshot creation"
 string typestr="command"
+default = "true"
 optional
 details="
 	Execute this after a snapshot has successfully been
@@ -281,6 +304,7 @@ option "pre-remove-hook" -
 #~~~~~~~~~~~~~~~~~~~~~~~~~~
 "Executed before snapshot removal"
 string typestr="command"
+default = "true"
 optional
 details="
 	Execute this command before removing a snapshot. The full
@@ -302,6 +326,7 @@ option "post-remove-hook" -
 #~~~~~~~~~~~~~~~~~~~~~~~~~~
 "Executed after snapshot removal"
 string typestr="command"
+default = "true"
 optional
 details="
 	Execute this after a snapshot has successfully been removed. As
@@ -314,6 +339,7 @@ option "exit-hook" e
 #~~~~~~~~~~~~~~~~~~~
 "Executed if run command exits"
 string typestr="command"
+default = "true"
 optional
 details="
 	This hook is only used if the --run command was given which