From 074f2e7f8d022d80faeaddc63467abdb189504b4 Mon Sep 17 00:00:00 2001 From: sthen Date: Mon, 1 Feb 2021 16:39:50 +0000 Subject: [PATCH] change "demote counter" / "demote count" to "demotion counter", ok deraadt --- sbin/ifconfig/ifconfig.8 | 10 +++++----- usr.sbin/sasyncd/sasyncd.conf.5 | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8 index a993fa946bc..7a2965496d9 100644 --- a/sbin/ifconfig/ifconfig.8 +++ b/sbin/ifconfig/ifconfig.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ifconfig.8,v 1.360 2021/01/17 20:35:31 sthen Exp $ +.\" $OpenBSD: ifconfig.8,v 1.361 2021/02/01 16:39:50 sthen 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 $ .\" @@ -31,7 +31,7 @@ .\" .\" @(#)ifconfig.8 8.4 (Berkeley) 6/1/94 .\" -.Dd $Mdocdate: January 17 2021 $ +.Dd $Mdocdate: February 1 2021 $ .Dt IFCONFIG 8 .Os .Sh NAME @@ -1405,17 +1405,17 @@ Specify the group. .It Cm carpdemote Op Ar number Increase .Xr carp 4 -demote count for given interface group by +demotion counter for given interface group by .Ar number . Acceptable values are 0 to 128. If .Ar number is omitted, it is increased by 1. -Demote count can be set up to 255. +The maximum value for a demotion counter is 255. .It Cm -carpdemote Op Ar number Decrease .Xr carp 4 -demote count for given interface group by +demotion counter for given interface group by .Ar number . Acceptable values are 0 to 128. If diff --git a/usr.sbin/sasyncd/sasyncd.conf.5 b/usr.sbin/sasyncd/sasyncd.conf.5 index 7ca4f001b27..c772d610fb8 100644 --- a/usr.sbin/sasyncd/sasyncd.conf.5 +++ b/usr.sbin/sasyncd/sasyncd.conf.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sasyncd.conf.5,v 1.19 2020/02/10 13:18:22 schwarze Exp $ +.\" $OpenBSD: sasyncd.conf.5,v 1.20 2021/02/01 16:39:50 sthen Exp $ .\" .\" Copyright (c) 2005 HÃ¥kan Olsson. All rights reserved. .\" @@ -27,7 +27,7 @@ .\" .\" Manual page for sasyncd.conf .\" -.Dd $Mdocdate: February 10 2020 $ +.Dd $Mdocdate: February 1 2021 $ .Dt SASYNCD.CONF 5 .Os .Sh NAME @@ -77,7 +77,7 @@ should track master/slave state on. .Xc Specify on which interface group .Xr sasyncd 8 -should increase the demote counter. +should increase the demotion counter. This has the effect of suppressing .Xr carp 4 preemption while initial -- 2.20.1