From nobody Thu Nov 25 05:01:41 2021 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 7420418962FF; Thu, 25 Nov 2021 05:01:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J05M96RZwz3DGR; Thu, 25 Nov 2021 05:01:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BE27417928; Thu, 25 Nov 2021 05:01:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1AP51f1J036850; Thu, 25 Nov 2021 05:01:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AP51fS4036849; Thu, 25 Nov 2021 05:01:41 GMT (envelope-from git) Date: Thu, 25 Nov 2021 05:01:41 GMT Message-Id: <202111250501.1AP51fS4036849@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Guangyuan Yang Subject: git: 3218666bd082 - stable/13 - bridge(4): Use American spelling of "behavior" List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ygy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3218666bd082737e41d886dc3af8d172bbe111e6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637816501; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fYAL5g5CYkQXuiBhBdX5b45uzfkPvtRF7Qthpkhk+vg=; b=Mm7lwNVaqKZqhqmHJilOycqeG0jacOvyQnSW1/GrBtsrR4MuRTBdAJoqbPiColtB645sWt LBHRdI9KZJ9iXyBbycHPo8JPcCeABWZEl6m9bgthbjVBUvPdsbH8zNMSeZ+X0RuUn+Uxd/ ymvMJb7WZtWseTlwsQ9lToZGkhN5KdRv78deKPlpZvtgb4ekBDMzexaRhxNZjlO7Gy9ZlN UGOQo2HAVu7tgcMIBMLNb2MN64zg9Pi+5ZKNmSWVhgyQZu5nYR5YnF2KbDgmZCtqVEjIMQ SNWN/zirqpkDNQE3f5X4M45Pu4GhahgZxSEyNJTClCkE8FK4IOxnITiCeE2Y3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637816501; a=rsa-sha256; cv=none; b=ODJaSk3CbExaHN/bNabTAiNAbH5ujKWe2u8Oq0ko1Nbs3KfA38kDvx+zSeM5meGgYIvjDf oFmhS/YBwjnTSVkLuPtGOU8dyfqlOfR1u66bGvwvOiMxgRfIu0sQDFL9E0+WqD6Jrb+6VP mz2+h0JtzSuU7z8Cgh5BAe/qruQAghRRYtRFMSNqRz6XQdSDg2kyYFGiXboQ6qmTYEQxs4 93yHLBYCvCRD/5hlAZQkHdr91laH9yfq+ebvatcoClQ2CRPWA/1JtnxiUIecAQ1R30e4oi Y8nUas6wM6hW/eBZcQJFHY97s2erNFl9LXoCQcCPTdlwTwC/PprvA5kiZbIaLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by ygy (doc, ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=3218666bd082737e41d886dc3af8d172bbe111e6 commit 3218666bd082737e41d886dc3af8d172bbe111e6 Author: Guangyuan Yang AuthorDate: 2021-11-22 02:41:49 +0000 Commit: Guangyuan Yang CommitDate: 2021-11-25 05:01:16 +0000 bridge(4): Use American spelling of "behavior" Fixes: 8406182dbeb972698775e2468902bc5f6e593d72 Reported by: Pau Amma (cherry picked from commit 28ba36c65db8b4d95abcd543b97f2ec5161cdae5) --- share/man/man4/bridge.4 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/share/man/man4/bridge.4 b/share/man/man4/bridge.4 index c79e5da69837..e193724928ca 100644 --- a/share/man/man4/bridge.4 +++ b/share/man/man4/bridge.4 @@ -180,7 +180,7 @@ This situation is clearly against the description in Section 5, RFC 4007. Although it works in most cases, -it can cause some counterintuitive or undesirable behaviour in some +it can cause some counterintuitive or undesirable behavior in some edge cases when both, the .Nm interface and one of the member interfaces, have an IPv6 address @@ -198,7 +198,7 @@ interface has IPv6 addresses, IPv6 addresses on the member interface will be automatically removed before the interface is added. .Pp -This behaviour can be disabled by setting +This behavior can be disabled by setting .Xr sysctl 8 variable .Va net.link.bridge.allow_llz_overlap @@ -250,7 +250,7 @@ When filtering is enabled, bridged packets will pass through the filter inbound on the originating interface, on the bridge interface and outbound on the appropriate interfaces. Either stage can be disabled. -The filtering behaviour can be controlled using +The filtering behavior can be controlled using .Xr sysctl 8 : .Bl -tag -width ".Va net.link.bridge.pfil_onlyip" .It Va net.link.bridge.pfil_onlyip