diff options
Diffstat (limited to 'talermerchantdemos/blog/articles/en/floss-and-foss.html')
| -rw-r--r-- | talermerchantdemos/blog/articles/en/floss-and-foss.html | 47 |
1 files changed, 35 insertions, 12 deletions
diff --git a/talermerchantdemos/blog/articles/en/floss-and-foss.html b/talermerchantdemos/blog/articles/en/floss-and-foss.html index 279c88f..eeaf586 100644 --- a/talermerchantdemos/blog/articles/en/floss-and-foss.html +++ b/talermerchantdemos/blog/articles/en/floss-and-foss.html @@ -1,11 +1,18 @@ <!--#include virtual="/server/header.html" --> -<!-- Parent-Version: 1.79 --> +<!-- 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>FLOSS and FOSS - GNU Project - Free Software Foundation</title> <!--#include virtual="/philosophy/po/floss-and-foss.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="article reduced-width"> <h2>FLOSS and FOSS</h2> -<p>by <strong>Richard Stallman</strong></p> +<address class="byline">by Richard Stallman</address> <p>The two political camps in the free software community are the free software movement and open source. The free software movement is a @@ -53,14 +60,13 @@ source, and clear about them, the way to achieve that is to say <p>We in the free software movement don't use either of these terms, because we don't want to be neutral on the political question. We stand for freedom, and we show it every time—by saying -“free” and “libre”— or “free -(libre)”.</p> +“free” and “libre”—or “free +(libre).”</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 @@ -78,18 +84,35 @@ 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 © 2013, 2015, 2016 Richard Stallman</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 © 2013, 2015, 2016, 2021 Richard Stallman</p> <p>This page is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nd/4.0/">Creative @@ -99,10 +122,10 @@ Commons Attribution-NoDerivatives 4.0 International License</a>.</p> <p class="unprintable">Updated: <!-- timestamp start --> -$Date: 2016/11/18 06:31:40 $ +$Date: 2021/09/11 09:37:22 $ <!-- timestamp end --> </p> </div> -</div> +</div><!-- for class="inner", starts in the banner include --> </body> </html> |