summaryrefslogtreecommitdiffstats
path: root/usr.sbin/hostapd
diff options
context:
space:
mode:
authorsthen <sthen@openbsd.org>2011-06-23 20:35:22 +0000
committersthen <sthen@openbsd.org>2011-06-23 20:35:22 +0000
commit1916bc224386ee6e7ef0c7b1a99844f71cba0808 (patch)
tree1f2e355496735fb86b4b865d41554d34a6ea9432 /usr.sbin/hostapd
parentSet pd->af very early in pf_setup_pdesc() since the AF is used in (diff)
downloadwireguard-openbsd-1916bc224386ee6e7ef0c7b1a99844f71cba0808.tar.xz
wireguard-openbsd-1916bc224386ee6e7ef0c7b1a99844f71cba0808.zip
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/hostapd')
-rw-r--r--usr.sbin/hostapd/hostapd.conf.58
1 files changed, 6 insertions, 2 deletions
diff --git a/usr.sbin/hostapd/hostapd.conf.5 b/usr.sbin/hostapd/hostapd.conf.5
index 6bdef319c6f..a104b577730 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.37 2009/04/16 20:13:13 sobrado Exp $
+.\" $OpenBSD: hostapd.conf.5,v 1.38 2011/06/23 20:35:22 sthen Exp $
.\"
.\" Copyright (c) 2004, 2005, 2006 Reyk Floeter <reyk@openbsd.org>
.\"
@@ -14,7 +14,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 16 2009 $
+.Dd $Mdocdate: June 23 2011 $
.Dt HOSTAPD.CONF 5
.Os
.Sh NAME
@@ -47,9 +47,13 @@ The concepts and details about the optional IP based roaming in
.Xr hostapd 8 .
.El
.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