diff options
author | pfg <pfg@FreeBSD.org> | 2016-02-29 14:46:39 +0000 |
---|---|---|
committer | pfg <pfg@FreeBSD.org> | 2016-02-29 14:46:39 +0000 |
commit | 0f231ca03489f944c2825b461d215b34d43b9c4a (patch) | |
tree | b906a3b51ec000d02f5a1ea32fb9303c5c735405 /contrib/openresolv/resolvconf.conf.5.in | |
parent | 6dd3382ff8741c8167dd44d3f94b1c162da3be3a (diff) | |
download | FreeBSD-src-0f231ca03489f944c2825b461d215b34d43b9c4a.zip FreeBSD-src-0f231ca03489f944c2825b461d215b34d43b9c4a.tar.gz |
MFV r296164:
Update openresolve to version 3.7.3 including:
* Save the initial working directory and change to it just before
running any scripts.
This avoids scripts putting files accidently where they shouldn't.
* Strip trailing dot from search and domain names.
* man page improvements.
Relnotes: yes
Diffstat (limited to 'contrib/openresolv/resolvconf.conf.5.in')
-rw-r--r-- | contrib/openresolv/resolvconf.conf.5.in | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/contrib/openresolv/resolvconf.conf.5.in b/contrib/openresolv/resolvconf.conf.5.in index 7aa1450..ddf0558 100644 --- a/contrib/openresolv/resolvconf.conf.5.in +++ b/contrib/openresolv/resolvconf.conf.5.in @@ -1,4 +1,4 @@ -.\" Copyright (c) 2009-2015 Roy Marples +.\" Copyright (c) 2009-2016 Roy Marples .\" All rights reserved .\" .\" Redistribution and use in source and binary forms, with or without @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 14, 2015 +.Dd February 21, 2016 .Dt RESOLVCONF.CONF 5 .Os .Sh NAME @@ -42,8 +42,11 @@ must contain valid shell commands. Listed below are the standard .Nm variables that may be set. -If the values contain white space for special shell characters, +If the values contain whitespace, wildcards or other special shell characters, ensure they are quoted and escaped correctly. +See the +.Sy replace +variable for an example on quoting. .Pp After updating this file, you may wish to run .Nm resolvconf -u |