Add an ignore file.

[openresolv] / resolvconf.8.in

diff --git a/resolvconf.8.in b/resolvconf.8.in
index bf63a677e5ecc5aa3fd3d2e5d6354cee5fe17070..1f8a8de15288141c5f1f43e337eef1d96d869b87 100644 (file)
--- a/resolvconf.8.in
+++ b/resolvconf.8.in
@@ -48,13 +48,11 @@ Normally
 .B resolvconf
 is run only by hook scripts attached to network interface configurers
 such as
 .B resolvconf
 is run only by hook scripts attached to network interface configurers
 such as

-.BR pppd (8) 
+.BR ppp (8) 

 (for ppp interfaces),
 to DHCP clients such as
 .BR dhcpcd (8),
 (for ppp interfaces),
 to DHCP clients such as
 .BR dhcpcd (8),

-to
-.BR /etc/init.d/net.eth0 
-and
+to network configuration scripts and

 .BR openvpn ,
 and
 to DNS caches such as
 .BR openvpn ,
 and
 to DNS caches such as


@@ -79,7 +77,7 @@ whither to forward queries.
 .PP
 The most important piece of
 software that subscribes to the notification service is the set of functions
 .PP
 The most important piece of
 software that subscribes to the notification service is the set of functions

-that make up the GNU C Library
+that make up the C Library

 .BR resolver (3).
 When nameserver information is updated the script
 \fI%%PREFIX%%/etc/resolvconf/update.d/libc\fR writes a new resolver configuration
 .BR resolver (3).
 When nameserver information is updated the script
 \fI%%PREFIX%%/etc/resolvconf/update.d/libc\fR writes a new resolver configuration


@@ -88,7 +86,7 @@ file to \fI%%PREFIX%%/etc/resolvconf/run/resolv.conf\fR and then runs the script
 To make the resolver use the dynamically generated resolver configuration
 file the administrator should ensure that \fI/etc/resolv.conf\fR is a symbolic
 link to \fI%%PREFIX%%/etc/resolvconf/run/resolv.conf\fR.
 To make the resolver use the dynamically generated resolver configuration
 file the administrator should ensure that \fI/etc/resolv.conf\fR is a symbolic
 link to \fI%%PREFIX%%/etc/resolvconf/run/resolv.conf\fR.

-This link is never modified by \fB/sbin/resolvconf\fR.
+This link is never modified by \fBresolvconf\fR.

 If you find that \fI/etc/resolv.conf\fR is not being updated,
 check to see that the link is intact.
 .PP
 If you find that \fI/etc/resolv.conf\fR is not being updated,
 check to see that the link is intact.
 .PP


@@ -101,26 +99,26 @@ should work with \fBresolvconf\fR.
 .BR dnsmasq (8)
 and
 .BR named (8)
 .BR dnsmasq (8)
 and
 .BR named (8)

-wwhich handle resolv.conf a bit differently. If they handle search AND domain
+which handle resolv.conf a bit differently. If they handle search AND domain

 options then the nameservers listed with the domain are only used when
 querying for that domain.
 .TP
 Example
 .nf
 # resolv.conf from bge0
 options then the nameservers listed with the domain are only used when
 querying for that domain.
 .TP
 Example
 .nf
 # resolv.conf from bge0

-# search foo.com
-# nameserver 1.2.3.4
+search foo.com
+nameserver 1.2.3.4

 
 # resolv.conf from tap0
 
 # resolv.conf from tap0

-# domain bar.org
-# nameserver 5.6.7.8
+domain bar.org
+nameserver 5.6.7.8

 .fi
 .PP
 In this instance, nameserver 5.6.7.8 will only handle requests for bar.org
 and nameserver 1.2.3.4 will handle everything else.
 .PP
 Subscribers that need to know only when the resolver configuration file
 .fi
 .PP
 In this instance, nameserver 5.6.7.8 will only handle requests for bar.org
 and nameserver 1.2.3.4 will handle everything else.
 .PP
 Subscribers that need to know only when the resolver configuration file

-has changed should install a script in \fI/etc/resolvconf/update-libc.d/\fR
+has changed should install a script in \fI%%PREFIX%%/etc/resolvconf/update-libc.d/\fR

 rather than in \fI%%PREFIX%%/etc/resolvconf/update.d/\fR.
 (This is important for synchronization purposes:
 scripts in \fIupdate-libc.d/\fR are run after resolv.conf has been updated;
 rather than in \fI%%PREFIX%%/etc/resolvconf/update.d/\fR.
 (This is important for synchronization purposes:
 scripts in \fIupdate-libc.d/\fR are run after resolv.conf has been updated;


@@ -178,7 +176,7 @@ even when no interfaces are configured.
 File to be prepended to the dynamically generated resolver configuration file.
 Normally this is just a comment line.
 .TP
 File to be prepended to the dynamically generated resolver configuration file.
 Normally this is just a comment line.
 .TP

-.I %%PREFIX%%/etc/resolvconf/reslov.conf.d/tail
+.I %%PREFIX%%/etc/resolvconf/resolv.conf.d/tail

 File to be appended to the dynamically generated resolver configuration file.
 To append nothing, make this an empty file.
 .SH BUGS
 File to be appended to the dynamically generated resolver configuration file.
 To append nothing, make this an empty file.
 .SH BUGS


@@ -190,8 +188,6 @@ Written by Roy Marples <roy@marples.name>.
 .br
 Heavily based on Debians resolvconf by Thomas Hood <jdthood_AT_yahoo.co.uk>
 .SH COPYRIGHT
 .br
 Heavily based on Debians resolvconf by Thomas Hood <jdthood_AT_yahoo.co.uk>
 .SH COPYRIGHT

-Copyright \(co 2006 Gentoo Foundation
-.br

 Copyright \(co 2007 Roy Marples
 .SH "SEE ALSO"
 .BR resolv.conf (5),
 Copyright \(co 2007 Roy Marples
 .SH "SEE ALSO"
 .BR resolv.conf (5),