From 96dc4026054df77affedfe50380a661dcdba732a Mon Sep 17 00:00:00 2001 From: Tar Committer Date: Thu, 7 Jul 2005 01:14:43 +0000 Subject: Imported from rancid-2.3.2a2.tar.gz. --- man/Makefile.in | 8 +++++--- man/rancid.conf.5.in | 21 +++++++++++++++++++-- 2 files changed, 24 insertions(+), 5 deletions(-) (limited to 'man') diff --git a/man/Makefile.in b/man/Makefile.in index 82dd0e2..c7415a2 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.8.4 from Makefile.am. +# Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -132,6 +132,8 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build_alias = @build_alias@ datadir = @datadir@ @@ -368,7 +370,7 @@ clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" diff --git a/man/rancid.conf.5.in b/man/rancid.conf.5.in index b8c01e3..4a86364 100644 --- a/man/rancid.conf.5.in +++ b/man/rancid.conf.5.in @@ -1,8 +1,8 @@ .\" -.\" $Id: rancid.conf.5.in,v 1.11 2004/03/12 23:13:09 heas Exp $ +.\" $Id: rancid.conf.5.in,v 1.14 2005/07/07 01:09:13 heas Exp $ .\" .hys 50 -.TH "rancid.conf" "5" "12 Mar 2004" +.TH "rancid.conf" "5" "5 July 2005" .SH NAME rancid.conf \- rancid environment configuration file .SH DESCRIPTION @@ -123,6 +123,23 @@ For example @MAILPLUS@usfs@example.com, if had been set to "@example.com". .\" .TP +.B MAILHEADERS +Define additional mail headers to be added to rancid mail, such as Precedence +or X- style headers. +Individual headers must be separated by a \\n (new line). +.sp +Default: Precedence: bulk +.sp +Example: Precedence: bulk\\nX-clamation: beef cake +.\" +.TP +.B MAX_ROUNDS +Defines how many times rancid should retry collection of devices that fail. +The minimum is 1. +.sp +Default: 4. +.\" +.TP .B NOCOMMSTR If set, .IR rancid (1) -- cgit