Merge commit 'upstream/2.6.1p2'

[debian/amanda] / man / amanda.conf.5

diff --git a/man/amanda.conf.5 b/man/amanda.conf.5
index 67d0849c32c0967c50dedd0cdb4f3e3b558fadd0..fcbb39e505b5644619d4a8cb949a7f85cb949f1d 100644 (file)
--- a/man/amanda.conf.5
+++ b/man/amanda.conf.5
@@ -2,12 +2,12 @@
 .\"     Title: amanda.conf
 .\"    Author: James da Silva <jds@amanda.org>
 .\" Generator: DocBook XSL Stylesheets vsnapshot_8273 <http://docbook.sf.net/>
-.\"      Date: 04/10/2009
+.\"      Date: 11/05/2009
 .\"    Manual: File formats and conventions
-.\"    Source: Amanda 2.6.1p1
+.\"    Source: Amanda 2.6.1p2
 .\"  Language: English
 .\"
-.TH "AMANDA\&.CONF" "5" "04/10/2009" "Amanda 2\&.6\&.1p1" "File formats and conventions"
+.TH "AMANDA\&.CONF" "5" "11/05/2009" "Amanda 2\&.6\&.1p2" "File formats and conventions"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -1585,6 +1585,12 @@ and
 has scheduled an incremental backup, these disks will be skipped\&.
 .RE
 .PP
+\fBssh_keys\fR \fI string\fR
+.RS 4
+Default:
+\fINo default\fR\&. The key file the ssh auth will use, it must be the private key\&. If this parameter is not specified, then the default ssh key will be used\&.
+.RE
+.PP
 \fBstarttime\fR \fI int\fR
 .RS 4
 Default: