summaryrefslogtreecommitdiff
path: root/usr.sbin/relayd
diff options
context:
space:
mode:
authorStuart Henderson <sthen@cvs.openbsd.org>2011-06-23 20:35:23 +0000
committerStuart Henderson <sthen@cvs.openbsd.org>2011-06-23 20:35:23 +0000
commit7d92efd246de448e6fb91f652014db2db9853704 (patch)
tree96278cfa14b7b5a5b617ba2c5dd686b47cc92360 /usr.sbin/relayd
parente192765f7f0758656f42c3e96d176eaa48fcd489 (diff)
Use a common text explaining how the various configuration parsers using
the standard OpenBSD-style parse.y handle continuing lines with backslashes, paying particular attention to how comments are handled (which can cause nasty side-effects if you're not expecting it). Most wording from jmc@, with suggestions from fgsch@, marc@, Richard Toohey, patrick keshishian and Florian Obser, ok jmc@.
Diffstat (limited to 'usr.sbin/relayd')
-rw-r--r--usr.sbin/relayd/relayd.conf.58
1 files changed, 6 insertions, 2 deletions
diff --git a/usr.sbin/relayd/relayd.conf.5 b/usr.sbin/relayd/relayd.conf.5
index 540aeac8c60..b967a7eac20 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.122 2011/05/23 10:44:59 reyk Exp $
+.\" $OpenBSD: relayd.conf.5,v 1.123 2011/06/23 20:35:22 sthen 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: May 23 2011 $
+.Dd $Mdocdate: June 23 2011 $
.Dt RELAYD.CONF 5
.Os
.Sh NAME
@@ -78,9 +78,13 @@ see
.Xr services 5
for details.
.Pp
+The current line can be extended over multiple lines using a backslash
+.Pq Sq \e .
Comments can be put anywhere in the file using a hash mark
.Pq Sq # ,
and extend to the end of the current line.
+Care should be taken when commenting out multi-line text:
+the comment is effective until the end of the entire block.
.Pp
Additional configuration files can be included with the
.Ic include