www-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

www gnu/gnu-linux-faq.fr.html gnu/gnu-linux-faq...


From: GNUN
Subject: www gnu/gnu-linux-faq.fr.html gnu/gnu-linux-faq...
Date: Mon, 30 Aug 2021 10:04:43 -0400 (EDT)

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     21/08/30 10:04:43

Modified files:
        gnu            : gnu-linux-faq.fr.html gnu-linux-faq.ru.html 
                         gnu-users-never-heard-of-gnu.fr.html 
                         gnu-users-never-heard-of-gnu.ru.html 
                         linux-and-gnu.fr.html linux-and-gnu.ru.html 
                         why-gnu-linux.fr.html why-gnu-linux.ru.html 
        gnu/po         : gnu-linux-faq.fr-en.html 
                         gnu-linux-faq.ru-en.html gnu-linux-faq.ru.po 
                         gnu-users-never-heard-of-gnu.fr-en.html 
                         gnu-users-never-heard-of-gnu.ru-en.html 
                         gnu-users-never-heard-of-gnu.ru.po 
                         linux-and-gnu.fr-en.html 
                         linux-and-gnu.ru-en.html linux-and-gnu.ru.po 
                         why-gnu-linux.fr-en.html 
                         why-gnu-linux.ru-en.html why-gnu-linux.ru.po 
        server/gnun/compendia: compendium.ar.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/gnu-linux-faq.fr.html?cvsroot=www&r1=1.97&r2=1.98
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/gnu-linux-faq.ru.html?cvsroot=www&r1=1.73&r2=1.74
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/gnu-users-never-heard-of-gnu.fr.html?cvsroot=www&r1=1.66&r2=1.67
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/gnu-users-never-heard-of-gnu.ru.html?cvsroot=www&r1=1.39&r2=1.40
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/linux-and-gnu.fr.html?cvsroot=www&r1=1.97&r2=1.98
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/linux-and-gnu.ru.html?cvsroot=www&r1=1.53&r2=1.54
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/why-gnu-linux.fr.html?cvsroot=www&r1=1.76&r2=1.77
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/why-gnu-linux.ru.html?cvsroot=www&r1=1.41&r2=1.42
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.fr-en.html?cvsroot=www&r1=1.63&r2=1.64
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.ru-en.html?cvsroot=www&r1=1.56&r2=1.57
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.ru.po?cvsroot=www&r1=1.124&r2=1.125
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.fr-en.html?cvsroot=www&r1=1.38&r2=1.39
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.ru-en.html?cvsroot=www&r1=1.28&r2=1.29
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.ru.po?cvsroot=www&r1=1.38&r2=1.39
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.fr-en.html?cvsroot=www&r1=1.51&r2=1.52
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.ru-en.html?cvsroot=www&r1=1.42&r2=1.43
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.ru.po?cvsroot=www&r1=1.73&r2=1.74
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/why-gnu-linux.fr-en.html?cvsroot=www&r1=1.40&r2=1.41
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/why-gnu-linux.ru-en.html?cvsroot=www&r1=1.33&r2=1.34
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/why-gnu-linux.ru.po?cvsroot=www&r1=1.46&r2=1.47
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.ar.po?cvsroot=www&r1=1.133&r2=1.134

Patches:
Index: gnu/gnu-linux-faq.fr.html
===================================================================
RCS file: /web/www/www/gnu/gnu-linux-faq.fr.html,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -b -r1.97 -r1.98
--- gnu/gnu-linux-faq.fr.html   4 Jul 2021 18:30:36 -0000       1.97
+++ gnu/gnu-linux-faq.fr.html   30 Aug 2021 14:04:42 -0000      1.98
@@ -1,35 +1,28 @@
 <!--#set var="ENGLISH_PAGE" value="/gnu/gnu-linux-faq.en.html" -->
 
-<!--#include virtual="/server/html5-header.fr.html" -->
+<!--#include virtual="/server/header.fr.html" -->
 <!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>FAQ sur GNU/Linux - Projet GNU - Free Software Foundation</title>
 
 <!--#include virtual="/gnu/po/gnu-linux-faq.translist" -->
 <!--#include virtual="/server/banner.fr.html" -->
-<h2 class="c">FAQ sur GNU/Linux</h2>
+<div class="article reduced-width">
+<h2>FAQ sur GNU/Linux</h2>
 
-<address class="byline c">par Richard Stallman</address>
+<address class="byline">par Richard Stallman</address>
 
-<div class="reduced-width">
-<hr class="no-display" />
-<div class="announcement">
-<p>Pour en savoir plus, voir aussi les pages suivantes : <a
-href="/gnu/linux-and-gnu.html">Linux et le projet GNU</a>, <a
-href="/gnu/why-gnu-linux.html">Pourquoi GNU/Linux ?</a> et <a
-href="/gnu/gnu-users-never-heard-of-gnu.html">Les utilisateurs de GNU qui
-n'ont jamais entendu parler de GNU</a>.</p>
-</div>
-<hr class="thin" />
-
-<div class="article">
 <p>
 Quand les gens voient que nous utilisons et recommandons le nom GNU/Linux
 pour un système que beaucoup d'autres appellent simplement « Linux », ils 
se
 posent beaucoup de questions. Voici les plus communes d'entre elles, et nos
 réponses.</p>
 
+<div class="toc">
+<hr class="no-display" />
+<h3 class="no-display">Table des matières</h3>
 <ul>
 
 <li><a href="#why">Pourquoi appelez-vous le système que nous utilisons 
GNU/Linux
@@ -277,7 +270,16 @@
 mal. Ne pourriez-vous pas obtenir leur soutien par d'autres moyens ?</a></li>
 
 </ul>
-<hr class="thin" />
+</div>
+
+<div class="announcement comment" role="complementary">
+<p>Pour en savoir plus, voir aussi les pages suivantes : <a
+href="/gnu/linux-and-gnu.html">Linux et le système GNU</a>, <a
+href="/gnu/why-gnu-linux.html">Pourquoi GNU/Linux ?</a> et <a
+href="/gnu/gnu-users-never-heard-of-gnu.html">Les utilisateurs de GNU qui
+n'ont jamais entendu parler de GNU</a>.</p>
+<hr class="no-display" />
+</div>
 
 <dl>
 
@@ -320,10 +322,13 @@
 <dt id="what">Quelle est la relation exacte entre GNU et Linux ? <span
 class="anchor-reference-id">(<a href="#what">#what</a>)</span></dt>
 
-<dd>Le système d'exploitation GNU et le noyau Linux sont deux projets 
logiciels
+<dd>
+<p>
+Le système d'exploitation GNU et le noyau Linux sont deux projets logiciels
 différents qui se complètent mutuellement. Ils sont généralement 
empaquetés
 dans une <a href="/distros/distros.html">distribution GNU/Linux</a> et
-utilisés ensemble.</dd>
+utilisés ensemble.</p>
+</dd>
 
 <dt id="howerror">D'où vient le fait que la plupart des gens appellent le 
système « Linux » ?
 <span class="anchor-reference-id">(<a 
href="#howerror">#howerror</a>)</span></dt>
@@ -442,11 +447,12 @@
 <span class="anchor-reference-id">(<a
 href="#freespeech">#freespeech</a>)</span></dt>
 <dd>
+<p>
 Oui, effectivement nous croyons que vous avez le droit d'appeler le système
 d'exploitation par le nom que vous voulez. Nous demandons que les gens
 l'appellent GNU/Linux pour rendre justice au projet GNU, pour promouvoir les
 valeurs de liberté que GNU représente et pour informer les autres que ces
-valeurs de liberté ont fait naître ce système.
+valeurs de liberté ont fait naître ce système.</p>
 </dd>
 
 <dt id="everyoneknows">Puisque tout le monde connaît le rôle de GNU dans le 
développement du
@@ -481,11 +487,12 @@
 href="#everyoneknows2">#everyoneknows2</a>)</span></dt>
 
 <dd>
+<p>
 Si les mots que vous utilisez ne reflètent pas votre connaissance, vous
 n'apprenez rien aux autres. La plupart des gens qui ont entendu parler du
 système GNU/Linux pensent qu'il s'agit de « Linux », que son 
développement a
 été initié par Linus Torvalds et qu'il était destiné à être « open
-source ». Si vous ne les détrompez pas, qui le fera ?
+source ». Si vous ne les détrompez pas, qui le fera ?</p>
 </dd>
 
 <dt id="windows">L'abréviation de « GNU/Linux » en « Linux » 
n'est-elle pas simplement comme
@@ -604,8 +611,9 @@
 class="anchor-reference-id">(<a href="#brain">#brain</a>)</span></dt>
 
 <dd>
+<p>
 Un ordinateur ne ressemble pas à un corps humain et aucune de ses parties ne
-joue un rôle comparable à celui du cerveau humain.
+joue un rôle comparable à celui du cerveau humain.</p>
 </dd>
 
 <dt id="kernelmost">L'écriture du noyau n'est-elle pas le plus gros travail 
dans un système
@@ -613,7 +621,8 @@
 href="#kernelmost">#kernelmost</a>)</span></dt>
 
 <dd>
-Non, beaucoup de composants requièrent beaucoup de travail.
+<p>
+Non, beaucoup de composants requièrent beaucoup de travail.</p>
 </dd>
 
 <dt id="nokernel">Un système d'exploitation a besoin d'un noyau. Puisque le 
projet GNU n'en a
@@ -702,12 +711,13 @@
 <span class="anchor-reference-id">(<a href="#feel">#feel</a>)</span></dt>
 
 <dd>
+<p>
 Il n'y a rien de tel que la « sensation de Linux », car Linux n'a pas
 d'interface utilisateur. Comme tout noyau moderne, Linux sert de base à
 l'exécution des programmes ; la place des interfaces utilisateur est
 ailleurs dans le système. L'interaction humaine avec GNU/Linux passe
 toujours par d'autres programmes, et ce sont eux qui donnent la
-« sensation ».
+« sensation ».</p>
 </dd>
 
 <dt id="long">Le problème avec « GNU/Linux » est que c'est trop long. 
Pourquoi ne pas
@@ -796,7 +806,7 @@
 « Linux », si nous disions « GNU » ils pourraient simplement ne pas
 reconnaître que nous parlons du même système. Si nous disons « GNU/Linux 
»,
 ils peuvent faire la relation avec ce dont ils ont entendu parler.</li>
-</ul><p></p>
+</ul>
 </dd>
 
 <dt id="trademarkfee">Il me faudrait payer une taxe si j'utilisais « Linux 
» dans le nom d'un
@@ -851,10 +861,11 @@
 class="anchor-reference-id">(<a href="#others">#others</a>)</span></dt>
 
 <dd>
+<p>
 systemd est assez important, mais pas aussi important que le noyau (Linux),
 ni aussi important que la base du système dans son ensemble
 (GNU). Cependant, si vous voulez mettre en avant la présence de systemd en
-appelant le système « GNU/systemd/Linux », il n'y a rien de mal à ça.
+appelant le système « GNU/systemd/Linux », il n'y a rien de mal à 
ça.</p>
 </dd>
 
 <dt id="others">Beaucoup d'autre projets ont contribué au système tel qu'il 
est
@@ -928,7 +939,7 @@
 <p>
 Nous ne parlons pas ici d'une version distincte, GNU, du noyau Linux. Les
 distributions libres GNU/Linux ont une <a
-href="http://directory.fsf.org/project/linux";>version distincte de
+href="https://directory.fsf.org/wiki/Linux-libre";>version distincte de
 Linux</a>, car la version « standard » contient des « blobs » de
 micrologiciel <i>[firmware]</i> non libre. Si cela faisait partie du projet
 GNU, on pourrait imaginer l'appeler « GNU Linux » ; mais nous ne voudrions
@@ -1243,7 +1254,7 @@
 systèmes), mais au lieu de l'appeler d'un nom ennuyeux comme
 <em>quelque-chose</em> TECO, il a imaginé un nom plus intelligent et plus
 amusant (c'est ce que hacking signifie : <a
-href="http://stallman.org/articles/on-hacking.html";>intelligence
+href="https://stallman.org/articles/on-hacking.html";>intelligence
 ludique</a>).</p>
 <p>
 D'autres hackers ont tellement aimé ce nom qu'ils ont imité cette
@@ -1305,23 +1316,25 @@
 class="anchor-reference-id">(<a href="#othersys">#othersys</a>)</span></dt>
 
 <dd>
+<p>
 Pas dans le sens où nous l'entendons dans « GNU/Linux ». Les outils de GNU
 ne sont qu'une partie des logiciels GNU, qui eux-mêmes sont une partie du
 système GNU ; sous ces outils vous auriez aussi un autre système
 d'exploitation complet, mais il n'aurait aucun code en commun avec
-GNU. C'est donc une situation très différente de GNU/Linux.
+GNU. C'est donc une situation très différente de GNU/Linux.</p>
 </dd>
 
 <dt id="justlinux">Linux ne peut-il être utilisé sans GNU ? <span
 class="anchor-reference-id">(<a href="#justlinux">#justlinux</a>)</span></dt>
 
 <dd>
+<p>
 Linux est utilisé par lui-même, ou avec d'autres petits programmes, dans
 certains appareils. Ces petits systèmes logiciels sont très différents d'un
 système GNU/Linux. Par exemple, les utilisateurs ne les installent pas sur
 leur PC ; ils les trouveraient plutôt décevants. Il est utile de dire que
 ces appareils n'exécutent que Linux, pour montrer combien ces petites
-plateformes sont différentes de GNU/Linux.
+plateformes sont différentes de GNU/Linux.</p>
 </dd>
 
 <dt id="howmuch">Quelle quantité du système GNU faut-il pour que le système 
soit
@@ -1439,10 +1452,11 @@
 href="#claimlinux">#claimlinux</a>)</span></dt>
 
 <dd>
+<p>
 Ce serait une erreur, c'est pourquoi nous ne le faisons pas. Le travail de
 Torvalds est Linux, le noyau ; nous faisons attention à ne pas attribuer ce
 travail au projet GNU ni lui mettre l'étiquette « GNU ». Quand nous 
parlons
-du système entier, le nom « GNU/Linux » lui donne une part du crédit.
+du système entier, le nom « GNU/Linux » lui donne une part du crédit.</p>
 </dd>
 
 
@@ -1452,7 +1466,7 @@
 <dd>
 <p>Il l'a reconnu dès le début. La première note de distribution de Linux 
dit :
 « <a
-href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01";>La
+href="https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01";>La
 plupart des outils utilisés avec Linux sont des logiciels GNU et sont sous
 le copyleft de GNU. Ces outils ne sont pas dans la distribution ;
 adressez-vous à moi (ou à GNU) pour toute information supplémentaire</a>. 
»</p>
@@ -1470,7 +1484,7 @@
 un gros travail dont la nécessité n'est pas évidente. Le seul défaut 
éthique
 de Linux en tant que noyau est qu'il inclut des « blobs » de 
micrologiciel ;
 le meilleur remède à ce problème est de <a
-href="http://fsf.org/campaigns/priority-projects";>développer des
+href="https://www.fsf.org/campaigns/priority-projects";>développer des
 micrologiciels libres de substitution</a>.</p>
 </dd>
 
@@ -1479,12 +1493,13 @@
 class="anchor-reference-id">(<a href="#lost">#lost</a>)</span></dt>
 
 <dd>
+<p>
 Ceci n'est pas une bataille, c'est une campagne éducative. Comment nommer le
 système n'est pas une décision unique, prise à un moment donné par la
 « société » : chaque personne, chaque organisation, peut décider quel 
nom
 utiliser. Vous ne pouvez forcer les autres à dire « GNU/Linux », mais vous
 pouvez décider d'appeler le système « GNU/Linux » vous-même, et ainsi 
vous
-contribuerez à éduquer les autres.
+contribuerez à éduquer les autres.</p>
 </dd>
 
 <dt id="whatgood">La société a pris sa décision et nous ne pouvons rien y 
changer, quel bien
@@ -1492,6 +1507,7 @@
 href="#whatgood">#whatgood</a>)</span></dt>
 
 <dd>
+<p>
 Ce n'est pas une situation de tout ou rien : les deux noms, le correct et
 l'incorrect, sont propagés à des degrés divers par différentes personnes. 
Si
 vous appelez le système « GNU/Linux », vous aiderez les autres à 
apprendre
@@ -1500,7 +1516,7 @@
 pas plus que nous ne le pouvons. Mais si quelques centaines de personnes
 seulement vous voient utiliser le terme correct « GNU/Linux », vous aurez
 éduqué un nombre de gens considérable avec très peu de travail. Et certains
-d'entre eux propageront sûrement la rectification à d'autres.
+d'entre eux propageront sûrement la rectification à d'autres.</p>
 </dd>
 
 <dt id="explain">Ne serait-il pas mieux d'appeler le système « Linux » et 
d'apprendre aux
@@ -1577,17 +1593,20 @@
 href="#rename">#rename</a>)</span></dt>
 
 <dd>
+<p>
 Nous ne renommons rien ; nous avons appelé le système « GNU » depuis 
notre
 première annonce en 1983. Les personnes qui ont essayé de le renommer
-« Linux » n'auraient pas dû le faire.</dd>
+« Linux » n'auraient pas dû le faire.</p>
+</dd>
 
 <dt id="force">N'est-ce pas mal de forcer les gens à appeler le système « 
GNU/Linux » ?
 <span class="anchor-reference-id">(<a href="#force">#force</a>)</span></dt>
 
 <dd>
+<p>
 Ce serait mal de les y forcer et nous n'essayons pas de le faire. Nous
 appelons le système « GNU/Linux » et vous demandons simplement de faire de
-même.
+même.</p>
 </dd>
 
 <dt id="whynotsue">Pourquoi ne pas assigner en justice les personnes qui 
appellent le système
@@ -1595,10 +1614,11 @@
 href="#whynotsue">#whynotsue</a>)</span></dt>
 
 <dd>
+<p>
 Il n'y a aucune base juridique pour les assigner en justice, et de toute
 manière nous ne le ferions pas, car nous croyons en la liberté de
 parole. Nous demandons aux gens d'appeler le système « GNU/Linux » parce 
que
-c'est juste de le faire.
+c'est juste de le faire.</p>
 </dd>
 
 <dt id="require">Ne devriez-vous pas mettre quelque chose dans la GNU GPL pour 
obliger les
@@ -1606,6 +1626,7 @@
 href="#require">#require</a>)</span></dt>
 
 <dd>
+<p>
 Le but de la GNU GPL est de protéger la liberté des utilisateurs contre les
 gens qui voudraient faire des versions privatrices basées sur des logiciels
 libres. Il est vrai que, souvent, ceux qui appellent le système « Linux »
@@ -1614,7 +1635,7 @@
 logiciels non libres à cet usage ; cependant le simple fait d'appeler le
 système « Linux » ne refuse pas aux utilisateurs leur liberté. Il ne 
semble
 pas correct de se servir de la GPL pour limiter le choix des noms que les
-gens peuvent donner au système.
+gens peuvent donner au système.</p>
 </dd>
 
 <dt id="BSDlicense">Puisque vous étiez contre la « clause publicitaire » 
de la licence originale
@@ -1666,7 +1687,8 @@
 href="#somanyright">#somanyright</a>)</span></dt>
 
 <dd>
-Nous ne pensons pas que la popularité d'une erreur la rende juste.
+<p>
+Nous ne pensons pas que la popularité d'une erreur la rende juste.</p>
 </dd>
 
 <dt id="knownname">N'est-ce pas mieux d'appeler le système par un nom que les 
utilisateurs
@@ -1674,10 +1696,11 @@
 href="#knownname">#knownname</a>)</span></dt>
 
 <dd>
+<p>
 Les utilisateurs ne sont pas incapables d'apprendre. Puisque « GNU/Linux »
 comprend « Linux », ils vont reconnaître de quoi il est question. Si de
 temps en temps vous ajoutez « souvent appelé à tort “Linux” », ils
-comprendront tous.
+comprendront tous.</p>
 </dd>
 
 <dt id="winning">Ce qui compte pour beaucoup de gens, c'est l'aspect pratique 
ou le gagnant
@@ -1698,7 +1721,6 @@
 
 </dl>
 </div>
-</div>
 
 <div class="translators-notes">
 
@@ -1760,8 +1782,8 @@
 
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2001, 2006-2008, 2010, 2011, 2013, 2014-2018, 2020, 2021
-Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2001-2011, 2013-2018, 2020, 2021 Free Software Foundation,
+Inc.</p>
 
 <p>Cette page peut être utilisée suivant les conditions de la licence <a
 rel="license"
@@ -1779,7 +1801,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Dernière mise à jour :
 
-$Date: 2021/07/04 18:30:36 $
+$Date: 2021/08/30 14:04:42 $
 
 <!-- timestamp end -->
 </p>

Index: gnu/gnu-linux-faq.ru.html
===================================================================
RCS file: /web/www/www/gnu/gnu-linux-faq.ru.html,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- gnu/gnu-linux-faq.ru.html   8 Apr 2021 11:34:36 -0000       1.73
+++ gnu/gnu-linux-faq.ru.html   30 Aug 2021 14:04:42 -0000      1.74
@@ -1,36 +1,28 @@
 <!--#set var="ENGLISH_PAGE" value="/gnu/gnu-linux-faq.en.html" -->
 
-<!--#include virtual="/server/html5-header.ru.html" -->
+<!--#include virtual="/server/header.ru.html" -->
 <!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Вопросы о GNU/Linux - Проект GNU - Фонд 
свободного программного обеспечения</title>
 
 <!--#include virtual="/gnu/po/gnu-linux-faq.translist" -->
 <!--#include virtual="/server/banner.ru.html" -->
-<h2 class="c">Вопросы о GNU/Linux</h2>
+<div class="article reduced-width">
+<h2>Вопросы о GNU/Linux</h2>
 
-<address class="byline c">Ричард Столмен</address>
+<address class="byline">Ричард Столмен</address>
 
-<div class="reduced-width">
-<hr class="no-display" />
-<div class="announcement">
-<p>Другие сведения об этом вопросе можно 
получить на наших страницах <a
-href="/gnu/linux-and-gnu.html">&ldquo;Linux и проект GNU&rdquo;</a>, <a
-href="/gnu/why-gnu-linux.html">&ldquo;Почему
-&lsquo;GNU/Linux&rsquo;?&rdquo;</a> и <a
-href="/gnu/gnu-users-never-heard-of-gnu.html">&ldquo;Пользователи 
GNU,
-которые никогда не слышали о GNU&rdquo;</a>.</p>
-</div>
-<hr class="thin" />
-
-<div class="article">
 <p>
 Когда люди видят, что мы используем и 
рекомендуем название
 &ldquo;GNU/Linux&rdquo; для системы, которую многие 
другие называют просто
 &ldquo;Linux&rdquo;, они задают много вопросов. Вот 
наиболее общие из них и
 наши ответы на них:</p>
 
+<div class="toc">
+<hr class="no-display" />
+<h3 class="no-display">Содержание</h3>
 <ul>
 
 <li><a href="#why">Почему вы называете систему, 
которой мы пользуемся,
@@ -270,7 +262,17 @@
 поддержки с их стороны при другом подх
оде?</a></li>
 
 </ul>
-<hr class="thin" />
+</div>
+
+<div class="announcement comment" role="complementary">
+<p>Другие сведения об этом вопросе можно 
получить на наших страницах <a
+href="/gnu/linux-and-gnu.html">&ldquo;Linux и система GNU&rdquo;</a>, 
<a
+href="/gnu/why-gnu-linux.html">&ldquo;Почему
+&lsquo;GNU/Linux&rsquo;?&rdquo;</a> и <a
+href="/gnu/gnu-users-never-heard-of-gnu.html">&ldquo;Пользователи 
GNU,
+которые никогда не слышали о GNU&rdquo;</a>.</p>
+<hr class="no-display" />
+</div>
 
 <dl>
 
@@ -315,10 +317,13 @@
 <dt id="what">Какова на самом деле связь между GNU 
и Linux? <span
 class="anchor-reference-id">(<a href="#what">#what</a>)</span></dt>
 
-<dd>Операционноая система GNU и ядро под 
названием Linux&nbsp;&mdash; отдельные
+<dd>
+<p>
+Операционноая система GNU и ядро под 
названием Linux&nbsp;&mdash; отдельные
 проекты программ, которые дополняют друг 
друга. Как правило, они
 упаковываются в <a 
href="/distros/distros.html">дистрибутив GNU/Linux</a> и
-применяются совместно.</dd>
+применяются совместно.</p>
+</dd>
 
 <dt id="howerror">Как получилось, что большинство 
людей называет эту систему
 &ldquo;Linux&rdquo;?<span class="anchor-reference-id">(<a
@@ -440,12 +445,13 @@
 называть систему так, как она хочет? <span 
class="anchor-reference-id">(<a
 href="#freespeech">#freespeech</a>)</span></dt>
 <dd>
+<p>
 Да, конечно, мы убеждены, что у вас есть 
свобода слова и право называть
 операционную систему так, как вам угодно. 
Мы просим людей называть систему
 &ldquo;GNU/Linux&rdquo; для того, чтобы быть 
справедливыми по отношению к
 проекту GNU, популяризовать ценности 
свободы, которые отстаивает GNU, а
 также проинформировать других людей, что 
эти ценности свободы дали жизнь
-этой системе.
+этой системе.</p>
 </dd>
 
 <dt id="everyoneknows">Поскольку все знают о роли GNU в 
разработке этой системы, разве не ясно и
@@ -480,11 +486,12 @@
 href="#everyoneknows2">#everyoneknows2</a>)</span></dt>
 
 <dd>
+<p>
 Если ваши слова не отражают вашего знания, 
то вы не передаете его
 другим. Большинство людей, которые слышали 
о системе GNU/Linux, думают, что
 это &ldquo;Linux&rdquo;, что она была основана 
Линусом Торвальдсом и что ее
 собирались делать &ldquo;с открытым исходным 
текстом&rdquo;. Если вы им не
-расскажете правду, то кто расскажет?
+расскажете правду, то кто расскажет?</p>
 </dd>
 
 <dt id="windows">Разве сокращение &ldquo;GNU/Linux&rdquo; до 
&ldquo;Linux&rdquo; не то же
@@ -601,8 +608,9 @@
 class="anchor-reference-id">(<a href="#brain">#brain</a>)</span></dt>
 
 <dd>
+<p>
 Вычислительная система не очень похожа на 
человеческий организм, и ни одна
-ее часть не играет роли, сравнимой с ролью 
человеческого мозга в организме.
+ее часть не играет роли, сравнимой с ролью 
человеческого мозга в организме.</p>
 </dd>
 
 <dt id="kernelmost">Разве написание ядра не 
составляет основную часть работы по 
созданию
@@ -610,7 +618,8 @@
 href="#kernelmost">#kernelmost</a>)</span></dt>
 
 <dd>
-Нет, многие компоненты требуют большого 
объема работ.
+<p>
+Нет, многие компоненты требуют большого 
объема работ.</p>
 </dd>
 
 <dt id="nokernel">Для операционной системы 
требуется ядро. Поскольку проект GNU не 
разработал
@@ -698,12 +707,13 @@
 class="anchor-reference-id">(<a href="#feel">#feel</a>)</span></dt>
 
 <dd>
+<p>
 Такой вещи как &ldquo;ощущение Linux&rdquo; не 
существует, потому что у
 Linux нет пользовательских интерфейсов. Как 
любое современное ядро,
 Linux&nbsp;&mdash; основание, на котором 
выполняются программы;
 пользовательские интерфейсы относятся к 
другим частям
 системы. Взаимодействие человека с GNU/Linux 
всегда осуществляется через
-другие программы, а &ldquo;ощущение&rdquo; прих
одит от них.
+другие программы, а &ldquo;ощущение&rdquo; прих
одит от них.</p>
 </dd>
 
 <dt id="long">Проблема с &ldquo;GNU/Linux&rdquo;&nbsp;&mdash; в 
том, что название слишком
@@ -794,7 +804,7 @@
 станем говорить &ldquo;GNU&rdquo;, они могут 
просто не понять, о чем мы
 говорим. Когда же мы говорим &ldquo;GNU/Linux&rdquo;, 
они могут связать это
 с тем, о чем они уже слышали.</li>
-</ul><p></p>
+</ul>
 </dd>
 
 <dt id="trademarkfee">Если бы я использовал 
&ldquo;Linux&rdquo; в названии продукта, мне 
пришлось
@@ -852,10 +862,11 @@
 href="#others">#others</a>)</span></dt>
 
 <dd>
+<p>
 Systemd&nbsp;&mdash; довольно важный компонент, но 
он не настолько важен,
 как ядро (Linux), и не настолько важен, как 
основа системы в целом
 (GNU). Однако если вы хотите подчеркнуть 
присутствие systemd, называя
-систему &ldquo;GNU/systemd/Linux&rdquo;, в этом нет 
ничего дурного.
+систему &ldquo;GNU/systemd/Linux&rdquo;, в этом нет 
ничего дурного.</p>
 </dd>
 
 <dt id="others">К настоящему времени систему 
дополнили многие другие проекты, однако 
они не
@@ -929,7 +940,7 @@
 <p>
 Мы не имеем в виду особую версию Linux (ядра) в 
проекте GNU. В свободных
 дистрибутивах GNU/Linux <a
-href="http://directory.fsf.org/project/linux";>отдельная версия 
Linux</a>
+href="https://directory.fsf.org/project/linux";>отдельная версия 
Linux</a>
 есть, поскольку &ldquo;стандартная&rdquo; версия 
содержит вкрапления
 несвободных программ для устройств. Если 
бы это была часть проекта GNU, ее
 можно было бы рассматривать как &ldquo;GNU 
Linux&rdquo;; но мы не хотели бы
@@ -1252,7 +1263,7 @@
 систем), но вместо скучного названия 
наподобие &ldquo;<em>Такой-то</em>
 TECO&rdquo; он придумал остроумное и забавное 
название. (Именно это означает
 &ldquo;хак&rdquo;: <a
-href="http://stallman.org/articles/on-hacking.html";>игривое 
остроумие</a>.)</p>
+href="https://stallman.org/articles/on-hacking.html";>игривое 
остроумие</a>.)</p>
 <p>
 Другим хакерам так понравилось это 
название, что мы начали подражать
 этому. Стало традицией, что, когда вы 
писали с нуля программу, подобную
@@ -1312,24 +1323,26 @@
 href="#othersys">#othersys</a>)</span></dt>
 
 <dd>
+<p>
 Не в том смысле, какой мы вкладываем в
 &ldquo;GNU/Linux&rdquo;. Инструментарий GNU&nbsp;&mdash; это 
только часть
 программ GNU, которые составляют только 
часть системы GNU, а за ними у вас
 все равно была бы другая полная 
операционная система, у которой нет общих с
 GNU исходных текстов. В общем, это 
совершенно отличная от GNU/Linux
-ситуация.
+ситуация.</p>
 </dd>
 
 <dt id="justlinux">Разве Linux нельзя использовать 
без GNU? <span
 class="anchor-reference-id">(<a href="#justlinux">#justlinux</a>)</span></dt>
 
 <dd>
+<p>
 В некоторых случаях Linux применяется 
самостоятельно или с небольшими
 другими программами. Эти небольшие 
программные системы и на пушечный выстрел
 не приближаются к системе GNU/Linux. 
Пользователи, например, не
 устанавливают их на персональные 
компьютеры; эти системы обманули бы все их
 ожидания. Чтобы показать, насколько эти 
небольшие платформы отличаются от
-GNU/Linux, полезно говорить, что в этих 
приложениях работает только Linux.
+GNU/Linux, полезно говорить, что в этих 
приложениях работает только Linux.</p>
 </dd>
 
 <dt id="howmuch">Какое количество системы GNU 
должна содержать система, чтобы быть GNU/Linux?
@@ -1443,11 +1456,12 @@
 class="anchor-reference-id">(<a href="#claimlinux">#claimlinux</a>)</span></dt>
 
 <dd>
+<p>
 Это было бы нечестно, поэтому мы так не 
поступаем. Работа
 Торвальдса&nbsp;&mdash; Linux (ядро); мы аккуратно 
стараемся не приписывать
 эту работу проекту GNU и не помечать ее как 
&ldquo;GNU&rdquo;. Когда мы
 говорим о системе в целом, название 
&ldquo;GNU/Linux&rdquo; отмечает и его
-заслуги.
+заслуги.</p>
 </dd>
 
 
@@ -1475,7 +1489,7 @@
 бы большой работой, необходимость которой 
не очевидна. Единственное, что
 этически неверно в Linux как ядре&nbsp;&mdash; 
включение в него
 &ldquo;клякс&rdquo; с программами для устройств; 
лучше всего эту проблему
-решает <a href="http://fsf.org/campaigns/priority-projects";> 
разработка
+решает <a href="https://fsf.org/campaigns/priority-projects";> 
разработка
 свободных аналогов клякс</a>.</p>
 </dd>
 
@@ -1484,13 +1498,14 @@
 class="anchor-reference-id">(<a href="#lost">#lost</a>)</span></dt>
 
 <dd>
+<p>
 Это не битва, это образовательная 
кампания. Как называть
 систему&nbsp;&mdash; это не единичный выбор, 
который &ldquo;общество&rdquo;
 должно сделать раз и навсегда: каждый 
человек, каждая организация может
 решать, какое название использовать. Вы не 
можете заставить других называть
 систему &ldquo;GNU/Linux&rdquo;, но вы можете решить 
называть систему
 &ldquo;GNU/Linux&rdquo; сами&nbsp;&mdash; и поступая таким 
образом, вы
-поможете научить других.
+поможете научить других.</p>
 </dd>
 
 <dt id="whatgood">Общество уже приняло решение, и 
мы не можем его изменить, так какая же будет
@@ -1498,6 +1513,7 @@
 class="anchor-reference-id">(<a href="#whatgood">#whatgood</a>)</span></dt>
 
 <dd>
+<p>
 Это не ситуация &ldquo;все или ничего&rdquo;: как 
правильная, так и
 неправильная картина распространяются 
разными людьми, одна более, другая
 менее активно. Если вы будете называть 
систему &ldquo;GNU/Linux&rdquo;, вы
@@ -1506,7 +1522,7 @@
 неверное наименование повсюду&nbsp;&mdash; не 
более, чем мы сами,&mdash; но
 вы можете помочь. Если хотя бы несколько 
сотен человек увидят, что вы
 употребляете термин &ldquo;GNU/Linux&rdquo;, вы 
обучите значительное число
-людей без особого труда. А некоторые из них 
передадут исправление дальше.
+людей без особого труда. А некоторые из них 
передадут исправление дальше.</p>
 </dd>
 
 <dt id="explain">Не лучше ли называть систему 
&ldquo;Linux&rdquo;, познакомив людей с ее
@@ -1582,16 +1598,19 @@
 <span class="anchor-reference-id">(<a href="#rename">#rename</a>)</span></dt>
 
 <dd>
+<p>
 Мы ничего не переименовываем; мы называем 
эту систему &ldquo;GNU&rdquo; с
 тех пор, как мы объявили о ней в 1983&nbsp;году. 
Люди, которые попытались
-переименовать ее в &ldquo;Linux&rdquo;, не должны 
были это делать.</dd>
+переименовать ее в &ldquo;Linux&rdquo;, не должны 
были это делать.</p>
+</dd>
 
 <dt id="force">Разве честно заставлять людей 
называть систему &ldquo;GNU/Linux&rdquo;?
 <span class="anchor-reference-id">(<a href="#force">#force</a>)</span></dt>
 
 <dd>
+<p>
 Было бы нечестно заставлять их, и мы не 
пытаемся делать это. Мы называем
-систему &ldquo;GNU/Linux&rdquo; и просим вас 
поступать так же.
+систему &ldquo;GNU/Linux&rdquo; и просим вас 
поступать так же.</p>
 </dd>
 
 <dt id="whynotsue">Почему бы не преследовать в 
судебном порядке людей, которые называют 
всю
@@ -1599,10 +1618,11 @@
 href="#whynotsue">#whynotsue</a>)</span></dt>
 
 <dd>
+<p>
 Нет никаких законных оснований 
преследовать их в судебном порядке; кроме
 того, поскольку мы верим в свободу слова, 
мы в любом случае не хотели бы
 этого. Мы просим людей называть систему 
&ldquo;GNU/Linux&rdquo;, потому что
-это правильно.
+это правильно.</p>
 </dd>
 
 <dt id="require">Не следует ли вам внести в GNU GPL 
требование называть систему
@@ -1610,6 +1630,7 @@
 href="#require">#require</a>)</span></dt>
 
 <dd>
+<p>
 Целью лицензии GNU GPL является защита 
свободы пользователей от тех, кто мог
 бы создать несвободные версии свободной 
программы. Хотя те, кто называет
 систему &ldquo;Linux&rdquo;, действительно часто 
делают то, что ограничивает
@@ -1617,7 +1638,7 @@
 комплекте с системой GNU/Linux или даже 
разрабатывают несвободные программы
 для таких поставок, сам по себе факт 
называния системы &ldquo;Linux&rdquo;
 не ограничивает свободы пользователей. 
Нам кажется неуместным изменять GPL
-так, чтобы она ограничивала пользователей 
в выборе названия для системы.
+так, чтобы она ограничивала пользователей 
в выборе названия для системы.</p>
 </dd>
 
 <dt id="BSDlicense">Разве не лицемерно требовать 
ссылки на проект GNU после того, как вы
@@ -1670,7 +1691,8 @@
 href="#somanyright">#somanyright</a>)</span></dt>
 
 <dd>
-Мы не думаем, что популярность заблуждения 
обращает его в истину.
+<p>
+Мы не думаем, что популярность заблуждения 
обращает его в истину.</p>
 </dd>
 
 <dt id="knownname">Не лучше ли называть систему 
именем, уже известным большинству
@@ -1678,10 +1700,11 @@
 href="#knownname">#knowname</a>)</span></dt>
 
 <dd>
+<p>
 Пользователи не лишены способности 
учиться. Поскольку в состав
 &ldquo;GNU/Linux&rdquo; входит &ldquo;Linux&rdquo;, они 
распознают, о чем вы
 говорите. Если вы время от времени будете 
добавлять &ldquo;(часто по ошибке
-называемая &ldquo;Linux&rdquo;)&rdquo;, то все они это 
поймут.
+называемая &ldquo;Linux&rdquo;)&rdquo;, то все они это 
поймут.</p>
 </dd>
 
 <dt id="winning">Многих людей интересует, что 
удобнее и кто побеждает, а не споры о том, 
что
@@ -1701,7 +1724,6 @@
 
 </dl>
 </div>
-</div>
 
 <div class="translators-notes">
 
@@ -1764,9 +1786,8 @@
 
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2001, 2006-2008, 2010, 2011, 2012, 2013, 2014-2018, 2020,
-2021 Free Software Foundation, Inc.<br />Copyright &copy; 2010 Vladimir
-Smolyar (translation)</p>
+<p>Copyright &copy; 2001-2011, 2013-2018, 2020, 2021 Free Software Foundation,
+Inc.<br />Copyright &copy; 2010 Vladimir Smolyar (translation) </p>
 
 <p>Это произведение доступно по <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru";>лицензии
@@ -1782,7 +1803,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2021/04/08 11:34:36 $
+$Date: 2021/08/30 14:04:42 $
 
 <!-- timestamp end -->
 </p>

Index: gnu/gnu-users-never-heard-of-gnu.fr.html
===================================================================
RCS file: /web/www/www/gnu/gnu-users-never-heard-of-gnu.fr.html,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- gnu/gnu-users-never-heard-of-gnu.fr.html    4 Jul 2021 18:30:36 -0000       
1.66
+++ gnu/gnu-users-never-heard-of-gnu.fr.html    30 Aug 2021 14:04:42 -0000      
1.67
@@ -1,7 +1,8 @@
 <!--#set var="ENGLISH_PAGE" value="/gnu/gnu-users-never-heard-of-gnu.en.html" 
-->
 
-<!--#include virtual="/server/html5-header.fr.html" -->
+<!--#include virtual="/server/header.fr.html" -->
 <!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Les utilisateurs de GNU qui n'ont jamais entendu parler de GNU - Projet 
GNU
@@ -9,22 +10,11 @@
 
 <!--#include virtual="/gnu/po/gnu-users-never-heard-of-gnu.translist" -->
 <!--#include virtual="/server/banner.fr.html" -->
-<h2 class="c">Les utilisateurs de GNU qui n'ont jamais entendu parler de 
GNU</h2>
+<div class="article reduced-width">
+<h2>Les utilisateurs de GNU qui n'ont jamais entendu parler de GNU</h2>
 
-<address class="byline c">par <a href="https://www.stallman.org/";>Richard 
Stallman</a></address>
+<address class="byline">par <a href="https://www.stallman.org/";>Richard 
Stallman</a></address>
 
-<div class="reduced-width">
-<hr class="no-display" />
-<div class="announcement">
-<p>Pour en apprendre plus sur ce problème, vous pouvez aussi lire notre <a
-href="/gnu/gnu-linux-faq.html">FAQ GNU/Linux</a>, notre page sur <a
-href="/gnu/why-gnu-linux.html">Pourquoi GNU/Linux ?</a> et notre page sur <a
-href="/gnu/linux-and-gnu.html">Linux et le projet GNU</a>.
-</p>
-</div>
-<hr class="thin" />
-
-<div class="article">
 <p>La plupart des gens n'ont jamais entendu parler de GNU. Qui plus est, la
 plupart des utilisateurs du système GNU n'en ont jamais entendu parler, dans
 la mesure où de nombreuses personnes et entreprises leur apprennent à
@@ -63,6 +53,15 @@
 approche uniquement pratique (et par conséquent non éthique). Quand nous
 vous demandons d'appeler le système « GNU/Linux », nous vous demandons
 d'aider à rendre le public conscient des idéaux du logiciel libre.</p>
+
+<div class="announcement comment" role="complementary">
+<hr class="no-display" />
+<p>Pour en apprendre plus sur ce problème, vous pouvez aussi lire notre <a
+href="/gnu/gnu-linux-faq.html">FAQ GNU/Linux</a>, notre page sur <a
+href="/gnu/why-gnu-linux.html">Pourquoi GNU/Linux ?</a> et notre page sur <a
+href="/gnu/linux-and-gnu.html">Linux et le système GNU</a>.
+</p>
+<hr class="no-display" />
 </div>
 </div>
 
@@ -123,8 +122,7 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software
-Foundation, Inc.</p>
+<p>Copyright &copy; 2006, 2015, 2021 Free Software Foundation, Inc.</p>
 
 <p>Cette page peut être utilisée suivant les conditions de la licence <a
 rel="license"
@@ -142,11 +140,12 @@
 <p class="unprintable"><!-- timestamp start -->
 Dernière mise à jour :
 
-$Date: 2021/07/04 18:30:36 $
+$Date: 2021/08/30 14:04:42 $
 
 <!-- timestamp end -->
 </p>
 </div>
 </div>
+<!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: gnu/gnu-users-never-heard-of-gnu.ru.html
===================================================================
RCS file: /web/www/www/gnu/gnu-users-never-heard-of-gnu.ru.html,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- gnu/gnu-users-never-heard-of-gnu.ru.html    8 Apr 2021 11:34:36 -0000       
1.39
+++ gnu/gnu-users-never-heard-of-gnu.ru.html    30 Aug 2021 14:04:42 -0000      
1.40
@@ -1,7 +1,8 @@
 <!--#set var="ENGLISH_PAGE" value="/gnu/gnu-users-never-heard-of-gnu.en.html" 
-->
 
-<!--#include virtual="/server/html5-header.ru.html" -->
+<!--#include virtual="/server/header.ru.html" -->
 <!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Пользователи GNU, которые никогда не 
слышали о GNU - Проект GNU - Фонд
@@ -9,23 +10,11 @@
 
 <!--#include virtual="/gnu/po/gnu-users-never-heard-of-gnu.translist" -->
 <!--#include virtual="/server/banner.ru.html" -->
-<h2 class="c">Пользователи GNU, которые никогда не 
слышали о GNU</h2>
+<div class="article reduced-width">
+<h2>Пользователи GNU, которые никогда не 
слышали о GNU</h2>
 
-<address class="byline c"><a href="https://www.stallman.org/";>Ричард 
Столмен</a></address>
+<address class="byline"><a href="https://www.stallman.org/";>Ричард 
Столмен</a></address>
 
-<div class="reduced-width">
-<hr class="no-display" />
-<div class="announcement">
-<p>Чтобы узнать больше об этой проблеме, вы 
также можете прочитать нашу статью
-<a href="/gnu/gnu-linux-faq.html">&ldquo;Вопросы о 
GNU/Linux&rdquo;</a>,
-нашу страницу <a href="/gnu/why-gnu-linux.html">&ldquo;Почему
-GNU/Linux?&rdquo;</a>, а также нашу страницу <a
-href="/gnu/linux-and-gnu.html">&ldquo;Linux и проект GNU&rdquo;</a>.
-</p>
-</div>
-<hr class="thin" />
-
-<div class="article">
 <p>Большинство людей никогда не слышали о 
GNU. Даже большинство людей,
 использующих систему GNU, никогда не 
слышали о GNU, поскольку так много
 людей и компаний приучают их называть ее 
&ldquo;Linux&rdquo;. Действительно,
@@ -63,6 +52,16 @@
 безнравственный) оборот. Когда мы просим 
вас называть систему
 &ldquo;GNU/Linux&rdquo;, мы просим вас помочь 
осведомлять общество об
 идеалах свободных программ.</p>
+
+<div class="announcement comment" role="complementary">
+<hr class="no-display" />
+<p>Чтобы узнать больше об этой проблеме, вы 
также можете прочитать нашу статью
+<a href="/gnu/gnu-linux-faq.html">&ldquo;Вопросы о 
GNU/Linux&rdquo;</a>,
+нашу страницу <a href="/gnu/why-gnu-linux.html">&ldquo;Почему
+GNU/Linux?&rdquo;</a>, а также нашу страницу <a
+href="/gnu/linux-and-gnu.html">&ldquo;Linux и система GNU&rdquo;</a>.
+</p>
+<hr class="no-display" />
 </div>
 </div>
 
@@ -123,8 +122,7 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2006, 2007, 2010, 2011, 2013-2015, 2017, 2019, 2021 Free
-Software Foundation, Inc.</p>
+<p>Copyright &copy; 2006, 2010, 2015, 2021 Free Software Foundation, Inc.</p>
 
 <p>Это произведение доступно по <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru";>лицензии
@@ -140,11 +138,12 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2021/04/08 11:34:36 $
+$Date: 2021/08/30 14:04:42 $
 
 <!-- timestamp end -->
 </p>
 </div>
 </div>
+<!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: gnu/linux-and-gnu.fr.html
===================================================================
RCS file: /web/www/www/gnu/linux-and-gnu.fr.html,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -b -r1.97 -r1.98
--- gnu/linux-and-gnu.fr.html   4 Jul 2021 18:30:36 -0000       1.97
+++ gnu/linux-and-gnu.fr.html   30 Aug 2021 14:04:42 -0000      1.98
@@ -1,7 +1,8 @@
 <!--#set var="ENGLISH_PAGE" value="/gnu/linux-and-gnu.en.html" -->
 
-<!--#include virtual="/server/html5-header.fr.html" -->
+<!--#include virtual="/server/header.fr.html" -->
 <!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Linux et GNU - Projet GNU - Free Software Foundation</title>
@@ -13,20 +14,11 @@
 
 <!--#include virtual="/gnu/po/linux-and-gnu.translist" -->
 <!--#include virtual="/server/banner.fr.html" -->
-<h2 class="c">Linux et le système GNU</h2>
+<div class="article reduced-width">
+<h2>Linux et le système GNU</h2>
 
-<address class="byline c">par <a href="https://www.stallman.org/";>Richard 
Stallman</a></address>
+<address class="byline">par <a href="https://www.stallman.org/";>Richard 
Stallman</a></address>
 
-<div class="reduced-width">
-<hr class="no-display" />
-<div class="announcement">
-<p>Pour plus de détails, consultez aussi la <a
-href="/gnu/gnu-linux-faq.html">FAQ GNU/Linux</a> et <a
-href="/gnu/why-gnu-linux.html">Pourquoi GNU/Linux ?</a></p>
-</div>
-<hr class="thin" />
-
-<div class="article">
 <p>
 Beaucoup d'utilisateurs de l'informatique utilisent une version modifiée du
 <a href="/philosophy/categories.html#TheGNUsystem">système GNU</a> tous les
@@ -37,6 +29,14 @@
 essentiellement du système GNU, développé par le <a
 href="/gnu/gnu-history.html">projet GNU</a>.</p>
 
+<div class="announcement comment" role="complementary">
+<hr class="no-display" />
+<p>Pour plus de détails, consultez aussi la <a
+href="/gnu/gnu-linux-faq.html">FAQ GNU/Linux</a> et <a
+href="/gnu/why-gnu-linux.html">Pourquoi GNU/Linux ?</a></p>
+<hr class="no-display" />
+</div>
+
 <p>
 Il existe bien un Linux et ces personnes l'utilisent, mais c'est juste une
 partie du système qu'ils utilisent. Linux est le noyau, c'est-à-dire le
@@ -139,7 +139,7 @@
 Heureusement, nous n'avons pas eu à attendre le Hurd, grâce à Linux. Quand
 Linus Torvalds a libéré Linux en 1992, il a bouché le dernier trou du
 système GNU. Les gens purent alors <a
-href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01";>adjoindre
+href="https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01";>adjoindre
 Linux au système GNU</a> pour obtenir un système libre complet : une version
 du système GNU qui contenait aussi Linux, autrement dit le système
 GNU/Linux.</p>
@@ -158,7 +158,7 @@
 
 <p>
 Le projet GNU soutient les systèmes GNU/Linux ainsi que <em>le</em> système
-GNU. La <a href="http://fsf.org/";>FSF</a> a financé la réécriture des
+GNU. La <a href="https://fsf.org/";>FSF</a> a financé la réécriture des
 extensions propres à Linux de la bibliothèque C de GNU de sorte qu'elles
 sont maintenant bien intégrées, et les systèmes GNU/Linux les plus récents
 emploient la bibliothèque actuelle sans aucune modification. La FSF a aussi
@@ -183,7 +183,7 @@
 démarre, et ils sont inclus, sous forme de longues séries de nombres, dans
 le « code source » de Linux. De ce fait, la maintenance de distributions
 libres de GNU/Linux comporte maintenant celle d'une <a
-href="http://directory.fsf.org/project/linux";>version libre de Linux</a>.</p>
+href="https://directory.fsf.org/project/linux";>version libre de Linux</a>.</p>
 
 <p>Que vous utilisiez GNU/Linux ou non, veuillez ne pas semer la confusion en
 utilisant le nom « Linux » de manière ambiguë. Linux est le noyau, un des
@@ -193,10 +193,10 @@
 
 <p>
 Si vous voulez indiquer une référence vers « GNU/Linux », cette page et 
<a
-href="/gnu/the-gnu-project.html">http://www.gnu.org/gnu/the-gnu-project.html</a>
+href="/gnu/the-gnu-project.html">https://www.gnu.org/gnu/the-gnu-project.html</a>
 sont de bons choix. Si vous voulez indiquer une référence à Linux, le noyau,
-<a href="http://foldoc.org/linux";>http://foldoc.org/linux</a> est une bonne
-URL.</p>
+<a href="https://foldoc.org/linux";>https://foldoc.org/linux</a> est une
+bonne URL.</p>
 <div class="column-limit"></div>
 
 <h3 class="footnote">Addendum</h3>
@@ -225,43 +225,35 @@
 
 <h3 class="footnote">Notes</h3>
 <ol>
-<li>
-<a id="unexciting">Ces composants non passionnants mais essentiels</a>
-comprennent l'assembleur GNU (GAS) et le <i>linker</i> (GLD) qui font
-actuellement partie du paquet <a href="/software/binutils/">GNU
-Binutils</a>, <a href="/software/tar/">GNU tar</a>, etc.</li>
-
-<li>
-<a id="nottools">Par exemple</a>, le Bourne Again SHell (BASH),
-l'interpréteur PostScript <a
+<li id="unexciting">Ces composants non passionnants mais essentiels 
comprennent l'assembleur GNU
+(GAS) et le <i>linker</i> (GLD) qui font actuellement partie du paquet <a
+href="/software/binutils/">GNU Binutils</a>, <a href="/software/tar/">GNU
+tar</a>, etc.</li>
+
+<li id="nottools">Par exemple, le Bourne Again SHell (BASH), l'interpréteur 
PostScript <a
 href="/software/ghostscript/ghostscript.html">Ghostscript</a> et la <a
 href="/software/libc/libc.html">bibliothèque C de GNU</a> ne sont pas des
 outils de programmation ; GNUCash, GNOME et GNU Chess non plus.</li>
 
-<li>
-<a id="somecomponents">Par exemple</a>, la <a
-href="/software/libc/libc.html">bibliothèque C de GNU</a>.</li>
-
-<li>
-<a id="newersystems"></a>Depuis que ceci a été écrit, un système presque
-entièrement libre de style Windows a été développé, mais techniquement il
-n'est pas du tout comme GNU ou Unix, donc cela n'affecte pas vraiment ce
-problème. La majeure partie du noyau de Solaris a été libérée, mais si 
vous
-voulez en faire un système libre, outre remplacer les parties manquantes du
-noyau, vous aurez aussi besoin de l'intégrer à GNU ou BSD.</li>
-
-<li>
-<a id="gnubsd"></a>Toutefois, dans les années qui ont suivi l'écriture de
-cet article, la bibliothèque C de GNU a été portée sur plusieurs versions 
du
-noyau BSD, ce qui permit de combiner le système GNU avec ce noyau. Tout
-comme GNU/Linux, il s'agit de variantes de GNU et elles sont par conséquent
-appelées GNU/kFreeBSD et GNU/kNetBSD, en fonction du noyau du système. Les
+<li id="somecomponents">Par exemple, la <a 
href="/software/libc/libc.html">bibliothèque C de
+GNU</a>.</li>
+
+<li id="newersystems">Depuis que ceci a été écrit, un système presque 
entièrement libre de style
+Windows a été développé, mais techniquement il n'est pas du tout comme GNU
+ou Unix, donc cela n'affecte pas vraiment ce problème. La majeure partie du
+noyau de Solaris a été libérée, mais si vous voulez en faire un système
+libre, outre remplacer les parties manquantes du noyau, vous aurez aussi
+besoin de l'intégrer à GNU ou BSD.</li>
+
+<li id="gnubsd">Toutefois, dans les années qui ont suivi l'écriture de cet 
article, la
+bibliothèque C de GNU a été portée sur plusieurs versions du noyau BSD, ce
+qui permit de combiner le système GNU avec ce noyau. Tout comme GNU/Linux,
+il s'agit de variantes de GNU et elles sont par conséquent appelées
+GNU/kFreeBSD et GNU/kNetBSD, en fonction du noyau du système. Les
 utilisateurs ordinaires des bureaux classiques peuvent difficilement faire
 la différence entre GNU/Linux et GNU/*BSD.</li>
-
 </ol>
 </div>
-</div>
 
 <div class="translators-notes">
 
@@ -320,7 +312,7 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. 
Stallman</p>
+<p>Copyright &copy; 1997-2002, 2005, 2008, 2019, 2021 Richard M. Stallman</p>
 
 <p>Cette page peut être utilisée suivant les conditions de la licence <a
 rel="license"
@@ -338,11 +330,12 @@
 <p class="unprintable"><!-- timestamp start -->
 Dernière mise à jour :
 
-$Date: 2021/07/04 18:30:36 $
+$Date: 2021/08/30 14:04:42 $
 
 <!-- timestamp end -->
 </p>
 </div>
 </div>
+<!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: gnu/linux-and-gnu.ru.html
===================================================================
RCS file: /web/www/www/gnu/linux-and-gnu.ru.html,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- gnu/linux-and-gnu.ru.html   8 Apr 2021 11:34:36 -0000       1.53
+++ gnu/linux-and-gnu.ru.html   30 Aug 2021 14:04:42 -0000      1.54
@@ -1,7 +1,8 @@
 <!--#set var="ENGLISH_PAGE" value="/gnu/linux-and-gnu.en.html" -->
 
-<!--#include virtual="/server/html5-header.ru.html" -->
+<!--#include virtual="/server/header.ru.html" -->
 <!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Linux и GNU - Проект GNU - Фонд свободного 
программного обеспечения</title>
@@ -13,20 +14,11 @@
 
 <!--#include virtual="/gnu/po/linux-and-gnu.translist" -->
 <!--#include virtual="/server/banner.ru.html" -->
-<h2 class="c">Linux и система GNU</h2>
+<div class="article reduced-width">
+<h2>Linux и система GNU</h2>
 
-<address class="byline c"><a href="https://www.stallman.org/";>Ричард 
Столмен</a></address>
+<address class="byline"><a href="https://www.stallman.org/";>Ричард 
Столмен</a></address>
 
-<div class="reduced-width">
-<hr class="no-display" />
-<div class="announcement">
-<p>Дополнительные сведения можно найти на 
страницах <a
-href="/gnu/gnu-linux-faq.html">&ldquo;Вопросы о GNU/Linux&rdquo;</a> 
и <a
-href="/gnu/why-gnu-linux.html">&ldquo;Почему GNU/Linux?&rdquo;</a></p>
-</div>
-<hr class="thin" />
-
-<div class="article">
 <p>
 Многие пользователи компьютеров каждый 
день запускают модифицированную
 версию <a href="/philosophy/categories.html#TheGNUsystem">системы 
GNU</a>,
@@ -36,6 +28,14 @@
 известно</a>, что в основном это система GNU, 
разработанная <a
 href="/gnu/gnu-history.html">проектом GNU</a>.</p>
 
+<div class="announcement comment" role="complementary">
+<hr class="no-display" />
+<p>Дополнительные сведения можно найти на 
страницах <a
+href="/gnu/gnu-linux-faq.html">&ldquo;Вопросы о GNU/Linux&rdquo;</a> 
и <a
+href="/gnu/why-gnu-linux.html">&ldquo;Почему GNU/Linux?&rdquo;</a></p>
+<hr class="no-display" />
+</div>
+
 <p>
 Там действительно есть Linux, и эти люди 
используют ее, но это только часть
 системы, которой они пользуются. Linux&nbsp;&mdash; 
это ядро&nbsp;&mdash;
@@ -152,7 +152,7 @@
 
 <p>
 Проект GNU поддерживает системы GNU/Linux так же 
хорошо, как <em>саму</em>
-систему GNU. <a href="http://fsf.org/";>ФСПО</a> 
финансировал доработку
+систему GNU. <a href="https://fsf.org/";>ФСПО</a> 
финансировал доработку
 расширений библиотеки C GNU, связанных с Linux, 
так что теперь они хорошо
 пригнаны друг к другу, и самые новые 
системы GNU/Linux используют текущий
 выпуск библиотеки без изменений. ФСПО 
финансировал также на ранней стадии
@@ -176,7 +176,7 @@
 длинных последовательностей чисел в 
&ldquo;исходный текст&rdquo;
 Linux. Таким образом, поддержка свободных 
дистрибутивов GNU/Linux сейчас
 включает также и поддержку <a
-href="http://directory.fsf.org/project/linux";>свободной версии 
Linux</a>.</p>
+href="https://directory.fsf.org/project/linux";>свободной версии 
Linux</a>.</p>
 
 <p>Пользуетесь вы GNU/Linux или нет, пожалуйста, 
не вводите общественность в
 заблуждение двусмысленным употреблением 
названия
@@ -190,7 +190,7 @@
 страница и <a href="/gnu/the-gnu-project.html">
 http://www.gnu.org/gnu/the-gnu-project.html</a>&nbsp;&mdash; хорошие
 примеры. Если вы упоминаете Linux (ядро) и х
отите добавить ссылку для
-справок, <a href="http://foldoc.org/linux";>
+справок, <a href="https://foldoc.org/linux";>
 http://foldoc.org/foldoc/linux</a>&nbsp;&mdash; хороший адрес 
для этого.</p>
 <div class="column-limit"></div>
 
@@ -219,44 +219,33 @@
 
 <h3 class="footnote">Примечания</h3>
 <ol>
-<li>
-<a id="unexciting"></a>Эти не впечатляющие, но 
существенные компоненты
-включают ассемблер (GAS) и редактор связей 
(GLD), которые сейчас оба входят
-в пакет <a href="/software/binutils/">GNU Binutils</a>, <a
-href="/software/tar/">GNU tar</a>, и другие.</li>
-
-<li>
-<a id="nottools"></a>Например, Bourne Again SHell (BASH), 
интерпретатор
-языка PostScript <a
+<li id="unexciting">Эти не впечатляющие, но 
существенные компоненты включают 
ассемблер (GAS) и
+редактор связей (GLD), которые сейчас оба вх
одят в пакет <a
+href="/software/binutils/">GNU Binutils</a>, <a href="/software/tar/">GNU
+tar</a>, и другие.</li>
+
+<li id="nottools">Например, Bourne Again SHell (BASH), 
интерпретатор языка PostScript <a
 href="/software/ghostscript/ghostscript.html">Ghostscript</a> и <a
 href="/software/libc/libc.html">библиотека C GNU</a> не 
являются средствами
 программирования. Так же, как и GNUCash, GNOME и GNU 
Chess.</li>
 
-<li>
-<a id="somecomponents"></a>Например, <a
-href="/software/libc/libc.html">библиотека C GNU</a>.</li>
-
-<li>
-<a id="newersystems"></a>С тех пор, как были написаны 
эти строки, была
-разработана почти полностью свободная 
операционная система, подобная
-Windows, но с технической точки зрения она 
совсем не сходна с GNU или Unix,
-так что на самом деле это к делу не 
относится. Ядро Solaris по большей части
-сделали свободным, но если бы вы захотели 
сделать из этого свободную
-систему, кроме замены недостающих частей 
ядра, вам потребовалось бы также
-обратить ее в GNU или BSD.</li>
-
-<li>
-<a id="gnubsd"></a>С другой стороны, за годы, 
прошедшие со времени написания
-этой статьи, библиотека C GNU была 
перенесена на несколько версий ядра BSD,
-что позволило прямо соединять систему GNU с 
этим ядром. Точно так же, как в
-случае с GNU/Linux, это действительно варианты 
GNU и потому называются
-GNU/kFreeBSD и GNU/kNetBSD, в зависимости от ядра 
системы. Обычные
-пользователи типичных настольных 
компьютеров с трудом могут отличить
-GNU/Linux от GNU/*BSD.</li>
+<li id="somecomponents">Например, <a 
href="/software/libc/libc.html">библиотека C GNU</a>.</li>
 
+<li id="newersystems">С тех пор, как были написаны 
эти строки, была разработана почти 
полностью
+свободная операционная система, подобная 
Windows, но с технической точки
+зрения она совсем не сходна с GNU или Unix, так 
что на самом деле это к делу
+не относится. Ядро Solaris по большей части 
сделали свободным, но если бы вы
+захотели сделать из этого свободную 
систему, кроме замены недостающих частей
+ядра, вам потребовалось бы также обратить 
ее в GNU или BSD.</li>
+
+<li id="gnubsd">С другой стороны, за годы, 
прошедшие со времени написания этой статьи,
+библиотека C GNU была перенесена на 
несколько версий ядра BSD, что позволило
+прямо соединять систему GNU с этим ядром. 
Точно так же, как в случае с
+GNU/Linux, это действительно варианты GNU и 
потому называются GNU/kFreeBSD и
+GNU/kNetBSD, в зависимости от ядра системы. 
Обычные пользователи типичных
+настольных компьютеров с трудом могут 
отличить GNU/Linux от GNU/*BSD.</li>
 </ol>
 </div>
-</div>
 
 <div class="translators-notes">
 
@@ -266,7 +255,7 @@
 являются программами GNU и 
распространяются по авторскому леву GNU. Эти
 инструменты не входят в 
дистрибутив&nbsp;&mdash; подробности 
запрашивайте у
 меня (или в GNU)&rdquo;. (<a
-href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01";>Most
+href="https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01";>Most
 of the tools used with linux are GNU software and are under the GNU
 copyleft. These tools aren't in the distribution - ask me (or GNU) for more
 info</a>).</li></ol></div>
@@ -323,10 +312,9 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard
-M. Stallman<br />Copyright &copy; 1999 Сергей Короп (translation)<br
-/>Copyright &copy; 2010, 2011, 2012, 2013, 2014, 2016, 2017, 2019, 2021 Free
-Software Foundation, Inc. (translation)</p>
+<p>Copyright &copy; 1997-2002, 2005, 2008, 2019, 2021 Richard Stallman<br
+/>Copyright &copy; 1999 Сергей Короп (translation)<br />Copyright 
&copy;
+2010, 2019, 2021 Free Software Foundation, Inc. (translation)</p>
 
 <p>Это произведение доступно по <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru";>лицензии
@@ -342,11 +330,12 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2021/04/08 11:34:36 $
+$Date: 2021/08/30 14:04:42 $
 
 <!-- timestamp end -->
 </p>
 </div>
 </div>
+<!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: gnu/why-gnu-linux.fr.html
===================================================================
RCS file: /web/www/www/gnu/why-gnu-linux.fr.html,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -b -r1.76 -r1.77
--- gnu/why-gnu-linux.fr.html   4 Jul 2021 18:30:36 -0000       1.76
+++ gnu/why-gnu-linux.fr.html   30 Aug 2021 14:04:42 -0000      1.77
@@ -1,35 +1,19 @@
 <!--#set var="ENGLISH_PAGE" value="/gnu/why-gnu-linux.en.html" -->
 
-<!--#include virtual="/server/html5-header.fr.html" -->
+<!--#include virtual="/server/header.fr.html" -->
 <!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Pourquoi GNU/Linux ? - Projet GNU - Free Software Foundation</title>
 
 <!--#include virtual="/gnu/po/why-gnu-linux.translist" -->
 <!--#include virtual="/server/banner.fr.html" -->
-<h2 class="c">Qu'y a-t-il dans un nom ?</h2>
+<div class="article reduced-width">
+<h2>Qu'y a-t-il dans un nom ?</h2>
 
-<address class="byline c">par <a href="https://www.stallman.org/";>Richard 
Stallman</a></address>
+<address class="byline">par <a href="https://www.stallman.org/";>Richard 
Stallman</a></address>
 
-<div class="reduced-width">
-<hr class="no-display" />
-<div class="announcement">
-<p>Si vous souhaitez en savoir plus sur ce sujet, vous pouvez aussi consulter
-notre <a href="/gnu/gnu-linux-faq.html">FAQ GNU/Linux</a>, notre page <a
-href="/gnu/linux-and-gnu.html">Linux et le projet GNU</a>, qui donne une
-histoire du système GNU/Linux s'intéressant à la question du nom, et notre
-page sur <a href="/gnu/gnu-users-never-heard-of-gnu.html">les utilisateurs
-de GNU qui n'ont jamais entendu parler de GNU</a>.</p>
-</div>
-
-<p id="fsfs">Cet essai est publié dans <a
-href="http://shop.fsf.org/product/free-software-free-society/";><cite>Free
-Software, Free Society: The Selected Essays of Richard
-M. Stallman</cite></a>.</p>
-<hr class="thin" />
-
-<div class="article">
 <p>
 Les noms véhiculent des significations ; le choix des noms détermine la
 signification de ce que nous disons. Un nom mal choisi donne aux gens une
@@ -41,6 +25,18 @@
 système, de son histoire et de sa finalité. Si vous l'appelez <a
 href="/gnu/linux-and-gnu.html">GNU/Linux</a>, cela véhicule (mais sans la
 détailler) une idée juste.</p>
+
+<div class="announcement comment" role="complementary">
+<hr class="no-display" />
+<p>Si vous souhaitez en savoir plus sur ce sujet, vous pouvez aussi consulter
+notre <a href="/gnu/gnu-linux-faq.html">FAQ GNU/Linux</a>, notre page <a
+href="/gnu/linux-and-gnu.html">Linux et le système GNU</a>, qui donne une
+histoire du système GNU/Linux s'intéressant à la question du nom, et notre
+page sur <a href="/gnu/gnu-users-never-heard-of-gnu.html">les utilisateurs
+de GNU qui n'ont jamais entendu parler de GNU</a>.</p>
+<hr class="no-display" />
+</div>
+
 <p>
 Mais est-ce important pour notre communauté ? Est-ce important que les gens
 connaissent l'origine, l'histoire et la finalité du système? Oui – parce 
que
@@ -100,7 +96,7 @@
 mouvement vers le logiciel open source devrait être soutenu par des
 décisions techniques, plutôt que politiques ». Et le PDG de Caldera a
 demandé ouvertement aux utilisateurs de <a
-href="http://www.zdnet.com/article/stallman-love-is-not-free/";>laisser
+href="https://www.zdnet.com/article/stallman-love-is-not-free/";>laisser
 tomber l'objectif de la liberté pour travailler à la place en faveur de « 
la
 popularité de Linux »</a>.</p>
 
@@ -205,7 +201,12 @@
 faire le travail qui doit être fait, nous avons besoin d'être reconnus pour
 ce que nous avons déjà fait. S'il vous plaît, aidez-nous en appelant le
 système d'exploitation <a href="/gnu/linux-and-gnu.html">GNU/Linux</a>.</p>
-</div>
+
+<hr class="no-display" />
+<div class="edu-note c"><p id="fsfs">Cet essai est publié dans <a
+href="https://shop.fsf.org/product/free-software-free-society/";><cite>Free
+Software, Free Society: The Selected Essays of Richard
+M. Stallman</cite></a>.</p></div>
 </div>
 
 <div class="translators-notes">
@@ -265,7 +266,7 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard 
Stallman</p>
+<p>Copyright &copy; 2000, 2007, 2021 Richard Stallman</p>
 
 <p>Cette page peut être utilisée suivant les conditions de la licence <a
 rel="license"
@@ -283,11 +284,12 @@
 <p class="unprintable"><!-- timestamp start -->
 Dernière mise à jour :
 
-$Date: 2021/07/04 18:30:36 $
+$Date: 2021/08/30 14:04:42 $
 
 <!-- timestamp end -->
 </p>
 </div>
 </div>
+<!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: gnu/why-gnu-linux.ru.html
===================================================================
RCS file: /web/www/www/gnu/why-gnu-linux.ru.html,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- gnu/why-gnu-linux.ru.html   8 Apr 2021 11:34:36 -0000       1.41
+++ gnu/why-gnu-linux.ru.html   30 Aug 2021 14:04:42 -0000      1.42
@@ -1,36 +1,19 @@
 <!--#set var="ENGLISH_PAGE" value="/gnu/why-gnu-linux.en.html" -->
 
-<!--#include virtual="/server/html5-header.ru.html" -->
+<!--#include virtual="/server/header.ru.html" -->
 <!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Почему GNU/Linux? - Проект GNU - Фонд 
свободного программного обеспечения</title>
 
 <!--#include virtual="/gnu/po/why-gnu-linux.translist" -->
 <!--#include virtual="/server/banner.ru.html" -->
-<h2 class="c">Что в имени?</h2>
+<div class="article reduced-width">
+<h2>Что в имени?</h2>
 
-<address class="byline c"><a href="https://www.stallman.org/";>Ричард 
Столмен</a></address>
+<address class="byline"><a href="https://www.stallman.org/";>Ричард 
Столмен</a></address>
 
-<div class="reduced-width">
-<hr class="no-display" />
-<div class="announcement">
-<p>Чтобы узнать больше об этом вопросе, вы 
можете прочитать наши <a
-href="/gnu/gnu-linux-faq.html">&ldquo;Вопросы о GNU/Linux&rdquo;</a>,
-страницу <a href="/gnu/linux-and-gnu.html">&ldquo;Linux и проект
-GNU&rdquo;</a>, на которой приведена история 
системы GNU/Linux в отношении к
-этой проблеме наименования, а также <a
-href="/gnu/gnu-users-never-heard-of-gnu.html">&ldquo;Пользователи 
GNU,
-которые никогда не слышали о GNU&rdquo;</a>.</p>
-</div>
-
-<p id="fsfs">Этот очерк публикуется в сборнике <a
-href="http://shop.fsf.org/product/free-software-free-society/";><cite>Свободные
-программы, свободное общество: избранные 
очерки Ричарда
-М. Столмена</cite></a>.</p>
-<hr class="thin" />
-
-<div class="article">
 <p>
 Названия передают значения; наш выбор 
названий определяет значение того, что
 мы говорим. Неподходящее название даёт 
людям неверное представление. Как
@@ -42,6 +25,18 @@
 истории и назначении. Если вы называете её 
<a
 href="/gnu/linux-and-gnu.html">&ldquo;GNU/Linux&rdquo;</a>, это 
передаёт
 (хоть и не во всех подробностях) правильное 
представление.</p>
+
+<div class="announcement comment" role="complementary">
+<hr class="no-display" />
+<p>Чтобы узнать больше об этом вопросе, вы 
можете прочитать наши <a
+href="/gnu/gnu-linux-faq.html">Вопросы о GNU/Linux</a>, 
страницу <a
+href="/gnu/linux-and-gnu.html">Linux и система GNU</a>, на 
которой приведена
+история системы GNU/Linux в отношении к этой 
проблеме наименования, а также
+<a href="/gnu/gnu-users-never-heard-of-gnu.html">Пользователи GNU, 
которые
+никогда не слышали о GNU</a>.</p>
+<hr class="no-display" />
+</div>
+
 <p>
 Так ли это важно для нашего сообщества? Р
азве важно, знают ли люди об
 истоках системы, её истории и назначении? 
Да&nbsp;&mdash; потому что люди,
@@ -99,9 +94,9 @@
 открытым исходным текстом должно 
подпитываться техническими, а не
 политическими решениями&rdquo;. А 
генеральный директор Caldera открыто
 побуждал пользователей <a
-href="http://www.zdnet.com/article/stallman-love-is-not-free/";>отказаться
 от
-свободы как цели, а вместо этого работать 
над повышением &ldquo;популярности
-Linux&rdquo;</a>.</p>
+href="https://www.zdnet.com/article/stallman-love-is-not-free/";>отказаться
+от свободы как цели, а вместо этого 
работать над повышением
+&ldquo;популярности Linux&rdquo;</a>.</p>
 
 <p>
 Добавление несвободных программ в систему 
<a
@@ -195,7 +190,12 @@
 проделать, нам необходимо, чтобы за нами 
признавали то, что мы уже
 сделали. Пожалуйста, помогите нам, называя 
эту операционную систему <a
 href="/gnu/linux-and-gnu.html">&ldquo;GNU/Linux&rdquo;</a>.</p>
-</div>
+
+<hr class="no-display" />
+<div class="edu-note c"><p id="fsfs">Этот очерк 
публикуется в сборнике <a
+href="https://shop.fsf.org/product/free-software-free-society/";><cite>Свободные
+программы, свободное общество: избранные 
очерки Ричарда
+М. Столмена</cite></a>.</p></div>
 </div>
 
 <div class="translators-notes">
@@ -255,9 +255,8 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2000, 2006, 2007, 2014, 2015, 2016, 2020, 2021 Richard
-Stallman <br />Copyright &copy; 2010 Vladimir Smolyar (translation)<br
-/>Copyright &copy; 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2020, 2021 Free
+<p>Copyright &copy; 2000, 2007, 2021 Richard Stallman <br />Copyright &copy;
+2010 Vladimir Smolyar (translation)<br />Copyright &copy; 2010, 2021 Free
 Software Foundation, Inc. (translation)</p>
 
 <p>Это произведение доступно по <a rel="license"
@@ -274,11 +273,12 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2021/04/08 11:34:36 $
+$Date: 2021/08/30 14:04:42 $
 
 <!-- timestamp end -->
 </p>
 </div>
 </div>
+<!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: gnu/po/gnu-linux-faq.fr-en.html
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.fr-en.html,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- gnu/po/gnu-linux-faq.fr-en.html     7 Apr 2021 18:31:12 -0000       1.63
+++ gnu/po/gnu-linux-faq.fr-en.html     30 Aug 2021 14:04:42 -0000      1.64
@@ -1,30 +1,23 @@
-<!--#include virtual="/server/html5-header.html" -->
+<!--#include virtual="/server/header.html" -->
 <!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
 <title>GNU/Linux FAQ
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/gnu/po/gnu-linux-faq.translist" -->
 <!--#include virtual="/server/banner.html" -->
-<h2 class="c">GNU/Linux FAQ</h2>
+<div class="article reduced-width">
+<h2>GNU/Linux FAQ</h2>
 
-<address class="byline c">by Richard Stallman</address>
+<address class="byline">by Richard Stallman</address>
 
-<div class="reduced-width">
-<hr class="no-display" />
-<div class="announcement">
-<p>To learn more about this issue, you can also read
-our page on <a href="/gnu/linux-and-gnu.html">Linux and the GNU Project</a>, 
our
- page on <a href="/gnu/why-gnu-linux.html">Why GNU/Linux?</a>
-and our page on <a href="/gnu/gnu-users-never-heard-of-gnu.html">GNU
-Users Who Have Never Heard of GNU</a>.</p>
-</div>
-<hr class="thin" />
-
-<div class="article">
 <p>
 When people see that we use and recommend the name GNU/Linux for a
 system that many others call just &ldquo;Linux&rdquo;, they ask many questions.
 Here are common questions, and our answers.</p>
 
+<div class="toc">
+<hr class="no-display" />
+<h3 class="no-display">Table of Contents</h3>
 <ul>
 
 <li><a href="#why">Why do you call the system we use GNU/Linux and not 
Linux?</a></li>
@@ -285,7 +278,16 @@
     get more of their support by a different road?</a></li>
 
 </ul>
-<hr class="thin" />
+</div>
+
+<div class="announcement comment" role="complementary">
+<p>To learn more about this issue, you can also read
+our page on <a href="/gnu/linux-and-gnu.html">Linux and the GNU System</a>, our
+ page on <a href="/gnu/why-gnu-linux.html">Why GNU/Linux?</a>
+and our page on <a href="/gnu/gnu-users-never-heard-of-gnu.html">GNU
+Users Who Have Never Heard of GNU</a>.</p>
+<hr class="no-display" />
+</div>
 
 <dl>
 
@@ -326,10 +328,13 @@
 
 <dt id="what">What is the real relationship between GNU and Linux? <span 
class="anchor-reference-id">(<a href="#what">#what</a>)</span></dt>
 
-<dd>The GNU operating system and the Linux kernel are separate
+<dd>
+<p>
+The GNU operating system and the Linux kernel are separate
 software projects that do complementary jobs.  Typically they are
 packaged in a <a href="/distros/distros.html">GNU/Linux distribution</a>, and 
used
-together.</dd>
+together.</p>
+</dd>
 
 <dt id="howerror">How did it come about that most
     people call the system &ldquo;Linux&rdquo;? <span 
class="anchor-reference-id">(<a href="#howerror">#howerror</a>)</span></dt>
@@ -442,11 +447,12 @@
           support an individual's free speech rights to call the system by
           any name that individual chooses? <span 
class="anchor-reference-id">(<a href="#freespeech">#freespeech</a>)</span></dt>
 <dd>
+<p>
 Yes, indeed, we believe you have a free speech right to call the
 operating system by any name you wish.  We ask that people call it
 GNU/Linux as a matter of doing justice to the GNU project, to promote
 the values of freedom that GNU stands for, and to inform others that
-those values of freedom brought the system into existence.
+those values of freedom brought the system into existence.</p>
 </dd>
 
 <dt id="everyoneknows">Since everyone knows the role
@@ -476,11 +482,12 @@
     why does it matter what name I use? <span class="anchor-reference-id">(<a 
href="#everyoneknows2">#everyoneknows2</a>)</span></dt>
 
 <dd>
+<p>
 If your words don't reflect your knowledge, you don't teach others.
 Most people who have heard of the GNU/Linux system think it is
 &ldquo;Linux&rdquo;, that it was started by Linus Torvalds, and that
 it was intended to be &ldquo;open source&rdquo;.  If you don't tell
-them, who will?
+them, who will?</p>
 </dd>
 
 <dt id="windows">Isn't shortening &ldquo;GNU/Linux&rdquo;
@@ -587,16 +594,18 @@
 <dt id="brain">Isn't the kernel the brain of the system? <span 
class="anchor-reference-id">(<a href="#brain">#brain</a>)</span></dt>
 
 <dd>
+<p>
 A computer system is not much like a human body,
 and no part of it plays a role comparable to that of
-the brain in a human.
+the brain in a human.</p>
 </dd>
 
 <dt id="kernelmost">Isn't writing the kernel most of the work in an
 operating system? <span class="anchor-reference-id">(<a 
href="#kernelmost">#kernelmost</a>)</span></dt>
 
 <dd>
-No, many components take a lot of work.
+<p>
+No, many components take a lot of work.</p>
 </dd>
 
 <dt id="nokernel">An operating system requires a kernel.
@@ -682,11 +691,12 @@
     feel of Linux&rdquo;? <span class="anchor-reference-id">(<a 
href="#feel">#feel</a>)</span></dt>
 
 <dd>
+<p>
 There is no such thing as the &ldquo;feel of Linux&rdquo; because
 Linux has no user interfaces.  Like any modern kernel, Linux is a base
 for running programs; user interfaces belong elsewhere in the system.
 Human interaction with GNU/Linux always goes through other programs,
-and the &ldquo;feel&rdquo; comes from them.
+and the &ldquo;feel&rdquo; comes from them.</p>
 </dd>
 
 <dt id="long">The problem with &ldquo;GNU/Linux&rdquo; is that it is too long.
@@ -777,7 +787,7 @@
 may simply not recognize we're talking about the same system.  If we
 say &ldquo;GNU/Linux&rdquo;, they can make a connection to what they have heard
 about.</li>
-</ul><p></p>
+</ul>
 </dd>
 
 <dt id="trademarkfee">I would have
@@ -831,11 +841,12 @@
     GNU/systemd/Linux? <span class="anchor-reference-id">(<a 
href="#others">#others</a>)</span></dt>
 
 <dd>
+<p>
 systemd is a fairly important component, but not as important as the
 kernel (Linux), nor as important as the basis of the system as a whole
 (GNU).  However, if you want to emphasize the presence of systemd
 by calling the system &ldquo;GNU/systemd/Linux&rdquo;, there is nothing
-wrong with doing so.
+wrong with doing so.</p>
 </dd>
 
 <dt id="others">Many other projects contributed to
@@ -907,8 +918,8 @@
 <p>
 We're not talking about a distinct GNU version of Linux, the kernel.
 The free GNU/Linux distros do have
-a <a href="http://directory.fsf.org/project/linux";>separate version of
-Linux</a>, since the &ldquo;standard&rdquo; version contains non-free
+a <a href="https://directory.fsf.org/wiki/Linux-libre";>separate version of
+Linux</a>, since the &ldquo;standard&rdquo; version contains nonfree
 firmware &ldquo;blobs&rdquo;.  If this were part of the GNU Project,
 it could be considered &ldquo;GNU Linux&rdquo;; but we would not want
 to call it that, because it would be too confusing.</p>
@@ -1028,13 +1039,13 @@
     free software?  After all, that is the ideal of GNU. <span 
class="anchor-reference-id">(<a href="#reserve">#reserve</a>)</span></dt>
 
 <dd>
-The widespread practice of adding non-free software to the GNU/Linux
+The widespread practice of adding nonfree software to the GNU/Linux
 system is a major problem for our community.  It teaches the users
-that non-free software is ok, and that using it is part of the spirit
+that nonfree software is ok, and that using it is part of the spirit
 of &ldquo;Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part of 
their mission to
-help users use non-free add-ons, and may even invite salesmen to come
+help users use nonfree add-ons, and may even invite salesmen to come
 and make sales pitches for them.  They adopt goals such as &ldquo;helping
-the users&rdquo; of GNU/Linux (including helping them use non-free
+the users&rdquo; of GNU/Linux (including helping them use nonfree
 applications and drivers), or making the system more popular even at
 the cost of freedom.
 <p>
@@ -1052,7 +1063,7 @@
 versions <em>are</em> versions of GNU, that they all are based on a
 system that exists specifically for the sake of the users' freedom.
 With this understanding, they can start to recognize the distributions
-that include non-free software as perverted, adulterated versions of
+that include nonfree software as perverted, adulterated versions of
 GNU, instead of thinking they are proper and appropriate &ldquo;versions of
 Linux&rdquo;.</p>
 <p>
@@ -1205,7 +1216,7 @@
 (there were already many of them, for various systems), but instead of
 calling it by a dull name like &ldquo;<em>somethingorother</em> TECO&rdquo;, he
 thought of a clever amusing name.  (That's what hacking
-means: <a href="http://stallman.org/articles/on-hacking.html";>playful
+means: <a href="https://stallman.org/articles/on-hacking.html";>playful
 cleverness</a>.)</p>
 <p>
 Other hackers enjoyed that name so much that we imitated the approach.
@@ -1231,7 +1242,7 @@
 We don't call the BSD systems (FreeBSD, etc.) &ldquo;GNU/BSD&rdquo; systems,
 because that term does not fit the history of the BSD systems.
 <p>
-The BSD system was developed by UC Berkeley as non-free software in
+The BSD system was developed by UC Berkeley as nonfree software in
 the 80s, and became free in the early 90s.  A free operating system
 that exists today is almost certainly either a variant of the GNU
 system, or a kind of BSD system.</p>
@@ -1262,22 +1273,24 @@
 on Windows, does that mean I am running a GNU/Windows system? <span 
class="anchor-reference-id">(<a href="#othersys">#othersys</a>)</span></dt>
 
 <dd>
+<p>
 Not in the same sense that we mean by &ldquo;GNU/Linux&rdquo;.  The tools of 
GNU
 are just a part of the GNU software, which is just a part of the GNU
 system, and underneath them you would still have another complete
 operating system which has no code in common with GNU.  All in all,
-that's a very different situation from GNU/Linux.
+that's a very different situation from GNU/Linux.</p>
 </dd>
 
 <dt id="justlinux">Can't Linux be used without GNU? <span 
class="anchor-reference-id">(<a href="#justlinux">#justlinux</a>)</span></dt>
 
 <dd>
+<p>
 Linux is used by itself, or with small other programs, in some
 appliances.  These small software systems are a far cry from the
 GNU/Linux system.  Users do not install them on PCs, for instance, and
 would find them rather disappointing.  It is useful to say that these
 appliances run just Linux, to show how different those small platforms
-are from GNU/Linux.
+are from GNU/Linux.</p>
 </dd>
 
 <dt id="howmuch">How much of the GNU system is needed for the system
@@ -1367,10 +1380,10 @@
 &ldquo;Linux&rdquo; with that principle.
 <p>
 Linus publicly states his disagreement with the free software
-movement's ideals.  He developed non-free software in his job for many
+movement's ideals.  He developed nonfree software in his job for many
 years (and said so to a large audience at a &ldquo;Linux&rdquo;World show), and
 publicly invited fellow developers of Linux, the kernel, to use
-non-free software to work on it with him.  He goes even further, and
+nonfree software to work on it with him.  He goes even further, and
 rebukes people who suggest that engineers and scientists should
 consider social consequences of our technical work&mdash;rejecting the
 lessons society learned from the development of the atom bomb.</p>
@@ -1389,11 +1402,12 @@
     work as GNU? <span class="anchor-reference-id">(<a 
href="#claimlinux">#claimlinux</a>)</span></dt>
 
 <dd>
+<p>
 It would be wrong, so we don't do that.  Torvalds' work is Linux, the
 kernel; we are careful not to attribute that work to the GNU Project
 or label it as &ldquo;GNU&rdquo;.  When we talk about the whole
 system, the name &ldquo;GNU/Linux&rdquo; gives him a share of the
-credit.
+credit.</p>
 </dd>
 
 
@@ -1403,7 +1417,7 @@
 <dd>
 <p>He recognized this at the beginning.  The earliest Linux release notes
 said, <a
-href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01";>
+href="https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01";>
 &ldquo;Most of the tools used with linux are GNU software and are under the
 GNU copyleft. These tools aren't in the distribution - ask me (or GNU)
 for more info&rdquo;</a>.</p>
@@ -1421,7 +1435,7 @@
 a big job, and it's not clearly necessary.  The only thing ethically
 wrong with Linux as a kernel is its inclusion of firmware
 &ldquo;blobs&rdquo;; the best fix for that problem
-is <a href="http://fsf.org/campaigns/priority-projects";> developing
+is <a href="https://www.fsf.org/campaigns/priority-projects";> developing
 free replacement for the blobs</a>.</p>
 </dd>
 
@@ -1430,12 +1444,13 @@
     it? <span class="anchor-reference-id">(<a 
href="#lost">#lost</a>)</span></dt>
 
 <dd>
+<p>
 This isn't a battle, it is a campaign of education.  What to call the
 system is not a single decision, to be made at one moment by
 &ldquo;society&rdquo;: each person, each organization, can decide what
 name to use.  You can't make others say &ldquo;GNU/Linux&rdquo;, but
 you can decide to call the system &ldquo;GNU/Linux&rdquo;
-yourself&mdash;and by doing so, you will help educate others.
+yourself&mdash;and by doing so, you will help educate others.</p>
 </dd>
 
 <dt id="whatgood">Society has made its
@@ -1443,6 +1458,7 @@
     &ldquo;GNU/Linux&rdquo;? <span class="anchor-reference-id">(<a 
href="#whatgood">#whatgood</a>)</span></dt>
 
 <dd>
+<p>
 This is not an all-or-nothing situation: correct and incorrect
 pictures are being spread more or less by various people.  If you call
 the system &ldquo;GNU/Linux&rdquo;, you will help others learn the system's 
true
@@ -1450,7 +1466,7 @@
 everywhere on your own, any more than we can, but you can help.  If
 only a few hundred people see you use the term &ldquo;GNU/Linux&rdquo;, you 
will
 have educated a substantial number of people with very little work.
-And some of them will spread the correction to others.
+And some of them will spread the correction to others.</p>
 </dd>
 
 <dt id="explain">Wouldn't it be better to call
@@ -1521,39 +1537,44 @@
     is it legitimate to rename the operating system? <span 
class="anchor-reference-id">(<a href="#rename">#rename</a>)</span></dt>
 
 <dd>
+<p>
 We are not renaming anything; we have been calling this system 
&ldquo;GNU&rdquo;
 ever since we announced it in 1983.  The people who tried to rename
-it to &ldquo;Linux&rdquo; should not have done so.</dd>
+it to &ldquo;Linux&rdquo; should not have done so.</p>
+</dd>
 
 <dt id="force">Isn't it wrong to force people to call
 the system &ldquo;GNU/Linux&rdquo;? <span class="anchor-reference-id">(<a 
href="#force">#force</a>)</span></dt>
 
 <dd>
+<p>
 It would be wrong to force them, and we don't try.  We call the system
-&ldquo;GNU/Linux&rdquo;, and we ask you to do it too.
+&ldquo;GNU/Linux&rdquo;, and we ask you to do it too.</p>
 </dd>
 
 <dt id="whynotsue">Why not sue people who call
 the whole system &ldquo;Linux&rdquo;? <span class="anchor-reference-id">(<a 
href="#whynotsue">#whynotsue</a>)</span></dt>
 
 <dd>
+<p>
 There are no legal grounds to sue them, but since we believe in
 freedom of speech, we wouldn't want to do that anyway.  We ask people
-to call the system &ldquo;GNU/Linux&rdquo; because that is the right thing to 
do.
+to call the system &ldquo;GNU/Linux&rdquo; because that is the right thing to 
do.</p>
 </dd>
 
 <dt id="require">Shouldn't you put something in
     the GNU GPL to require people to call the system &ldquo;GNU&rdquo;? <span 
class="anchor-reference-id">(<a href="#require">#require</a>)</span></dt>
 
 <dd>
+<p>
 The purpose of the GNU GPL is to protect the users' freedom from those
 who would make proprietary versions of free software.  While it is
 true that those who call the system &ldquo;Linux&rdquo; often do things that 
limit
-the users' freedom, such as bundling non-free software with the
-GNU/Linux system or even developing non-free software for such use,
+the users' freedom, such as bundling nonfree software with the
+GNU/Linux system or even developing nonfree software for such use,
 the mere act of calling the system &ldquo;Linux&rdquo; does not, in itself, 
deny
 users their freedom.  It seems improper to make the GPL restrict what
-name people can use for the system.
+name people can use for the system.</p>
 </dd>
 
 <dt id="BSDlicense">Since you objected to the original BSD license's
@@ -1601,17 +1622,19 @@
 it &ldquo;Linux&rdquo;, doesn't that make it right? <span 
class="anchor-reference-id">(<a 
href="#somanyright">#somanyright</a>)</span></dt>
 
 <dd>
-We don't think that the popularity of an error makes it the truth.
+<p>
+We don't think that the popularity of an error makes it the truth.</p>
 </dd>
 
 <dt id="knownname">Isn't it better to call the
     system by the name most users already know? <span 
class="anchor-reference-id">(<a href="#knownname">#knownname</a>)</span></dt>
 
 <dd>
+<p>
 Users are not incapable of learning.  Since &ldquo;GNU/Linux&rdquo;
 includes &ldquo;Linux&rdquo;, they will recognize what you're talking
 about.  If you add &ldquo;(often erroneously referred to as
-&lsquo;Linux&rsquo;)&rdquo; once in a while, they will all understand.
+&lsquo;Linux&rsquo;)&rdquo; once in a while, they will all understand.</p>
 </dd>
 
 <dt id="winning">Many people care about what's
@@ -1621,7 +1644,7 @@
 
 <dd>
 To care only about what's convenient or who's winning is an amoral
-approach to life.  Non-free software is an example of that amoral
+approach to life.  Nonfree software is an example of that amoral
 approach and thrives on it.  Thus, in the long run it would be
 self-defeating for us to adopt that approach.  We will continue
 talking in terms of right and wrong.
@@ -1631,7 +1654,6 @@
 
 </dl>
 </div>
-</div>
 
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
@@ -1680,7 +1702,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2001, 2006-2008, 2010, 2011, 2013, 2014-2018, 2020, 2021
+<p>Copyright &copy; 2001-2011, 2013-2018, 2020, 2021
 Free Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
@@ -1691,7 +1713,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/04/07 18:31:12 $
+$Date: 2021/08/30 14:04:42 $
 <!-- timestamp end -->
 </p>
 </div>

Index: gnu/po/gnu-linux-faq.ru-en.html
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.ru-en.html,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- gnu/po/gnu-linux-faq.ru-en.html     8 Apr 2021 11:34:36 -0000       1.56
+++ gnu/po/gnu-linux-faq.ru-en.html     30 Aug 2021 14:04:42 -0000      1.57
@@ -1,30 +1,23 @@
-<!--#include virtual="/server/html5-header.html" -->
+<!--#include virtual="/server/header.html" -->
 <!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
 <title>GNU/Linux FAQ
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/gnu/po/gnu-linux-faq.translist" -->
 <!--#include virtual="/server/banner.html" -->
-<h2 class="c">GNU/Linux FAQ</h2>
+<div class="article reduced-width">
+<h2>GNU/Linux FAQ</h2>
 
-<address class="byline c">by Richard Stallman</address>
+<address class="byline">by Richard Stallman</address>
 
-<div class="reduced-width">
-<hr class="no-display" />
-<div class="announcement">
-<p>To learn more about this issue, you can also read
-our page on <a href="/gnu/linux-and-gnu.html">Linux and the GNU Project</a>, 
our
- page on <a href="/gnu/why-gnu-linux.html">Why GNU/Linux?</a>
-and our page on <a href="/gnu/gnu-users-never-heard-of-gnu.html">GNU
-Users Who Have Never Heard of GNU</a>.</p>
-</div>
-<hr class="thin" />
-
-<div class="article">
 <p>
 When people see that we use and recommend the name GNU/Linux for a
 system that many others call just &ldquo;Linux&rdquo;, they ask many questions.
 Here are common questions, and our answers.</p>
 
+<div class="toc">
+<hr class="no-display" />
+<h3 class="no-display">Table of Contents</h3>
 <ul>
 
 <li><a href="#why">Why do you call the system we use GNU/Linux and not 
Linux?</a></li>
@@ -285,7 +278,16 @@
     get more of their support by a different road?</a></li>
 
 </ul>
-<hr class="thin" />
+</div>
+
+<div class="announcement comment" role="complementary">
+<p>To learn more about this issue, you can also read
+our page on <a href="/gnu/linux-and-gnu.html">Linux and the GNU System</a>, our
+ page on <a href="/gnu/why-gnu-linux.html">Why GNU/Linux?</a>
+and our page on <a href="/gnu/gnu-users-never-heard-of-gnu.html">GNU
+Users Who Have Never Heard of GNU</a>.</p>
+<hr class="no-display" />
+</div>
 
 <dl>
 
@@ -326,10 +328,13 @@
 
 <dt id="what">What is the real relationship between GNU and Linux? <span 
class="anchor-reference-id">(<a href="#what">#what</a>)</span></dt>
 
-<dd>The GNU operating system and the Linux kernel are separate
+<dd>
+<p>
+The GNU operating system and the Linux kernel are separate
 software projects that do complementary jobs.  Typically they are
 packaged in a <a href="/distros/distros.html">GNU/Linux distribution</a>, and 
used
-together.</dd>
+together.</p>
+</dd>
 
 <dt id="howerror">How did it come about that most
     people call the system &ldquo;Linux&rdquo;? <span 
class="anchor-reference-id">(<a href="#howerror">#howerror</a>)</span></dt>
@@ -442,11 +447,12 @@
           support an individual's free speech rights to call the system by
           any name that individual chooses? <span 
class="anchor-reference-id">(<a href="#freespeech">#freespeech</a>)</span></dt>
 <dd>
+<p>
 Yes, indeed, we believe you have a free speech right to call the
 operating system by any name you wish.  We ask that people call it
 GNU/Linux as a matter of doing justice to the GNU project, to promote
 the values of freedom that GNU stands for, and to inform others that
-those values of freedom brought the system into existence.
+those values of freedom brought the system into existence.</p>
 </dd>
 
 <dt id="everyoneknows">Since everyone knows the role
@@ -476,11 +482,12 @@
     why does it matter what name I use? <span class="anchor-reference-id">(<a 
href="#everyoneknows2">#everyoneknows2</a>)</span></dt>
 
 <dd>
+<p>
 If your words don't reflect your knowledge, you don't teach others.
 Most people who have heard of the GNU/Linux system think it is
 &ldquo;Linux&rdquo;, that it was started by Linus Torvalds, and that
 it was intended to be &ldquo;open source&rdquo;.  If you don't tell
-them, who will?
+them, who will?</p>
 </dd>
 
 <dt id="windows">Isn't shortening &ldquo;GNU/Linux&rdquo;
@@ -587,16 +594,18 @@
 <dt id="brain">Isn't the kernel the brain of the system? <span 
class="anchor-reference-id">(<a href="#brain">#brain</a>)</span></dt>
 
 <dd>
+<p>
 A computer system is not much like a human body,
 and no part of it plays a role comparable to that of
-the brain in a human.
+the brain in a human.</p>
 </dd>
 
 <dt id="kernelmost">Isn't writing the kernel most of the work in an
 operating system? <span class="anchor-reference-id">(<a 
href="#kernelmost">#kernelmost</a>)</span></dt>
 
 <dd>
-No, many components take a lot of work.
+<p>
+No, many components take a lot of work.</p>
 </dd>
 
 <dt id="nokernel">An operating system requires a kernel.
@@ -682,11 +691,12 @@
     feel of Linux&rdquo;? <span class="anchor-reference-id">(<a 
href="#feel">#feel</a>)</span></dt>
 
 <dd>
+<p>
 There is no such thing as the &ldquo;feel of Linux&rdquo; because
 Linux has no user interfaces.  Like any modern kernel, Linux is a base
 for running programs; user interfaces belong elsewhere in the system.
 Human interaction with GNU/Linux always goes through other programs,
-and the &ldquo;feel&rdquo; comes from them.
+and the &ldquo;feel&rdquo; comes from them.</p>
 </dd>
 
 <dt id="long">The problem with &ldquo;GNU/Linux&rdquo; is that it is too long.
@@ -777,7 +787,7 @@
 may simply not recognize we're talking about the same system.  If we
 say &ldquo;GNU/Linux&rdquo;, they can make a connection to what they have heard
 about.</li>
-</ul><p></p>
+</ul>
 </dd>
 
 <dt id="trademarkfee">I would have
@@ -831,11 +841,12 @@
     GNU/systemd/Linux? <span class="anchor-reference-id">(<a 
href="#others">#others</a>)</span></dt>
 
 <dd>
+<p>
 systemd is a fairly important component, but not as important as the
 kernel (Linux), nor as important as the basis of the system as a whole
 (GNU).  However, if you want to emphasize the presence of systemd
 by calling the system &ldquo;GNU/systemd/Linux&rdquo;, there is nothing
-wrong with doing so.
+wrong with doing so.</p>
 </dd>
 
 <dt id="others">Many other projects contributed to
@@ -907,8 +918,8 @@
 <p>
 We're not talking about a distinct GNU version of Linux, the kernel.
 The free GNU/Linux distros do have
-a <a href="http://directory.fsf.org/project/linux";>separate version of
-Linux</a>, since the &ldquo;standard&rdquo; version contains non-free
+a <a href="https://directory.fsf.org/wiki/Linux-libre";>separate version of
+Linux</a>, since the &ldquo;standard&rdquo; version contains nonfree
 firmware &ldquo;blobs&rdquo;.  If this were part of the GNU Project,
 it could be considered &ldquo;GNU Linux&rdquo;; but we would not want
 to call it that, because it would be too confusing.</p>
@@ -1028,13 +1039,13 @@
     free software?  After all, that is the ideal of GNU. <span 
class="anchor-reference-id">(<a href="#reserve">#reserve</a>)</span></dt>
 
 <dd>
-The widespread practice of adding non-free software to the GNU/Linux
+The widespread practice of adding nonfree software to the GNU/Linux
 system is a major problem for our community.  It teaches the users
-that non-free software is ok, and that using it is part of the spirit
+that nonfree software is ok, and that using it is part of the spirit
 of &ldquo;Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part of 
their mission to
-help users use non-free add-ons, and may even invite salesmen to come
+help users use nonfree add-ons, and may even invite salesmen to come
 and make sales pitches for them.  They adopt goals such as &ldquo;helping
-the users&rdquo; of GNU/Linux (including helping them use non-free
+the users&rdquo; of GNU/Linux (including helping them use nonfree
 applications and drivers), or making the system more popular even at
 the cost of freedom.
 <p>
@@ -1052,7 +1063,7 @@
 versions <em>are</em> versions of GNU, that they all are based on a
 system that exists specifically for the sake of the users' freedom.
 With this understanding, they can start to recognize the distributions
-that include non-free software as perverted, adulterated versions of
+that include nonfree software as perverted, adulterated versions of
 GNU, instead of thinking they are proper and appropriate &ldquo;versions of
 Linux&rdquo;.</p>
 <p>
@@ -1205,7 +1216,7 @@
 (there were already many of them, for various systems), but instead of
 calling it by a dull name like &ldquo;<em>somethingorother</em> TECO&rdquo;, he
 thought of a clever amusing name.  (That's what hacking
-means: <a href="http://stallman.org/articles/on-hacking.html";>playful
+means: <a href="https://stallman.org/articles/on-hacking.html";>playful
 cleverness</a>.)</p>
 <p>
 Other hackers enjoyed that name so much that we imitated the approach.
@@ -1231,7 +1242,7 @@
 We don't call the BSD systems (FreeBSD, etc.) &ldquo;GNU/BSD&rdquo; systems,
 because that term does not fit the history of the BSD systems.
 <p>
-The BSD system was developed by UC Berkeley as non-free software in
+The BSD system was developed by UC Berkeley as nonfree software in
 the 80s, and became free in the early 90s.  A free operating system
 that exists today is almost certainly either a variant of the GNU
 system, or a kind of BSD system.</p>
@@ -1262,22 +1273,24 @@
 on Windows, does that mean I am running a GNU/Windows system? <span 
class="anchor-reference-id">(<a href="#othersys">#othersys</a>)</span></dt>
 
 <dd>
+<p>
 Not in the same sense that we mean by &ldquo;GNU/Linux&rdquo;.  The tools of 
GNU
 are just a part of the GNU software, which is just a part of the GNU
 system, and underneath them you would still have another complete
 operating system which has no code in common with GNU.  All in all,
-that's a very different situation from GNU/Linux.
+that's a very different situation from GNU/Linux.</p>
 </dd>
 
 <dt id="justlinux">Can't Linux be used without GNU? <span 
class="anchor-reference-id">(<a href="#justlinux">#justlinux</a>)</span></dt>
 
 <dd>
+<p>
 Linux is used by itself, or with small other programs, in some
 appliances.  These small software systems are a far cry from the
 GNU/Linux system.  Users do not install them on PCs, for instance, and
 would find them rather disappointing.  It is useful to say that these
 appliances run just Linux, to show how different those small platforms
-are from GNU/Linux.
+are from GNU/Linux.</p>
 </dd>
 
 <dt id="howmuch">How much of the GNU system is needed for the system
@@ -1367,10 +1380,10 @@
 &ldquo;Linux&rdquo; with that principle.
 <p>
 Linus publicly states his disagreement with the free software
-movement's ideals.  He developed non-free software in his job for many
+movement's ideals.  He developed nonfree software in his job for many
 years (and said so to a large audience at a &ldquo;Linux&rdquo;World show), and
 publicly invited fellow developers of Linux, the kernel, to use
-non-free software to work on it with him.  He goes even further, and
+nonfree software to work on it with him.  He goes even further, and
 rebukes people who suggest that engineers and scientists should
 consider social consequences of our technical work&mdash;rejecting the
 lessons society learned from the development of the atom bomb.</p>
@@ -1389,11 +1402,12 @@
     work as GNU? <span class="anchor-reference-id">(<a 
href="#claimlinux">#claimlinux</a>)</span></dt>
 
 <dd>
+<p>
 It would be wrong, so we don't do that.  Torvalds' work is Linux, the
 kernel; we are careful not to attribute that work to the GNU Project
 or label it as &ldquo;GNU&rdquo;.  When we talk about the whole
 system, the name &ldquo;GNU/Linux&rdquo; gives him a share of the
-credit.
+credit.</p>
 </dd>
 
 
@@ -1403,7 +1417,7 @@
 <dd>
 <p>He recognized this at the beginning.  The earliest Linux release notes
 said, <a
-href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01";>
+href="https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01";>
 &ldquo;Most of the tools used with linux are GNU software and are under the
 GNU copyleft. These tools aren't in the distribution - ask me (or GNU)
 for more info&rdquo;</a>.</p>
@@ -1421,7 +1435,7 @@
 a big job, and it's not clearly necessary.  The only thing ethically
 wrong with Linux as a kernel is its inclusion of firmware
 &ldquo;blobs&rdquo;; the best fix for that problem
-is <a href="http://fsf.org/campaigns/priority-projects";> developing
+is <a href="https://www.fsf.org/campaigns/priority-projects";> developing
 free replacement for the blobs</a>.</p>
 </dd>
 
@@ -1430,12 +1444,13 @@
     it? <span class="anchor-reference-id">(<a 
href="#lost">#lost</a>)</span></dt>
 
 <dd>
+<p>
 This isn't a battle, it is a campaign of education.  What to call the
 system is not a single decision, to be made at one moment by
 &ldquo;society&rdquo;: each person, each organization, can decide what
 name to use.  You can't make others say &ldquo;GNU/Linux&rdquo;, but
 you can decide to call the system &ldquo;GNU/Linux&rdquo;
-yourself&mdash;and by doing so, you will help educate others.
+yourself&mdash;and by doing so, you will help educate others.</p>
 </dd>
 
 <dt id="whatgood">Society has made its
@@ -1443,6 +1458,7 @@
     &ldquo;GNU/Linux&rdquo;? <span class="anchor-reference-id">(<a 
href="#whatgood">#whatgood</a>)</span></dt>
 
 <dd>
+<p>
 This is not an all-or-nothing situation: correct and incorrect
 pictures are being spread more or less by various people.  If you call
 the system &ldquo;GNU/Linux&rdquo;, you will help others learn the system's 
true
@@ -1450,7 +1466,7 @@
 everywhere on your own, any more than we can, but you can help.  If
 only a few hundred people see you use the term &ldquo;GNU/Linux&rdquo;, you 
will
 have educated a substantial number of people with very little work.
-And some of them will spread the correction to others.
+And some of them will spread the correction to others.</p>
 </dd>
 
 <dt id="explain">Wouldn't it be better to call
@@ -1521,39 +1537,44 @@
     is it legitimate to rename the operating system? <span 
class="anchor-reference-id">(<a href="#rename">#rename</a>)</span></dt>
 
 <dd>
+<p>
 We are not renaming anything; we have been calling this system 
&ldquo;GNU&rdquo;
 ever since we announced it in 1983.  The people who tried to rename
-it to &ldquo;Linux&rdquo; should not have done so.</dd>
+it to &ldquo;Linux&rdquo; should not have done so.</p>
+</dd>
 
 <dt id="force">Isn't it wrong to force people to call
 the system &ldquo;GNU/Linux&rdquo;? <span class="anchor-reference-id">(<a 
href="#force">#force</a>)</span></dt>
 
 <dd>
+<p>
 It would be wrong to force them, and we don't try.  We call the system
-&ldquo;GNU/Linux&rdquo;, and we ask you to do it too.
+&ldquo;GNU/Linux&rdquo;, and we ask you to do it too.</p>
 </dd>
 
 <dt id="whynotsue">Why not sue people who call
 the whole system &ldquo;Linux&rdquo;? <span class="anchor-reference-id">(<a 
href="#whynotsue">#whynotsue</a>)</span></dt>
 
 <dd>
+<p>
 There are no legal grounds to sue them, but since we believe in
 freedom of speech, we wouldn't want to do that anyway.  We ask people
-to call the system &ldquo;GNU/Linux&rdquo; because that is the right thing to 
do.
+to call the system &ldquo;GNU/Linux&rdquo; because that is the right thing to 
do.</p>
 </dd>
 
 <dt id="require">Shouldn't you put something in
     the GNU GPL to require people to call the system &ldquo;GNU&rdquo;? <span 
class="anchor-reference-id">(<a href="#require">#require</a>)</span></dt>
 
 <dd>
+<p>
 The purpose of the GNU GPL is to protect the users' freedom from those
 who would make proprietary versions of free software.  While it is
 true that those who call the system &ldquo;Linux&rdquo; often do things that 
limit
-the users' freedom, such as bundling non-free software with the
-GNU/Linux system or even developing non-free software for such use,
+the users' freedom, such as bundling nonfree software with the
+GNU/Linux system or even developing nonfree software for such use,
 the mere act of calling the system &ldquo;Linux&rdquo; does not, in itself, 
deny
 users their freedom.  It seems improper to make the GPL restrict what
-name people can use for the system.
+name people can use for the system.</p>
 </dd>
 
 <dt id="BSDlicense">Since you objected to the original BSD license's
@@ -1601,17 +1622,19 @@
 it &ldquo;Linux&rdquo;, doesn't that make it right? <span 
class="anchor-reference-id">(<a 
href="#somanyright">#somanyright</a>)</span></dt>
 
 <dd>
-We don't think that the popularity of an error makes it the truth.
+<p>
+We don't think that the popularity of an error makes it the truth.</p>
 </dd>
 
 <dt id="knownname">Isn't it better to call the
     system by the name most users already know? <span 
class="anchor-reference-id">(<a href="#knownname">#knownname</a>)</span></dt>
 
 <dd>
+<p>
 Users are not incapable of learning.  Since &ldquo;GNU/Linux&rdquo;
 includes &ldquo;Linux&rdquo;, they will recognize what you're talking
 about.  If you add &ldquo;(often erroneously referred to as
-&lsquo;Linux&rsquo;)&rdquo; once in a while, they will all understand.
+&lsquo;Linux&rsquo;)&rdquo; once in a while, they will all understand.</p>
 </dd>
 
 <dt id="winning">Many people care about what's
@@ -1621,7 +1644,7 @@
 
 <dd>
 To care only about what's convenient or who's winning is an amoral
-approach to life.  Non-free software is an example of that amoral
+approach to life.  Nonfree software is an example of that amoral
 approach and thrives on it.  Thus, in the long run it would be
 self-defeating for us to adopt that approach.  We will continue
 talking in terms of right and wrong.
@@ -1631,7 +1654,6 @@
 
 </dl>
 </div>
-</div>
 
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
@@ -1680,7 +1702,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2001, 2006-2008, 2010, 2011, 2013, 2014-2018, 2020, 2021
+<p>Copyright &copy; 2001-2011, 2013-2018, 2020, 2021
 Free Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
@@ -1691,7 +1713,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/04/08 11:34:36 $
+$Date: 2021/08/30 14:04:42 $
 <!-- timestamp end -->
 </p>
 </div>

Index: gnu/po/gnu-linux-faq.ru.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.ru.po,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -b -r1.124 -r1.125
--- gnu/po/gnu-linux-faq.ru.po  30 Aug 2021 13:51:54 -0000      1.124
+++ gnu/po/gnu-linux-faq.ru.po  30 Aug 2021 14:04:42 -0000      1.125
@@ -18,7 +18,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2021-08-30 13:26+0000\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>
@@ -48,8 +47,6 @@
 "ответы на них:"
 
 #. type: Content of: <div><div><h3>
-# || No change detected.  The change might only be in amounts of spaces.
-#| msgid "Table of Contents"
 msgid "Table of Contents"
 msgstr "Содержание"
 
@@ -658,18 +655,6 @@
 
 # type: Content of: <div><blockquote><p>
 #. type: Content of: <div><div><p>
-# | To learn more about this issue, you can also read our page on <a
-# | href=\"/gnu/linux-and-gnu.html\">Linux and the GNU [-Project</a>,-]
-# | {+System</a>,+} our page on <a href=\"/gnu/why-gnu-linux.html\">Why
-# | GNU/Linux?</a> and our page on <a
-# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never
-# | Heard of GNU</a>.
-#| msgid ""
-#| "To learn more about this issue, you can also read our page on <a href=\"/"
-#| "gnu/linux-and-gnu.html\">Linux and the GNU Project</a>, our page on <a "
-#| "href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a "
-#| "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
-#| "Heard of GNU</a>."
 msgid ""
 "To learn more about this issue, you can also read our page on <a href=\"/gnu/"
 "linux-and-gnu.html\">Linux and the GNU System</a>, our page on <a href=\"/"
@@ -2113,22 +2098,6 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <div><dl><dd><p>
-# | We're not talking about a distinct GNU version of Linux, the kernel.  The
-# | free GNU/Linux distros do have a <a
-# | [-href=\"http://directory.fsf.org/project/linux\";>separate-]
-# | {+href=\"https://directory.fsf.org/wiki/Linux-libre\";>separate+} version
-# | of Linux</a>, since the &ldquo;standard&rdquo; version contains
-# | non[---]free firmware &ldquo;blobs&rdquo;.  If this were part of the GNU
-# | Project, it could be considered &ldquo;GNU Linux&rdquo;; but we would not
-# | want to call it that, because it would be too confusing.
-#| msgid ""
-#| "We're not talking about a distinct GNU version of Linux, the kernel.  The "
-#| "free GNU/Linux distros do have a <a href=\"http://directory.fsf.org/";
-#| "project/linux\">separate version of Linux</a>, since the &ldquo;"
-#| "standard&rdquo; version contains non-free firmware &ldquo;blobs&rdquo;.  "
-#| "If this were part of the GNU Project, it could be considered &ldquo;GNU "
-#| "Linux&rdquo;; but we would not want to call it that, because it would be "
-#| "too confusing."
 msgid ""
 "We're not talking about a distinct GNU version of Linux, the kernel.  The "
 "free GNU/Linux distros do have a <a href=\"https://directory.fsf.org/wiki/";
@@ -2412,25 +2381,6 @@
 
 # type: Content of: <dl><dd>
 #. type: Content of: <div><dl><dd>
-# | The widespread practice of adding non[---]free software to the GNU/Linux
-# | system is a major problem for our community.  It teaches the users that
-# | non[---]free software is ok, and that using it is part of the spirit of
-# | &ldquo;Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part of
-# | their mission to help users use non[---]free add-ons, and may even invite
-# | salesmen to come and make sales pitches for them.  They adopt goals such
-# | as &ldquo;helping the users&rdquo; of GNU/Linux (including helping them
-# | use non[---]free applications and drivers), or making the system more
-# | popular even at the cost of freedom.
-#| msgid ""
-#| "The widespread practice of adding non-free software to the GNU/Linux "
-#| "system is a major problem for our community.  It teaches the users that "
-#| "non-free software is ok, and that using it is part of the spirit of "
-#| "&ldquo;Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part "
-#| "of their mission to help users use non-free add-ons, and may even invite "
-#| "salesmen to come and make sales pitches for them.  They adopt goals such "
-#| "as &ldquo;helping the users&rdquo; of GNU/Linux (including helping them "
-#| "use non-free applications and drivers), or making the system more popular "
-#| "even at the cost of freedom."
 msgid ""
 "The widespread practice of adding nonfree software to the GNU/Linux system "
 "is a major problem for our community.  It teaches the users that nonfree "
@@ -2476,21 +2426,6 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <div><dl><dd><p>
-# | The way to lead these users to see a connection with freedom is exactly
-# | the opposite: to inform them that all these system versions <em>are</em>
-# | versions of GNU, that they all are based on a system that exists
-# | specifically for the sake of the users' freedom.  With this understanding,
-# | they can start to recognize the distributions that include non[---]free
-# | software as perverted, adulterated versions of GNU, instead of thinking
-# | they are proper and appropriate &ldquo;versions of Linux&rdquo;.
-#| msgid ""
-#| "The way to lead these users to see a connection with freedom is exactly "
-#| "the opposite: to inform them that all these system versions <em>are</em> "
-#| "versions of GNU, that they all are based on a system that exists "
-#| "specifically for the sake of the users' freedom.  With this "
-#| "understanding, they can start to recognize the distributions that include "
-#| "non-free software as perverted, adulterated versions of GNU, instead of "
-#| "thinking they are proper and appropriate &ldquo;versions of Linux&rdquo;."
 msgid ""
 "The way to lead these users to see a connection with freedom is exactly the "
 "opposite: to inform them that all these system versions <em>are</em> "
@@ -2860,21 +2795,6 @@
 "рекурсивные сокращения, появившейся в 
семидесятые годы."
 
 #. type: Content of: <div><dl><dd><p>
-# | The first such recursive acronym was TINT, &ldquo;TINT Is Not TECO&rdquo;.
-# |  The author of TINT wrote another implementation of TECO (there were
-# | already many of them, for various systems), but instead of calling it by a
-# | dull name like &ldquo;<em>somethingorother</em> TECO&rdquo;, he thought of
-# | a clever amusing name.  (That's what hacking means: <a
-# | href=\"http{+s+}://stallman.org/articles/on-hacking.html\">playful
-# | cleverness</a>.)
-#| msgid ""
-#| "The first such recursive acronym was TINT, &ldquo;TINT Is Not "
-#| "TECO&rdquo;.  The author of TINT wrote another implementation of TECO "
-#| "(there were already many of them, for various systems), but instead of "
-#| "calling it by a dull name like &ldquo;<em>somethingorother</em> "
-#| "TECO&rdquo;, he thought of a clever amusing name.  (That's what hacking "
-#| "means: <a href=\"http://stallman.org/articles/on-hacking.html\";>playful "
-#| "cleverness</a>.)"
 msgid ""
 "The first such recursive acronym was TINT, &ldquo;TINT Is Not TECO&rdquo;.  "
 "The author of TINT wrote another implementation of TECO (there were already "
@@ -2946,15 +2866,6 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <div><dl><dd><p>
-# | The BSD system was developed by UC Berkeley as non[---]free software in
-# | the 80s, and became free in the early 90s.  A free operating system that
-# | exists today is almost certainly either a variant of the GNU system, or a
-# | kind of BSD system.
-#| msgid ""
-#| "The BSD system was developed by UC Berkeley as non-free software in the "
-#| "80s, and became free in the early 90s.  A free operating system that "
-#| "exists today is almost certainly either a variant of the GNU system, or a "
-#| "kind of BSD system."
 msgid ""
 "The BSD system was developed by UC Berkeley as nonfree software in the 80s, "
 "and became free in the early 90s.  A free operating system that exists today "
@@ -3264,23 +3175,6 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <div><dl><dd><p>
-# | Linus publicly states his disagreement with the free software movement's
-# | ideals.  He developed non[---]free software in his job for many years (and
-# | said so to a large audience at a &ldquo;Linux&rdquo;World show), and
-# | publicly invited fellow developers of Linux, the kernel, to use
-# | non[---]free software to work on it with him.  He goes even further, and
-# | rebukes people who suggest that engineers and scientists should consider
-# | social consequences of our technical work&mdash;rejecting the lessons
-# | society learned from the development of the atom bomb.
-#| msgid ""
-#| "Linus publicly states his disagreement with the free software movement's "
-#| "ideals.  He developed non-free software in his job for many years (and "
-#| "said so to a large audience at a &ldquo;Linux&rdquo;World show), and "
-#| "publicly invited fellow developers of Linux, the kernel, to use non-free "
-#| "software to work on it with him.  He goes even further, and rebukes "
-#| "people who suggest that engineers and scientists should consider social "
-#| "consequences of our technical work&mdash;rejecting the lessons society "
-#| "learned from the development of the atom bomb."
 msgid ""
 "Linus publicly states his disagreement with the free software movement's "
 "ideals.  He developed nonfree software in his job for many years (and said "
@@ -3353,18 +3247,6 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <div><dl><dd><p>
-# | He recognized this at the beginning.  The earliest Linux release notes
-# | said, <a
-# | 
href=\"http{+s+}://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\">
-# | &ldquo;Most of the tools used with linux are GNU software and are under
-# | the GNU copyleft. These tools aren't in the distribution - ask me (or GNU)
-# |  for more info&rdquo;</a>.
-#| msgid ""
-#| "He recognized this at the beginning.  The earliest Linux release notes "
-#| "said, <a href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-";
-#| "versions/RELNOTES-0.01\"> &ldquo;Most of the tools used with linux are "
-#| "GNU software and are under the GNU copyleft. These tools aren't in the "
-#| "distribution - ask me (or GNU)  for more info&rdquo;</a>."
 msgid ""
 "He recognized this at the beginning.  The earliest Linux release notes said, "
 "<a href=\"https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/";
@@ -3398,19 +3280,6 @@
 "от того, с каким ядром она применяется."
 
 #. type: Content of: <div><dl><dd><p>
-# | Making the GNU Hurd work well enough to compete with Linux would be a big
-# | job, and it's not clearly necessary.  The only thing ethically wrong with
-# | Linux as a kernel is its inclusion of firmware &ldquo;blobs&rdquo;; the
-# | best fix for that problem is <a
-# | [-href=\"http://fsf.org/campaigns/priority-projects\";>-]
-# | {+href=\"https://www.fsf.org/campaigns/priority-projects\";>+} developing
-# | free replacement for the blobs</a>.
-#| msgid ""
-#| "Making the GNU Hurd work well enough to compete with Linux would be a big "
-#| "job, and it's not clearly necessary.  The only thing ethically wrong with "
-#| "Linux as a kernel is its inclusion of firmware &ldquo;blobs&rdquo;; the "
-#| "best fix for that problem is <a href=\"http://fsf.org/campaigns/priority-";
-#| "projects\"> developing free replacement for the blobs</a>."
 msgid ""
 "Making the GNU Hurd work well enough to compete with Linux would be a big "
 "job, and it's not clearly necessary.  The only thing ethically wrong with "
@@ -3711,23 +3580,6 @@
 
 # type: Content of: <dl><dd>
 #. type: Content of: <div><dl><dd><p>
-# | The purpose of the GNU GPL is to protect the users' freedom from those who
-# | would make proprietary versions of free software.  While it is true that
-# | those who call the system &ldquo;Linux&rdquo; often do things that limit
-# | the users' freedom, such as bundling non[---]free software with the
-# | GNU/Linux system or even developing non[---]free software for such use,
-# | the mere act of calling the system &ldquo;Linux&rdquo; does not, in
-# | itself, deny users their freedom.  It seems improper to make the GPL
-# | restrict what name people can use for the system.
-#| msgid ""
-#| "The purpose of the GNU GPL is to protect the users' freedom from those "
-#| "who would make proprietary versions of free software.  While it is true "
-#| "that those who call the system &ldquo;Linux&rdquo; often do things that "
-#| "limit the users' freedom, such as bundling non-free software with the GNU/"
-#| "Linux system or even developing non-free software for such use, the mere "
-#| "act of calling the system &ldquo;Linux&rdquo; does not, in itself, deny "
-#| "users their freedom.  It seems improper to make the GPL restrict what "
-#| "name people can use for the system."
 msgid ""
 "The purpose of the GNU GPL is to protect the users' freedom from those who "
 "would make proprietary versions of free software.  While it is true that "
@@ -3898,17 +3750,6 @@
 
 # type: Content of: <dl><dd>
 #. type: Content of: <div><dl><dd>
-# | To care only about what's convenient or who's winning is an amoral
-# | approach to life.  Non[---]free software is an example of that amoral
-# | approach and thrives on it.  Thus, in the long run it would be
-# | self-defeating for us to adopt that approach.  We will continue talking in
-# | terms of right and wrong.
-#| msgid ""
-#| "To care only about what's convenient or who's winning is an amoral "
-#| "approach to life.  Non-free software is an example of that amoral "
-#| "approach and thrives on it.  Thus, in the long run it would be self-"
-#| "defeating for us to adopt that approach.  We will continue talking in "
-#| "terms of right and wrong."
 msgid ""
 "To care only about what's convenient or who's winning is an amoral approach "
 "to life.  Nonfree software is an example of that amoral approach and thrives "
@@ -3978,18 +3819,12 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-# | Copyright &copy; [-2014, 2015, 2016, 2017, 2018, 2019-] {+2001-2011,
-# | 2013-2018, 2020, 2021+} Free Software Foundation, Inc.
-#| msgid ""
-#| "Copyright &copy; 2014, 2015, 2016, 2017, 2018, 2019 Free Software "
-#| "Foundation, Inc."
 msgid ""
 "Copyright &copy; 2001-2011, 2013-2018, 2020, 2021 Free Software Foundation, "
 "Inc."
 msgstr ""
-"Copyright &copy; 2001-2011, 2013-2018, 2020, 2021 Free Software "
-"Foundation, Inc.<br />"
-"Copyright &copy; 2010 Vladimir Smolyar (translation) "
+"Copyright &copy; 2001-2011, 2013-2018, 2020, 2021 Free Software Foundation, "
+"Inc.<br />Copyright &copy; 2010 Vladimir Smolyar (translation) "
 
 #. type: Content of: <div><p>
 msgid ""

Index: gnu/po/gnu-users-never-heard-of-gnu.fr-en.html
===================================================================
RCS file: /web/www/www/gnu/po/gnu-users-never-heard-of-gnu.fr-en.html,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- gnu/po/gnu-users-never-heard-of-gnu.fr-en.html      7 Apr 2021 18:31:13 
-0000       1.38
+++ gnu/po/gnu-users-never-heard-of-gnu.fr-en.html      30 Aug 2021 14:04:42 
-0000      1.39
@@ -1,32 +1,22 @@
-<!--#include virtual="/server/html5-header.html" -->
+<!--#include virtual="/server/header.html" -->
 <!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
 <title>GNU Users Who Have Never Heard of GNU
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/gnu/po/gnu-users-never-heard-of-gnu.translist" -->
 <!--#include virtual="/server/banner.html" -->
-<h2 class="c">GNU Users Who Have Never Heard of&nbsp;GNU</h2>
+<div class="article reduced-width">
+<h2>GNU Users Who Have Never Heard of&nbsp;GNU</h2>
 
-<address class="byline c">by <a
+<address class="byline">by <a
 href="https://www.stallman.org/";>Richard Stallman</a></address>
 
-<div class="reduced-width">
-<hr class="no-display" />
-<div class="announcement">
-<p>To learn more about this issue, you can also read
-our <a href="/gnu/gnu-linux-faq.html">GNU/Linux FAQ</a>, our page on 
-<a href="/gnu/why-gnu-linux.html">Why GNU/Linux?</a> 
-and our page on <a href="/gnu/linux-and-gnu.html">Linux and the GNU 
Project</a>.
-</p>
-</div>
-<hr class="thin" />
-
-<div class="article">
 <p>Most people have never heard of GNU.  Even most of the people who
 use the GNU system have never heard of GNU, since so many people and
-companies teach them to call it &ldquo;Linux&rdquo;.  Indeed, GNU
-users often say they are &ldquo;running Linux&rdquo;, which is like
+companies teach them to call it &ldquo;Linux.&rdquo;  Indeed, GNU
+users often say they are &ldquo;running Linux,&rdquo; which is like
 saying you are &ldquo;driving your carburetor&rdquo; or
-&ldquo;driving your transmission&rdquo;.</p>
+&ldquo;driving your transmission.&rdquo;</p>
 
 <p>Nonetheless, those who know about GNU associate it with the ideals
 of freedom of the free software movement.  That association is no
@@ -57,9 +47,18 @@
 system.  It is also useful as a reminder for people in our community
 who know about these ideals, in a world where much of discussion of
 free software takes a totally practical (and thus amoral) approach.
-When we ask you to call the system &ldquo;GNU/Linux&rdquo;, we are
+When we ask you to call the system &ldquo;GNU/Linux,&rdquo; we are
 asking you to help in making the public aware of the free software
 ideals.</p>
+
+<div class="announcement comment" role="complementary">
+<hr class="no-display" />
+<p>To learn more about this issue, you can also read
+our <a href="/gnu/gnu-linux-faq.html">GNU/Linux FAQ</a>, our page on 
+<a href="/gnu/why-gnu-linux.html">Why GNU/Linux?</a> 
+and our page on <a href="/gnu/linux-and-gnu.html">Linux and the GNU System</a>.
+</p>
+<hr class="no-display" />
 </div>
 </div>
 
@@ -110,7 +109,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software
+<p>Copyright &copy; 2006, 2015, 2021 Free Software
 Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
@@ -121,10 +120,10 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/04/07 18:31:13 $
+$Date: 2021/08/30 14:04:42 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: gnu/po/gnu-users-never-heard-of-gnu.ru-en.html
===================================================================
RCS file: /web/www/www/gnu/po/gnu-users-never-heard-of-gnu.ru-en.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- gnu/po/gnu-users-never-heard-of-gnu.ru-en.html      8 Apr 2021 11:34:36 
-0000       1.28
+++ gnu/po/gnu-users-never-heard-of-gnu.ru-en.html      30 Aug 2021 14:04:42 
-0000      1.29
@@ -1,32 +1,22 @@
-<!--#include virtual="/server/html5-header.html" -->
+<!--#include virtual="/server/header.html" -->
 <!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
 <title>GNU Users Who Have Never Heard of GNU
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/gnu/po/gnu-users-never-heard-of-gnu.translist" -->
 <!--#include virtual="/server/banner.html" -->
-<h2 class="c">GNU Users Who Have Never Heard of&nbsp;GNU</h2>
+<div class="article reduced-width">
+<h2>GNU Users Who Have Never Heard of&nbsp;GNU</h2>
 
-<address class="byline c">by <a
+<address class="byline">by <a
 href="https://www.stallman.org/";>Richard Stallman</a></address>
 
-<div class="reduced-width">
-<hr class="no-display" />
-<div class="announcement">
-<p>To learn more about this issue, you can also read
-our <a href="/gnu/gnu-linux-faq.html">GNU/Linux FAQ</a>, our page on 
-<a href="/gnu/why-gnu-linux.html">Why GNU/Linux?</a> 
-and our page on <a href="/gnu/linux-and-gnu.html">Linux and the GNU 
Project</a>.
-</p>
-</div>
-<hr class="thin" />
-
-<div class="article">
 <p>Most people have never heard of GNU.  Even most of the people who
 use the GNU system have never heard of GNU, since so many people and
-companies teach them to call it &ldquo;Linux&rdquo;.  Indeed, GNU
-users often say they are &ldquo;running Linux&rdquo;, which is like
+companies teach them to call it &ldquo;Linux.&rdquo;  Indeed, GNU
+users often say they are &ldquo;running Linux,&rdquo; which is like
 saying you are &ldquo;driving your carburetor&rdquo; or
-&ldquo;driving your transmission&rdquo;.</p>
+&ldquo;driving your transmission.&rdquo;</p>
 
 <p>Nonetheless, those who know about GNU associate it with the ideals
 of freedom of the free software movement.  That association is no
@@ -57,9 +47,18 @@
 system.  It is also useful as a reminder for people in our community
 who know about these ideals, in a world where much of discussion of
 free software takes a totally practical (and thus amoral) approach.
-When we ask you to call the system &ldquo;GNU/Linux&rdquo;, we are
+When we ask you to call the system &ldquo;GNU/Linux,&rdquo; we are
 asking you to help in making the public aware of the free software
 ideals.</p>
+
+<div class="announcement comment" role="complementary">
+<hr class="no-display" />
+<p>To learn more about this issue, you can also read
+our <a href="/gnu/gnu-linux-faq.html">GNU/Linux FAQ</a>, our page on 
+<a href="/gnu/why-gnu-linux.html">Why GNU/Linux?</a> 
+and our page on <a href="/gnu/linux-and-gnu.html">Linux and the GNU System</a>.
+</p>
+<hr class="no-display" />
 </div>
 </div>
 
@@ -110,7 +109,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software
+<p>Copyright &copy; 2006, 2015, 2021 Free Software
 Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
@@ -121,10 +120,10 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/04/08 11:34:36 $
+$Date: 2021/08/30 14:04:42 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: gnu/po/gnu-users-never-heard-of-gnu.ru.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-users-never-heard-of-gnu.ru.po,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- gnu/po/gnu-users-never-heard-of-gnu.ru.po   30 Aug 2021 13:51:54 -0000      
1.38
+++ gnu/po/gnu-users-never-heard-of-gnu.ru.po   30 Aug 2021 14:04:42 -0000      
1.39
@@ -14,7 +14,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2021-08-30 13:26+0000\n"
 "X-Poedit-Language: Russian\n"
 
 # type: Content of: <title>
@@ -38,19 +37,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <div><p>
-# | Most people have never heard of GNU.  Even most of the people who use the
-# | GNU system have never heard of GNU, since so many people and companies
-# | teach them to call it [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+}
-# | Indeed, GNU users often say they are &ldquo;running [-Linux&rdquo;,-]
-# | {+Linux,&rdquo;+} which is like saying you are &ldquo;driving your
-# | carburetor&rdquo; or &ldquo;driving your [-transmission&rdquo;.-]
-# | {+transmission.&rdquo;+}
-#| msgid ""
-#| "Most people have never heard of GNU.  Even most of the people who use the "
-#| "GNU system have never heard of GNU, since so many people and companies "
-#| "teach them to call it &ldquo;Linux&rdquo;.  Indeed, GNU users often say "
-#| "they are &ldquo;running Linux&rdquo;, which is like saying you are &ldquo;"
-#| "driving your carburetor&rdquo; or &ldquo;driving your transmission&rdquo;."
 msgid ""
 "Most people have never heard of GNU.  Even most of the people who use the "
 "GNU system have never heard of GNU, since so many people and companies teach "
@@ -119,21 +105,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <div><p>
-# | Over time, calling the system &ldquo;GNU/Linux&rdquo; spreads awareness of
-# | the ideals of freedom for which we developed the GNU system.  It is also
-# | useful as a reminder for people in our community who know about these
-# | ideals, in a world where much of discussion of free software takes a
-# | totally practical (and thus amoral) approach.  When we ask you to call the
-# | system [-&ldquo;GNU/Linux&rdquo;,-] {+&ldquo;GNU/Linux,&rdquo;+} we are
-# | asking you to help in making the public aware of the free software ideals.
-#| msgid ""
-#| "Over time, calling the system &ldquo;GNU/Linux&rdquo; spreads awareness "
-#| "of the ideals of freedom for which we developed the GNU system.  It is "
-#| "also useful as a reminder for people in our community who know about "
-#| "these ideals, in a world where much of discussion of free software takes "
-#| "a totally practical (and thus amoral) approach.  When we ask you to call "
-#| "the system &ldquo;GNU/Linux&rdquo;, we are asking you to help in making "
-#| "the public aware of the free software ideals."
 msgid ""
 "Over time, calling the system &ldquo;GNU/Linux&rdquo; spreads awareness of "
 "the ideals of freedom for which we developed the GNU system.  It is also "
@@ -154,16 +125,6 @@
 
 # type: Content of: <div><blockquote><p>
 #. type: Content of: <div><div><p>
-# | To learn more about this issue, you can also read our <a
-# | href=\"/gnu/gnu-linux-faq.html\">GNU/Linux FAQ</a>, our page on <a
-# | href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a
-# | href=\"/gnu/linux-and-gnu.html\">Linux and the GNU [-Project</a>.-]
-# | {+System</a>.+}
-#| msgid ""
-#| "To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
-#| "linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-"
-#| "linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-"
-#| "gnu.html\">Linux and the GNU Project</a>."
 msgid ""
 "To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
 "linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-linux."
@@ -221,9 +182,6 @@
 "translations.html\">&ldquo;Руководстве по 
переводам&rdquo;</a>."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; [-2014,-] {+2006,+} 2015, [-2016-] {+2021+} Free Software
-# | Foundation, Inc.
-#| msgid "Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
 msgid "Copyright &copy; 2006, 2015, 2021 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2006, 2010, 2015, 2021 Free Software Foundation, Inc."
 

Index: gnu/po/linux-and-gnu.fr-en.html
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.fr-en.html,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- gnu/po/linux-and-gnu.fr-en.html     7 Apr 2021 18:31:13 -0000       1.51
+++ gnu/po/linux-and-gnu.fr-en.html     30 Aug 2021 14:04:42 -0000      1.52
@@ -1,36 +1,36 @@
-<!--#include virtual="/server/html5-header.html" -->
+<!--#include virtual="/server/header.html" -->
 <!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
 <title>Linux and GNU
 - GNU Project - Free Software Foundation</title>
 <meta http-equiv="Keywords" content="GNU, FSF, Free Software Foundation, 
Linux, Emacs, GCC, Unix, Free Software, Operating System, GNU Kernel, HURD, GNU 
HURD, Hurd" />
 <meta http-equiv="Description" content="Since 1983, developing the free Unix 
style operating system GNU, so that computer users can have the freedom to 
share and improve the software they use." />
 <!--#include virtual="/gnu/po/linux-and-gnu.translist" -->
 <!--#include virtual="/server/banner.html" -->
-<h2 class="c">Linux and the GNU System</h2>
+<div class="article reduced-width">
+<h2>Linux and the GNU System</h2>
 
-<address class="byline c">by <a
+<address class="byline">by <a
 href="https://www.stallman.org/";>Richard Stallman</a></address>
 
-<div class="reduced-width">
-<hr class="no-display" />
-<div class="announcement">
-<p>For more information see also
-the <a href="/gnu/gnu-linux-faq.html">GNU/Linux FAQ</a>,
-and <a href="/gnu/why-gnu-linux.html">Why GNU/Linux?</a></p>
-</div>
-<hr class="thin" />
-
-<div class="article">
 <p>
 Many computer users run a modified version of
 <a href="/philosophy/categories.html#TheGNUsystem">the GNU system</a>
 every day, without realizing it.  Through a peculiar turn of events,
 the version of GNU which is widely used today is often called
-&ldquo;Linux&rdquo;, and many of its users
+&ldquo;Linux,&rdquo; and many of its users
 are <a href="/gnu/gnu-users-never-heard-of-gnu.html"> not aware</a>
 that it is basically the GNU system, developed by the
 <a href="/gnu/gnu-history.html">GNU Project</a>.</p>
 
+<div class="announcement comment" role="complementary">
+<hr class="no-display" />
+<p>For more information see also
+the <a href="/gnu/gnu-linux-faq.html">GNU/Linux FAQ</a>,
+and <a href="/gnu/why-gnu-linux.html">Why GNU/Linux?</a></p>
+<hr class="no-display" />
+</div>
+
 <p>
 There really is a Linux, and these people are using it, but it is just
 a part of the system they use.  Linux is the kernel: the program in
@@ -46,7 +46,7 @@
 <p>
 Many users do not understand the difference between the kernel, which
 is Linux, and the whole system, which they also call
-&ldquo;Linux&rdquo;.  The ambiguous use of the name doesn't help
+&ldquo;Linux.&rdquo;  The ambiguous use of the name doesn't help
 people understand.  These users often think that Linus Torvalds
 developed the whole operating system in 1991, with a bit of help.</p>
 
@@ -83,7 +83,7 @@
 <p>
 If we tried to measure the GNU Project's contribution in this way,
 what would we conclude?  One CD-ROM vendor found that in their &ldquo;Linux
-distribution&rdquo;, <a href="/philosophy/categories.html#GNUsoftware">GNU
+distribution,&rdquo; <a href="/philosophy/categories.html#GNUsoftware">GNU
 software</a> was the largest single contingent, around 28% of the
 total source code, and this included some of the essential major
 components without which there could be no system.  Linux itself was
@@ -91,7 +91,7 @@
 repository of gNewSense, Linux is 1.5% and GNU packages are 15%.)
 So if you were going to pick a name for the system based on
 who wrote the programs in the system, the most appropriate single
-choice would be &ldquo;GNU&rdquo;.</p>
+choice would be &ldquo;GNU.&rdquo;</p>
 
 <p>
 But that is not the deepest way to consider the question.  The GNU
@@ -130,7 +130,7 @@
 Fortunately, we didn't have to wait for the Hurd, because of Linux.
 Once Torvalds freed Linux in 1992, it fit into the last major gap in
 the GNU system.  People could
-then <a 
href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01";>
+then <a 
href="https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01";>
 combine Linux with the GNU system</a> to make a complete free system
 &mdash; a version of the GNU system which also contained Linux.  The
 GNU/Linux system, in other words.</p>
@@ -148,7 +148,7 @@
 
 <p>
 The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU
-system.  The <a href="http://fsf.org/";>FSF</a> funded the rewriting of
+system.  The <a href="https://fsf.org/";>FSF</a> funded the rewriting of
 the Linux-related extensions to the GNU C library, so that now they
 are well integrated, and the newest GNU/Linux systems use the current
 library release with no changes.  The FSF also funded an early stage
@@ -171,7 +171,7 @@
 be loaded into I/O devices when the system starts, and they are
 included, as long series of numbers, in the "source code" of Linux.
 Thus, maintaining free GNU/Linux distributions now entails maintaining
-a <a href="http://directory.fsf.org/project/linux";> free version of
+a <a href="https://directory.fsf.org/project/linux";> free version of
 Linux</a> too.</p>
 
 <p>Whether you use GNU/Linux or not, please don't confuse the public
@@ -179,14 +179,14 @@
 kernel, one of the essential major components of the system.  The
 system as a whole is basically the GNU system, with Linux added.  When
 you're talking about this combination, please call it
-&ldquo;GNU/Linux&rdquo;.</p>
+&ldquo;GNU/Linux.&rdquo;</p>
 
 <p>
 If you want to make a link on &ldquo;GNU/Linux&rdquo; for further
 reference, this page and <a href="/gnu/the-gnu-project.html">
-http://www.gnu.org/gnu/the-gnu-project.html</a> are good choices.  If
+https://www.gnu.org/gnu/the-gnu-project.html</a> are good choices.  If
 you mention Linux, the kernel, and want to add a link for further
-reference, <a href="http://foldoc.org/linux";>http://foldoc.org/linux</a> 
+reference, <a href="https://foldoc.org/linux";>https://foldoc.org/linux</a> 
 is a good URL to use.</p>
 <div class="column-limit"></div>
 
@@ -213,35 +213,30 @@
 href="#gnubsd">(5)</a></p>
 <div class="column-limit"></div>
 
-<h3 class="footnote">Notes</h3>
+<h3 class="footnote">Footnotes</h3>
 <ol>
-<li>
-<a id="unexciting"></a>These unexciting but essential components
+<li id="unexciting">These unexciting but essential components
 include the GNU assembler (GAS) and the linker (GLD), both
 are now part of the <a href="/software/binutils/">GNU Binutils</a>
 package, <a href="/software/tar/">GNU tar</a>, and many more.</li>
 
-<li>
-<a id="nottools"></a>For instance, The Bourne Again SHell (BASH),
+<li id="nottools">For instance, The Bourne Again SHell (BASH),
 the PostScript interpreter
 <a href="/software/ghostscript/ghostscript.html">Ghostscript</a>, and the
 <a href="/software/libc/libc.html">GNU C library</a> are not
 programming tools.  Neither are GNUCash, GNOME, and GNU Chess.</li>
 
-<li>
-<a id="somecomponents"></a>For instance, the
+<li id="somecomponents">For instance, the
 <a href="/software/libc/libc.html">GNU C library</a>.</li>
 
-<li>
-<a id="newersystems"></a>Since that was written, a nearly-all-free
+<li id="newersystems">Since that was written, a nearly-all-free
 Windows-like system has been developed, but technically it is not at
 all like GNU or Unix, so it doesn't really affect this issue.  Most of
 the kernel of Solaris has been made free, but if you wanted to make a
 free system out of that, aside from replacing the missing parts of the
 kernel, you would also need to put it into GNU or BSD.</li>
 
-<li>
-<a id="gnubsd"></a>On the other hand, in the years since this article
+<li id="gnubsd">On the other hand, in the years since this article
 was written, the GNU C Library has been ported to several versions of
 the BSD kernel, which made it straightforward to combine the GNU system
 with that kernel.  Just as with GNU/Linux, these are indeed variants of
@@ -249,10 +244,8 @@
 GNU/kNetBSD depending on the kernel of the system.  Ordinary users on
 typical desktops can hardly distinguish between GNU/Linux and
 GNU/*BSD.</li>
-
 </ol>
 </div>
-</div>
 
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
@@ -301,7 +294,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. 
Stallman</p>
+<p>Copyright &copy; 1997-2002, 2005, 2008, 2019, 2021 Richard Stallman</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -311,10 +304,10 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/04/07 18:31:13 $
+$Date: 2021/08/30 14:04:42 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: gnu/po/linux-and-gnu.ru-en.html
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.ru-en.html,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- gnu/po/linux-and-gnu.ru-en.html     8 Apr 2021 11:34:36 -0000       1.42
+++ gnu/po/linux-and-gnu.ru-en.html     30 Aug 2021 14:04:42 -0000      1.43
@@ -1,36 +1,36 @@
-<!--#include virtual="/server/html5-header.html" -->
+<!--#include virtual="/server/header.html" -->
 <!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
 <title>Linux and GNU
 - GNU Project - Free Software Foundation</title>
 <meta http-equiv="Keywords" content="GNU, FSF, Free Software Foundation, 
Linux, Emacs, GCC, Unix, Free Software, Operating System, GNU Kernel, HURD, GNU 
HURD, Hurd" />
 <meta http-equiv="Description" content="Since 1983, developing the free Unix 
style operating system GNU, so that computer users can have the freedom to 
share and improve the software they use." />
 <!--#include virtual="/gnu/po/linux-and-gnu.translist" -->
 <!--#include virtual="/server/banner.html" -->
-<h2 class="c">Linux and the GNU System</h2>
+<div class="article reduced-width">
+<h2>Linux and the GNU System</h2>
 
-<address class="byline c">by <a
+<address class="byline">by <a
 href="https://www.stallman.org/";>Richard Stallman</a></address>
 
-<div class="reduced-width">
-<hr class="no-display" />
-<div class="announcement">
-<p>For more information see also
-the <a href="/gnu/gnu-linux-faq.html">GNU/Linux FAQ</a>,
-and <a href="/gnu/why-gnu-linux.html">Why GNU/Linux?</a></p>
-</div>
-<hr class="thin" />
-
-<div class="article">
 <p>
 Many computer users run a modified version of
 <a href="/philosophy/categories.html#TheGNUsystem">the GNU system</a>
 every day, without realizing it.  Through a peculiar turn of events,
 the version of GNU which is widely used today is often called
-&ldquo;Linux&rdquo;, and many of its users
+&ldquo;Linux,&rdquo; and many of its users
 are <a href="/gnu/gnu-users-never-heard-of-gnu.html"> not aware</a>
 that it is basically the GNU system, developed by the
 <a href="/gnu/gnu-history.html">GNU Project</a>.</p>
 
+<div class="announcement comment" role="complementary">
+<hr class="no-display" />
+<p>For more information see also
+the <a href="/gnu/gnu-linux-faq.html">GNU/Linux FAQ</a>,
+and <a href="/gnu/why-gnu-linux.html">Why GNU/Linux?</a></p>
+<hr class="no-display" />
+</div>
+
 <p>
 There really is a Linux, and these people are using it, but it is just
 a part of the system they use.  Linux is the kernel: the program in
@@ -46,7 +46,7 @@
 <p>
 Many users do not understand the difference between the kernel, which
 is Linux, and the whole system, which they also call
-&ldquo;Linux&rdquo;.  The ambiguous use of the name doesn't help
+&ldquo;Linux.&rdquo;  The ambiguous use of the name doesn't help
 people understand.  These users often think that Linus Torvalds
 developed the whole operating system in 1991, with a bit of help.</p>
 
@@ -83,7 +83,7 @@
 <p>
 If we tried to measure the GNU Project's contribution in this way,
 what would we conclude?  One CD-ROM vendor found that in their &ldquo;Linux
-distribution&rdquo;, <a href="/philosophy/categories.html#GNUsoftware">GNU
+distribution,&rdquo; <a href="/philosophy/categories.html#GNUsoftware">GNU
 software</a> was the largest single contingent, around 28% of the
 total source code, and this included some of the essential major
 components without which there could be no system.  Linux itself was
@@ -91,7 +91,7 @@
 repository of gNewSense, Linux is 1.5% and GNU packages are 15%.)
 So if you were going to pick a name for the system based on
 who wrote the programs in the system, the most appropriate single
-choice would be &ldquo;GNU&rdquo;.</p>
+choice would be &ldquo;GNU.&rdquo;</p>
 
 <p>
 But that is not the deepest way to consider the question.  The GNU
@@ -130,7 +130,7 @@
 Fortunately, we didn't have to wait for the Hurd, because of Linux.
 Once Torvalds freed Linux in 1992, it fit into the last major gap in
 the GNU system.  People could
-then <a 
href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01";>
+then <a 
href="https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01";>
 combine Linux with the GNU system</a> to make a complete free system
 &mdash; a version of the GNU system which also contained Linux.  The
 GNU/Linux system, in other words.</p>
@@ -148,7 +148,7 @@
 
 <p>
 The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU
-system.  The <a href="http://fsf.org/";>FSF</a> funded the rewriting of
+system.  The <a href="https://fsf.org/";>FSF</a> funded the rewriting of
 the Linux-related extensions to the GNU C library, so that now they
 are well integrated, and the newest GNU/Linux systems use the current
 library release with no changes.  The FSF also funded an early stage
@@ -171,7 +171,7 @@
 be loaded into I/O devices when the system starts, and they are
 included, as long series of numbers, in the "source code" of Linux.
 Thus, maintaining free GNU/Linux distributions now entails maintaining
-a <a href="http://directory.fsf.org/project/linux";> free version of
+a <a href="https://directory.fsf.org/project/linux";> free version of
 Linux</a> too.</p>
 
 <p>Whether you use GNU/Linux or not, please don't confuse the public
@@ -179,14 +179,14 @@
 kernel, one of the essential major components of the system.  The
 system as a whole is basically the GNU system, with Linux added.  When
 you're talking about this combination, please call it
-&ldquo;GNU/Linux&rdquo;.</p>
+&ldquo;GNU/Linux.&rdquo;</p>
 
 <p>
 If you want to make a link on &ldquo;GNU/Linux&rdquo; for further
 reference, this page and <a href="/gnu/the-gnu-project.html">
-http://www.gnu.org/gnu/the-gnu-project.html</a> are good choices.  If
+https://www.gnu.org/gnu/the-gnu-project.html</a> are good choices.  If
 you mention Linux, the kernel, and want to add a link for further
-reference, <a href="http://foldoc.org/linux";>http://foldoc.org/linux</a> 
+reference, <a href="https://foldoc.org/linux";>https://foldoc.org/linux</a> 
 is a good URL to use.</p>
 <div class="column-limit"></div>
 
@@ -213,35 +213,30 @@
 href="#gnubsd">(5)</a></p>
 <div class="column-limit"></div>
 
-<h3 class="footnote">Notes</h3>
+<h3 class="footnote">Footnotes</h3>
 <ol>
-<li>
-<a id="unexciting"></a>These unexciting but essential components
+<li id="unexciting">These unexciting but essential components
 include the GNU assembler (GAS) and the linker (GLD), both
 are now part of the <a href="/software/binutils/">GNU Binutils</a>
 package, <a href="/software/tar/">GNU tar</a>, and many more.</li>
 
-<li>
-<a id="nottools"></a>For instance, The Bourne Again SHell (BASH),
+<li id="nottools">For instance, The Bourne Again SHell (BASH),
 the PostScript interpreter
 <a href="/software/ghostscript/ghostscript.html">Ghostscript</a>, and the
 <a href="/software/libc/libc.html">GNU C library</a> are not
 programming tools.  Neither are GNUCash, GNOME, and GNU Chess.</li>
 
-<li>
-<a id="somecomponents"></a>For instance, the
+<li id="somecomponents">For instance, the
 <a href="/software/libc/libc.html">GNU C library</a>.</li>
 
-<li>
-<a id="newersystems"></a>Since that was written, a nearly-all-free
+<li id="newersystems">Since that was written, a nearly-all-free
 Windows-like system has been developed, but technically it is not at
 all like GNU or Unix, so it doesn't really affect this issue.  Most of
 the kernel of Solaris has been made free, but if you wanted to make a
 free system out of that, aside from replacing the missing parts of the
 kernel, you would also need to put it into GNU or BSD.</li>
 
-<li>
-<a id="gnubsd"></a>On the other hand, in the years since this article
+<li id="gnubsd">On the other hand, in the years since this article
 was written, the GNU C Library has been ported to several versions of
 the BSD kernel, which made it straightforward to combine the GNU system
 with that kernel.  Just as with GNU/Linux, these are indeed variants of
@@ -249,10 +244,8 @@
 GNU/kNetBSD depending on the kernel of the system.  Ordinary users on
 typical desktops can hardly distinguish between GNU/Linux and
 GNU/*BSD.</li>
-
 </ol>
 </div>
-</div>
 
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
@@ -301,7 +294,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. 
Stallman</p>
+<p>Copyright &copy; 1997-2002, 2005, 2008, 2019, 2021 Richard Stallman</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -311,10 +304,10 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/04/08 11:34:36 $
+$Date: 2021/08/30 14:04:42 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: gnu/po/linux-and-gnu.ru.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.ru.po,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- gnu/po/linux-and-gnu.ru.po  30 Aug 2021 13:51:54 -0000      1.73
+++ gnu/po/linux-and-gnu.ru.po  30 Aug 2021 14:04:42 -0000      1.74
@@ -17,7 +17,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2021-08-30 13:26+0000\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>
@@ -56,22 +55,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <div><p>
-# | Many computer users run a modified version of <a
-# | href=\"/philosophy/categories.html#TheGNUsystem\">the GNU system</a> every
-# | day, without realizing it.  Through a peculiar turn of events, the version
-# | of GNU which is widely used today is often called [-&ldquo;Linux&rdquo;,-]
-# | {+&ldquo;Linux,&rdquo;+} and many of its users are <a
-# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not aware</a> that it is
-# | basically the GNU system, developed by the <a
-# | href=\"/gnu/gnu-history.html\">GNU Project</a>.
-#| msgid ""
-#| "Many computer users run a modified version of <a href=\"/philosophy/"
-#| "categories.html#TheGNUsystem\">the GNU system</a> every day, without "
-#| "realizing it.  Through a peculiar turn of events, the version of GNU "
-#| "which is widely used today is often called &ldquo;Linux&rdquo;, and many "
-#| "of its users are <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not "
-#| "aware</a> that it is basically the GNU system, developed by the <a href="
-#| "\"/gnu/gnu-history.html\">GNU Project</a>."
 msgid ""
 "Many computer users run a modified version of <a href=\"/philosophy/"
 "categories.html#TheGNUsystem\">the GNU system</a> every day, without "
@@ -124,17 +107,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <div><p>
-# | Many users do not understand the difference between the kernel, which is
-# | Linux, and the whole system, which they also call [-&ldquo;Linux&rdquo;.-]
-# | {+&ldquo;Linux.&rdquo;+} The ambiguous use of the name doesn't help people
-# | understand.  These users often think that Linus Torvalds developed the
-# | whole operating system in 1991, with a bit of help.
-#| msgid ""
-#| "Many users do not understand the difference between the kernel, which is "
-#| "Linux, and the whole system, which they also call &ldquo;Linux&rdquo;.  "
-#| "The ambiguous use of the name doesn't help people understand.  These "
-#| "users often think that Linus Torvalds developed the whole operating "
-#| "system in 1991, with a bit of help."
 msgid ""
 "Many users do not understand the difference between the kernel, which is "
 "Linux, and the whole system, which they also call &ldquo;Linux.&rdquo; The "
@@ -209,29 +181,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <div><p>
-# | If we tried to measure the GNU Project's contribution in this way, what
-# | would we conclude? One CD-ROM vendor found that in their &ldquo;Linux
-# | [-distribution&rdquo;,-] {+distribution,&rdquo;+} <a
-# | href=\"/philosophy/categories.html#GNUsoftware\">GNU software</a> was the
-# | largest single contingent, around 28% of the total source code, and this
-# | included some of the essential major components without which there could
-# | be no system.  Linux itself was about 3%.  (The proportions in 2008 are
-# | similar: in the &ldquo;main&rdquo; repository of gNewSense, Linux is 1.5%
-# | and GNU packages are 15%.)  So if you were going to pick a name for the
-# | system based on who wrote the programs in the system, the most appropriate
-# | single choice would be [-&ldquo;GNU&rdquo;.-] {+&ldquo;GNU.&rdquo;+}
-#| msgid ""
-#| "If we tried to measure the GNU Project's contribution in this way, what "
-#| "would we conclude? One CD-ROM vendor found that in their &ldquo;Linux "
-#| "distribution&rdquo;, <a href=\"/philosophy/categories.html#GNUsoftware"
-#| "\">GNU software</a> was the largest single contingent, around 28% of the "
-#| "total source code, and this included some of the essential major "
-#| "components without which there could be no system.  Linux itself was "
-#| "about 3%.  (The proportions in 2008 are similar: in the &ldquo;"
-#| "main&rdquo; repository of gNewSense, Linux is 1.5% and GNU packages are "
-#| "15%.)  So if you were going to pick a name for the system based on who "
-#| "wrote the programs in the system, the most appropriate single choice "
-#| "would be &ldquo;GNU&rdquo;."
 msgid ""
 "If we tried to measure the GNU Project's contribution in this way, what "
 "would we conclude? One CD-ROM vendor found that in their &ldquo;Linux "
@@ -321,21 +270,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <div><p>
-# | Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once
-# | Torvalds freed Linux in 1992, it fit into the last major gap in the GNU
-# | system.  People could then <a
-# | 
href=\"http{+s+}://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\">
-# | combine Linux with the GNU system</a> to make a complete free system
-# | &mdash; a version of the GNU system which also contained Linux.  The
-# | GNU/Linux system, in other words.
-#| msgid ""
-#| "Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once "
-#| "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
-#| "system.  People could then <a href=\"http://ftp.funet.fi/pub/linux/";
-#| "historical/kernel/old-versions/RELNOTES-0.01\"> combine Linux with the "
-#| "GNU system</a> to make a complete free system &mdash; a version of the "
-#| "GNU system which also contained Linux.  The GNU/Linux system, in other "
-#| "words."
 msgid ""
 "Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once "
 "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
@@ -376,19 +310,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <div><p>
-# | The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU
-# | system.  The <a href=\"http{+s+}://fsf.org/\">FSF</a> funded the rewriting
-# | of the Linux-related extensions to the GNU C library, so that now they are
-# | well integrated, and the newest GNU/Linux systems use the current library
-# | release with no changes.  The FSF also funded an early stage of the
-# | development of Debian GNU/Linux.
-#| msgid ""
-#| "The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU "
-#| "system.  The <a href=\"http://fsf.org/\";>FSF</a> funded the rewriting of "
-#| "the Linux-related extensions to the GNU C library, so that now they are "
-#| "well integrated, and the newest GNU/Linux systems use the current library "
-#| "release with no changes.  The FSF also funded an early stage of the "
-#| "development of Debian GNU/Linux."
 msgid ""
 "The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU "
 "system.  The <a href=\"https://fsf.org/\";>FSF</a> funded the rewriting of "
@@ -428,22 +349,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <div><p>
-# | Making a free GNU/Linux distribution is not just a matter of eliminating
-# | various nonfree programs.  Nowadays, the usual version of Linux contains
-# | nonfree programs too.  These programs are intended to be loaded into I/O
-# | devices when the system starts, and they are included, as long series of
-# | numbers, in the \"source code\" of Linux.  Thus, maintaining free
-# | GNU/Linux distributions now entails maintaining a <a
-# | href=\"http{+s+}://directory.fsf.org/project/linux\"> free version of
-# | Linux</a> too.
-#| msgid ""
-#| "Making a free GNU/Linux distribution is not just a matter of eliminating "
-#| "various nonfree programs.  Nowadays, the usual version of Linux contains "
-#| "nonfree programs too.  These programs are intended to be loaded into I/O "
-#| "devices when the system starts, and they are included, as long series of "
-#| "numbers, in the \"source code\" of Linux.  Thus, maintaining free GNU/"
-#| "Linux distributions now entails maintaining a <a href=\"http://directory.";
-#| "fsf.org/project/linux\"> free version of Linux</a> too."
 msgid ""
 "Making a free GNU/Linux distribution is not just a matter of eliminating "
 "various nonfree programs.  Nowadays, the usual version of Linux contains "
@@ -464,18 +369,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <div><p>
-# | Whether you use GNU/Linux or not, please don't confuse the public by using
-# | the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one of the
-# | essential major components of the system.  The system as a whole is
-# | basically the GNU system, with Linux added.  When you're talking about
-# | this combination, please call it [-&ldquo;GNU/Linux&rdquo;.-]
-# | {+&ldquo;GNU/Linux.&rdquo;+}
-#| msgid ""
-#| "Whether you use GNU/Linux or not, please don't confuse the public by "
-#| "using the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one "
-#| "of the essential major components of the system.  The system as a whole "
-#| "is basically the GNU system, with Linux added.  When you're talking about "
-#| "this combination, please call it &ldquo;GNU/Linux&rdquo;."
 msgid ""
 "Whether you use GNU/Linux or not, please don't confuse the public by using "
 "the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one of the "
@@ -492,21 +385,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <div><p>
-# | If you want to make a link on &ldquo;GNU/Linux&rdquo; for further
-# | reference, this page and <a href=\"/gnu/the-gnu-project.html\">
-# | http{+s+}://www.gnu.org/gnu/the-gnu-project.html</a> are good choices.  If
-# | you mention Linux, the kernel, and want to add a link for further
-# | reference, <a
-# | [-href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a>-]
-# | {+href=\"https://foldoc.org/linux\";>https://foldoc.org/linux</a>+} is a
-# | good URL to use.
-#| msgid ""
-#| "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further "
-#| "reference, this page and <a href=\"/gnu/the-gnu-project.html\"> http://";
-#| "www.gnu.org/gnu/the-gnu-project.html</a> are good choices.  If you "
-#| "mention Linux, the kernel, and want to add a link for further reference, "
-#| "<a href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a> is a good "
-#| "URL to use."
 msgid ""
 "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further reference, "
 "this page and <a href=\"/gnu/the-gnu-project.html\"> https://www.gnu.org/gnu/";
@@ -573,79 +451,38 @@
 
 # type: Content of: <ol><li>
 #. type: Content of: <div><ol><li>
-# | [-<a id=\"unexciting\"></a>These-]{+These+} unexciting but essential
-# | components include the GNU assembler (GAS) and the linker (GLD), both are
-# | now part of the <a href=\"/software/binutils/\">GNU Binutils</a> package,
-# | <a href=\"/software/tar/\">GNU tar</a>, and many more.
-#| msgid ""
-#| "<a id=\"unexciting\"></a>These unexciting but essential components "
-#| "include the GNU assembler (GAS) and the linker (GLD), both are now part "
-#| "of the <a href=\"/software/binutils/\">GNU Binutils</a> package, <a href="
-#| "\"/software/tar/\">GNU tar</a>, and many more."
 msgid ""
 "These unexciting but essential components include the GNU assembler (GAS) "
 "and the linker (GLD), both are now part of the <a href=\"/software/binutils/"
 "\">GNU Binutils</a> package, <a href=\"/software/tar/\">GNU tar</a>, and "
 "many more."
 msgstr ""
-"Эти не впечатляющие, но существенные 
компоненты "
-"включают ассемблер (GAS) и редактор связей 
(GLD), которые сейчас оба входят "
-"в пакет <a href=\"/software/binutils/\">GNU Binutils</a>, <a href=\"/"
-"software/tar/\">GNU tar</a>, и другие."
+"Эти не впечатляющие, но существенные 
компоненты включают ассемблер (GAS) и "
+"редактор связей (GLD), которые сейчас оба вх
одят в пакет <a href=\"/software/"
+"binutils/\">GNU Binutils</a>, <a href=\"/software/tar/\">GNU tar</a>, и "
+"другие."
 
 # type: Content of: <ol><li>
 #. type: Content of: <div><ol><li>
-# | [-<a id=\"nottools\"></a>For-]{+For+} instance, The Bourne Again SHell
-# | (BASH), the PostScript interpreter <a
-# | href=\"/software/ghostscript/ghostscript.html\">Ghostscript</a>, and the
-# | <a href=\"/software/libc/libc.html\">GNU C library</a> are not programming
-# | tools.  Neither are GNUCash, GNOME, and GNU Chess.
-#| msgid ""
-#| "<a id=\"nottools\"></a>For instance, The Bourne Again SHell (BASH), the "
-#| "PostScript interpreter <a href=\"/software/ghostscript/ghostscript.html"
-#| "\">Ghostscript</a>, and the <a href=\"/software/libc/libc.html\">GNU C "
-#| "library</a> are not programming tools.  Neither are GNUCash, GNOME, and "
-#| "GNU Chess."
 msgid ""
 "For instance, The Bourne Again SHell (BASH), the PostScript interpreter <a "
 "href=\"/software/ghostscript/ghostscript.html\">Ghostscript</a>, and the <a "
 "href=\"/software/libc/libc.html\">GNU C library</a> are not programming "
 "tools.  Neither are GNUCash, GNOME, and GNU Chess."
 msgstr ""
-"Например, Bourne Again SHell (BASH), интерпретатор "
-"языка PostScript <a href=\"/software/ghostscript/ghostscript.html"
-"\">Ghostscript</a> и <a 
href=\"/software/libc/libc.html\">библиотека C GNU</"
-"a> не являются средствами 
программирования. Так же, как и GNUCash, GNOME и "
-"GNU Chess."
+"Например, Bourne Again SHell (BASH), интерпретатор 
языка PostScript <a href="
+"\"/software/ghostscript/ghostscript.html\">Ghostscript</a> и <a href=\"/"
+"software/libc/libc.html\">библиотека C GNU</a> не 
являются средствами "
+"программирования. Так же, как и GNUCash, GNOME и 
GNU Chess."
 
 # type: Content of: <ol><li>
 #. type: Content of: <div><ol><li>
-# | [-<a id=\"somecomponents\"></a>For-]{+For+} instance, the <a
-# | href=\"/software/libc/libc.html\">GNU C library</a>.
-#| msgid ""
-#| "<a id=\"somecomponents\"></a>For instance, the <a href=\"/software/libc/"
-#| "libc.html\">GNU C library</a>."
 msgid ""
 "For instance, the <a href=\"/software/libc/libc.html\">GNU C library</a>."
-msgstr ""
-"Например, <a href=\"/software/libc/libc.html"
-"\">библиотека C GNU</a>."
+msgstr "Например, <a 
href=\"/software/libc/libc.html\">библиотека C GNU</a>."
 
 # type: Content of: <ol><li>
 #. type: Content of: <div><ol><li>
-# | [-<a id=\"newersystems\"></a>Since-]{+Since+} that was written, a
-# | nearly-all-free Windows-like system has been developed, but technically it
-# | is not at all like GNU or Unix, so it doesn't really affect this issue. 
-# | Most of the kernel of Solaris has been made free, but if you wanted to
-# | make a free system out of that, aside from replacing the missing parts of
-# | the kernel, you would also need to put it into GNU or BSD.
-#| msgid ""
-#| "<a id=\"newersystems\"></a>Since that was written, a nearly-all-free "
-#| "Windows-like system has been developed, but technically it is not at all "
-#| "like GNU or Unix, so it doesn't really affect this issue.  Most of the "
-#| "kernel of Solaris has been made free, but if you wanted to make a free "
-#| "system out of that, aside from replacing the missing parts of the kernel, "
-#| "you would also need to put it into GNU or BSD."
 msgid ""
 "Since that was written, a nearly-all-free Windows-like system has been "
 "developed, but technically it is not at all like GNU or Unix, so it doesn't "
@@ -654,31 +491,15 @@
 "the missing parts of the kernel, you would also need to put it into GNU or "
 "BSD."
 msgstr ""
-"С тех пор, как были написаны эти строки, 
была "
-"разработана почти полностью свободная 
операционная система, подобная "
-"Windows, но с технической точки зрения она 
совсем не сходна с GNU или Unix, "
-"так что на самом деле это к делу не 
относится. Ядро Solaris по большей части "
-"сделали свободным, но если бы вы захотели 
сделать из этого свободную "
-"систему, кроме замены недостающих частей 
ядра, вам потребовалось бы также "
-"обратить ее в GNU или BSD."
+"С тех пор, как были написаны эти строки, 
была разработана почти полностью "
+"свободная операционная система, подобная 
Windows, но с технической точки "
+"зрения она совсем не сходна с GNU или Unix, так 
что на самом деле это к делу "
+"не относится. Ядро Solaris по большей части 
сделали свободным, но если бы вы "
+"захотели сделать из этого свободную 
систему, кроме замены недостающих частей "
+"ядра, вам потребовалось бы также обратить 
ее в GNU или BSD."
 
 # type: Content of: <ol><li>
 #. type: Content of: <div><ol><li>
-# | [-<a id=\"gnubsd\"></a>On-]{+On+} the other hand, in the years since this
-# | article was written, the GNU C Library has been ported to several versions
-# | of the BSD kernel, which made it straightforward to combine the GNU system
-# | with that kernel.  Just as with GNU/Linux, these are indeed variants of
-# | GNU, and are therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD
-# | depending on the kernel of the system.  Ordinary users on typical desktops
-# | can hardly distinguish between GNU/Linux and GNU/*BSD.
-#| msgid ""
-#| "<a id=\"gnubsd\"></a>On the other hand, in the years since this article "
-#| "was written, the GNU C Library has been ported to several versions of the "
-#| "BSD kernel, which made it straightforward to combine the GNU system with "
-#| "that kernel.  Just as with GNU/Linux, these are indeed variants of GNU, "
-#| "and are therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD "
-#| "depending on the kernel of the system.  Ordinary users on typical "
-#| "desktops can hardly distinguish between GNU/Linux and GNU/*BSD."
 msgid ""
 "On the other hand, in the years since this article was written, the GNU C "
 "Library has been ported to several versions of the BSD kernel, which made it "
@@ -688,13 +509,12 @@
 "system.  Ordinary users on typical desktops can hardly distinguish between "
 "GNU/Linux and GNU/*BSD."
 msgstr ""
-"С другой стороны, за годы, прошедшие со 
времени "
-"написания этой статьи, библиотека C GNU была 
перенесена на несколько версий "
-"ядра BSD, что позволило прямо соединять 
систему GNU с этим ядром. Точно так "
-"же, как в случае с GNU/Linux, это действительно 
варианты GNU и потому "
-"называются GNU/kFreeBSD и GNU/kNetBSD, в зависимости 
от ядра системы. "
-"Обычные пользователи типичных настольных 
компьютеров с трудом могут отличить "
-"GNU/Linux от GNU/*BSD."
+"С другой стороны, за годы, прошедшие со 
времени написания этой статьи, "
+"библиотека C GNU была перенесена на 
несколько версий ядра BSD, что позволило "
+"прямо соединять систему GNU с этим ядром. 
Точно так же, как в случае с GNU/"
+"Linux, это действительно варианты GNU и потому 
называются GNU/kFreeBSD и GNU/"
+"kNetBSD, в зависимости от ядра системы. 
Обычные пользователи типичных "
+"настольных компьютеров с трудом могут 
отличить GNU/Linux от GNU/*BSD."
 
 # type: Content of: <div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -705,10 +525,10 @@
 "Linux 0.01 сказано: &ldquo;Большинство из 
инструментов, применяемых с linux, "
 "являются программами GNU и 
распространяются по авторскому леву GNU. Эти 
"
 "инструменты не входят в 
дистрибутив&nbsp;&mdash; подробности 
запрашивайте у "
-"меня (или в GNU)&rdquo;. (<a 
href=\"https://ftp.funet.fi/pub/linux/historical/";
-"kernel/old-versions/RELNOTES-0.01\">Most of the tools used with linux are "
-"GNU software and are under the GNU copyleft. These tools aren't in the "
-"distribution - ask me (or GNU) for more info</a>).</li></ol>"
+"меня (или в GNU)&rdquo;. (<a href=\"https://ftp.funet.fi/pub/linux/";
+"historical/kernel/old-versions/RELNOTES-0.01\">Most of the tools used with "
+"linux are GNU software and are under the GNU copyleft. These tools aren't in "
+"the distribution - ask me (or GNU) for more info</a>).</li></ol>"
 
 #. type: Content of: <div><div><p>
 msgid ""
@@ -749,17 +569,11 @@
 "translations.html\">&ldquo;Руководстве по 
переводам&rdquo;</a>."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; 1997-2002, [-2007, 2014-2017,-] {+2005, 2008,+} 2019,
-# | 2021 Richard [-M.-] Stallman
-#| msgid ""
-#| "Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. "
-#| "Stallman"
 msgid "Copyright &copy; 1997-2002, 2005, 2008, 2019, 2021 Richard Stallman"
 msgstr ""
-"Copyright &copy; 1997-2002, 2005, 2008, 2019, 2021 Richard "
-"Stallman<br />Copyright &copy; 1999 Сергей Короп (translation)<br 
/"
-">Copyright &copy; 2010, 2019, 2021 Free "
-"Software Foundation, Inc. (translation)"
+"Copyright &copy; 1997-2002, 2005, 2008, 2019, 2021 Richard Stallman<br /"
+">Copyright &copy; 1999 Сергей Короп (translation)<br />Copyright 
&copy; "
+"2010, 2019, 2021 Free Software Foundation, Inc. (translation)"
 
 #. type: Content of: <div><p>
 msgid ""

Index: gnu/po/why-gnu-linux.fr-en.html
===================================================================
RCS file: /web/www/www/gnu/po/why-gnu-linux.fr-en.html,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- gnu/po/why-gnu-linux.fr-en.html     7 Apr 2021 18:31:13 -0000       1.40
+++ gnu/po/why-gnu-linux.fr-en.html     30 Aug 2021 14:04:42 -0000      1.41
@@ -1,42 +1,38 @@
-<!--#include virtual="/server/html5-header.html" -->
+<!--#include virtual="/server/header.html" -->
 <!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
 <title>Why GNU/Linux?
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/gnu/po/why-gnu-linux.translist" -->
 <!--#include virtual="/server/banner.html" -->
-<h2 class="c">What's in a Name?</h2>
+<div class="article reduced-width">
+<h2>What's in a Name?</h2>
 
-<address class="byline c">by <a
+<address class="byline">by <a
 href="https://www.stallman.org/";>Richard Stallman</a></address>
 
-<div class="reduced-width">
-<hr class="no-display" />
-<div class="announcement">
-<p>To learn more about this issue, you can read
-our <a href="/gnu/gnu-linux-faq.html">GNU/Linux FAQ</a>, our page on 
-<a href="/gnu/linux-and-gnu.html">Linux and the GNU Project</a>, which gives a 
history of the GNU/Linux system as it relates to this issue of naming, 
-and our page on <a href="/gnu/gnu-users-never-heard-of-gnu.html">GNU
-Users Who Have Never Heard of GNU</a>.</p>
-</div>
-
-<p id="fsfs">This essay is published in 
-<a href="http://shop.fsf.org/product/free-software-free-society/";>
-<cite>Free Software, Free Society: The Selected Essays of Richard 
-M. Stallman</cite></a>.</p>
-<hr class="thin" />
-
-<div class="article">
 <p>
 Names convey meanings; our choice of names determines the meaning of
 what we say.  An inappropriate name gives people the wrong idea.  A
 rose by any other name would smell as sweet&mdash;but if you call it a pen,
 people will be rather disappointed when they try to write with it.
-And if you call pens &ldquo;roses&rdquo;, people may not realize what
+And if you call pens &ldquo;roses,&rdquo; people may not realize what
 they are good for.  If you call our operating system
 Linux, that conveys a mistaken idea of the system's
 origin, history, and purpose.  If you call
 it <a href="/gnu/linux-and-gnu.html">GNU/Linux</a>, that conveys
 (though not in detail) an accurate idea.</p>
+
+<div class="announcement comment" role="complementary">
+<hr class="no-display" />
+<p>To learn more about this issue, you can read
+our <a href="/gnu/gnu-linux-faq.html">GNU/Linux FAQ</a>, our page on 
+<a href="/gnu/linux-and-gnu.html">Linux and the GNU System</a>, which gives a 
history of the GNU/Linux system as it relates to this issue of naming, 
+and our page on <a href="/gnu/gnu-users-never-heard-of-gnu.html">GNU
+Users Who Have Never Heard of GNU</a>.</p>
+<hr class="no-display" />
+</div>
+
 <p>
 Does this really matter for our community?  Is it important whether people
 know the system's origin, history, and purpose?  Yes&mdash;because people
@@ -86,7 +82,7 @@
 Most of them do not clearly identify the nonfree
 packages in their distributions.  Many even develop nonfree software
 and add it to the system.  Some outrageously advertise
-&ldquo;Linux&rdquo; systems that are &ldquo;licensed per seat&rdquo;,
+&ldquo;Linux&rdquo; systems that are &ldquo;licensed per seat,&rdquo;
 which give the user as much freedom as Microsoft Windows.</p>
 
 <p>
@@ -98,7 +94,7 @@
 technical, rather than political, decisions.&rdquo; And Caldera's
 <abbr title="Chief Executive Officer">CEO</abbr> openly urged
 users
-to <a href="http://www.zdnet.com/article/stallman-love-is-not-free/";>drop
+to <a href="https://www.zdnet.com/article/stallman-love-is-not-free/";>drop
 the goal of freedom and work instead for the &ldquo;popularity of
 Linux&rdquo;</a>.</p>
 
@@ -176,16 +172,16 @@
 Project can see a direct relationship between themselves and GNU.
 They won't automatically agree with our philosophy, but at least they
 will see a reason to think seriously about it.  In contrast, people
-who consider themselves &ldquo;Linux users&rdquo;, and believe that
+who consider themselves &ldquo;Linux users,&rdquo; and believe that
 the GNU Project &ldquo;developed tools which proved to be useful in
-Linux&rdquo;, typically perceive only an indirect relationship between
+Linux,&rdquo; typically perceive only an indirect relationship between
 GNU and themselves.  They may just ignore the GNU philosophy when they
 come across it.</p>
 
 <p>
 The GNU Project is idealistic, and anyone encouraging idealism today
 faces a great obstacle: the prevailing ideology encourages people to
-dismiss idealism as &ldquo;impractical&rdquo;.  Our idealism has been
+dismiss idealism as &ldquo;impractical.&rdquo;  Our idealism has been
 extremely practical: it is the reason we have a
 free <a href="/gnu/linux-and-gnu.html">GNU/Linux</a> operating system.
 People who love this system ought to know that it is our idealism made
@@ -198,7 +194,12 @@
 that needs to be done, we need to be recognized for what we have
 already done.  Please help us, by calling the operating
 system <a href="/gnu/linux-and-gnu.html">GNU/Linux</a>.</p>
-</div>
+
+<hr class="no-display" />
+<div class="edu-note c"><p id="fsfs">This essay is published in
+<a href="https://shop.fsf.org/product/free-software-free-society/";><cite>Free
+Software, Free Society: The Selected Essays of Richard
+M. Stallman</cite></a>.</p></div>
 </div>
 
 </div><!-- for id="content", starts in the include above -->
@@ -248,7 +249,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard 
Stallman</p>
+<p>Copyright &copy; 2000, 2007, 2021 Richard Stallman</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -258,10 +259,10 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/04/07 18:31:13 $
+$Date: 2021/08/30 14:04:42 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: gnu/po/why-gnu-linux.ru-en.html
===================================================================
RCS file: /web/www/www/gnu/po/why-gnu-linux.ru-en.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- gnu/po/why-gnu-linux.ru-en.html     8 Apr 2021 11:34:36 -0000       1.33
+++ gnu/po/why-gnu-linux.ru-en.html     30 Aug 2021 14:04:42 -0000      1.34
@@ -1,42 +1,38 @@
-<!--#include virtual="/server/html5-header.html" -->
+<!--#include virtual="/server/header.html" -->
 <!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
 <title>Why GNU/Linux?
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/gnu/po/why-gnu-linux.translist" -->
 <!--#include virtual="/server/banner.html" -->
-<h2 class="c">What's in a Name?</h2>
+<div class="article reduced-width">
+<h2>What's in a Name?</h2>
 
-<address class="byline c">by <a
+<address class="byline">by <a
 href="https://www.stallman.org/";>Richard Stallman</a></address>
 
-<div class="reduced-width">
-<hr class="no-display" />
-<div class="announcement">
-<p>To learn more about this issue, you can read
-our <a href="/gnu/gnu-linux-faq.html">GNU/Linux FAQ</a>, our page on 
-<a href="/gnu/linux-and-gnu.html">Linux and the GNU Project</a>, which gives a 
history of the GNU/Linux system as it relates to this issue of naming, 
-and our page on <a href="/gnu/gnu-users-never-heard-of-gnu.html">GNU
-Users Who Have Never Heard of GNU</a>.</p>
-</div>
-
-<p id="fsfs">This essay is published in 
-<a href="http://shop.fsf.org/product/free-software-free-society/";>
-<cite>Free Software, Free Society: The Selected Essays of Richard 
-M. Stallman</cite></a>.</p>
-<hr class="thin" />
-
-<div class="article">
 <p>
 Names convey meanings; our choice of names determines the meaning of
 what we say.  An inappropriate name gives people the wrong idea.  A
 rose by any other name would smell as sweet&mdash;but if you call it a pen,
 people will be rather disappointed when they try to write with it.
-And if you call pens &ldquo;roses&rdquo;, people may not realize what
+And if you call pens &ldquo;roses,&rdquo; people may not realize what
 they are good for.  If you call our operating system
 Linux, that conveys a mistaken idea of the system's
 origin, history, and purpose.  If you call
 it <a href="/gnu/linux-and-gnu.html">GNU/Linux</a>, that conveys
 (though not in detail) an accurate idea.</p>
+
+<div class="announcement comment" role="complementary">
+<hr class="no-display" />
+<p>To learn more about this issue, you can read
+our <a href="/gnu/gnu-linux-faq.html">GNU/Linux FAQ</a>, our page on 
+<a href="/gnu/linux-and-gnu.html">Linux and the GNU System</a>, which gives a 
history of the GNU/Linux system as it relates to this issue of naming, 
+and our page on <a href="/gnu/gnu-users-never-heard-of-gnu.html">GNU
+Users Who Have Never Heard of GNU</a>.</p>
+<hr class="no-display" />
+</div>
+
 <p>
 Does this really matter for our community?  Is it important whether people
 know the system's origin, history, and purpose?  Yes&mdash;because people
@@ -86,7 +82,7 @@
 Most of them do not clearly identify the nonfree
 packages in their distributions.  Many even develop nonfree software
 and add it to the system.  Some outrageously advertise
-&ldquo;Linux&rdquo; systems that are &ldquo;licensed per seat&rdquo;,
+&ldquo;Linux&rdquo; systems that are &ldquo;licensed per seat,&rdquo;
 which give the user as much freedom as Microsoft Windows.</p>
 
 <p>
@@ -98,7 +94,7 @@
 technical, rather than political, decisions.&rdquo; And Caldera's
 <abbr title="Chief Executive Officer">CEO</abbr> openly urged
 users
-to <a href="http://www.zdnet.com/article/stallman-love-is-not-free/";>drop
+to <a href="https://www.zdnet.com/article/stallman-love-is-not-free/";>drop
 the goal of freedom and work instead for the &ldquo;popularity of
 Linux&rdquo;</a>.</p>
 
@@ -176,16 +172,16 @@
 Project can see a direct relationship between themselves and GNU.
 They won't automatically agree with our philosophy, but at least they
 will see a reason to think seriously about it.  In contrast, people
-who consider themselves &ldquo;Linux users&rdquo;, and believe that
+who consider themselves &ldquo;Linux users,&rdquo; and believe that
 the GNU Project &ldquo;developed tools which proved to be useful in
-Linux&rdquo;, typically perceive only an indirect relationship between
+Linux,&rdquo; typically perceive only an indirect relationship between
 GNU and themselves.  They may just ignore the GNU philosophy when they
 come across it.</p>
 
 <p>
 The GNU Project is idealistic, and anyone encouraging idealism today
 faces a great obstacle: the prevailing ideology encourages people to
-dismiss idealism as &ldquo;impractical&rdquo;.  Our idealism has been
+dismiss idealism as &ldquo;impractical.&rdquo;  Our idealism has been
 extremely practical: it is the reason we have a
 free <a href="/gnu/linux-and-gnu.html">GNU/Linux</a> operating system.
 People who love this system ought to know that it is our idealism made
@@ -198,7 +194,12 @@
 that needs to be done, we need to be recognized for what we have
 already done.  Please help us, by calling the operating
 system <a href="/gnu/linux-and-gnu.html">GNU/Linux</a>.</p>
-</div>
+
+<hr class="no-display" />
+<div class="edu-note c"><p id="fsfs">This essay is published in
+<a href="https://shop.fsf.org/product/free-software-free-society/";><cite>Free
+Software, Free Society: The Selected Essays of Richard
+M. Stallman</cite></a>.</p></div>
 </div>
 
 </div><!-- for id="content", starts in the include above -->
@@ -248,7 +249,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard 
Stallman</p>
+<p>Copyright &copy; 2000, 2007, 2021 Richard Stallman</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -258,10 +259,10 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/04/08 11:34:36 $
+$Date: 2021/08/30 14:04:42 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: gnu/po/why-gnu-linux.ru.po
===================================================================
RCS file: /web/www/www/gnu/po/why-gnu-linux.ru.po,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- gnu/po/why-gnu-linux.ru.po  30 Aug 2021 13:51:54 -0000      1.46
+++ gnu/po/why-gnu-linux.ru.po  30 Aug 2021 14:04:42 -0000      1.47
@@ -16,7 +16,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2021-08-30 13:26+0000\n"
 "X-Poedit-Language: Russian\n"
 
 # type: Content of: <title>
@@ -37,25 +36,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <div><p>
-# | Names convey meanings; our choice of names determines the meaning of what
-# | we say.  An inappropriate name gives people the wrong idea.  A rose by any
-# | other name would smell as sweet&mdash;but if you call it a pen, people
-# | will be rather disappointed when they try to write with it.  And if you
-# | call pens [-&ldquo;roses&rdquo;,-] {+&ldquo;roses,&rdquo;+} people may not
-# | realize what they are good for.  If you call our operating system Linux,
-# | that conveys a mistaken idea of the system's origin, history, and purpose.
-# |  If you call it <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>, that
-# | conveys (though not in detail) an accurate idea.
-#| msgid ""
-#| "Names convey meanings; our choice of names determines the meaning of what "
-#| "we say.  An inappropriate name gives people the wrong idea.  A rose by "
-#| "any other name would smell as sweet&mdash;but if you call it a pen, "
-#| "people will be rather disappointed when they try to write with it.  And "
-#| "if you call pens &ldquo;roses&rdquo;, people may not realize what they "
-#| "are good for.  If you call our operating system Linux, that conveys a "
-#| "mistaken idea of the system's origin, history, and purpose.  If you call "
-#| "it <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>, that conveys "
-#| "(though not in detail) an accurate idea."
 msgid ""
 "Names convey meanings; our choice of names determines the meaning of what we "
 "say.  An inappropriate name gives people the wrong idea.  A rose by any "
@@ -80,20 +60,6 @@
 
 # type: Content of: <div><blockquote><p>
 #. type: Content of: <div><div><p>
-# | To learn more about this issue, you can read our <a
-# | href=\"/gnu/gnu-linux-faq.html\">GNU/Linux FAQ</a>, our page on <a
-# | href=\"/gnu/linux-and-gnu.html\">Linux and the GNU [-Project</a>,-]
-# | {+System</a>,+} which gives a history of the GNU/Linux system as it
-# | relates to this issue of naming, and our page on <a
-# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never
-# | Heard of GNU</a>.
-#| msgid ""
-#| "To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
-#| "faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu."
-#| "html\">Linux and the GNU Project</a>, which gives a history of the GNU/"
-#| "Linux system as it relates to this issue of naming, and our page on <a "
-#| "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
-#| "Heard of GNU</a>."
 msgid ""
 "To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
 "faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu.html"
@@ -103,11 +69,11 @@
 "a>."
 msgstr ""
 "Чтобы узнать больше об этом вопросе, вы 
можете прочитать наши <a href=\"/gnu/"
-"gnu-linux-faq.html\">Вопросы о GNU/Linux</a>, страницу <a 
href="
-"\"/gnu/linux-and-gnu.html\">Linux и система GNU</a>, на 
которой "
-"приведена история системы GNU/Linux в 
отношении к этой проблеме "
-"наименования, а также <a 
href=\"/gnu/gnu-users-never-heard-of-gnu.html"
-"\">Пользователи GNU, которые никогда не 
слышали о GNU</a>."
+"gnu-linux-faq.html\">Вопросы о GNU/Linux</a>, страницу <a 
href=\"/gnu/linux-"
+"and-gnu.html\">Linux и система GNU</a>, на которой 
приведена история системы "
+"GNU/Linux в отношении к этой проблеме 
наименования, а также <a href=\"/gnu/"
+"gnu-users-never-heard-of-gnu.html\">Пользователи GNU, 
которые никогда не "
+"слышали о GNU</a>."
 
 # type: Content of: <p>
 #. type: Content of: <div><p>
@@ -184,25 +150,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <div><p>
-# | A great challenge to the future of free software comes from the tendency
-# | of the &ldquo;Linux&rdquo; distribution companies to add nonfree software
-# | to <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> in the name of
-# | convenience and power.  All the major commercial distribution developers
-# | do this; none limits itself to free software.  Most of them do not clearly
-# | identify the nonfree packages in their distributions.  Many even develop
-# | nonfree software and add it to the system.  Some outrageously advertise
-# | &ldquo;Linux&rdquo; systems that are &ldquo;licensed per [-seat&rdquo;,-]
-# | {+seat,&rdquo;+} which give the user as much freedom as Microsoft Windows.
-#| msgid ""
-#| "A great challenge to the future of free software comes from the tendency "
-#| "of the &ldquo;Linux&rdquo; distribution companies to add nonfree software "
-#| "to <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> in the name of "
-#| "convenience and power.  All the major commercial distribution developers "
-#| "do this; none limits itself to free software.  Most of them do not "
-#| "clearly identify the nonfree packages in their distributions.  Many even "
-#| "develop nonfree software and add it to the system.  Some outrageously "
-#| "advertise &ldquo;Linux&rdquo; systems that are &ldquo;licensed per "
-#| "seat&rdquo;, which give the user as much freedom as Microsoft Windows."
 msgid ""
 "A great challenge to the future of free software comes from the tendency of "
 "the &ldquo;Linux&rdquo; distribution companies to add nonfree software to <a "
@@ -228,27 +175,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <div><p>
-# | People try to justify adding nonfree software in the name of the
-# | &ldquo;popularity of Linux&rdquo;&mdash;in effect, valuing popularity
-# | above freedom.  Sometimes this is openly admitted.  For instance, Wired
-# | Magazine said that Robert McMillan, editor of Linux Magazine, &ldquo;feels
-# | that the move toward open source software should be fueled by technical,
-# | rather than political, decisions.&rdquo; And Caldera's <abbr title=\"Chief
-# | Executive Officer\">CEO</abbr> openly urged users to <a
-# | href=\"http{+s+}://www.zdnet.com/article/stallman-love-is-not-free/\">drop
-# | the goal of freedom and work instead for the &ldquo;popularity of
-# | Linux&rdquo;</a>.
-#| msgid ""
-#| "People try to justify adding nonfree software in the name of the &ldquo;"
-#| "popularity of Linux&rdquo;&mdash;in effect, valuing popularity above "
-#| "freedom.  Sometimes this is openly admitted.  For instance, Wired "
-#| "Magazine said that Robert McMillan, editor of Linux Magazine, &ldquo;"
-#| "feels that the move toward open source software should be fueled by "
-#| "technical, rather than political, decisions.&rdquo; And Caldera's <abbr "
-#| "title=\"Chief Executive Officer\">CEO</abbr> openly urged users to <a "
-#| "href=\"http://www.zdnet.com/article/stallman-love-is-not-free/\";>drop the "
-#| "goal of freedom and work instead for the &ldquo;popularity of Linux&rdquo;"
-#| "</a>."
 msgid ""
 "People try to justify adding nonfree software in the name of the &ldquo;"
 "popularity of Linux&rdquo;&mdash;in effect, valuing popularity above "
@@ -409,25 +335,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <div><p>
-# | People who know they are using a system that came out of the GNU Project
-# | can see a direct relationship between themselves and GNU.  They won't
-# | automatically agree with our philosophy, but at least they will see a
-# | reason to think seriously about it.  In contrast, people who consider
-# | themselves &ldquo;Linux [-users&rdquo;,-] {+users,&rdquo;+} and believe
-# | that the GNU Project &ldquo;developed tools which proved to be useful in
-# | [-Linux&rdquo;,-] {+Linux,&rdquo;+} typically perceive only an indirect
-# | relationship between GNU and themselves.  They may just ignore the GNU
-# | philosophy when they come across it.
-#| msgid ""
-#| "People who know they are using a system that came out of the GNU Project "
-#| "can see a direct relationship between themselves and GNU.  They won't "
-#| "automatically agree with our philosophy, but at least they will see a "
-#| "reason to think seriously about it.  In contrast, people who consider "
-#| "themselves &ldquo;Linux users&rdquo;, and believe that the GNU Project "
-#| "&ldquo;developed tools which proved to be useful in Linux&rdquo;, "
-#| "typically perceive only an indirect relationship between GNU and "
-#| "themselves.  They may just ignore the GNU philosophy when they come "
-#| "across it."
 msgid ""
 "People who know they are using a system that came out of the GNU Project can "
 "see a direct relationship between themselves and GNU.  They won't "
@@ -449,20 +356,6 @@
 
 # type: Content of: <p>
 #. type: Content of: <div><p>
-# | The GNU Project is idealistic, and anyone encouraging idealism today faces
-# | a great obstacle: the prevailing ideology encourages people to dismiss
-# | idealism as [-&ldquo;impractical&rdquo;.-] {+&ldquo;impractical.&rdquo;+}
-# | Our idealism has been extremely practical: it is the reason we have a free
-# | <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> operating system. 
-# | People who love this system ought to know that it is our idealism made
-# | real.
-#| msgid ""
-#| "The GNU Project is idealistic, and anyone encouraging idealism today "
-#| "faces a great obstacle: the prevailing ideology encourages people to "
-#| "dismiss idealism as &ldquo;impractical&rdquo;.  Our idealism has been "
-#| "extremely practical: it is the reason we have a free <a href=\"/gnu/linux-"
-#| "and-gnu.html\">GNU/Linux</a> operating system.  People who love this "
-#| "system ought to know that it is our idealism made real."
 msgid ""
 "The GNU Project is idealistic, and anyone encouraging idealism today faces a "
 "great obstacle: the prevailing ideology encourages people to dismiss "
@@ -497,11 +390,6 @@
 "linux-and-gnu.html\">&ldquo;GNU/Linux&rdquo;</a>."
 
 #. type: Content of: <div><div><p>
-# || No change detected.  The change might only be in amounts of spaces.
-#| msgid ""
-#| "This essay is published in <a href=\"https://shop.fsf.org/product/free-";
-#| "software-free-society/\"><cite>Free Software, Free Society: The Selected "
-#| "Essays of Richard M. Stallman</cite></a>."
 msgid ""
 "This essay is published in <a href=\"https://shop.fsf.org/product/free-";
 "software-free-society/\"><cite>Free Software, Free Society: The Selected "
@@ -556,15 +444,10 @@
 "translations.html\">&ldquo;Руководстве по 
переводам&rdquo;</a>."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; 2000, [-2006,-] 2007, [-2014-2016, 2020,-] 2021 Richard
-# | Stallman
-#| msgid ""
-#| "Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman"
 msgid "Copyright &copy; 2000, 2007, 2021 Richard Stallman"
 msgstr ""
-"Copyright &copy; 2000, 2007, 2021 Richard "
-"Stallman <br />Copyright &copy; 2010 Vladimir Smolyar (translation)<br /"
-">Copyright &copy; 2010, 2021 Free "
+"Copyright &copy; 2000, 2007, 2021 Richard Stallman <br />Copyright &copy; "
+"2010 Vladimir Smolyar (translation)<br />Copyright &copy; 2010, 2021 Free "
 "Software Foundation, Inc. (translation)"
 
 #. type: Content of: <div><p>

Index: server/gnun/compendia/compendium.ar.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.ar.po,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -b -r1.133 -r1.134
--- server/gnun/compendia/compendium.ar.po      30 Aug 2021 13:34:55 -0000      
1.133
+++ server/gnun/compendia/compendium.ar.po      30 Aug 2021 14:04:42 -0000      
1.134
@@ -131,9 +131,12 @@
 "حقوق النشر:<br />\n"
 "Copyright &copy; 2014 Free Software Foundation, Inc. (مؤسسة البرم
جيات الحرة)"
 
+# | [-Education-]{+Table of+} Contents
 #. type: Content of: <div><div><h3>
+#, fuzzy
+#| msgid "Education Contents"
 msgid "Table of Contents"
-msgstr ""
+msgstr "المحنوى التعليمي"
 
 #. type: Content of: <div><a>
 msgid "<a id=\"side-menu-button\" class=\"switch\" href=\"#navlinks\">"



reply via email to

[Prev in Thread] Current Thread [Next in Thread]