summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjj <jj@openbsd.org>2009-06-02 17:05:57 +0000
committerjj <jj@openbsd.org>2009-06-02 17:05:57 +0000
commitc132fd20d5369d7ef8abecb72af34b3bc5d12e67 (patch)
tree37d36b83f4930f14065b386daf395ca3dff49e47
parentsatosin was already defined in in.h, no need to redefine it here (diff)
downloadwireguard-openbsd-c132fd20d5369d7ef8abecb72af34b3bc5d12e67.tar.xz
wireguard-openbsd-c132fd20d5369d7ef8abecb72af34b3bc5d12e67.zip
note that order is important in the file regarding global options at this time. ok pyr@
-rw-r--r--usr.sbin/relayd/relayd.conf.57
1 files changed, 5 insertions, 2 deletions
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 <reyk@openbsd.org>
.\" Copyright (c) 2006, 2007 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -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