From nobody Wed Sep 30 07:34:37 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 4hvmyj3zRbz6tx82 for ; Wed, 30 Sep 2026 07:34:37 +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 4hvmyj3Nztz4frH for ; Wed, 30 Sep 2026 07:34:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790753677; 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=UXjGmML+88K/IXXK5RTMQm9lfKUnReHCwWyMABZHwUE=; b=SS2H6zflIVWHsTxgMYm9WAldJB03+voM4gYbbVvkBWoahgMtV4YUApJ+esv7PEvWRS4nkQ vNISKdV8y4sOtD1jXkpmRDVmmTr/anzx4L7QjlVLA0ztu9j8grHvICwSitpjuc49j6lIsb xGw/67eK+HZ1yzDo00cBjrpLcoWUSDXnNUK0pHYBfUHcvEKG9vKeoCsd5/2p796yVjhvHi HmVKTRKuUStjKWgk9TwUAd9BeDhMpoePTEwFQjjztcBtWkt5vE2sd0Qw+yURiIZkhugSVC OJWnNrL1lwljZrUe56fzEd1P835Orx2Gr+8oOgf/MyCKBtLy+qTIKeP8+dyvnQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790753677; b=IYk4Q556nSKGsmMfMmB4XpMBEkX4pNjgLDrK+uG0K7rgCQUrKSXI0y4vrFefXoc/zq8Wl3 SBpPSYHrqcK7LgenQxNDKwf8U0WoMW8OVJG47ewiXWT/kdPVpVLOezam7pe6Zv7EaCbO8I aVJ2Giyos7r1Y/oD81cju0lP2UONXTdwzgTEoWAPDxpwYU1HoH57yby/DdWJIMbwIp7U7l qLM8/2jWOJxlW8m38mDx+i91a/P/LmeVOlq183U+agnAgQiMnLtwv2cxGe4gIrikrp1nqW ctnWFApbjzpP+ggzOSadrj/8IgfQDs+w+dy8Fo1P8Fz3s9UBVBe336gOGu/gLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790753677; 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=UXjGmML+88K/IXXK5RTMQm9lfKUnReHCwWyMABZHwUE=; b=mXEoPTjbgF3vwOikxXvbSWc0bS09rlmUz2CZSx4Xd0uhXtsQsuXQWH6MpZaKlRCh0aS5Ln QLS+EGafj1KAYsgNwvHkzcIRIdA4V24R9q9nITffy0nW04ala8x5Ze0Qgjf3SzhMwHN5fc J9t0e4KgLvrvvlANnQehiFUuSc46gX63tly8munF9asb7kSIjdcf19CR3SnXD+BeeedfLg Sp2967TFUJkftLikfUZ1nIu+CSw2BhoZIDymPuzr853n9KcLxY/bjcOek9x+Ug5mnif7PP yj5kLSWsHdeN/pRcy19IBn+uwpcxjv6aJ8njvVku4HMILnzYlRGMBsTsvoTSpg== 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 4hvmyj1vsDzcmB for ; Wed, 30 Sep 2026 07:34:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1cecd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 30 Sep 2026 07:34:37 +0000 To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Wolfram Schneider Subject: git: 543234de27 - main - man.cgi: improve grouping of release permalinks 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: 543234de277685ef6f82b013fcf541cb07bcb336 Auto-Submitted: auto-generated Date: Wed, 30 Sep 2026 07:34:37 +0000 Message-Id: <6abcbb8d.1cecd.260b8de3@gitrepo.freebsd.org> The branch main has been updated by wosch: URL: https://cgit.FreeBSD.org/doc/commit/?id=543234de277685ef6f82b013fcf541cb07bcb336 commit 543234de277685ef6f82b013fcf541cb07bcb336 Author: Wolfram Schneider AuthorDate: 2026-09-30 07:34:30 +0000 Commit: Wolfram Schneider CommitDate: 2026-09-30 07:34:30 +0000 man.cgi: improve grouping of release permalinks --- website/content/en/cgi/man.cgi | 74 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 67 insertions(+), 7 deletions(-) diff --git a/website/content/en/cgi/man.cgi b/website/content/en/cgi/man.cgi index 529faf6a4d..91ff160f23 100755 --- a/website/content/en/cgi/man.cgi +++ b/website/content/en/cgi/man.cgi @@ -1340,6 +1340,48 @@ sub sort_manpath { return sort { &sort_versions } keys %$manpath; } +sub grouping_os { + my $os = shift; + + # FreeBSD 13.5-RELEASE and Ports: "FreeBSD" + if ($os =~ /^([A-Za-z0-9\-]+)\s+\d/) { + return $1; + } + + # Red Hat 9.0: "Red Hat" + elsif ($os =~ /^([A-Za-z]+\s+[A-Za-z]+)\s+\d/) { + return $1; + } + + # Dell UNIX SVR4 2.2: "Dell UNIX" + elsif ($os =~ /^([A-Za-z]+\s+[A-Za-z]+)/) { + return $1; + } + + # 2.11 BSD: "BSD" + elsif ($os =~ /^[\d\.]+\s*([A-Za-z]+)/) { + return $1; + } + + # X11R7.4: "X11R7" + elsif ($os =~ /^([A-Z0-9]+)\.[\d\.]+$/) { + 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; + } + + # XXX + return $os; +} + # # sort by OS release number, highest version first # @@ -2532,6 +2574,25 @@ ETX } } +sub details_id { + my $name = shift; + + $name =~ s/\s+/_/g; + + return lc($name); +} + +sub detail_html { + my ($os_group, $os_group_lc, @l) = @_; + + my @list; + push @list, qq[
\n]; + push @list, qq|$os_group (@{[ scalar(@l) ]} releases)\n|; + push @list, "
    \n", @l, "
\n
\n"; + + return @list; +} + sub faq { local ( @list, @list2 ); @@ -2543,18 +2604,14 @@ sub faq { my $os_group_lc = ""; my @l; foreach ( &freebsd_first (&sort_manpath(\%manPath) )) { - if (/^(\S+)/) { - $os = $1; - } - $os_lc = lc($os); + $os = &grouping_os($_); + $os_lc = &details_id($os); $url = &encode_url($_); my $download_link = $enable_download ? qq[tarball] : ''; if ($os_lc ne $os_group_lc && $os_group_lc ne "") { - push @list, qq[
\n]; - push @list, qq|$os_group (@{[ scalar(@l) ]} releases)\n|; - push @list, "
    \n", @l, "
\n
\n"; + push @list, &detail_html($os_group, $os_group_lc, @l); undef @l; } push( @l, qq{
  • $_: permalink | $download_link
    • \n} ); @@ -2562,6 +2619,9 @@ sub faq { $os_group_lc = $os_lc; } + # last entry + push @list, &detail_html($os_group, $os_group_lc, @l); + foreach ( &freebsd_first (&sort_manpath(\%manPathAliases) )) { if (!$manPathAliases{$_}) { warn "missing release alias '$_'\n" if $debug >= 2;