diff options
Diffstat (limited to 'talermerchantdemos/blog/articles/en/free-open-overlap.html')
| -rw-r--r-- | talermerchantdemos/blog/articles/en/free-open-overlap.html | 47 |
1 files changed, 36 insertions, 11 deletions
diff --git a/talermerchantdemos/blog/articles/en/free-open-overlap.html b/talermerchantdemos/blog/articles/en/free-open-overlap.html index d3a6c04..2c10bd1 100644 --- a/talermerchantdemos/blog/articles/en/free-open-overlap.html +++ b/talermerchantdemos/blog/articles/en/free-open-overlap.html @@ -1,17 +1,24 @@ <!--#include virtual="/server/header.html" --> -<!-- Parent-Version: 1.77 --> +<!-- Parent-Version: 1.96 --> +<!-- This page is derived from /server/standards/boilerplate.html --> +<!--#set var="TAGS" value="essays aboutfs free-open" --> +<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" --> <title>How Free Software and Open Source Relate as Categories of Programs - GNU Project - Free Software Foundation</title> <!--#include virtual="/philosophy/po/free-open-overlap.translist" --> <!--#include virtual="/server/banner.html" --> +<!--#include virtual="/philosophy/ph-breadcrumb.html" --> +<!--GNUN: OUT-OF-DATE NOTICE--> +<!--#include virtual="/server/top-addendum.html" --> +<div class="reduced-width"> <h2>How Free Software and Open Source Relate as Categories of Programs</h2> <p>Here's how <a href="/philosophy/open-source-misses-the-point.html">free software and open source</a> relate as categories of programs:</p> +<div style="max-width:max-content; padding:1em 1.5em; background:#f3f3f3"> <pre> -<code> /----------------------------------------------\ / | | \ / | | \ @@ -29,8 +36,8 @@ free | X11, expat, Python, MPL, etc., | \---------------------------------------------- / | tivoized (tyrant) devices | O | / ----------------------------------------------/ -</code> </pre> +</div> <p>Among all programs that are open source, only a minuscule fraction are not free. If the bottom row were drawn to scale, its text would @@ -51,10 +58,11 @@ of software released under those licenses. We don't know whether they are still used.</p> <p>Most nonfree licenses are not open source either.</p> +</div> </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 @@ -72,30 +80,47 @@ to <a 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 +README</a> for information on coordinating and contributing translations of this article.</p> </div> -<p>Copyright © 2015 Free Software Foundation, Inc.</p> +<!-- 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 © 2015, 2021 Free Software Foundation, Inc.</p> <p>This page is licensed under a <a rel="license" -href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative -Commons Attribution-NoDerivs 3.0 United States License</a>.</p> +href="http://creativecommons.org/licenses/by-nd/4.0/">Creative +Commons Attribution-NoDerivatives 4.0 International License</a>.</p> <!--#include virtual="/server/bottom-notes.html" --> <p class="unprintable">Updated: <!-- timestamp start --> -$Date: 2015/01/08 15:59:31 $ +$Date: 2021/10/01 17:02:54 $ <!-- timestamp end --> </p> </div> -</div> +</div><!-- for class="inner", starts in the banner include --> </body> </html> |