From nobody Tue Oct 03 11:19:19 2023 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 4S0FhS0yqRz4w7hR for ; Tue, 3 Oct 2023 11:19:20 +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 4S0FhR6H4hz4NXp; Tue, 3 Oct 2023 11:19:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696331959; 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=WOcJWvDZRl6pKb45y9avM6qcqeiYwAiWCaKR2bOv+i0=; b=ZgCr1oWs8timsTHrnTmAWbtt48QUa1Kd2J1u+1vs3Fr6SsqnSSaqbdAgaw4+F7rIn7d0Na udh8g2Ad4ZTmZVAZhnJSY5AKk/SDEPIi5KbwxvL7ay3rpCf0rXSySn+b2bGnPSAsbbPMqy kvvzVc8RlK6P32fd8Le0NsX7q03vIWYAajIfUUETf3H7yPIwEbtE9Cw34qXEYAEhd1/CH1 xVXaXVcBWMlq+Rb3vkq5tnHda0aoQTJOBxup6orN9oiWpFFHUO+qTVBqJ+vAPhQ5/0+rta Wo4kG9cfQx+xQ/lVveKLzUcAd8K9a1X6V6Ijc2fKSEhiLxEiYnoYYlmiB7dBKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696331959; a=rsa-sha256; cv=none; b=Q+uiKhcUx8KT0ewMbPa623e+hmN2hmL/eWrJ35B0JEjD1pk5yFvi5/NitC72H3j/ygH/UX YVPefiodqaScGmWobalGkT+NRE6+YX0lhx9eFmMBH2OdWbtmUFPcwbPXlrCDEPjZnmi0g3 Qgga7sgVFL7xspUjLTv4xcp1mDA2D+Uk2lg3rw2oy5nacE0ZzWYAGVF9ZXvwpT7ptGB+5T LgSZvznPvkQA6jN0dpNynUdqcFiHsIXL0pzYCidsayYkOPV4lKk+nIrQu8QOkf/PDxJlh3 cf3RGOZQjDJyia963O+aByCwsHK/0SFiFGctj/VqtbT9aBc0yHWbkuNkWzIs2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696331959; 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=WOcJWvDZRl6pKb45y9avM6qcqeiYwAiWCaKR2bOv+i0=; b=nwYwHSXG6+b+mzfbDgcZ+RSmqwommQ6Ndap+6RXHRBSR+5CGdEIcEM+2NwPH49ocyRnXj2 ITmmsIQAhxYYrLfEft68KyRPnsaiREJljQc5nyIOpV5e6TExQSA9E2xyPvAkBFTtTCM8im IkXcqu0WH7ykd0IwNVMqiaGD89tUzjXOuNi/C4h1iG6EtK3W7Y6wTLkNwswtqnBjTDjTRp 9L+U8RgqIjtTUGNf29d+B6w5PcNY2PwjLEORHBYYqls7EE9pH7Yfl0AA7kLkvKXznNobkB +Uriqh2Oa71zygQqZKDKQdTfx0OBfWJGEVW1qKrzpdutTNRUwjFC3Bs0pg4hEQ== 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 4S0FhR5Kt1zsgw; Tue, 3 Oct 2023 11:19:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 393BJJjC069813; Tue, 3 Oct 2023 11:19:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 393BJJ93069810; Tue, 3 Oct 2023 11:19:19 GMT (envelope-from git) Date: Tue, 3 Oct 2023 11:19:19 GMT Message-Id: <202310031119.393BJJ93069810@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Wolfram Schneider Subject: git: 463bb60d9e - main - improve help.html 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: Sender: owner-dev-commits-doc-all@freebsd.org X-BeenThere: dev-commits-doc-all@freebsd.org 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: 463bb60d9e14c4cdd1c29f8ce2963fcba8b0cce8 Auto-Submitted: auto-generated The branch main has been updated by wosch: URL: https://cgit.FreeBSD.org/doc/commit/?id=463bb60d9e14c4cdd1c29f8ce2963fcba8b0cce8 commit 463bb60d9e14c4cdd1c29f8ce2963fcba8b0cce8 Author: Wolfram Schneider AuthorDate: 2023-10-03 11:18:45 +0000 Commit: Wolfram Schneider CommitDate: 2023-10-03 11:18:45 +0000 improve help.html page - correct footer links - show download links for tarball only if enabled --- website/content/en/cgi/man.cgi | 44 +++++++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 16 deletions(-) diff --git a/website/content/en/cgi/man.cgi b/website/content/en/cgi/man.cgi index cbaab2981b..9c74a7dde3 100755 --- a/website/content/en/cgi/man.cgi +++ b/website/content/en/cgi/man.cgi @@ -50,11 +50,15 @@ package main; $debug = 2; $www{'title'} = 'FreeBSD Manual Pages'; $www{'home'} = 'https://www.FreeBSD.org'; +$www{'home_man'} = 'https://man.FreeBSD.org'; $www{'head'} = $www{'title'}; # set to zero if your front-end cache has low memory my $download_streaming_caching = 0; +# enable to download the manual pages as a tarball +my $enable_download = 1; + #$command{'man'} = '/usr/bin/man'; # 8Bit clean man $command{'man'} = '/usr/local/www/bin/man.wrapper'; # set CPU limits @@ -1113,9 +1117,14 @@ my $enable_intro = 0; sub html_footer { my %args = @_; - print -qq{home | help\n} - if !$args{'no_home_link'}; + if (!$args{'no_home_link'}) { + print < + home | + help1 + +EOF + } if (cgi_style::HAS_FREEBSD_CGI_STYLE) { print q{
}; @@ -1300,9 +1309,11 @@ sub get_the_sources { # download a manual directory as gzip'd tar archive sub download { + if (!$enable_download) { # 2019-05-31: allanjude: Disable downloading as it is being abused. print qq{Status: 418 No Downloads For You\n\n}; exit(0); + } $| = 1; my $filename = $manpath; @@ -2038,12 +2049,14 @@ ETX
-home | help + + home | + help2 + ETX if ($query) { print "
\n"; } - 0; } sub faq { @@ -2052,21 +2065,17 @@ sub faq { local ($url); foreach ( &freebsd_first (sort { &sort_versions } keys %manPath )) { $url = &encode_url($_); - push( @list, - qq{
  • [download]} - . qq{ "$_" -> $BASE?manpath=$url} - . qq{
    • \n} ); + my $download_link = $enable_download ? qq[[download] ] : ''; + push( @list, qq{
  • $download_link $_" -> $BASE?manpath=$url
    • \n} ); } foreach ( &freebsd_first (sort { &sort_versions } keys %manPathAliases )) { + next if !$manPathAliases{$_}; + + my $encode_url = &encode_url($_); push( @list2, - qq[
  • "$_" -> "$manPathAliases{$_}" -> ] - . qq{$BASE?manpath=} - . &encode_url($_) - . "
    • \n" ) - if $manPathAliases{$_}; + qq[
  • "$_" -> "$manPathAliases{$_}" -> ] . + qq[$www{'home_man'}/cgi/man.cgi?manpath=$encode_url
    • \n] ) } return qq{\ @@ -2145,8 +2154,11 @@ for private use. A tarball is usually 5MB big.

    Releases Aliases

    +

    Release aliases are for lazy people. Plus, they have a longer lifetime, eg. 'openbsd' points always to the latest OpenBSD release. +

    +
      @list2