From nobody Fri Mar 22 13:32:28 2024 X-Original-To: dev-commits-src-branches@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 4V1NY869zXz5DwbZ; Fri, 22 Mar 2024 13:32: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 4V1NY83fB4z443f; Fri, 22 Mar 2024 13:32:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114348; 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=yO5S3RgZp/E+lPns4NRsPZS84e6WUgVp2TYhLEDpyLY=; b=Pcie57oZKDP1cf91UrquMZ8O1dql0j4CqkZwNNb2C97INiYvrFTy3UQQWIVS4mou+1m7K3 NNKnNeQHnWrV3fY9J0NcB2QOn5m7O526pVGHECbgFscZebt8oGT1MA0IzYJ1TnQ9CBqImm 5IWc0XumYaOk514Mkl8J/0mhYPVyw0WoVE136gqjGfW5uoEui7UHQ1zB7o5VB87kpG7XkO bppigW+5N2nFfjFMR8wEG9LBP9O6TSHao6rPr3uNL1Se13MVFHs9IpM2A3C6iki0g71Twq Z5JjPiM2KGsTEaBrmA5LJmldTFHOPpw8+Q7nLWfHsRFuAUSBjH95PeWRCqrZKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711114348; a=rsa-sha256; cv=none; b=jaf7CIw0+pGTSrIORH5D1+FM420+2vb6HBcy3tDmT2ifjECbLoUoAKftqvDm/hTHpbnSc5 EK3qrgh9r53Q5bMJOv5XjB2+vRZj/Our26uwz5yqHiEiQnQqwPX5ZqRkeaEWKOwgEpCsHT TMv1SPv8C276lsjMtgjFa7vdZdKm23/bJfzB7YxGPqUQodGQRG+74MSAHMfNUm+g9ChQzk q4sQcusnoRsQ/U/W797JzVetyTio4b+7PURM8k4izWQlOdbu3H7aMGueYg92voUQzbB1oj YwszJcNqOtDDO1u1zJMzGVe9l2nQgzQZ2ia9SWNj/PL2n8n+fQC/7TtJ0IQB+w== 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=1711114348; 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=yO5S3RgZp/E+lPns4NRsPZS84e6WUgVp2TYhLEDpyLY=; b=X+FhINuQPSaudNGEFeqkGy6JZ9NQMcIH00GND8iDGQHDxSFIf67PL6GUy0Cg4yFNsdxtQ0 j2eQjqqUStuwIeVPc3O1MijZJg5l5/BDa52e044IWqUlG3MPd9aBD3JMHKp9amGp+ipziY gzc558pjelsiheLgJyP+v+G0Pa3gyRoEWK4ERwYz/NnS7sTd4Jhbry7HiZBsD4a6oGtpCg O3N2suUGvpYFOgmyM5dpNNreqQ9yX83RBp15khkmQdceMuZQ9ZLwcVQLUBu0iNmNdwqj4R 6RVQOpKAZQ7FYj5aMPLJeBH3PP4hFGlxt9O6v8pWVj/t1I1QCbuoyX5J4z2wkg== 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 4V1NY83DR3z1LH2; Fri, 22 Mar 2024 13:32:28 +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 42MDWSSf002445; Fri, 22 Mar 2024 13:32:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MDWS1m002442; Fri, 22 Mar 2024 13:32:28 GMT (envelope-from git) Date: Fri, 22 Mar 2024 13:32:28 GMT Message-Id: <202403221332.42MDWS1m002442@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 269bc49fba66 - stable/14 - style.lua.9: remove mention of $FreeBSD$ List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 269bc49fba660d212a7ac50e2ae5923cbc675e14 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=269bc49fba660d212a7ac50e2ae5923cbc675e14 commit 269bc49fba660d212a7ac50e2ae5923cbc675e14 Author: Ed Maste AuthorDate: 2024-02-12 15:36:36 +0000 Commit: Ed Maste CommitDate: 2024-03-22 13:30:31 +0000 style.lua.9: remove mention of $FreeBSD$ Also restore a comment line in an example which previously started with -- $FreeBSD$ but was removed in 6ef644f5889a. The example shows the of a module require statement block following the license header. (cherry picked from commit f1bd7311fbd576a387042c0d81945b701c7459a3) --- share/man/man9/style.lua.9 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/share/man/man9/style.lua.9 b/share/man/man9/style.lua.9 index 0417efc83c45..991a6f96b01b 100644 --- a/share/man/man9/style.lua.9 +++ b/share/man/man9/style.lua.9 @@ -44,14 +44,13 @@ is silent on an issue. The copyright header should be a series of single-line comments. Use the single-line comment style for every line in a multi-line comment. .Pp -After any copyright header, there is a blank line, and the -.Li $\&FreeBSD$ -comment for non-C/C++ source files. +After any copyright header there is a blank line. .Pp The preferred method of including other files and modules is with .Fn require name , such as: .Bd -literal +-- License block config = require("config"); menu = require("menu");