From nobody Mon Aug 3 04:57:20 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 4hD4D61MpKz6nB08 for ; Mon, 03 Aug 2026 04:57:26 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hD4D60hXtz3d2v for ; Mon, 03 Aug 2026 04:57:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785733046; 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=SJEouWRQzN1sGGgyHB/tJrDUw+6JuzVlbnYcky/ec/U=; b=eRiOsOfERTw3TZz8dq6Vaq5x6srT6jaS00xEmntYmj2n4MuBTnGzYxS4SPAr2wSxxOctbc 01Scv9qPgIjJ1XLauND/d5GiNDnRkhiTSvxB0jyHUtT+zGKhmMLeNXIL68MJ5pXRaTy2DY wKVrtmSp9LmRbet3oQnL75TRWd+06ywzjN903tet4knXKzyYPJFd+Fwoqat0ZIYE6y7dih t3tCL0K0JK05DIigDJoxlolRape6yydZ/aZU1WqpksFI/yzBcygu1WbbSBGaOV9HdbA7iJ HZOPPD56UUb0GrFtAD9eVsoioqpeHO5UhxHVUZzhv+W/M0CYkd9iVv3yiCzRNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785733046; a=rsa-sha256; cv=none; b=dR+GM4xUNWTCJ1snJweKOUAZKmMye8w63YgzI0wq96F4q7szydcvyIQYIe2XcPm3MGhJmR PHV0PweSHb+PQu1N0MQnXdXnRq02LjERGJPtar0+thApcMCjoREtRKYOZntwZyX70prN9a GZ9ys0U7TsP2TYhihfJoeMspMxly6JjgQJ3OEL8k83V3nMaJNb3F5bHEvACZORMkhW8vOc 64awc/fIGvmaUckwiB6FtCpDf3E+mt7EU3+FBv4ZZOjNjyNqcoABkdGE4L9xPoFw/uIQbi IYiw+GYc8thMuvhepIpshxL4qjRQexyaJKTLL5Mms/166wKs2EPVEheRBmtjDQ== 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=1785733046; 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=SJEouWRQzN1sGGgyHB/tJrDUw+6JuzVlbnYcky/ec/U=; b=d+G1zjmC97WVEJQchsVJlGgNJFULNMYuTtdM8Xnhxs6R8V3yNNX0bw3GKPZvHA/fdbnJrj eEkiJnPn1Ap5AK4JpMx00up0LVivPr8dl7H4zLyHjvVMDdBsHTtbJ0TpXC76H7/dSoyoIr DL34WEK6MGfinXPpp+okPjd6BukSKF4uE9EPCbXy9powbQuOVOkvLMjb2PQrCsSGyQQu7O th88IjdTCB1BRf/wViVgndFAAlKE1uLymOJN61TzPGtt/q7/GZiN8lUqb+stnKsvXeMZMo MTXLO/uArYlgVuGDNgAqTJQnUHvS5HuvN+mmGzQMEQh+oW3qHuJ5uS3nOl44HQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hD4D56LSnzmcS for ; Mon, 03 Aug 2026 04:57:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19145 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 03 Aug 2026 04:57:20 +0000 To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Warner Losh Subject: git: 2b800f3c80 - main - license-guide: fix doubled word 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: imp X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2b800f3c80bed9e603acc9e106009da597103b13 Auto-Submitted: auto-generated Date: Mon, 03 Aug 2026 04:57:20 +0000 Message-Id: <6a701fb0.19145.dda824c@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/doc/commit/?id=2b800f3c80bed9e603acc9e106009da597103b13 commit 2b800f3c80bed9e603acc9e106009da597103b13 Author: Warner Losh AuthorDate: 2026-08-03 04:55:10 +0000 Commit: Warner Losh CommitDate: 2026-08-03 04:55:10 +0000 license-guide: fix doubled word full takes takes -> full text takes Sponsored by: Netflix --- documentation/content/en/articles/license-guide/_index.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/content/en/articles/license-guide/_index.adoc b/documentation/content/en/articles/license-guide/_index.adoc index e821f532c0..4fb86d1537 100644 --- a/documentation/content/en/articles/license-guide/_index.adoc +++ b/documentation/content/en/articles/license-guide/_index.adoc @@ -65,7 +65,7 @@ The FreeBSD Project uses this text as the preferred license: .... The preferred order is the copyright notice first, followed by the SPDX-License-Identifier, but either order is acceptable. -When both SPDX-License-Identifier and the full text of the license are present, the full takes takes priority and the SPDX-License-Identifier is informational only. +When both SPDX-License-Identifier and the full text of the license are present, the full text takes priority and the SPDX-License-Identifier is informational only. When both are present, the SPDX-License-Identifier will often preceed the copyright and license text. The FreeBSD project does not allow using the "advertising clause" in new code.