Merge commit 'upstream/3.1.0'

[debian/amanda] / man / disklist.5

diff --git a/man/disklist.5 b/man/disklist.5
index fde5de9cba5ffd3f90198ddf6a05cfabbabbaa91..b59c5739d78b53aff24d43a8f1d8dcd8c51468c4 100644 (file)
--- a/man/disklist.5
+++ b/man/disklist.5
@@ -2,12 +2,12 @@
 .\"     Title: disklist
 .\"    Author: James da Silva <jds@amanda.org>
 .\" Generator: DocBook XSL Stylesheets vsnapshot_8273 <http://docbook.sf.net/>
-.\"      Date: 11/05/2009
+.\"      Date: 06/01/2010
 .\"    Manual: File formats and conventions
-.\"    Source: Amanda 2.6.1p2
+.\"    Source: Amanda 3.1.0
 .\"  Language: English
 .\"
-.TH "DISKLIST" "5" "11/05/2009" "Amanda 2\&.6\&.1p2" "File formats and conventions"
+.TH "DISKLIST" "5" "06/01/2010" "Amanda 3\&.1\&.0" "File formats and conventions"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -19,13 +19,12 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-disklist \- List of partitions to back up for \fIAmanda\fR
+disklist \- List of partitions to back up for Amanda
 .SH "DESCRIPTION"
 .PP
 The
 \fIdisklist\fR
-file determines which disks will be backed up by
-\fIAmanda\fR\&. The file usually contains one line per disk:
+file determines which disks will be backed up by Amanda\&. The file usually contains one line per disk:
 .nf
 \fIhostname diskname\fR [\fIdiskdevice\fR] \fIdumptype\fR [\fIspindle\fR [\fIinterface\fR] ]
 .fi
@@ -40,9 +39,7 @@ Lines starting with # are ignored, as are blank lines\&. The fields have the fol
 .RS 4
 The name of the host to be backed up\&. If
 \fBdiskdevice\fR
-refers to a PC share, this is the host
-\fIAmanda\fR
-will run the Samba
+refers to a PC share, this is the host Amanda will run the Samba
 \fBsmbclient\fR
 program on to back up the share\&.
 .RE
@@ -60,9 +57,7 @@ If you want multiple entries with the same
 \fBdiskname\fR
 for each entry\&. It\'s the
 \fBdiskname\fR
-that you use on the commandline for any
-\fIAmanda\fR
-command\&. Look at the example/disklist file for example\&.
+that you use on the commandline for any Amanda command\&. Look at the example/disklist file for example\&.
 .RE
 .PP
 \fIdiskdevice\fR
@@ -100,9 +95,7 @@ file\&.
 \fIspindle\fR
 .RS 4
 Default:
-\fB\-1\fR\&. A number used to balance backup load on a host\&.
-\fIAmanda\fR
-will not run multiple backups at the same time on the same spindle, unless the spindle number is \-1, which means there is no spindle restriction\&.
+\fB\-1\fR\&. A number used to balance backup load on a host\&. Amanda will not run multiple backups at the same time on the same spindle, unless the spindle number is \-1, which means there is no spindle restriction\&.
 .RE
 .PP
 \fIinterface\fR
@@ -138,6 +131,15 @@ is used for most disks, but use of the holding disk needs to be disabled for the
   holdingdisk never
 } [ \fIspindle\fR [ \fIinterface\fR ] ]
 .fi
+.PP
+The { must appear at the end of a line, and the } on its own line possibly followed by the spindle and interface\&.
+.SH "SEE ALSO"
+.PP
+\fBamanda\fR(8),
+\fBamanda.conf\fR(5)
+.PP
+The Amanda Wiki:
+: http://wiki.zmanda.com/
 .SH "AUTHORS"
 .PP
 \fBJames da Silva\fR <\&jds@amanda\&.org\&>