summaryrefslogtreecommitdiff
path: root/talermerchantdemos/blog/articles/de/floss-and-foss.html
diff options
context:
space:
mode:
Diffstat (limited to 'talermerchantdemos/blog/articles/de/floss-and-foss.html')
-rw-r--r--talermerchantdemos/blog/articles/de/floss-and-foss.html39
1 files changed, 32 insertions, 7 deletions
diff --git a/talermerchantdemos/blog/articles/de/floss-and-foss.html b/talermerchantdemos/blog/articles/de/floss-and-foss.html
index fc902aa..a2a4254 100644
--- a/talermerchantdemos/blog/articles/de/floss-and-foss.html
+++ b/talermerchantdemos/blog/articles/de/floss-and-foss.html
@@ -1,16 +1,23 @@
<!--#set var="ENGLISH_PAGE" value="/philosophy/floss-and-foss.en.html" -->
<!--#include virtual="/server/header.de.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" -->
<!-- This file is automatically generated by GNUnited Nations! -->
<title>FLOSS und FOSS - GNU-Projekt - Free Software Foundation</title>
<!--#include virtual="/philosophy/po/floss-and-foss.translist" -->
<!--#include virtual="/server/banner.de.html" -->
+<!--#include virtual="/philosophy/ph-breadcrumb.de.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.de.html" -->
+<div class="article reduced-width">
<h2>FLOSS und FOSS</h2>
-<p>von <strong>Richard Stallman</strong></p>
+<address class="byline">von Richard Stallman</address>
<p>Die zwei politischen Lager in der Freie-Software-Gemeinschaft sind die
Freie-Software-Bewegung und Open Source. Die Freie-Software-Bewegung ist
@@ -65,6 +72,7 @@ der politischen Frage gegenüber nicht neutral sein wollen. Wir stehen für
Freiheit ein und bringen dies jedes Mal mit den Worten <em>Frei</em> und
<em>Libre</em> zum Ausdruck&#160;&#8209;&#160;oder mit <em>Frei
(Libre)</em>.</p>
+</div>
<div class="translators-notes">
@@ -80,7 +88,7 @@ Akronyme <em>FLOSS</em> bzw. <em>FOSS</em> sind hybride Begriffe für
<!-- for id="content", starts in the include above -->
<!--#include virtual="/server/footer.de.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
<div class="unprintable">
<p>Bitte senden Sie allgemeine Fragen zur FSF &amp; GNU an <a
@@ -103,7 +111,7 @@ werden.</p>
&lt;web-translators@gnu.org&gt;</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>. -->
@@ -117,11 +125,27 @@ href="mailto:web-translators@gnu.org?cc=www-de-translators@gnu.org">&lt;web-tran
href="/server/standards/README.translations">LIESMICH für Übersetzungen</a>.</p>
</div>
-<p>Copyright &copy; 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 &copy; 2013, 2015, 2016, 2021 Richard Stallman.</p>
<p>Dieses Werk ist lizenziert unter einer <a rel="license"
href="//creativecommons.org/licenses/by-nd/4.0/deed.de">Creative Commons
-Namensnennung-Keine Bearbeitung 4.0 International</a>-Lizenz.</p>
+Namensnennung-Keine Bearbeitungen 4.0 International</a>-Lizenz.</p>
<!--#include virtual="/server/bottom-notes.de.html" -->
<div class="translators-credits">
@@ -134,11 +158,12 @@ href="https://savannah.gnu.org/projects/www-de">&lt;www-de&gt;</a>, 2013,
<p class="unprintable"><!-- timestamp start -->
Letzte Änderung:
-$Date: 2016/12/03 23:45:10 $
+$Date: 2021/10/08 10:06:17 $
<!-- timestamp end -->
</p>
</div>
</div>
+<!-- for class="inner", starts in the banner include -->
</body>
</html>