From nobody Fri Nov 19 06:24:09 2021 X-Original-To: dev-commits-src-all@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 70F6A1851EC9; Fri, 19 Nov 2021 06:24:09 +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 4HwRT51cGzz3Mct; Fri, 19 Nov 2021 06:24:09 +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 13154235AE; Fri, 19 Nov 2021 06:24:09 +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 1AJ6O9VT082669; Fri, 19 Nov 2021 06:24:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AJ6O94i082668; Fri, 19 Nov 2021 06:24:09 GMT (envelope-from git) Date: Fri, 19 Nov 2021 06:24:09 GMT Message-Id: <202111190624.1AJ6O94i082668@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: f7c32ed61785 - main - Fix 'take effect' spelling in menus and comments. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f7c32ed617858bcd22f8d1b03199099d50125721 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f7c32ed617858bcd22f8d1b03199099d50125721 commit f7c32ed617858bcd22f8d1b03199099d50125721 Author: betterentley AuthorDate: 2021-11-12 21:55:27 +0000 Commit: Warner Losh CommitDate: 2021-11-19 06:22:12 +0000 Fix 'take effect' spelling in menus and comments. Signed-off-by: John Bentley Pull Request: https://github.com/freebsd/freebsd-src/pull/559 --- share/man/man4/bpf.4 | 2 +- share/man/man4/bxe.4 | 2 +- sys/dev/e1000/e1000_phy.c | 2 +- sys/dev/igc/igc_phy.c | 2 +- sys/dev/isci/scil/scif_sas_controller.c | 2 +- sys/dev/mlx4/mlx4_core/mlx4_cmd.c | 2 +- usr.sbin/bsdconfig/security/include/messages.subr | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/share/man/man4/bpf.4 b/share/man/man4/bpf.4 index f285d5276376..f07279566ee4 100644 --- a/share/man/man4/bpf.4 +++ b/share/man/man4/bpf.4 @@ -698,7 +698,7 @@ will start receiving when packets arrive. Note that you must do an .Dv FIOSETOWN -in order for this to take affect, +in order for this to take effect, as the system will not default this for you. The signal may be changed via .Dv BIOCSRSIG . diff --git a/share/man/man4/bxe.4 b/share/man/man4/bxe.4 index 4838b825b756..98d3040ef454 100644 --- a/share/man/man4/bxe.4 +++ b/share/man/man4/bxe.4 @@ -88,7 +88,7 @@ There a number of configuration parameters that can be set to tweak the driver's behavior. These parameters can be set via the .Xr loader.conf 5 -file to take affect during the next system boot. +file to take effect during the next system boot. The following parameters affect ALL instances of the driver. .Bl -tag -width indent diff --git a/sys/dev/e1000/e1000_phy.c b/sys/dev/e1000/e1000_phy.c index 5c346b2163de..0c74d4229a34 100644 --- a/sys/dev/e1000/e1000_phy.c +++ b/sys/dev/e1000/e1000_phy.c @@ -2020,7 +2020,7 @@ s32 e1000_phy_force_speed_duplex_ife(struct e1000_hw *hw) * disable auto-negotiation, configure duplex, configure speed, configure * the collision distance, write configuration to CTRL register. The * caller must write to the PHY_CONTROL register for these settings to - * take affect. + * take effect. **/ void e1000_phy_force_speed_duplex_setup(struct e1000_hw *hw, u16 *phy_ctrl) { diff --git a/sys/dev/igc/igc_phy.c b/sys/dev/igc/igc_phy.c index a6823ddf7bac..97cb11d1cd01 100644 --- a/sys/dev/igc/igc_phy.c +++ b/sys/dev/igc/igc_phy.c @@ -590,7 +590,7 @@ s32 igc_setup_copper_link_generic(struct igc_hw *hw) * disable auto-negotiation, configure duplex, configure speed, configure * the collision distance, write configuration to CTRL register. The * caller must write to the PHY_CONTROL register for these settings to - * take affect. + * take effect. **/ void igc_phy_force_speed_duplex_setup(struct igc_hw *hw, u16 *phy_ctrl) { diff --git a/sys/dev/isci/scil/scif_sas_controller.c b/sys/dev/isci/scil/scif_sas_controller.c index b3987984afa2..a3dd5513bdc8 100644 --- a/sys/dev/isci/scil/scif_sas_controller.c +++ b/sys/dev/isci/scil/scif_sas_controller.c @@ -561,7 +561,7 @@ SCI_STATUS scif_user_parameters_set( // In the future more could be done to prevent setting parameters at the // wrong time, but for now we'll simply set the values even if it is too - // late for them to take affect. + // late for them to take effect. return SCI_SUCCESS; } diff --git a/sys/dev/mlx4/mlx4_core/mlx4_cmd.c b/sys/dev/mlx4/mlx4_core/mlx4_cmd.c index 39a4064e3ff4..489492455bb9 100644 --- a/sys/dev/mlx4/mlx4_core/mlx4_cmd.c +++ b/sys/dev/mlx4/mlx4_core/mlx4_cmd.c @@ -3110,7 +3110,7 @@ int mlx4_set_vf_rate(struct mlx4_dev *dev, int port, int vf, int min_tx_rate, mlx4_info(dev, "VF in VGT mode (needed VST)\n"); mlx4_info(dev, - "rate %d take affect when VF moves to valid state\n", + "rate %d take effect when VF moves to valid state\n", max_tx_rate); return 0; } diff --git a/usr.sbin/bsdconfig/security/include/messages.subr b/usr.sbin/bsdconfig/security/include/messages.subr index f6df66751881..1ab2333c1fb8 100644 --- a/usr.sbin/bsdconfig/security/include/messages.subr +++ b/usr.sbin/bsdconfig/security/include/messages.subr @@ -33,7 +33,7 @@ msg_exit="Exit" msg_exit_this_menu="Exit this menu" msg_highly_secure="Highly Secure" msg_highly_secure_mode="Highly secure mode" -msg_menu_text="This menu allows you to configure aspects of the operating system security\npolicy. Please read the system documentation carefully before modifying\nthese settings, as they may cause service disruption if used improperly.\n\nMost settings will take affect only following a system reboot." +msg_menu_text="This menu allows you to configure aspects of the operating system security\npolicy. Please read the system documentation carefully before modifying\nthese settings, as they may cause service disruption if used improperly.\n\nMost settings will take effect only following a system reboot." msg_network_secure="Network Secure" msg_network_secure_mode="Network secure mode" msg_nfs_port="NFS port"