From nobody Mon Oct 26 20:23:19 2026 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 4jD4nn0GBfz6xYvx for ; Mon, 26 Oct 2026 20:23:25 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jD4nm6k5fz3KSp for ; Mon, 26 Oct 2026 20:23:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793046204; 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=YZ4BAquPsfvV863fRj64Z6CXN63AAKJCSFrLhp3cxuo=; b=ZhBEEE+XQCdkzCS4pyAMFtfpZzeQDDe/75yNagHHlkxNBiidDmRW7BIFpa7FZGgzOOXh5h F4fWJkDqmTuqLgyaCGVdU2WA/s1B8uKp7waBJftCLmmj1v/rAtUi+nrY8q2Q8i8PX/gBcb HTsWX3k3+g67gEHoqwVo/Ov2ZbKKbEt5fu6giTVxl/FZWoz3SdntwaHGXTenEb8Fq0mdFH h7f+G1UYqEsdQDHA3QBHoX8sC3iIfEOzUWYZVo9v9cJpaWlh9RR31ndw138XmuUSNOVUDV 7bSGJkrP7Bh08uAIeFIv0cHWPkjWBgqkHGxChhJUWcEjbOhGH+oGvZkYnOv74g== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793046204; b=OliNEXZ5B0GT+Dqn6pOIHeq7gT3BX/A0tWZiT03EVGnDGxJLmvx20CQpeRWyo05fYaq4Vx wuZFA5aYBlHB+DbzmAgz84j6o4/yoiDW5O/ptgL+KjZwbtTywW1F4vDuzi+IYzLxzFHpJM qRE6lyE0dt8gYfYUum+VFEg+ciZofSg+gI0GcWSnlxUyWGpk7rqevSe+e1JXu8w9qUrZty ijxYZ9x/BCb1I5gr5BFdMbcjiVFz3HefSX+382YxkI8HUtHVLmAfwmrFJ4Mvnfqv8rb8ql COpQFg++zaKf33Z+TuXqTcWJpMzYMMf5DqGXmlPW8jC1dqZne6is2i48Vhmxag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793046204; 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=YZ4BAquPsfvV863fRj64Z6CXN63AAKJCSFrLhp3cxuo=; b=BQzxn4NyFCiJf6CmLkoxE6/c3MrDj+WnSgJ64aavVNX4lc8ZkxgHrjpMChA98JpjRuY6cs 6P4hRtkUjXnWQmo4FMgnqWYMMPRDGdYl4PQ3MU4oHKTbuie8+9NXk3/D5wsAe/IF8wwEsH BOdmjx831YoGq+CaLK6Zg/lVRp0x/MHg4PzaCqiEqV2fM+QLDUhlJiMAOfzEbG7cKPsOss ChEZM5DgqABbmD52tF0nkGV4JKUrl4dt3DxT3CKp2ah02EtW1alWtngu9zqJyq8WwgUUEv 9LVDzmAP2H00IZBY/pBZmnPC9HnEiJ9njpw/gnCK6S0poBMkbsV0DJcvV1P/yA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jD4nm6NH5zqXS for ; Mon, 26 Oct 2026 20:23:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3bbe7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 26 Oct 2026 20:23:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dima Panov Subject: git: 5250c9890848 - main - usr.bin/man: allow man(1) to search translated manpages in pure $man_lang subdirectory (+) List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5250c98908482babae8379b4dede10c64e8639ae Auto-Submitted: auto-generated Date: Mon, 26 Oct 2026 20:23:19 +0000 Message-Id: <6adfb6b7.3bbe7.78cb75ba@gitrepo.freebsd.org> The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/src/commit/?id=5250c98908482babae8379b4dede10c64e8639ae commit 5250c98908482babae8379b4dede10c64e8639ae Author: Dima Panov AuthorDate: 2026-10-26 20:07:56 +0000 Commit: Dima Panov CommitDate: 2026-10-26 20:07:56 +0000 usr.bin/man: allow man(1) to search translated manpages in pure $man_lang subdirectory (+) Currently our man(1) utility search manages only in $lang_country.$charset, $lang.$charset and, as failover, in en.$charset which is historical behavior. But nowadays most of ported software uses only $lang subdirectories for translated manpages instead of use full locale notation, for example, share/ja/man1, share/de/man1, share/ru/man1. In such cases, our man(1) utility cannot find any translated manpages and silently fallback to english version. Add $man_lang in search path allows man(1) search and use translated manpages under historical and modern path traditions MFC after: 1 day MFC to: stable/15 stable/14 Reviewed by: ziaee, fernape Approved by: fernape Differential Revision: https://reviews.freebsd.org/D55805 --- usr.bin/man/man.1 | 4 ++++ usr.bin/man/man.sh | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/usr.bin/man/man.1 b/usr.bin/man/man.1 index 18b58f3c03b3..fbe820c99592 100644 --- a/usr.bin/man/man.1 +++ b/usr.bin/man/man.1 @@ -223,6 +223,8 @@ will search for locale specific manual pages using the following logic: .It .Va lang . Ns Va charset .It +.Va lang +.It .Li en . Ns Va charset .El .Pp @@ -240,6 +242,8 @@ will search the following paths when considering section 1 manual pages in .It .Pa /usr/share/man/ja.eucJP/man1 .It +.Pa /usr/share/man/ja/man1 +.It .Pa /usr/share/man/en.eucJP/man1 .It .Pa /usr/share/man/man1 diff --git a/usr.bin/man/man.sh b/usr.bin/man/man.sh index d6429901c598..9d54ed67bd2f 100755 --- a/usr.bin/man/man.sh +++ b/usr.bin/man/man.sh @@ -747,7 +747,7 @@ man_setup_locale() { man_country="${lang_cc#*_}" man_charset="${locstr#*.}" locpaths="$locstr" - locpaths="$locpaths:$man_lang.$man_charset" + locpaths="$locpaths:$man_lang.$man_charset:$man_lang" if [ "$man_lang" != "en" ]; then locpaths="$locpaths:en.$man_charset" fi