fishdescriptor: before redo option parsing

[chiark-utils.git] / backup / iwjbackup.txt

diff --git a/backup/iwjbackup.txt b/backup/iwjbackup.txt
index 39000ee29c74221a4dfa55a15d3b3f14b7ae9a00..a353e757f9be57b18157d138d3b4fa0264390137 100644 (file)
--- a/backup/iwjbackup.txt
+++ b/backup/iwjbackup.txt
@@ -64,12 +64,21 @@ In the fsys.* files:
 The file (including any included files) must end with the word 'end'
 on a line of its own.
 
-Valid values for <backup-type> are `cpio' (uses cpio to produce
-tar-format backups), `dump' (uses dump to dump entire filesystems;
-<directory name> should be a mount-point for this), `zafio' (uses afio
-to compress each file as it is backed up), and `ntfsimage' (for NTFS
-volumes, requires device name).  Only `dump' type backups perform
-incremental backups.
+Valid values for <backup-type> are
+  cpio
+    uses cpio to produce tar-format backups
+  dump
+    uses dump to dump entire filesystems
+    <directory name> should be a mount-point
+  gtar
+    uses GNU tar to produce GNU tar format backups and -N-based
+    semi-incrementals (not --incremental or --listed-incremental)
+  zafio
+    uses afio to compress each file as it is backed up
+  ntfsimage
+    for NTFS volumes, requires device name
+Only `dump' and `gtar' type backups perform any kind of incremental
+backups.
 
 <options> is a comma-separated list of <option> or <option>=<value>.
 Options supported:
@@ -85,6 +94,10 @@ Options supported:
     Indicates that the filesystem should be frozen before the backup
     by using /etc/chiark-backup/snap/<snapkind>.  See the head comment
     in /etc/chiark-backup/snap/lvm for details of how this works.
+    When snap= is used, the block device must be specified.
+
+  noinc
+    Suppress incrementals.
 
 expected-diffs is a config file to indicate which 
 filesystems should *not* be backed up. The scripts do a config
@@ -173,12 +186,13 @@ This file is part of chiark backup, a system for backing up GNU/Linux and
 other UN*X-compatible machines, as used on chiark.greenend.org.uk.
 
 chiark backup is:
- Copyright (C) 1997-1998,2000-2001 Ian Jackson <ian@chiark.greenend.org.uk>
+ Copyright (C) 1997-1998,2000-2001,2007
+                    Ian Jackson <ian@chiark.greenend.org.uk>
  Copyright (C) 1999 Peter Maydell <pmaydell@chiark.greenend.org.uk>
 
 This is free software; you can redistribute it and/or modify it under the
 terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2, or (at your option) any later version.
+Foundation; either version 3, or (at your option) any later version.
 
 This is distributed in the hope that it will be useful, but WITHOUT ANY
 WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
@@ -186,5 +200,5 @@ FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 details.
 
 You should have received a copy of the GNU General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+with this program; if not, consult the Free Software Foundation's
+website at www.fsf.org, or the GNU Project website at www.gnu.org.