From: Roy Marples <roy@marples.name>
Date: Wed, 27 Apr 2016 22:19:16 +0000 (+0000)
Subject: Describe multiple interfaces, master mode and single interfaces better.
X-Git-Tag: v6.11.0~67
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba754fc8374f9af6307b09a9bf9990336731bddc;p=thirdparty%2Fdhcpcd.git

Describe multiple interfaces, master mode and single interfaces better.
---

diff --git a/dhcpcd.8.in b/dhcpcd.8.in
index 890e5a7d..a72502a5 100644
--- a/dhcpcd.8.in
+++ b/dhcpcd.8.in
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd January 14, 2016
+.Dd April 27, 2016
 .Dt DHCPCD 8
 .Os
 .Sh NAME
@@ -166,23 +166,31 @@ only works with those interfaces, otherwise
 discovers available Ethernet interfaces that can be configured.
 When
 .Nm
-is operating on more than one interface,
-it is called Master mode. and this behaviour can be forced with the
-.Fl M , Fl Fl master
-option so that an individual interface can start
-.Nm
-but only one instance is running.
+not limited to one interface on the command line,
+it is running in Master mode.
 The
 .Nm dhcpcd-ui
 project expects dhcpcd to be running this way.
 .Pp
 If a single interface is given then
 .Nm
-only works for that interface and runs as a separate instance.
-The
+only works for that interface and runs as a separate instance to other
+.Nm
+processes.
 .Fl w , Fl Fl waitip
 option is enabled in this instance to maintain compatibility with older
 versions.
+Using a single interface also affects the
+.Fl k ,
+.Fl N ,
+.Fl n
+and
+.Fl x
+options where the same interface will need to be specified as a lack of an
+interace will imply Master mode which this is not.
+To force starting in Master mode with only one interface, the
+.Fl M , Fl Fl master
+option can be used.
 .Pp
 Interfaces are preferred by carrier, DHCP lease/IPv4LL and then lowest metric.
 For systems that support route metrics, each route will be tagged with the
@@ -355,7 +363,7 @@ regardless of the
 option.
 If no
 .Ar interface
-is specified then this applies to all interfaces.
+is specified then this applies to all interfaces in Master mode.
 If no interfaces are left running,
 .Nm
 will exit.
@@ -382,7 +390,9 @@ Notifies
 .Nm
 to reload its configuration and rebind the specified
 .Ar interface .
-If no interface is specified then this applies to all interfaces.
+If no
+.Ar interface
+is specified then this applies to all interfaces in Master mode.
 If
 .Nm
 is not running, then it starts up as normal.
@@ -395,7 +405,9 @@ Notifies
 .Nm
 to renew existing addresses on the specified
 .Ar interface .
-If no interface is specified then this applies to all interfaces.
+If no
+.Ar interface
+is specified then this applies to all interfaces in Master mode.
 If
 .Nm
 is not running, then it starts up as normal.
@@ -538,7 +550,9 @@ This will signal an existing
 process running on the
 .Ar interface
 to exit.
-If no interface is specified, then the above is applied to all interfaces.
+If no
+.Ar interface
+is specified, then the above is applied to all interfaces in Master mode.
 See the
 .Fl p , Fl Fl persistent
 option to control configuration persistence on exit,