aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--assets/sass/_custom.scss28
-rw-r--r--content/learn/_index.md33
-rw-r--r--content/learn/copyleft.md2
-rw-r--r--content/learn/four-freedoms.md4
-rw-r--r--content/learn/licenses.md2
5 files changed, 67 insertions, 2 deletions
diff --git a/assets/sass/_custom.scss b/assets/sass/_custom.scss
index 33f42e7..ded3df1 100644
--- a/assets/sass/_custom.scss
+++ b/assets/sass/_custom.scss
@@ -4,6 +4,10 @@
a {
text-decoration: underline;
+
+ &:hover {
+ text-decoration: none;
+ }
}
a.button, nav a, aside a {
@@ -23,3 +27,27 @@ b, strong {
max-width: 30rem;
}
}
+
+.next-button {
+ padding: 0.5rem 1rem;
+ margin-bottom: 0.75rem;
+ border-radius: 0.25rem;
+ width: 16rem;
+ max-width: 40vw;
+ position: relative;
+ display: flex;
+ align-items: center;
+ text-align: center;
+ justify-content: center;
+
+ &::after {
+ background-image: var(--next-icon);
+ content: "";
+ margin-left: 0.67rem;
+ height: 0.8rem;
+ width: 0.8rem;
+ background-size: 100%;
+ background-repeat: no-repeat;
+ transform-origin: 50% 50%;
+ }
+}
diff --git a/content/learn/_index.md b/content/learn/_index.md
index 76c8eb7..1d953ba 100644
--- a/content/learn/_index.md
+++ b/content/learn/_index.md
@@ -31,3 +31,36 @@ essential freedoms*:
Software which upholds these freedoms is **free software**. Software which does
not is **non-free**.
+
+{{< button "/learn/four-freedoms" "Next: The four freedoms" "next-button" >}}
+
+## What is "open source" software?
+
+**Open Source** is a movement similar to the Free Software movement. The
+movements differ mainly in their target audience: open source is more commercial
+in its focus, and free software is more about the users. Nevertheless, the two
+movements are closely related and often work together. Each movement provides a
+different view of software freedom, but in practice nearly all software which is
+considered free software is also considered open source and vice-versa. The Open
+Source definition and the four freedoms are compatible with one another.
+
+The two movements as a whole are often referred to as "free and open source
+software", or "FOSS".
+
+{{< tip >}}
+Generally speaking, all open source software is free software, and vice versa.
+{{< /tip >}}
+
+You can learn more about Open Source at
+[opensource.org](https://opensource.org/).
+
+## What is "source available" software?
+
+"Source available" software refers to any software for which the source code is
+available, but which does not uphold the four freedoms. It might limit
+commercial use, restrict redistribution, prevent the user from modifying the
+software, and so on. Source available software is non-free.
+
+{{< tip "warning" >}}
+All source available software is non-free.
+{{< /tip >}}
diff --git a/content/learn/copyleft.md b/content/learn/copyleft.md
index 3c15ee1..faa3d92 100644
--- a/content/learn/copyleft.md
+++ b/content/learn/copyleft.md
@@ -1,4 +1,4 @@
---
title: What is copyleft?
-weight: -10
+weight: -8
---
diff --git a/content/learn/four-freedoms.md b/content/learn/four-freedoms.md
new file mode 100644
index 0000000..78ea6d1
--- /dev/null
+++ b/content/learn/four-freedoms.md
@@ -0,0 +1,4 @@
+---
+title: The four freedoms
+weight: -10
+---
diff --git a/content/learn/licenses.md b/content/learn/licenses.md
index 5f5a48f..6d976d0 100644
--- a/content/learn/licenses.md
+++ b/content/learn/licenses.md
@@ -1,4 +1,4 @@
---
title: Free software licenses
-weight: -10
+weight: -9
---