From nobody Mon Jan 16 19:00:28 2023 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 4NwhDX47SSz2t5SF; Mon, 16 Jan 2023 19:00:28 +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 4NwhDX3Y6mz3mGf; Mon, 16 Jan 2023 19:00:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673895628; 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=41yH3aL57qmKbX8UgQGJd45Dm1Xk1Vr7rhUIUHKRIUw=; b=w1Uk0h1WOhoEQTtRSEaeens977dCTu8Q9yJNfF0rltHOITgwdRQJwYU2vyAsKu2vMEJ8Lz sqNIfLAvgJQWKVSNEkDfwiOGJikbN1ro8uGj7xn0wPNXjE/vfnNM0A2y24tQNN19x50sHe ziQTvKzKYeOlqawHWvUUxKxPO/G+ipFJZPCdKN3fB08K6eHg56ihguQaPvv4HlRvRRE1RE rn7ZzPc6ldiLtOb5MRojlhoX9XN4bBibcjnJMnXj2GPsu0eTxF0hMqRRUrdBJyQiCw8ohs befvovbC5edDdc1/R8iyB2mVNRQh8nxi+2B+NUdjA1mRnwJ5KDhrMeoe2KdMxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673895628; 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=41yH3aL57qmKbX8UgQGJd45Dm1Xk1Vr7rhUIUHKRIUw=; b=FJL9on6AFugBd4kcnKS2Cz4p3aAIOMxft1ksmVcAd7WBe+NfoaDRni87qMsPrGHf1izI03 GqcXenhs1VnCsMpLcb8EvAQCUD+h5MCv2JjCwQamP8LbTWHgsHTfcis+4Sc2Qo2lQLqVfX n5UgexHFvODWeHfUKA540OApokXDK7cgWXJVT98r0R6xIDKElhg8dYSHqNy/2nyCecJCWF 7M8rXlx+qpsOCVfX1a00gAYBFD3SWuioBAbtdJ9yPEc2Ia3uRcAGts1kEPf+V73eUryO33 Qndzhw730S6dZU/3mrH82GA92Q3ZeZJhMdpaithqwxHr0PSs66Fo6PerReW0OQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673895628; a=rsa-sha256; cv=none; b=Ngsl7hk1oUwmXxxIf2kzP+EQj1oY8PiPR4c7Edsh/xatarY0+rCPdaOQcLSYhSf+vNlbkd iEyKS0qrohYqJoL7x5Sd8kOTGaW3E/W85vDYc9WEqxOC5UweFw+yh9rUJNTZVD9F86/pu1 ImusekSbKFfm/rlZsK5Ki9d0Eo1IvJVXMhFfnT/D6TWaaOyXRTdlBiatJlgrBccqr1XS1D aP+SLgJyDV/fPh8O1x2iXGblqVpr4OKWfa/HtFJnJ0iyWUvzY7J50wK3xrBLiMEkxblvke hO9Umi8yrrDkbxqvZ8AzYZxchrYl8Vgk3q4CFR9Oyw364XapgndDFY4s2jP2sw== 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 4NwhDX2fXzz1HWQ; Mon, 16 Jan 2023 19:00:28 +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 30GJ0SRC031166; Mon, 16 Jan 2023 19:00:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30GJ0S1N031165; Mon, 16 Jan 2023 19:00:28 GMT (envelope-from git) Date: Mon, 16 Jan 2023 19:00:28 GMT Message-Id: <202301161900.30GJ0S1N031165@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ceri Davies Subject: git: d9499d3f47f2 - main - bsdconfig: correct name of the wpa_supplicant config file 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: ceri X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d9499d3f47f21d28074e5a82daf82784081a37a4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ceri (doc committer): URL: https://cgit.FreeBSD.org/src/commit/?id=d9499d3f47f21d28074e5a82daf82784081a37a4 commit d9499d3f47f21d28074e5a82daf82784081a37a4 Author: Ceri Davies AuthorDate: 2023-01-16 18:56:45 +0000 Commit: Ceri Davies CommitDate: 2023-01-16 18:56:45 +0000 bsdconfig: correct name of the wpa_supplicant config file Approved by: maintainer timeout (dteske) Differential Revision: https://reviews.freebsd.org/D37750 --- usr.sbin/bsdconfig/include/messages.subr | 6 +++--- usr.sbin/bsdconfig/share/media/wlan.subr | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/usr.sbin/bsdconfig/include/messages.subr b/usr.sbin/bsdconfig/include/messages.subr index 47ef6876854b..de8a374728ea 100644 --- a/usr.sbin/bsdconfig/include/messages.subr +++ b/usr.sbin/bsdconfig/include/messages.subr @@ -67,7 +67,7 @@ msg_canada="Canada" msg_cancel="Cancel" msg_cancel_exit="Cancel/Exit" msg_cannot_create_permission_denied="%s: cannot create %s: Permission denied" -msg_cannot_edit_wireless_ssid="Cannot edit wireless configuration; no matches for\nSSID \`%s' in wpa_supplicants.conf(5)" +msg_cannot_edit_wireless_ssid="Cannot edit wireless configuration; no matches for\nSSID \`%s' in wpa_supplicant.conf(5)" msg_cannot_resolve_hostname="Cannot resolve \`%s'! Are you sure that your\nname server, gateway and network interface are correctly configured?" msg_cant_find_distribution="Warning: Can't find the \`%s' distribution on this\nFTP server. You may need to visit a different server for\nthe release you are trying to fetch or go to the Options\nmenu and set the release name to explicitly match what's\navailable on %s (or set to \"any\").\n\nWould you like to select another FTP server?" msg_cant_seem_to_write_out_resolv_conf="Can't seem to write out %s. Net cannot be used." @@ -144,7 +144,7 @@ msg_finance_desc="Monetary, financial and related applications." msg_finland="Finland" msg_floppy="Floppy" msg_forget_all="Forget All" -msg_forget_all_confirm="WARNING! Are you really sure you want to forget all known networks\nby re-initializing wpa_supplicants.conf(5)? This cannot be undone." +msg_forget_all_confirm="WARNING! Are you really sure you want to forget all known networks\nby re-initializing wpa_supplicant.conf(5)? This cannot be undone." msg_forget_all_help="Reset wpa_supplicant(8) configuration, forgetting all known networks" msg_found="found" msg_france="France" @@ -368,7 +368,7 @@ msg_shells_desc="Various shells (tcsh, bash, etc)." msg_show_all="Show All" msg_show_all_help="Show wireless networks without an SSID and all BSSIDs" msg_show_configured="Show Configured" -msg_show_configured_help="Show networks configured in wpa_supplicants.conf(5)" +msg_show_configured_help="Show networks configured in wpa_supplicant.conf(5)" msg_show_scan_results="Show Scan Results" msg_show_scan_results_help="Show wpa_cli(8) scan results" msg_skip="Skip" diff --git a/usr.sbin/bsdconfig/share/media/wlan.subr b/usr.sbin/bsdconfig/share/media/wlan.subr index f25cddff94cd..55910b77daf2 100644 --- a/usr.sbin/bsdconfig/share/media/wlan.subr +++ b/usr.sbin/bsdconfig/share/media/wlan.subr @@ -781,7 +781,7 @@ f_dialog_scan_wireless() # f_dialog_wireless_edit $ssid # # Display a menu to allow the user to either create a new entry for the -# wpa_supplicants.conf(5) file, or to edit values for an existing entry. +# wpa_supplicant.conf(5) file, or to edit values for an existing entry. # # If more than one wireless network is found to match $ssid, a sub-menu is # presented, allowing the user to select the desired network. @@ -914,7 +914,7 @@ f_dialog_wireless_edit() # # XXXDT Unfinished # This is where we display a menu that edits the entry - # And then we modify the wpa_supplicants.conf(5) config file + # And then we modify the wpa_supplicant.conf(5) config file # XXXDT Unfinished # @@ -1208,7 +1208,7 @@ f_menu_wpa_scan_results() # f_dialog_menu_wireless_edit # -# Display a list of wireless networks configured in wpa_supplicants.conf(5) and +# Display a list of wireless networks configured in wpa_supplicant.conf(5) and # (if wpa_supplicant(8) is running) also displays scan results for unconfigured # wireless networks. # @@ -1247,7 +1247,7 @@ f_dialog_menu_wireless_edit() fi if [ "$do_parse" -a "$DIALOG_MENU_WLAN_SHOW_CONFIGURED" ] then - f_dprintf "$funcname: Parsing wpa_supplicants.conf(5)" + f_dprintf "$funcname: Parsing wpa_supplicant.conf(5)" f_wpa_supplicant_parse "$conf_file" \ WIRELESS_ NWIRELESS_CONFIGS f_dprintf "%s: Parsed %i wireless configurations" \ @@ -1262,7 +1262,7 @@ f_dialog_menu_wireless_edit() # # Add both items scanned from the airwaves and networks - # parsed from wpa_supplicants.conf(5). Latter items are + # parsed from wpa_supplicant.conf(5). Latter items are # marked, sorted, and added to top of list above the # former (which are unmarked and sorted separately). #