X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=man%2Famanda.8;h=26e4951577697deb4d85465d11ae8ed0d09c9f65;hb=cdbbeef9cde260e429854dd313bc0bf7560e1e24;hp=3112bba52d2734bee9eb08035b136c5e342c52e0;hpb=6663e25ecad46c729d9be4f8585c51b523ac9044;p=debian%2Famanda

diff --git a/man/amanda.8 b/man/amanda.8
index 3112bba..26e4951 100644
--- a/man/amanda.8
+++ b/man/amanda.8
@@ -437,7 +437,7 @@ is used for most disks, but use of the holding disk needs to be disabled for the
 
 \fBhostname diskname\fR [ \fBdiskdevice\fR ] {
   normal
-  holdingdisk no
+  holdingdisk never
 } [ \fBspindle\fR [ \fBinterface\fR ] ]
 .fi
 .SH "TAPE MANAGEMENT"
@@ -654,7 +654,9 @@ file is:
 \fBhostname\fR
 [
 \fBusername\fR
-]
+[
+\fBservice\fR
+]*]
 .sp
 If
 \fBusername\fR
@@ -664,6 +666,19 @@ is ommitted, it defaults to the user running
 or
 \fBxinetd\fR
 configuration file.
+.sp
+The
+\fBservice\fR
+is a list of the service the client is authorized to execute:
+\fBamdump\fR,
+\fBnoop\fR,
+\fBselfcheck\fR,
+\fBsendsize\fR,
+\fBsendbackup\fR,
+\fBamindexd\fR,
+\fBamidxtaped\fR.
+\fBamdump\fR
+is a shortcut for "noop selfcheck sendsize sendbackup"
 .TP
 Kerberos
 \fBAmanda\fR
@@ -681,10 +696,13 @@ with share names, (clear text) passwords and (optional) domain names, in that or
 .nf
 
   //some-pc/home normalpw
-  //another-pc/disk otheruser%otherpw.fi
-With clear text passwords, this file should obviously be tightly protected. It only needs to be readable by the
-\fBAmanda\fR-user on the Samba server.
-.sp
+  //another-pc/disk otheruser%otherpw
+.fi
+
+
+With clear text passwords, this file should obviously be tightly protected.
+It only needs to be readable by the \fBAmanda\fR-user on the Samba server.
+
 You can find further information in the
 \fBdocs/SAMBA\fRfile that comes with an
 \fBAmanda\fR
@@ -739,6 +757,19 @@ A
 expression is a range expression where we only match the prefix. Leading ^ is removed. Trailing $ forces an exact match.
 20001212-14match all dates beginning with 20001212, 20001213 or 2000121420001212-4same as previous20001212-24match all dates between 20001212 and 200012242000121match all dates that start with 2000121 (20001210-20001219)2match all dates that start with 2 (20000101-29991231)2000-10match all dates between 20000101-20101231200010$match only 200010.PP
 
+.SH "CONFIGURATION OVERWRITE"
+.PP
+Most command allow to overwrite any configuration parameter on the command line with the -o option.
+.PP
+-o NAME=value
+.PP
+eg. -o runtapes=2
+.PP
+eg. -o DUMPTYPE:no-compress:compress="server fast"
+.PP
+eg. -o TAPETYPE:HP-DAT:length=2000m
+.PP
+eg. -o INTERFACE:local:use="2000 kbps"
 .SH "AUTHOR"
 .PP
 James da Silva,
@@ -752,6 +783,7 @@ Stefan G. Weichinger,
 .PP
 \fBamadmin\fR(8),
 \fBamanda.conf\fR(5),
+\fBamanda-client.conf\fR(5),
 \fBamcheck\fR(8),
 \fBamcheckdb\fR(8),
 \fBamcleanup\fR(8),