Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ship 1.0 #12

Merged
merged 3 commits into from
Nov 16, 2023
Merged

Ship 1.0 #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9fa6cb5
Ship 1.0
chadwhitacre Nov 16, 2023
de2d036
Tighten up titles
chadwhitacre Nov 16, 2023
68364ed
Whitespace (per my Vim)
chadwhitacre Nov 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions FSL-DRAFT-Apache-2.0.template.md → FSL-1.0-Apache-2.0.template.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Functional Source License, DRAFT version, with Apache 2.0 change license
# Functional Source License, Version 1.0, Apache 2.0 Change License

## Abbreviation

FSL-DRAFT-Apache-2.0
FSL-1.0-Apache-2.0

## Notice

Expand Down Expand Up @@ -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:

Expand All @@ -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

Expand Down
10 changes: 5 additions & 5 deletions FSL-DRAFT-MIT.template.md → FSL-1.0-MIT.template.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Functional Source License, DRAFT version, with MIT change license
# Functional Source License, Version 1.0, MIT Change License

## Abbreviation

FSL-DRAFT-MIT
FSL-1.0-MIT

## Notice

Expand Down Expand Up @@ -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:

Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?

Expand Down
11 changes: 4 additions & 7 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@ <h1>FSL</h1>

<section class="intro">
<div class="content">
<h2 class="draft">DRAFT</h2>
<p><a href="https://github.com/getsentry/loose-confederation/issues/4">Comment on GitHub</a>.</p>
<br><br>
<h2>What?</h2>

<p>The Functional Source License (FSL) is a mostly permissive non-compete
Expand All @@ -38,10 +35,10 @@ <h2>What?</h2>

<section class="templates">
<div class="content">
<h2><a href="https://github.com/getsentry/loose-confederation/blob/main/FSL-DRAFT-Apache-2.0.template.md">FSL-DRAFT-Apache-2.0</a>
(<a href="./FSL-DRAFT-Apache-2.0.template.md">raw</a>)</h2>
<h2><a href="https://github.com/getsentry/loose-confederation/blob/main/FSL-DRAFT-MIT.template.md">FSL-DRAFT-MIT</a>
(<a href="./FSL-DRAFT-MIT.template.md">raw</a>)</h2>
<h2><a href="https://github.com/getsentry/loose-confederation/blob/main/FSL-1.0-Apache-2.0.template.md">FSL-1.0-Apache-2.0</a>
(<a href="./FSL-1.0-Apache-2.0.template.md">raw</a>)</h2>
<h2><a href="https://github.com/getsentry/loose-confederation/blob/main/FSL-1.0-MIT.template.md">FSL-1.0-MIT</a>
(<a href="./FSL-1.0-MIT.template.md">raw</a>)</h2>
</div>
</section>

Expand Down
3 changes: 0 additions & 3 deletions style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ h2, h3 {
font-weight: bold;
font-family: Gabarito;
}
h2.draft {
color: red;
}
h2 {
font-size: 24pt;
line-height: 32pt;
Expand Down