From nobody Wed Sep 30 08:45:02 2026 X-Original-To: dev-commits-doc-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 4hvpWy65dlz6v4Bq for ; Wed, 30 Sep 2026 08:45:02 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hvpWy5Zgzz4vCJ for ; Wed, 30 Sep 2026 08:45:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790757902; 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=JJmHdvfqjw6DQkmL5aLl04V+5jvpdY3Ntxq7yzWTWNc=; b=Q8cwJoih9+JQK/ftbHsJDAHhcY5u9iYG0SYs+1bPJgvnBjTo7q9F3swOcIhgqduOp84z+y NjgIqqn9eM2P7UsJLRoW5tIqAsvA05tbH0i1YB91SwkmFk7LRY05iyAN2X8dKLsAjU/MgA LWcR1GXpMQnbqedS+yb/yXvSDaH6tSQzJJpe3IsylH0ZyI6lOn2Mep2d6TwAFAhC0pLsr/ 3BA0CoTkhWug0ypUiMJD66Hgj7pT6SnNVVL8z37H26iPmTEwdWUFmvi35Koy5RuTElhMVr XFVHnl2+f0FmXVs/ECCO9ycmMwsUDPTeF9mnYNvWh7AC9nWivyWOgBZDvxZaVA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790757902; b=w8+9mKaDgpB89w0jSUau7pcIlYMvgWuEfn51EffGtXvGXuInNFjcJlMUVA/RP4a68aVVMn GL3OrVEz72gpaALWfTFHyaOiyHFxgMXCcpAdi6z84ocJZoAahqQ1TqfqS+uwjYwOEyxXu+ ZstTF5lWb4eoujqidtQuOXRNEGMuPaN5YY5py9+07sOf4myLht1hU6U84nnUMCUj9xtMi9 QQO1XBg5w1zsLXESPV4SN4rSibffrH/EQ8+dNN113v7lMEhJROtMQraf8319AsXntUAURC lbFP+HK6mH1hvTWmv4RvS1VyU3goar41C20tHz9wYbkq3Ts399FgHyzgOdVDhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790757902; 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=JJmHdvfqjw6DQkmL5aLl04V+5jvpdY3Ntxq7yzWTWNc=; b=ShI7RZ6R36/o+Cm+OGMnhlATZ6oiwwB4mKlv97MFl64TeKIN4/GbLDNDNVM5Ym08not95D aj2YozOFFKdqSO4Ixc0o/FVDwwvMpyuIZYgji2FkQG6oNrMmDMCvh8F0aBbTNKZM6VudsL 0tpgEc9LpKYNUi5dnKHUDOtYz+mvak7OHcXpNDCSRTmR97VoAzl9eQdq8O2Y2+7Jt/Vyq3 82o4CArHSGUEbq6Nz73iqlfp/Jzjg5qDVM0bWa02zwK9MSRB9GMuFJcR4a2FvFH6W/dXAh 3Abd7nR8L2/9PXNUxaNtJ80v2nd93Dxj1Q2jxtMFCPIskSnJwpOACaULbrQ6xA== 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 4hvpWy4fJzzfZN for ; Wed, 30 Sep 2026 08:45:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25530 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 30 Sep 2026 08:45:02 +0000 To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Wolfram Schneider Subject: git: 1661a0bd55 - main - man.cgi: improve os grouping on help page List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org List-Id: 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: wosch X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1661a0bd55d6c7a08d8c0ff1178e4b54e7a07aef Auto-Submitted: auto-generated Date: Wed, 30 Sep 2026 08:45:02 +0000 Message-Id: <6abccc0e.25530.58472ab2@gitrepo.freebsd.org> The branch main has been updated by wosch: URL: https://cgit.FreeBSD.org/doc/commit/?id=1661a0bd55d6c7a08d8c0ff1178e4b54e7a07aef commit 1661a0bd55d6c7a08d8c0ff1178e4b54e7a07aef Author: Wolfram Schneider AuthorDate: 2026-09-30 08:44:57 +0000 Commit: Wolfram Schneider CommitDate: 2026-09-30 08:44:57 +0000 man.cgi: improve os grouping on help page --- website/content/en/cgi/man.cgi | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/website/content/en/cgi/man.cgi b/website/content/en/cgi/man.cgi index d03f3314dd..4b1d6c83c5 100755 --- a/website/content/en/cgi/man.cgi +++ b/website/content/en/cgi/man.cgi @@ -1343,8 +1343,13 @@ sub sort_manpath { sub grouping_os { my $os = shift; + # Plan 9 + if ($os =~ /^([A-Za-z]+)\s+\d$/) { + return $os; + } + # FreeBSD 13.5-RELEASE and Ports: "FreeBSD" - if ($os =~ /^([A-Za-z0-9\-]+)\s+\d/) { + elsif ($os =~ /^([A-Za-z0-9\-]+)\s+\d/) { return $1; } @@ -1354,7 +1359,7 @@ sub grouping_os { } # Dell UNIX SVR4 2.2: "Dell UNIX" - elsif ($os =~ /^([A-Za-z]+\s+[A-Za-z]+)/) { + elsif ($os =~ /^([A-Za-z]+\s+[A-Za-z]+)\s.*\d/) { return $1; } @@ -1368,11 +1373,6 @@ sub grouping_os { return $1; } - # OSF1 V5.1/alpha: "OSF1" - elsif ($os =~ /^([A-Za-z0-1]+\s+[A-Za-z])/) { - return $1; - } - # first word elsif ($os =~ /^(\w+)/) { return $1; @@ -2586,8 +2586,12 @@ sub detail_html { my ($os_group, $os_group_lc, @l) = @_; my @list; + my $text = scalar(@l) . " release"; + # release <-> releases + $text .= "s" if scalar(@l) > 1; + push @list, qq[
\n]; - push @list, qq|$os_group (@{[ scalar(@l) ]} releases)\n|; + push @list, qq|$os_group ($text)\n|; push @list, "
    \n", @l, "
\n
\n"; return @list;