git: 82a06c65d2 - main - website: Update Software License Policy examples

The branch main has been updated by mhorne:

URL: https://cgit.FreeBSD.org/doc/commit/?id=82a06c65d256094bc5c36f068eff3cf1b136e5ba

commit 82a06c65d256094bc5c36f068eff3cf1b136e5ba
Author:     Mitchell Horne <mhorne@FreeBSD.org>
AuthorDate: 2023-05-24 12:02:28 +0000
Commit:     Mitchell Horne <mhorne@FreeBSD.org>
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]
  */
 ....