summaryrefslogtreecommitdiff
path: root/talermerchantdemos/blog/articles/ru/floss-and-foss.html
diff options
context:
space:
mode:
Diffstat (limited to 'talermerchantdemos/blog/articles/ru/floss-and-foss.html')
-rw-r--r--talermerchantdemos/blog/articles/ru/floss-and-foss.html40
1 files changed, 33 insertions, 7 deletions
diff --git a/talermerchantdemos/blog/articles/ru/floss-and-foss.html b/talermerchantdemos/blog/articles/ru/floss-and-foss.html
index bdb8d57..30fc861 100644
--- a/talermerchantdemos/blog/articles/ru/floss-and-foss.html
+++ b/talermerchantdemos/blog/articles/ru/floss-and-foss.html
@@ -1,16 +1,23 @@
<!--#set var="ENGLISH_PAGE" value="/philosophy/floss-and-foss.en.html" -->
<!--#include virtual="/server/header.ru.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 и FOSS - Проект GNU - Фонд свободного программного обеспечения</title>
<!--#include virtual="/philosophy/po/floss-and-foss.translist" -->
<!--#include virtual="/server/banner.ru.html" -->
+<!--#include virtual="/philosophy/ph-breadcrumb.ru.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.ru.html" -->
+<div class="article reduced-width">
<h2>FLOSS и FOSS</h2>
-<p><strong>Ричард Столмен</strong></p>
+<address class="byline">Ричард Столмен</address>
<p>В сообществе свободного программного обеспечения два лагеря: движение за
свободные программы и открытый исходный текст. Движение за свободные
@@ -70,6 +77,7 @@ lang="en" xml:lang="en">Free and Open Source Software</span> (Свободные
другим выражением, потому что мы не хотим быть нейтральными по этому
политическому вопросу. Мы стоим за свободу и показываем это каждый
раз&nbsp;&mdash; говоря &ldquo;свободные&rdquo; и подчеркивая их свободу.</p>
+</div>
<div class="translators-notes">
@@ -79,7 +87,7 @@ lang="en" xml:lang="en">Free and Open Source Software</span> (Свободные
<!-- for id="content", starts in the include above -->
<!--#include virtual="/server/footer.ru.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
<div class="unprintable">
<p>Пожалуйста, присылайте общие запросы фонду и GNU по адресу <a
@@ -100,7 +108,7 @@ href="/contact/">другие способы связаться</a> с фонд
&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>. -->
@@ -113,8 +121,25 @@ href="mailto:web-translators@gnu.org">&lt;web-translators@gnu.org&gt;</a>.
переводам&rdquo;</a>.</p>
</div>
-<p>Copyright &copy; 2013, 2015, 2016 Richard Stallman<br />Copyright &copy;
-2016 Free Software Foundation, Inc. (translation)</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<br />Copyright
+&copy; 2013, 2014, 2015, 2016, 2021 Free Software Foundation,
+Inc. (translation)</p>
<p>Это произведение доступно по <a rel="license"
href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru">лицензии
@@ -130,11 +155,12 @@ Creative Commons Attribution-NoDerivs (<em>Атрибуция&nbsp;&mdash; Бе
<p class="unprintable"><!-- timestamp start -->
Обновлено:
-$Date: 2016/11/18 07:32:43 $
+$Date: 2021/09/11 12:35:58 $
<!-- timestamp end -->
</p>
</div>
</div>
+<!-- for class="inner", starts in the banner include -->
</body>
</html>