From 9fa6cb5a320a9a083737f588302900716c46d8b9 Mon Sep 17 00:00:00 2001 From: Chad Whitacre Date: Thu, 16 Nov 2023 17:45:08 -0500 Subject: [PATCH 1/3] Ship 1.0 --- ...-2.0.template.md => FSL-1.0-Apache-2.0.template.md | 4 ++-- FSL-DRAFT-MIT.template.md => FSL-1.0-MIT.template.md | 4 ++-- README.md | 2 +- index.html | 11 ++++------- style.css | 3 --- 5 files changed, 9 insertions(+), 15 deletions(-) rename FSL-DRAFT-Apache-2.0.template.md => FSL-1.0-Apache-2.0.template.md (97%) rename FSL-DRAFT-MIT.template.md => FSL-1.0-MIT.template.md (98%) diff --git a/FSL-DRAFT-Apache-2.0.template.md b/FSL-1.0-Apache-2.0.template.md similarity index 97% rename from FSL-DRAFT-Apache-2.0.template.md rename to FSL-1.0-Apache-2.0.template.md index 5f8a3fc..efa210a 100644 --- a/FSL-DRAFT-Apache-2.0.template.md +++ b/FSL-1.0-Apache-2.0.template.md @@ -1,8 +1,8 @@ -# Functional Source License, DRAFT version, with Apache 2.0 change license +# Functional Source License, 1.0 version, with Apache 2.0 change license ## Abbreviation -FSL-DRAFT-Apache-2.0 +FSL-1.0-Apache-2.0 ## Notice diff --git a/FSL-DRAFT-MIT.template.md b/FSL-1.0-MIT.template.md similarity index 98% rename from FSL-DRAFT-MIT.template.md rename to FSL-1.0-MIT.template.md index 7625bf6..d15c9f7 100644 --- a/FSL-DRAFT-MIT.template.md +++ b/FSL-1.0-MIT.template.md @@ -1,8 +1,8 @@ -# Functional Source License, DRAFT version, with MIT change license +# Functional Source License, 1.0 version, with MIT change license ## Abbreviation -FSL-DRAFT-MIT +FSL-1.0-MIT ## Notice diff --git a/README.md b/README.md index 0d31347..fdf8254 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ https://twitter.com/adamhjk/status/1687113805237714944 ## First, a New License -We're focused on [writing a new license](https://github.com/getsentry/loose-confederation/issues/4) (evolution of the BSL), which we want to [announce on November 17](https://github.com/getsentry/loose-confederation/issues/7). Jump in! +We shipped [a new license](https://fsl.software/). 💃 ## Then ... What? diff --git a/index.html b/index.html index 074414c..7996f33 100644 --- a/index.html +++ b/index.html @@ -20,9 +20,6 @@

FSL

-

DRAFT

-

Comment on GitHub.

-

What?

The Functional Source License (FSL) is a mostly permissive non-compete @@ -38,10 +35,10 @@

What?

-

FSL-DRAFT-Apache-2.0 - (raw)

-

FSL-DRAFT-MIT - (raw)

+

FSL-1.0-Apache-2.0 + (raw)

+

FSL-1.0-MIT + (raw)

diff --git a/style.css b/style.css index fc3314d..23a2da9 100644 --- a/style.css +++ b/style.css @@ -31,9 +31,6 @@ h2, h3 { font-weight: bold; font-family: Gabarito; } -h2.draft { - color: red; -} h2 { font-size: 24pt; line-height: 32pt; From de2d036029f70ab57924c0d4613e9d2323c71d29 Mon Sep 17 00:00:00 2001 From: Chad Whitacre Date: Thu, 16 Nov 2023 17:52:20 -0500 Subject: [PATCH 2/3] Tighten up titles --- FSL-1.0-Apache-2.0.template.md | 2 +- FSL-1.0-MIT.template.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/FSL-1.0-Apache-2.0.template.md b/FSL-1.0-Apache-2.0.template.md index efa210a..1ce4513 100644 --- a/FSL-1.0-Apache-2.0.template.md +++ b/FSL-1.0-Apache-2.0.template.md @@ -1,4 +1,4 @@ -# Functional Source License, 1.0 version, with Apache 2.0 change license +# Functional Source License, Version 1.0, Apache 2.0 Change License ## Abbreviation diff --git a/FSL-1.0-MIT.template.md b/FSL-1.0-MIT.template.md index d15c9f7..a4b0fd5 100644 --- a/FSL-1.0-MIT.template.md +++ b/FSL-1.0-MIT.template.md @@ -1,4 +1,4 @@ -# Functional Source License, 1.0 version, with MIT change license +# Functional Source License, Version 1.0, MIT Change License ## Abbreviation From 68364ed883a9d8f5a00d8757618568e5dddb5228 Mon Sep 17 00:00:00 2001 From: Chad Whitacre Date: Thu, 16 Nov 2023 18:11:38 -0500 Subject: [PATCH 3/3] Whitespace (per my Vim) --- FSL-1.0-Apache-2.0.template.md | 6 +++--- FSL-1.0-MIT.template.md | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/FSL-1.0-Apache-2.0.template.md b/FSL-1.0-Apache-2.0.template.md index 1ce4513..3ab1387 100644 --- a/FSL-1.0-Apache-2.0.template.md +++ b/FSL-1.0-Apache-2.0.template.md @@ -41,7 +41,7 @@ Competing Uses specifically include using the Software: 2. in a way that exposes the APIs of the Software; and 3. in a product or service that offers the same or substantially similar -functionality to the Software. + functionality to the Software. Permitted Purposes specifically include using the Software: @@ -52,8 +52,8 @@ Permitted Purposes specifically include using the Software: 3. for non-commercial research; and 4. in connection with software development services or managed services that -you provide to a licensee using the Software in accordance with these Terms and -Conditions. + you provide to a licensee using the Software in accordance with these Terms +and Conditions. ### Patents diff --git a/FSL-1.0-MIT.template.md b/FSL-1.0-MIT.template.md index a4b0fd5..08e20af 100644 --- a/FSL-1.0-MIT.template.md +++ b/FSL-1.0-MIT.template.md @@ -41,7 +41,7 @@ Competing Uses specifically include using the Software: 2. in a way that exposes the APIs of the Software; and 3. in a product or service that offers the same or substantially similar -functionality to the Software. + functionality to the Software. Permitted Purposes specifically include using the Software: @@ -52,8 +52,8 @@ Permitted Purposes specifically include using the Software: 3. for non-commercial research; and 4. in connection with software development services or managed services that -you provide to a licensee using the Software in accordance with these Terms and -Conditions. + you provide to a licensee using the Software in accordance with these Terms +and Conditions. ### Patents