summaryrefslogtreecommitdiff
path: root/sbin/ipsecctl
diff options
context:
space:
mode:
authorStuart Henderson <sthen@cvs.openbsd.org>2014-03-19 12:49:01 +0000
committerStuart Henderson <sthen@cvs.openbsd.org>2014-03-19 12:49:01 +0000
commit7945b4f8073ee8cfa718d56d433d0130aaeccc71 (patch)
treee76406925f83b5924a44cb0298f9f994a91eeb18 /sbin/ipsecctl
parent6e2621c23c35516b6036c2c0d9bb69fd5e1d9376 (diff)
Unify ipsec.conf(5)'s copy of the text dealing with multiline comments,
this was missed when unifying text in the other parse.y parsers (see e.g. pf.conf.5 r1.495). Noticed in a misc@ post by zeloff at zeloff/org.
Diffstat (limited to 'sbin/ipsecctl')
-rw-r--r--sbin/ipsecctl/ipsec.conf.518
1 files changed, 9 insertions, 9 deletions
diff --git a/sbin/ipsecctl/ipsec.conf.5 b/sbin/ipsecctl/ipsec.conf.5
index a0444c67a3f..887337621e1 100644
--- a/sbin/ipsecctl/ipsec.conf.5
+++ b/sbin/ipsecctl/ipsec.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ipsec.conf.5,v 1.144 2013/11/01 10:42:38 henning Exp $
+.\" $OpenBSD: ipsec.conf.5,v 1.145 2014/03/19 12:49:00 sthen Exp $
.\"
.\" Copyright (c) 2004 Mathieu Sauve-Frankel All rights reserved.
.\"
@@ -22,7 +22,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: November 1 2013 $
+.Dd $Mdocdate: March 19 2014 $
.Dt IPSEC.CONF 5
.Os
.Sh NAME
@@ -104,13 +104,13 @@ Manual keying is not recommended,
but can be convenient for quick setups and testing.
Those procedures are documented within this page.
.Sh IPSEC.CONF FILE FORMAT
-Lines beginning with
-.Sq #
-and empty lines are regarded as comments,
-and ignored.
-Lines may be split using the
-.Sq \e
-character.
+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
Argument names not beginning with a letter, digit, or underscore
must be quoted.