summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2006-08-31 18:44:49 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2006-08-31 18:44:49 +0000
commit41fce8d53cef658b9545d3febb87a79921572241 (patch)
treeb57318c4a104b380992361a11ed9e5c65acc13e0
parent354cfc03043a78dfc816ea0d39823574f202901b (diff)
knock out the cpp/m4 stuff from MACROS; after discussion with many...
-rw-r--r--sbin/ipsecctl/ipsec.conf.58
-rw-r--r--share/man/man5/pf.conf.58
-rw-r--r--usr.sbin/bgpd/bgpd.conf.58
-rw-r--r--usr.sbin/hostapd/hostapd.conf.58
-rw-r--r--usr.sbin/ospfd/ospfd.conf.58
5 files changed, 10 insertions, 30 deletions
diff --git a/sbin/ipsecctl/ipsec.conf.5 b/sbin/ipsecctl/ipsec.conf.5
index c18f4f42fea..930954db28b 100644
--- a/sbin/ipsecctl/ipsec.conf.5
+++ b/sbin/ipsecctl/ipsec.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ipsec.conf.5,v 1.77 2006/08/31 17:50:43 jmc Exp $
+.\" $OpenBSD: ipsec.conf.5,v 1.78 2006/08/31 18:44:48 jmc Exp $
.\"
.\" Copyright (c) 2004 Mathieu Sauve-Frankel All rights reserved.
.\"
@@ -77,11 +77,7 @@ Rulesets can be loaded, viewed, and modified via the
.Xr ipsecctl 8
utility.
.Sh MACROS
-Much like
-.Xr cpp 1
-or
-.Xr m4 1 ,
-macros can be defined that will later be expanded in context.
+Macros can be defined that will later be expanded in context.
Macro names must start with a letter, and may contain letters, digits
and underscores.
Macro names may not be reserved words (for example
diff --git a/share/man/man5/pf.conf.5 b/share/man/man5/pf.conf.5
index ed0f00e88c7..db6a9430c01 100644
--- a/share/man/man5/pf.conf.5
+++ b/share/man/man5/pf.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pf.conf.5,v 1.353 2006/08/22 15:55:13 dhartmei Exp $
+.\" $OpenBSD: pf.conf.5,v 1.354 2006/08/31 18:44:48 jmc Exp $
.\"
.\" Copyright (c) 2002, Daniel Hartmeier
.\" All rights reserved.
@@ -80,11 +80,7 @@ enforces this order (see
.Ar set require-order
below).
.Sh MACROS
-Much like
-.Xr cpp 1
-or
-.Xr m4 1 ,
-macros can be defined that will later be expanded in context.
+Macros can be defined that will later be expanded in context.
Macro names must start with a letter, and may contain letters, digits
and underscores.
Macro names may not be reserved words (for example
diff --git a/usr.sbin/bgpd/bgpd.conf.5 b/usr.sbin/bgpd/bgpd.conf.5
index a5614d9d0ec..83aee63f658 100644
--- a/usr.sbin/bgpd/bgpd.conf.5
+++ b/usr.sbin/bgpd/bgpd.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: bgpd.conf.5,v 1.74 2006/08/28 23:16:51 stevesk Exp $
+.\" $OpenBSD: bgpd.conf.5,v 1.75 2006/08/31 18:44:48 jmc Exp $
.\"
.\" Copyright (c) 2004 Claudio Jeker <claudio@openbsd.org>
.\" Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -54,11 +54,7 @@ the sections should be grouped and appear in
.Nm
in the order shown above.
.Sh MACROS
-Much like
-.Xr cpp 1
-or
-.Xr m4 1 ,
-macros can be defined that will later be expanded in context.
+Macros can be defined that will later be expanded in context.
Macro names must start with a letter, and may contain letters, digits
and underscores.
Macro names may not be reserved words (for example,
diff --git a/usr.sbin/hostapd/hostapd.conf.5 b/usr.sbin/hostapd/hostapd.conf.5
index 9a46a936a4f..ba16596b637 100644
--- a/usr.sbin/hostapd/hostapd.conf.5
+++ b/usr.sbin/hostapd/hostapd.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: hostapd.conf.5,v 1.33 2006/06/27 18:14:59 reyk Exp $
+.\" $OpenBSD: hostapd.conf.5,v 1.34 2006/08/31 18:44:48 jmc Exp $
.\"
.\" Copyright (c) 2004, 2005, 2006 Reyk Floeter <reyk@openbsd.org>
.\"
@@ -58,11 +58,7 @@ keyword, for example:
include "/etc/hostapd.conf.local"
.Ed
.Sh MACROS
-Much like
-.Xr cpp 1
-or
-.Xr m4 1 ,
-macros can be defined that will later be expanded in context.
+Macros can be defined that will later be expanded in context.
Macro names must start with a letter, and may contain letters, digits
and underscores.
Macro names may not be reserved words (for example,
diff --git a/usr.sbin/ospfd/ospfd.conf.5 b/usr.sbin/ospfd/ospfd.conf.5
index c106de396e1..a880b7b9094 100644
--- a/usr.sbin/ospfd/ospfd.conf.5
+++ b/usr.sbin/ospfd/ospfd.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ospfd.conf.5,v 1.18 2006/08/28 23:16:50 stevesk Exp $
+.\" $OpenBSD: ospfd.conf.5,v 1.19 2006/08/31 18:44:48 jmc Exp $
.\"
.\" Copyright (c) 2005 Esben Norby <norby@openbsd.org>
.\" Copyright (c) 2004 Claudio Jeker <claudio@openbsd.org>
@@ -45,11 +45,7 @@ An OSPF router must be a member of at least one area.
Areas are used to group interfaces, simplifying configuration.
.El
.Sh MACROS
-Much like
-.Xr cpp 1
-or
-.Xr m4 1 ,
-macros can be defined that will later be expanded in context.
+Macros can be defined that will later be expanded in context.
Macro names must start with a letter, and may contain letters, digits,
and underscores.
Macro names may not be reserved words (for example,