From nobody Sat May 13 23:31:30 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 4QJhjG43WSz49vn6 for ; Sat, 13 May 2023 23:31:30 +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 4QJhjG3KHYz4FqZ; Sat, 13 May 2023 23:31:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684020690; 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=3bNPW863CZkNHnsICwZWJvQuznAhBmYguqmZAqelO7U=; b=AIUXKpPNhd6hsI8v1KO3dYtcjDs2c56bd5PdjKzbRBSwf/VLe0N7b2ImKSISuS0ikHAiWy A2ewTQ7MCwmEvkUPpgFVkbiHgoEoN11C7zjvvsSzAj/nhlm6rr0Qr7vLJ7C+LBoGrWawXu dqMqWTP+ZY0Hc2ux698Ya2wGHTaTs/fLKvwYdrxJ9jc8qrwSv6S3lpxjJch4ikqSx6UGLo q1t+9SSQ7dEs8rWNokvOsUC1nf2rr4obyGWm0odeUs8wAR/8YGipyqcX0E5q/hbGwHb38c I+lrL81EeDQ1erbPpIAnzrZRuUtoeSOOkI3TMql6/bCrt+9spwHUXOstctU2Cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684020690; 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=3bNPW863CZkNHnsICwZWJvQuznAhBmYguqmZAqelO7U=; b=TKf7amm7HUnYNidVK0j5G6xAovggIBoFnGs+8adGJPt/iOPrL97SC0rQALDpIh/FAOIX33 UsyLcMKmO9j0z6uZ0HMQABWrC3Ud7VL8MDaDCYiUM3qMTnzYZt3f/rzufLjwWN4lxhC0C9 x7oBI/CxDMabtLHINPCtpfxNHj/RNz3ZrrbQ9r0oLajS8i+EWXOg/7GfFwQbIGnjCTv/1x dTXo4CoEKTFcs88dql/M96mGz1mYG2ala/Mpsn7Rn7X3+5Z9WcCeJppvCHCbfC+o0UYbQK yDpChpArx5cXGs8imFTSPIaUvCUqr0tQmjvTDp+Rcx1slJ7DsTHArm+zupBHrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684020690; a=rsa-sha256; cv=none; b=ZtNhOYGxRW77HAsH3yvGxwjqFcU7BJbPvaGCPxkf7fp3Rkcd86SUaoS0CifYQAeI5cUeZr iMkSB6dSLyUNowyEwonHWcQ5A4O1r1cR2CBCubAht1J2wfrvAwz56PWfYBXh/DGO0SuWZP Q0P4yDdzs053GmPvTSj0zVH23z45/uSgLjA6jJ3fNqpPKQ6Fpq9bVc69Ox3P0rJJYKkWkO ooPXmeNTjFLPhI56ma69XyXWtVxNmLu3v0arrbVC61MoJPYQZj58kU3hsUVPSVPw9n4Nh2 cKldfkRJ7s9gBDh3n+0ue/ofxpepmJV1qfJy1H+ydZ3707M6kWBbi13ur2prZA== 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 4QJhjG2N7YzcGp; Sat, 13 May 2023 23:31:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34DNVUmB004702; Sat, 13 May 2023 23:31:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34DNVU7J004701; Sat, 13 May 2023 23:31:30 GMT (envelope-from git) Date: Sat, 13 May 2023 23:31:30 GMT Message-Id: <202305132331.34DNVU7J004701@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Graham Perrin Subject: git: fae4bec720 - main - FreeBSD Licensing Policy: markup, punctuation 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: grahamperrin X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fae4bec720c3d641187be76c7a77d5499b4962e7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by grahamperrin: URL: https://cgit.FreeBSD.org/doc/commit/?id=fae4bec720c3d641187be76c7a77d5499b4962e7 commit fae4bec720c3d641187be76c7a77d5499b4962e7 Author: Graham Perrin AuthorDate: 2023-05-13 23:26:12 +0000 Commit: Graham Perrin CommitDate: 2023-05-13 23:26:12 +0000 FreeBSD Licensing Policy: markup, punctuation Partially fix https://bugs.freebsd.org/271399 – make it easier to assess what remains to be changed. PR: 271399 --- documentation/content/en/articles/license-guide/_index.adoc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/documentation/content/en/articles/license-guide/_index.adoc b/documentation/content/en/articles/license-guide/_index.adoc index 248e615ea6..e6d91491dc 100644 --- a/documentation/content/en/articles/license-guide/_index.adoc +++ b/documentation/content/en/articles/license-guide/_index.adoc @@ -211,11 +211,12 @@ For further information see https://spdx.org/ and the following sections for how Entities that contribute fixes and enhancements to the software collection without an explicit license agree to license those changes under the terms that apply to the modified file(s). Project policy, in line with industry practice, only includes a copyright notice from significant contributors to the files in the collection. -There are four types of files in the FreeBSD software collection +There are four types of files in the FreeBSD software collection: + . Files that have only an explicit copyright notice and license. . Files that have both an explicit copyright notice and license, and a SPDX-License-Identifier tag. -. Files that have only a copyright notice and an SPDX-License-Identifier tag, but no explicit license -. Files that lack any copyright or license at all +. Files that have only a copyright notice and an SPDX-License-Identifier tag, but no explicit license. +. Files that lack any copyright or license at all. === Only Copyright and License @@ -252,7 +253,8 @@ When reading the license text that is detached from a file, a number of consider . Any reference to a copyright notice shall refer to the copyright notice constructed from the licensed file, not from any copyright notice in the license text file itself. Many SPDX files have sample copyright notices that are understood to be examples only. . When names of entities are referred to in the license text, they shall be construed to apply to the list of all copyright holders listed in the copyright notices of the licensed file. -For example, the BSD-4-clause license contains the phrase "This product includes software developed by the organization". The phrase 'the organization' should be replaced by the copyright holders. +For example, the BSD-4-clause license contains the phrase "This product includes software developed by the organization". +The phrase 'the organization' should be replaced by the copyright holders. . When the SPDX offers variations of the license, it is understood the license in the [.filename]#LICENSE/# file represents the exact version of the license selected. The SPDX standard exists to match families of licenses and these variations help match similar licenses that the SPDX organization believes to be legally identical.