From: jmc <jmc@openbsd.org>
Date: Thu, 30 Nov 2017 07:41:01 +0000 (+0000)
Subject: use the same macro consistently for the various carp balancing modes;
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=4fe17546ef5e6159246848fc50149c8b760f922c;p=openbsd

use the same macro consistently for the various carp balancing modes;
---

diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8
index 893b2b488a1..431dca65bfd 100644
--- a/sbin/ifconfig/ifconfig.8
+++ b/sbin/ifconfig/ifconfig.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ifconfig.8,v 1.290 2017/11/30 07:37:13 jmc Exp $
+.\"	$OpenBSD: ifconfig.8,v 1.291 2017/11/30 07:41:01 jmc Exp $
 .\"	$NetBSD: ifconfig.8,v 1.11 1996/01/04 21:27:29 pk Exp $
 .\"     $FreeBSD: ifconfig.8,v 1.16 1998/02/01 07:03:29 steve Exp $
 .\"
@@ -768,10 +768,10 @@ Acceptable values are 0 to 254; the default value is 0.
 Set the load balancing mode to
 .Ar mode .
 Valid modes are
-.Ar ip ,
-.Ar ip-stealth ,
+.Cm ip ,
+.Cm ip-stealth ,
 and
-.Ar ip-unicast .
+.Cm ip-unicast .
 .It Cm carpnodes Ar vhid:advskew,vhid:advskew,...
 Create a load balancing group consisting of up to 32 nodes.
 Each node is specified as a
diff --git a/share/man/man4/carp.4 b/share/man/man4/carp.4
index 42ed7d7460e..a6a3bae2709 100644
--- a/share/man/man4/carp.4
+++ b/share/man/man4/carp.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: carp.4,v 1.38 2015/11/03 17:45:32 jmc Exp $
+.\"	$OpenBSD: carp.4,v 1.39 2017/11/30 07:41:01 jmc Exp $
 .\"
 .\" Copyright (c) 2003, Ryan McBride.  All rights reserved.
 .\"
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: November 3 2015 $
+.Dd $Mdocdate: November 30 2017 $
 .Dt CARP 4
 .Os
 .Sh NAME
@@ -162,9 +162,7 @@ The filtering function uses a hash over the source and destination
 address of the IPv4 or IPv6 packet and compares the result against the
 state of the carpnode.
 .Pp
-IP balancing is activated by setting the
-.Cm balancing
-mode to
+IP balancing is activated by setting the balancing mode to
 .Cm ip .
 This is the recommended default setting.
 In this mode, carp uses a multicast MAC address, so that a switch
@@ -175,13 +173,13 @@ MAC address being mapped to a unicast IP.
 This can be resolved by using one of the following unicast options.
 For scenarios where a hub is used it is not necessary to use a multicast MAC
 and it is safe to use the
-.Ar ip-unicast
+.Cm ip-unicast
 mode.
 Manageable switches can usually be tricked into forwarding unicast
 traffic to all cluster nodes ports by configuring them into some
 sort of monitoring mode.
 If this is not possible, using the
-.Ar ip-stealth
+.Cm ip-stealth
 mode is another option, which should work on most switches.
 In this mode
 .Nm