diff options
Diffstat (limited to 'talermerchantdemos/blog/articles/en/categories.html')
| -rw-r--r-- | talermerchantdemos/blog/articles/en/categories.html | 96 |
1 files changed, 58 insertions, 38 deletions
diff --git a/talermerchantdemos/blog/articles/en/categories.html b/talermerchantdemos/blog/articles/en/categories.html index 5c4dbcb..75826d1 100644 --- a/talermerchantdemos/blog/articles/en/categories.html +++ b/talermerchantdemos/blog/articles/en/categories.html @@ -1,32 +1,40 @@ <!--#include virtual="/server/header.html" --> -<!-- Parent-Version: 1.86 --> +<!-- Parent-Version: 1.96 --> +<!-- This page is derived from /server/standards/boilerplate.html --> +<!--#set var="TAGS" value="essays term" --> +<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" --> <title>Categories of Free and Nonfree Software - GNU Project - Free Software Foundation</title> -<style type="text/css" media="screen"> -<!-- -#content #diagram { overflow: auto; margin: 2em 0; } -#diagram img { width: 31.7em; } ---> -</style> +<style type="text/css" media="screen"><!-- +#diagram { width: 32em; max-width: 100%; margin: 2.5em auto 2em; } +#diagram img { width: 29.9em; height: auto; overflow: auto; } +#diagram p { font-size: .88em; text-align: justify; } +--></style> <!--#include virtual="/philosophy/po/categories.translist" --> <!--#include virtual="/server/banner.html" --> -<h2>Categories of free and nonfree software</h2> - -<p>Also see <a href="/philosophy/words-to-avoid.html">Confusing - Words which You Might Want to Avoid</a>.</p> +<!--#include virtual="/philosophy/ph-breadcrumb.html" --> +<!--GNUN: OUT-OF-DATE NOTICE--> +<!--#include virtual="/server/top-addendum.html" --> +<div class="article reduced-width"> +<h2>Categories of Free and Nonfree Software</h2> <!-- GNUN: localize URL /philosophy/category.png --> -<p id="diagram" class="c"> +<div id="diagram" class="c" role="figure" aria-labelledby="caption"> <img src="/philosophy/category.png" alt=" [Categories of software] " /> -</p> - - <p>This diagram, originally by Chao-Kuei and updated by several + <p id="caption"> + This diagram, originally by Chao-Kuei and updated by several others since, explains the different categories of software. It's available as a <a href="/philosophy/category.svg">Scalable Vector Graphic</a> and as an <a href="/philosophy/category.fig">XFig document</a>, under the terms of any of the GNU GPL v2 or later, the GNU FDL v1.2 or later, or the Creative Commons Attribution-Share Alike v2.0 or later.</p> +</div> + +<div class="announcement" role="complementary"> +<p>Also see <a href="/philosophy/words-to-avoid.html">Confusing + Words which You Might Want to Avoid</a>.</p> +</div> <h3 id="FreeSoftware">Free software</h3> @@ -69,7 +77,7 @@ <p>Many languages have two separate words for “free” as in freedom and “free” as in zero price. For example, French has “libre” and - “gratuit”. Not so English; there is a word + “gratuit.” Not so English; there is a word “gratis” that refers unambiguously to price, but no common adjective that refers unambiguously to freedom. So if you are speaking another language, we suggest you translate @@ -122,7 +130,7 @@ mean <a href="#FreeSoftware">“free”</a> or “available gratis.” However, “public domain” is a legal term and means, precisely, “not - copyrighted”. For clarity, we recommend using + copyrighted.” For clarity, we recommend using “public domain” for that meaning only, and using other terms to convey the other meanings.</p> @@ -162,7 +170,7 @@ However, in actual practice nearly all copylefted software uses the <a href="/licenses/gpl.html">GNU General Public License</a>. Two different copyleft licenses are usually - “incompatible”, which means it is illegal to merge + “incompatible,” which means it is illegal to merge the code using one license with the code using the other license; therefore, it is good for the community if people use a single copyleft license.</p> @@ -180,7 +188,7 @@ a <a href="#ProprietarySoftware">proprietary</a> software product.</p> - <p>The <a href="http://www.x.org">X Window System</a> + <p>The <a href="https://www.x.org/wiki/">X Window System</a> illustrates this. The X Consortium released X11 with distribution terms that made it noncopylefted free software, and subsequent developers have mostly followed the @@ -247,13 +255,13 @@ <p>“GNU programs” is equivalent to <a href="#GNUsoftware">GNU software.</a> A program Foo is a GNU program if it is GNU software. We also sometimes say it - is a “GNU package”.</p> + is a “GNU package.”</p> <h3 id="GNUsoftware">GNU software</h3> <p><a href="/software/software.html">GNU software</a> is - software that is released under the auspices of the <a href= - "/gnu/gnu-history.html">GNU Project</a>. If a program is GNU + software that is released under the auspices of the <a + href="/gnu/gnu-history.html">GNU Project</a>. If a program is GNU software, we also say that it is a GNU program or a GNU package. The README or manual of a GNU package should say it is one; also, the <a href="/directory">Free Software @@ -264,9 +272,9 @@ all GNU software must be <a href="/philosophy/free-sw.html">free software</a>.</p> - <p>Some GNU software was written by <a href= - "http://www.fsf.org/about/staff/">staff</a> of - the <a href="http://www.fsf.org/">Free Software + <p>Some GNU software was written by <a + href="https://www.fsf.org/about/staff/">staff</a> of + the <a href="https://www.fsf.org/">Free Software Foundation</a>, but most GNU software comes from many <a href="/people/people.html">volunteers</a>. (Some of these volunteers are paid by companies or universities, but they are @@ -298,9 +306,9 @@ <p>Proprietary software is another name for nonfree software. In the past we subdivided nonfree software into - “semifree software”, which could be modified and + “semifree software,” which could be modified and redistributed noncommercially, and “proprietary - software”, which could not be. But we have dropped that + software,” which could not be. But we have dropped that distinction and now use “proprietary software” as synonymous with nonfree software.</p> @@ -402,16 +410,11 @@ software is possible. You can do this by making an effort not to say “commercial” when you mean “proprietary.”</p> +</div> -<!-- If needed, change the copyright block at the bottom. In general, --> -<!-- all pages on the GNU web server should have the section about --> -<!-- verbatim copying. Please do NOT remove this without talking --> -<!-- with the webmasters first. --> -<!-- Please make sure the copyright date is consistent with the document --> -<!-- and that it is like this "2001, 2002" not this "2001-2002." --> </div><!-- for id="content", starts in the include above --> <!--#include virtual="/server/footer.html" --> -<div id="footer"> +<div id="footer" role="contentinfo"> <div class="unprintable"> <p>Please send general FSF & GNU inquiries to <a @@ -429,16 +432,33 @@ href="mailto:webmasters@gnu.org"><webmasters@gnu.org></a>.</p> to <a href="mailto:web-translators@gnu.org"> <web-translators@gnu.org></a>.</p> - <p>For information on coordinating and submitting translations of + <p>For information on coordinating and contributing translations of our web pages, see <a href="/server/standards/README.translations.html">Translations README</a>. --> Please see the <a href="/server/standards/README.translations.html">Translations README</a> for -information on coordinating and submitting translations of this article.</p> +information on coordinating and contributing translations of this article.</p> </div> -<p>Copyright © 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 2015, 2016, 2017, 2018, 2019 Free +<!-- Regarding copyright, in general, standalone pages (as opposed to + files generated as part of manuals) on the GNU web server should + be under CC BY-ND 4.0. Please do NOT change or remove this + without talking with the webmasters or licensing team first. + Please make sure the copyright date is consistent with the + document. For web pages, it is ok to list just the latest year the + document was modified, or published. + + If you wish to list earlier years, that is ok too. + Either "2001, 2002, 2003" or "2001-2003" are ok for specifying + years, as long as each year in the range is in fact a copyrightable + year, i.e., a year in which the document was published (including + being publicly visible on the web or in a revision control system). + + There is more detail about copyright years in the GNU Maintainers + Information document, www.gnu.org/prep/maintain. --> + +<p>Copyright © 1996-1998, 2001-2005, 2007, 2009-2012, 2015, 2019, 2021 Free Software Foundation, Inc.</p> <p>This page is licensed under a <a rel="license" @@ -449,7 +469,7 @@ Commons Attribution-NoDerivatives 4.0 International License</a>.</p> <p class="unprintable">Updated: <!-- timestamp start --> -$Date: 2019/02/21 01:56:25 $ +$Date: 2021/09/11 09:37:22 $ <!-- timestamp end --> </p> </div> |