From 0de38eac0cad2243a44c2af50ff5e49070623994 Mon Sep 17 00:00:00 2001 From: Janne Johansson Date: Tue, 2 Jun 2009 17:05:58 +0000 Subject: note that order is important in the file regarding global options at this time. ok pyr@ --- usr.sbin/relayd/relayd.conf.5 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'usr.sbin/relayd/relayd.conf.5') diff --git a/usr.sbin/relayd/relayd.conf.5 b/usr.sbin/relayd/relayd.conf.5 index 3078ebd4109..b0b1436e5b6 100644 --- a/usr.sbin/relayd/relayd.conf.5 +++ b/usr.sbin/relayd/relayd.conf.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: relayd.conf.5,v 1.104 2009/04/24 14:20:24 reyk Exp $ +.\" $OpenBSD: relayd.conf.5,v 1.105 2009/06/02 17:05:57 jj Exp $ .\" .\" Copyright (c) 2006, 2007 Reyk Floeter .\" Copyright (c) 2006, 2007 Pierre-Yves Ritschard @@ -15,7 +15,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: April 24 2009 $ +.Dd $Mdocdate: June 2 2009 $ .Dt RELAYD.CONF 5 .Os .Sh NAME @@ -35,6 +35,9 @@ configuration file. .It Sy Global Configuration Global settings for .Xr relayd 8 . +Do note that the config file allows you to add global settings after +defining tables in the config file, but those tables will use the +built-in defaults instead of the global settings below them. .It Sy Tables Table definitions describe a list of hosts, in a similar fashion to -- cgit v1.2.3