From nobody Wed May 24 12:04:07 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 4QR8x34wvjz4Ccmn for ; Wed, 24 May 2023 12:04:07 +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 4QR8x34Jv2z3DFh; Wed, 24 May 2023 12:04:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684929847; 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=jVEVcHERNJxdLNLXIQ6bHLlcUv6f1QMeS2SoGrS1LLE=; b=QT78EpzJ2oqrOk+rDUPZO0y7nwkLfnwh+GMSV/Y6du5Ynyf/1DRjl+TI9TgGypvKl6IBqo vabu19zQ7wgO3ZmSl1b96YSoRQyzgWmcbBjIYRD47Et/1x3QauAiTr/xf7xNc7ciAkTYp4 tqkRzN5MzTlIEaX1Qn5VQtldInvDrsIDepLZz+Sm2abR7PexNDgZymoObfP1E49va5uDGV zoyXINx/+WYqi2PV7orW4c5JA/3P3kwPdwR/R2SlFWp7IWvccmOQPAwf/22AKCoM5xLqVc 6rSqIqNnxuOF0gbhk/rqsPe5gyTWTDdl1NFE6KIySUIBQqNFWlUHbkdmWTrERw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684929847; 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=jVEVcHERNJxdLNLXIQ6bHLlcUv6f1QMeS2SoGrS1LLE=; b=CCf9nF7qNFcNiZ9jlIF6dgK7B6AFRDDnT7cVZoD1JPpSU4iljf0k0rz7WMJaYMXfkGT8fK NYZv1N0FXlC2IbZ+gjunSL2pcWKZaJLpPKgoorQvrpq/ZIMj3h+oLNyOEb2e2FMzscXWgm Bbj1lNrW2YuQiUcy+n3/VHXgbyrkYkYbf69HPLWg0YlSJb7XzXpIc1UqpLIrVkbSHAawKL 1fSxaPRoSdEhgFcmUy4glnnH4Eiw5orWCBSHszgR7AYxnoZgqTLzrBVSwBr/V/yb2rMzev /JjbcP7Ar/UdlUr/zFJtyu3UEb8XNLFr5APRK82hgy9BnpDbjkhbjfdnTMJUgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684929847; a=rsa-sha256; cv=none; b=BekQ08KI/8sv+tI9N44tEuJjlKobZCV+2H7fvoi10Suy1uLjV3Y2aIxz5fSH7MFCWKY7ak 8Oj9klZPP5zKZUnlEK0ftm6toOtSg1rTxn2ZqEw+6+pIFQUcZnQN2LhTdAN3DwEf/tsHRo imSLuy5jJdRePMhRxuPDPrHV09a0ksPOD35g5ML9KwZQMhw7xHNEPZPPReNr4lkbQNh3C1 SjZ1D4PznS8IFjh8v+WVy5XkzY4y7gitInbi6CbvmYsks5xYUUQ42j8qKRpaS5ikvnF8yq D0s5Xra13Q9aWLYjWDxtdsVHji1+lEEBJb8gGszZhG+L8Ucy2fpA4c6z6G4gRA== 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 4QR8x33Mdjzhl4; Wed, 24 May 2023 12:04:07 +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 34OC479R057881; Wed, 24 May 2023 12:04:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34OC47LM057880; Wed, 24 May 2023 12:04:07 GMT (envelope-from git) Date: Wed, 24 May 2023 12:04:07 GMT Message-Id: <202305241204.34OC47LM057880@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Mitchell Horne Subject: git: 82a06c65d2 - main - website: Update Software License Policy examples 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: mhorne X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 82a06c65d256094bc5c36f068eff3cf1b136e5ba Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/doc/commit/?id=82a06c65d256094bc5c36f068eff3cf1b136e5ba commit 82a06c65d256094bc5c36f068eff3cf1b136e5ba Author: Mitchell Horne AuthorDate: 2023-05-24 12:02:28 +0000 Commit: Mitchell Horne CommitDate: 2023-05-24 12:03:57 +0000 website: Update Software License Policy examples Since these are suitable to copied directly into a C source file, we should: - Include the SPDX identifier - Remove the content ID (this is very nearly obsolete for us) Reviewed by: lwhsu, jhb, emaste Differential Revision: https://reviews.freebsd.org/D40233 --- website/content/en/internal/software-license.adoc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/website/content/en/internal/software-license.adoc b/website/content/en/internal/software-license.adoc index 45e9dc17b7..5e6a45a608 100644 --- a/website/content/en/internal/software-license.adoc +++ b/website/content/en/internal/software-license.adoc @@ -45,6 +45,8 @@ The following licenses are considered to be acceptable BSD-Like Licenses for the .... /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) [year] [your name] * * Redistribution and use in source and binary forms, with or without @@ -67,14 +69,14 @@ The following licenses are considered to be acceptable BSD-Like Licenses for the * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * [id for your version control system, if any] */ .... * The 3 clause version of the BSD license .... /*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) [year] [your name] * * Redistribution and use in source and binary forms, with or without @@ -99,14 +101,14 @@ The following licenses are considered to be acceptable BSD-Like Licenses for the * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * [id for your version control system, if any] */ .... * The ISC License .... /*- + * SPDX-License-Identifier: ISC + * * Copyright (c) [year] [copyright holder] * * Permission to use, copy, modify, and distribute this software for any @@ -120,14 +122,14 @@ The following licenses are considered to be acceptable BSD-Like Licenses for the * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * - * [id for your version control system, if any] */ .... * The MIT License .... /*- + * SPDX-License-Identifier: MIT + * * Copyright (c) [year] [copyright holders] * * Permission is hereby granted, free of charge, to any person obtaining a copy @@ -147,7 +149,5 @@ The following licenses are considered to be acceptable BSD-Like Licenses for the * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. - * - * [id for your version control system, if any] */ ....