aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Ziaee <ziaee@FreeBSD.org>2025-02-27 02:14:42 +0000
committerAlexander Ziaee <ziaee@FreeBSD.org>2025-02-27 02:21:12 +0000
commit11842bfb25444ad0788b614ed6e6a2acf14dbf16 (patch)
tree1f020f5ba8f7849e41e020265d80af261cddbfe6
parent98aea7f1e7b5f082fb2e7d52af62ee83308c627a (diff)
license: Prequel hyphen is no longer needed
"Once, long ago, indent(3) would not touch comments starting with /*-. But not too many people used it. Fast forward to the 90s or early 2000s. I wrote a crappy tool to parse out license statements. It was super ugly perl and super slow. So I repurposed that as a marker, convinced the project to adopt it and touched almsot every file in the tree. The parser was faster, but I couldn't get it released. I think nobody else ever used it." ~imp Concludes: 9ddb49cbe (begin license clauses) Reported by: imp, jlduran Reviewed by: carlavilla, imp (previous version) Approved by: carlavilla (mentor) Differential Revision: https://reviews.freebsd.org/D48345
-rw-r--r--documentation/content/en/articles/committers-guide/_index.adoc2
-rw-r--r--documentation/content/en/articles/license-guide/_index.adoc10
-rw-r--r--website/content/en/internal/software-license.adoc8
3 files changed, 10 insertions, 10 deletions
diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc
index aa9d9a5d9d..2cdb75630b 100644
--- a/documentation/content/en/articles/committers-guide/_index.adoc
+++ b/documentation/content/en/articles/committers-guide/_index.adoc
@@ -2770,7 +2770,7 @@ The FreeBSD Project suggests and uses this text as the preferred license scheme:
[.programlisting]
....
-/*-
+/*
* SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) [year] [your name]
diff --git a/documentation/content/en/articles/license-guide/_index.adoc b/documentation/content/en/articles/license-guide/_index.adoc
index 1533261697..de35c94860 100644
--- a/documentation/content/en/articles/license-guide/_index.adoc
+++ b/documentation/content/en/articles/license-guide/_index.adoc
@@ -54,7 +54,7 @@ The FreeBSD Project uses this text as the preferred license:
[.programlisting]
....
-/*-
+/*
* Copyright (c) [year] [your name]
*
* SPDX-License-Identifier: BSD-2-Clause
@@ -150,7 +150,7 @@ Deviations or the use of any other license must be approved by the FreeBSD Core
[.programlisting]
....
-/*-
+/*
* Copyright (c) [year] [your name]
*
* SPDX-License-Identifier: BSD-2-Clause
@@ -160,7 +160,7 @@ Deviations or the use of any other license must be approved by the FreeBSD Core
[.programlisting]
....
-/*-
+/*
* Copyright (c) [year] [your name]
*
* SPDX-License-Identifier: BSD-3-Clause
@@ -170,7 +170,7 @@ Deviations or the use of any other license must be approved by the FreeBSD Core
[.programlisting]
....
-/*-
+/*
* Copyright (c) [year] [copyright holder]
*
* SPDX-License-Identifier: ISC
@@ -180,7 +180,7 @@ Deviations or the use of any other license must be approved by the FreeBSD Core
[.programlisting]
....
-/*-
+/*
* Copyright (c) [year] [copyright holders]
*
* SPDX-License-Identifier: MIT
diff --git a/website/content/en/internal/software-license.adoc b/website/content/en/internal/software-license.adoc
index efbb16d59c..753b771f1c 100644
--- a/website/content/en/internal/software-license.adoc
+++ b/website/content/en/internal/software-license.adoc
@@ -49,7 +49,7 @@ The following licenses are considered to be acceptable BSD-Like Licenses for the
* The 2 clause version of the BSD license
....
-/*-
+/*
* SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) [year] [your name]
@@ -79,7 +79,7 @@ The following licenses are considered to be acceptable BSD-Like Licenses for the
* The 3 clause version of the BSD license
....
-/*-
+/*
* SPDX-License-Identifier: BSD-3-Clause
*
* Copyright (c) [year] [your name]
@@ -111,7 +111,7 @@ The following licenses are considered to be acceptable BSD-Like Licenses for the
* The ISC License
....
-/*-
+/*
* SPDX-License-Identifier: ISC
*
* Copyright (c) [year] [copyright holder]
@@ -132,7 +132,7 @@ The following licenses are considered to be acceptable BSD-Like Licenses for the
* The MIT License
....
-/*-
+/*
* SPDX-License-Identifier: MIT
*
* Copyright (c) [year] [copyright holders]