FSFE/fsfe-website
31
33
Fork 96
Code Issues 65 Pull Requests 18 Wiki Activity

swap synonyms and advantages
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Max Mehl
2020-05-06 10:13:28 +02:00
parent f126efd462
commit 3446c1171b
1 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
freesoftware/freesoftware.en.xhtml
+35 -34
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<html>
<version>2</version>
<version>3</version>
<head>
<title>Free Software - FSFE</title>
@@ -10,12 +10,13 @@
<h1>What is Free Software</h1>
<div id="introduction">
<p>
The principles of Free Software are simple but it is important to not
get confused by the underlying complexity caused by its long history.
Learn about the <a href="#freedoms">four freedoms</a> and their meaning,
the fundamentals about <a href="#licences">Free Software licenses</a>,
the most common <a href="#synonyms">synonyms</a>, and the <a
href="#advantages">advantages</a> that Free Software provides.
The principles of Free Software are simple but it is important
to not get confused by the underlying complexity caused by its
long history. Learn about the <a href="#freedoms">four
freedoms</a> and their meaning, the fundamentals about <a
href="#licences">Free Software licenses</a>, the <a
href="#advantages">advantages</a> that Free Software provides,
and the most common <a href="#synonyms">synonyms</a>.
</p>
<p>
@@ -112,33 +113,6 @@
to pick one of the most widely used licences.
</p>
<h2 id="synonyms">Synonyms</h2>
<p>
Over the course of time, people came up with additional labels for Free
Software. Often the motivation for these terms is to highlight different
aspects and to avoid confusion.
</p>
<p>
Free Software was first defined with the four freedoms mentioned above by
the <a href="/freesoftware/gnuproject.html">GNU project</a> in 1986. In
1998, "Open Source" has been set up as a marketing campaign for Free
Software but with the same freedoms in mind. Other widely known labels for
Free Software are "Libre Software", initiated to avoid the ambiguity of
the English word "free", and "FOSS" or "FLOSS" as abbreviations for "Free
(Libre) Open Source Software".
</p>
<p>
The level of freedom particular software offers is always determined by
the licence, not the label. In other words, don’t get confused by
different terms for the same features. If you are interested in the
historical background and why we prefer the original term, you can <a
class="learn-more"
href="/freesoftware/comparison.html">Read&#160;more...</a>
</p>
<h2 id="advantages">Advantages</h2>
<!-- adopted from PMPC brochure p.16+17 -->
@@ -238,6 +212,33 @@
</ul>
</div>
<h2 id="synonyms">Synonyms</h2>
<p>
Over the course of time, people came up with additional labels for Free
Software. Often the motivation for these terms is to highlight different
aspects and to avoid confusion.
</p>
<p>
Free Software was first defined with the four freedoms mentioned above by
the <a href="/freesoftware/gnuproject.html">GNU project</a> in 1986. In
1998, "Open Source" has been set up as a marketing campaign for Free
Software but with the same freedoms in mind. Other widely known labels for
Free Software are "Libre Software", initiated to avoid the ambiguity of
the English word "free", and "FOSS" or "FLOSS" as abbreviations for "Free
(Libre) Open Source Software".
</p>
<p>
The level of freedom particular software offers is always determined by
the licence, not the label. In other words, don’t get confused by
different terms for the same features. If you are interested in the
historical background and why we prefer the original term, you can <a
class="learn-more"
href="/freesoftware/comparison.html">Read&#160;more...</a>
</p>
<h2 id="more">Further Insights</h2>
<p>