www-commits
[Top][All Lists]
Advanced

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

www/server irc-rules.ar.html irc-rules.de.html ...


From: GNUN
Subject: www/server irc-rules.ar.html irc-rules.de.html ...
Date: Sat, 14 Aug 2021 18:30:25 -0400 (EDT)

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     21/08/14 18:30:25

Modified files:
        server         : irc-rules.ar.html irc-rules.de.html 
        server/po      : irc-rules.ar-diff.html irc-rules.de-diff.html 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/irc-rules.ar.html?cvsroot=www&r1=1.31&r2=1.32
http://web.cvs.savannah.gnu.org/viewcvs/www/server/irc-rules.de.html?cvsroot=www&r1=1.54&r2=1.55
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/irc-rules.ar-diff.html?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/irc-rules.de-diff.html?cvsroot=www&r1=1.1&r2=1.2

Patches:
Index: irc-rules.ar.html
===================================================================
RCS file: /web/www/www/server/irc-rules.ar.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- irc-rules.ar.html   15 Jun 2021 08:29:49 -0000      1.31
+++ irc-rules.ar.html   14 Aug 2021 22:30:24 -0000      1.32
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/server/irc-rules.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/server/po/irc-rules.ar.po">
+ https://www.gnu.org/server/po/irc-rules.ar.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/server/irc-rules.html"
+ --><!--#set var="DIFF_FILE" value="/server/po/irc-rules.ar-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2021-06-15" --><!--#set 
var="ENGLISH_PAGE" value="/server/irc-rules.en.html" -->
 
 <!--#include virtual="/server/header.ar.html" -->
 <!-- Parent-Version: 1.86 -->
@@ -8,6 +13,7 @@
 
 <!--#include virtual="/server/po/irc-rules.translist" -->
 <!--#include virtual="/server/banner.ar.html" -->
+<!--#include virtual="/server/outdated.ar.html" -->
 <h2>قوانين وإرشادات قنوات محادثة غنو 
وإف&#8203;إس&#8203;إف الرئيسية</h2>
 
 <p>توفر آي&#8203;آر&#8203;إس (اختصار Internet Relay Chat) 
وسيلة رائعة للتواصل
@@ -204,7 +210,7 @@
 <p class="unprintable"><!-- timestamp start -->
 حُدّثت:
 
-$Date: 2021/06/15 08:29:49 $
+$Date: 2021/08/14 22:30:24 $
 
 <!-- timestamp end -->
 </p>

Index: irc-rules.de.html
===================================================================
RCS file: /web/www/www/server/irc-rules.de.html,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- irc-rules.de.html   15 Jun 2021 11:29:00 -0000      1.54
+++ irc-rules.de.html   14 Aug 2021 22:30:24 -0000      1.55
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/server/irc-rules.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/server/po/irc-rules.de.po">
+ https://www.gnu.org/server/po/irc-rules.de.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/server/irc-rules.html"
+ --><!--#set var="DIFF_FILE" value="/server/po/irc-rules.de-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2021-06-15" --><!--#set 
var="ENGLISH_PAGE" value="/server/irc-rules.en.html" -->
 
 <!--#include virtual="/server/header.de.html" -->
 <!-- Parent-Version: 1.86 -->
@@ -9,6 +14,7 @@
 
 <!--#include virtual="/server/po/irc-rules.translist" -->
 <!--#include virtual="/server/banner.de.html" -->
+<!--#include virtual="/server/outdated.de.html" -->
 <h2>Grundsätze und Leitlinien für offizielle GNU- und FSF-IRC-Kanäle</h2>
 
 <p><i>Internet Relay Chat</i> (IRC), ein rein textbasiertes-System zur
@@ -244,7 +250,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Letzte Änderung:
 
-$Date: 2021/06/15 11:29:00 $
+$Date: 2021/08/14 22:30:24 $
 
 <!-- timestamp end -->
 </p>

Index: po/irc-rules.ar-diff.html
===================================================================
RCS file: /web/www/www/server/po/irc-rules.ar-diff.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- po/irc-rules.ar-diff.html   8 Jul 2020 17:01:36 -0000       1.12
+++ po/irc-rules.ar-diff.html   14 Aug 2021 22:30:25 -0000      1.13
@@ -11,15 +11,25 @@
 </style></head>
 <body><pre>
 &lt;!--#include virtual="/server/header.html" --&gt;
-&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.77</strong></del></span> <span 
class="inserted"><ins><em>1.86</em></ins></span> --&gt;
+&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.86</strong></del></span> <span 
class="inserted"><ins><em>1.96</em></ins></span> --&gt;
 &lt;title&gt;GNU and FSF related IRC channels
 - GNU Project - Free Software Foundation&lt;/title&gt;
 
 &lt;!--#include virtual="/server/po/irc-rules.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
-
+<span class="inserted"><ins><em>&lt;div 
class="reduced-width"&gt;</em></ins></span>
 &lt;h2&gt;Rules and guidelines for the official GNU and FSF IRC 
channels&lt;/h2&gt;
 
+<span class="inserted"><ins><em>&lt;div class="important"&gt;
+&lt;p&gt;&lt;strong&gt;GNU and FSF move official IRC channels to the 
Libera.Chat
+network effective immediately.&lt;/strong&gt;&lt;/p&gt;
+&lt;p&gt;Please see the
+&lt;a 
href="https://lists.gnu.org/archive/html/info-gnu/2021-06/msg00005.html"&gt;original
+announcement&lt;/a&gt; and the follow-up
+&lt;a 
href="https://lists.gnu.org/archive/html/info-gnu/2021-06/msg00007.html"&gt;update
+announcement&lt;/a&gt; for more details.&lt;/p&gt;
+&lt;/div&gt;</em></ins></span>
+
 &lt;p&gt;IRC (Internet Relay Chat) provides a wonderful resource to connect
 free software users and developers together.  Our channels try to be
 welcoming to both new people and long-time regulars.  These guidelines
@@ -31,37 +41,50 @@
 and talk about free software and other issues which affect the rights
 of computer users, such as Digital Restrictions Management.&lt;/p&gt;
 
-&lt;p&gt;&lt;b&gt;If you have problems with any of these channels, with trolls 
or
+<span class="removed"><del><strong>&lt;p&gt;&lt;b&gt;If you have problems with 
any of these channels, with trolls or
 abusive members, please email us at: &lt;a
-href="mailto:campaigns@fsf.org"&gt;campaigns@fsf.org&lt;/a&gt;.&lt;/b&gt;&lt;/p&gt;
+href="mailto:campaigns@fsf.org"&gt;campaigns@fsf.org&lt;/a&gt;.&lt;/b&gt;&lt;/p&gt;</strong></del></span>
 
 &lt;h3&gt;List of channels&lt;/h3&gt;
+
 &lt;p&gt;This is a list of our channels.&lt;/p&gt;
 &lt;ul&gt;
-&lt;li&gt;&lt;a href="irc://irc.gnu.org/gnu"&gt;#gnu&lt;/a&gt; &mdash;
+&lt;li&gt;&lt;a href="ircs://irc.libera.chat:6697/gnu"&gt;#gnu&lt;/a&gt; 
&mdash;
 the &lt;em&gt;official&lt;/em&gt; GNU Project Channel&lt;/li&gt;
-&lt;li&gt;&lt;a href="irc://irc.gnu.org/gnu-women"&gt;#gnu-women&lt;/a&gt; 
&mdash; a channel for women in GNU and other free software&lt;/li&gt;
-&lt;li&gt;&lt;a href="irc://irc.gnu.org/gnu-es"&gt;#gnu-es&lt;/a&gt; &mdash; 
GNU in Spanish&lt;/li&gt;
-&lt;li&gt;&lt;a href="irc://irc.gnu.org/gnu-mx"&gt;#gnu-mx&lt;/a&gt; &mdash; 
Discussion
-  about GNU Mexico chapter&lt;/li&gt;
-&lt;li&gt;&lt;a href="irc://irc.gnu.org/fsf"&gt;#fsf&lt;/a&gt; &mdash; 
Discussion about the
-&lt;a href="http://www.fsf.org/"&gt;FSF (Free Software Foundation) and 
fsf.org&lt;/a&gt;
+&lt;li&gt;&lt;a 
href="ircs://irc.libera.chat:6697/gnu-women"&gt;#gnu-women&lt;/a&gt;
+&mdash; a channel for women in GNU and other free software&lt;/li&gt;
+&lt;li&gt;&lt;a href="ircs://irc.libera.chat:6697/gnu-es"&gt;#gnu-es&lt;/a&gt; 
&mdash;
+GNU in Spanish&lt;/li&gt;
+&lt;li&gt;&lt;a href="ircs://irc.libera.chat:6697/gnu-mx"&gt;#gnu-mx&lt;/a&gt; 
&mdash;
+Discussion about GNU Mexico chapter&lt;/li&gt;
+&lt;li&gt;&lt;a href="ircs://irc.libera.chat:6697/fsf"&gt;#fsf&lt;/a&gt; 
&mdash;
+Discussion about the &lt;a href="https://www.fsf.org/"&gt;FSF (Free Software
+Foundation) and fsf.org&lt;/a&gt;
 &lt;/li&gt;
-&lt;li&gt;&lt;a href="irc://irc.gnu.org/libreplanet"&gt;#libreplanet&lt;/a&gt; 
&mdash; Discussion of the LibrePlanet website, and &lt;a 
href="http://www.fsf.org/conference/"&gt;conference&lt;/a&gt;.&lt;/li&gt;
-&lt;li&gt;&lt;a href="irc://irc.gnu.org/emacs"&gt;#emacs&lt;/a&gt; &mdash; 
Discussion
-regarding &lt;a href="/software/emacs/"&gt;Emacs&lt;/a&gt;&lt;/li&gt;
-&lt;li&gt;&lt;a href="irc://irc.gnu.org/hurd"&gt;#hurd&lt;/a&gt; &mdash; 
Discussion regarding
-&lt;a href="/software/hurd/"&gt;Hurd&lt;/a&gt;&lt;/li&gt;
-&lt;li&gt;&lt;a href="irc://irc.gnu.org/grub"&gt;#grub&lt;/a&gt; &mdash; for 
the GNU bootloader, &lt;a href="/software/grub/"&gt;GRUB&lt;/a&gt;.&lt;/li&gt;
-&lt;li&gt;&lt;a href="irc://irc.oftc.net/savannah"&gt;#savannah&lt;/a&gt; 
&mdash;
-&lt;a href="http://savannah.gnu.org/"&gt;Savannah.GNU.org&lt;/a&gt; hangout 
channel&lt;/li&gt;
-&lt;li&gt;&lt;a 
href="irc://irc.gnu.org/gnu-webmasters"&gt;#gnu-webmasters&lt;/a&gt; &mdash; The
-&lt;a href="http://www.gnu.org/people/webmeisters.html"&gt;GNU 
Webmasters&lt;/a&gt;
+&lt;li&gt;&lt;a 
href="ircs://irc.libera.chat:6697/libreplanet"&gt;#libreplanet&lt;/a&gt;
+&mdash; Discussion of the LibrePlanet website, and
+&lt;a 
href="https://www.fsf.org/conference/"&gt;conference&lt;/a&gt;.&lt;/li&gt;
+&lt;li&gt;&lt;a href="ircs://irc.libera.chat:6697/emacs"&gt;#emacs&lt;/a&gt; 
&mdash;
+Discussion regarding &lt;a 
href="/software/emacs/"&gt;Emacs&lt;/a&gt;&lt;/li&gt;
+&lt;li&gt;&lt;a href="ircs://irc.libera.chat:6697/hurd"&gt;#hurd&lt;/a&gt; 
&mdash;
+Discussion regarding &lt;a href="/software/hurd/"&gt;Hurd&lt;/a&gt;&lt;/li&gt;
+&lt;li&gt;&lt;a href="ircs://irc.libera.chat:6697/grub"&gt;#grub&lt;/a&gt; 
&mdash; for
+the GNU bootloader, &lt;a href="/software/grub/"&gt;GRUB&lt;/a&gt;&lt;/li&gt;
+&lt;li&gt;&lt;a 
href="ircs://irc.libera.chat:6697/savannah"&gt;#savannah&lt;/a&gt;
+&mdash; GNU and NonGNU &lt;a 
href="https://savannah.gnu.org"&gt;Savannah&lt;/a&gt;
+hangout and support channel&lt;/li&gt;
+&lt;li&gt;&lt;a 
href="ircs://irc.libera.chat:6697/gnu-webmasters"&gt;#gnu-webmasters&lt;/a&gt; 
&mdash; The
+&lt;a href="/people/webmeisters.html"&gt;GNU Webmasters&lt;/a&gt;
 channel, for discussions about www.gnu.org&lt;/li&gt;
-<span class="inserted"><ins><em>&lt;li&gt;&lt;a 
href="irc://irc.gnu.org/erc"&gt;#erc&lt;/a&gt; &mdash; IRC channel about ERC, 
an IRC client for Emacs&lt;/li&gt;
-&lt;li&gt;&lt;a 
href="irc://irc.gnu.org/emacs-beginners"&gt;#emacs-beginners&lt;/a&gt; &mdash; 
IRC channel for helping out Emacs beginners&lt;/li&gt;
-&lt;li&gt;&lt;a href="irc://irc.gnu.org/emacsconf"&gt;#emacsconf&lt;/a&gt; 
&mdash; Discussion about the Emacs Conference&lt;/li&gt;
-&lt;li&gt;&lt;a href="irc://irc.gnu.org/pspp"&gt;#pspp&lt;/a&gt; &mdash; 
Discussion regarding &lt;a 
href="/software/pspp/"&gt;PSPP&lt;/a&gt;&lt;/li&gt;</em></ins></span>
+&lt;li&gt;&lt;a href="ircs://irc.libera.chat:6697/erc"&gt;#erc&lt;/a&gt; 
&mdash; IRC
+channel about ERC, an IRC client built into GNU Emacs&lt;/li&gt;
+&lt;li&gt;&lt;a 
href="ircs://irc.libera.chat:6697/emacs-beginners"&gt;#emacs-beginners&lt;/a&gt;
+&mdash; IRC channel for helping out Emacs beginners&lt;/li&gt;
+&lt;li&gt;&lt;a 
href="ircs://irc.libera.chat:6697/emacsconf"&gt;#emacsconf&lt;/a&gt;
+&mdash; Discussion about the Emacs Conference&lt;/li&gt;
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="ircs://irc.libera.chat:6697/pspp"&gt;#pspp&lt;/a&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="ircs://irc.libera.chat:6697/gnu-librejs"&gt;#librejs&lt;/a&gt;</em></ins></span>
 
+&mdash; Discussion regarding &lt;a <span 
class="removed"><del><strong>href="/software/pspp/"&gt;PSPP&lt;/a&gt;&lt;/li&gt;</strong></del></span>
 <span class="inserted"><ins><em>href="/software/librejs/"&gt;LibreJS&lt;/a&gt; 
+and how to free your JavaScript&lt;/li&gt;</em></ins></span>
 &lt;/ul&gt;
 
 &lt;h3&gt;Channel rules&lt;/h3&gt;
@@ -100,40 +123,60 @@
 instead of trying to blame operators for this, blame the users who are
 not willing to be in our community.&lt;/p&gt;
 
-&lt;hr /&gt;
+&lt;hr <span class="inserted"><ins><em>class="column-limit"</em></ins></span> 
/&gt;
 
 &lt;p&gt;Rules end here, but here are some helpful 
suggestions&hellip;&lt;/p&gt;
 
 &lt;h3&gt;Getting help&lt;/h3&gt;
 
-&lt;p&gt;Speak to one of the operators.  If an operator is unable to help
-you immediately, please be patient.  Ask other members of the channel
-for help and contact details for the operator.&lt;/p&gt;
-
-&lt;p&gt;You can find a list of operators by typing <span 
class="removed"><del><strong>&lt;tt&gt;/msg</strong></del></span> <span 
class="inserted"><ins><em>&lt;code&gt;/msg</em></ins></span> chanserv access
-#gnu <span class="removed"><del><strong>list&lt;/tt&gt;</strong></del></span> 
<span class="inserted"><ins><em>list&lt;/code&gt;</em></ins></span> (where #gnu 
is the channel you are interested in).&lt;/p&gt;
-
-&lt;h3&gt;Freenode guidelines&lt;/h3&gt;
-
-&lt;p&gt;Freenode also
-maintains &lt;a <span 
class="removed"><del><strong>href="http://freenode.net/channel_guidelines.shtml"&gt;a</strong></del></span>
 <span 
class="inserted"><ins><em>href="http://freenode.net/changuide"&gt;a</em></ins></span>
-list of channel guidelines&lt;/a&gt; which you should also consider.
-Certain discussions such as GNU vs BSD, vi
-vs &lt;a href="/software/emacs/"&gt;Emacs&lt;/a&gt; are often healthy to free
-software discussion and we encourage healthy debate.&lt;/p&gt;
+<span class="removed"><del><strong>&lt;p&gt;Speak</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;p&gt;
+If you had any problem with trolls, abusers, or people violating channels' 
rules,
+please reach out</em></ins></span> to <span class="removed"><del><strong>one 
of</strong></del></span> the <span 
class="inserted"><ins><em>channel's</em></ins></span> operators.
+If an operator is unable to help you immediately, please be patient.  <span 
class="removed"><del><strong>Ask</strong></del></span>
+<span class="inserted"><ins><em>&lt;/p&gt;
+&lt;p&gt;
+Prefer to ask general questions generally;</em></ins></span>
+other <span class="removed"><del><strong>members of the</strong></del></span> 
channel
+<span class="removed"><del><strong>for help and contact details 
for</strong></del></span> <span class="inserted"><ins><em>members can help, as 
much as</em></ins></span> the <span 
class="removed"><del><strong>operator.&lt;/p&gt;
+
+&lt;p&gt;You</strong></del></span> <span class="inserted"><ins><em>operators, 
in most cases.
+&lt;/p&gt;
+&lt;p&gt;
+You</em></ins></span> can <span class="removed"><del><strong>find a list 
of</strong></del></span> <span class="inserted"><ins><em>identify 
the</em></ins></span> operators by <span 
class="removed"><del><strong>typing</strong></del></span> <span 
class="inserted"><ins><em>typing:
+&lt;/p&gt;
+&lt;p class="emph-box"&gt;</em></ins></span>
+&lt;code&gt;/msg ChanServ flags
+<span class="removed"><del><strong>#gnu&lt;/code&gt; (where 
#gnu</strong></del></span> <span 
class="inserted"><ins><em>&lt;var&gt;channel&lt;/var&gt;&lt;/code&gt;
+&lt;/p&gt;
+&lt;p&gt;where 
&lt;code&gt;&lt;var&gt;channel&lt;/var&gt;&lt;/code&gt;</em></ins></span> is 
the channel <span class="removed"><del><strong>you</strong></del></span> <span 
class="inserted"><ins><em>name, for example
+&lt;code&gt;#gnu&lt;/code&gt;.
+If the operators</em></ins></span> are <span 
class="removed"><del><strong>interested in).&lt;/p&gt;</strong></del></span> 
<span class="inserted"><ins><em>unable to help you,
+or if your concern is of a more sensitive nature,
+please email &lt;a 
href="mailto:campaigns@fsf.org"&gt;&lt;campaigns@fsf.org&gt;&lt;/a&gt;.
+&lt;/p&gt;</em></ins></span>
+
+&lt;h3&gt;Libera.Chat guidelines&lt;/h3&gt;
+
+&lt;p&gt;Libera.Chat also
+maintains &lt;a href="https://libera.chat/guidelines"&gt;a list of channel
+guidelines&lt;/a&gt; which you should also consider.  Certain discussions
+such as GNU vs BSD, vi vs &lt;a href="/software/emacs/"&gt;Emacs&lt;/a&gt; are
+often healthy to free software discussion and we encourage healthy
+debate.&lt;/p&gt;
 
 &lt;h3&gt;Remember&lt;/h3&gt;
 
-&lt;p&gt;IRC is there for everyone, not just seasoned GNU <span 
class="removed"><del><strong>Developers.</strong></del></span> <span 
class="inserted"><ins><em>developers.</em></ins></span>  It is
+&lt;p&gt;IRC is there for everyone, not just seasoned GNU developers.  It is
 unreasonable to expect everyone to ignore a user who is misbehaving,
 and if you have a GNU or FSF cloak, you may be reassigned an
-&ldquo;unaffiliated&rdquo; <span class="removed"><del><strong>cloak, in 
accordance
-with &lt;a 
href="http://freenode.net/policy.shtml#behaviorandcloaks"&gt;Freenode
-guidelines&lt;/a&gt;</strong></del></span> <span 
class="inserted"><ins><em>cloak</em></ins></span> if you continue to abuse your 
privileges.&lt;/p&gt;
+&ldquo;unaffiliated&rdquo; cloak if you continue to abuse your 
privileges.&lt;/p&gt;
+<span class="inserted"><ins><em>&lt;/div&gt;</em></ins></span>
 
 &lt;/div&gt;&lt;!-- for id="content", starts in the include above --&gt;
 &lt;!--#include virtual="/server/footer.html" --&gt;
-&lt;div id="footer"&gt;
+&lt;div <span 
class="removed"><del><strong>id="footer"&gt;</strong></del></span> <span 
class="inserted"><ins><em>id="footer" role="contentinfo"&gt;</em></ins></span>
 &lt;div class="unprintable"&gt;
 
 &lt;p&gt;Please send general FSF &amp; GNU inquiries to
@@ -151,19 +194,19 @@
         to &lt;a href="mailto:web-translators@gnu.org"&gt;
         &lt;web-translators@gnu.org&gt;&lt;/a&gt;.&lt;/p&gt;
 
-        &lt;p&gt;For information on coordinating and submitting translations of
+        &lt;p&gt;For information on coordinating and <span 
class="removed"><del><strong>submitting</strong></del></span> <span 
class="inserted"><ins><em>contributing</em></ins></span> translations of
         our web pages, see &lt;a
         href="/server/standards/README.translations.html"&gt;Translations
         README&lt;/a&gt;. --&gt;
 Please see the &lt;a
 href="/server/standards/README.translations.html"&gt;Translations
-README&lt;/a&gt; for information on coordinating and submitting translations
+README&lt;/a&gt; for information on coordinating and <span 
class="removed"><del><strong>submitting</strong></del></span> <span 
class="inserted"><ins><em>contributing</em></ins></span> translations
 of this article.&lt;/p&gt;
 &lt;/div&gt;
 
 &lt;!-- Regarding copyright, in general, standalone pages (as opposed to
      files generated as part of manuals) on the GNU web server should
-     be under CC BY-ND <span class="removed"><del><strong>3.0 
US.</strong></del></span> <span 
class="inserted"><ins><em>4.0.</em></ins></span>  Please do NOT change or 
remove this
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
      without talking with the webmasters or licensing team first.
      Please make sure the copyright date is consistent with the
      document.  For web pages, it is ok to list just the latest year the
@@ -178,24 +221,21 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. --&gt;
 
-&lt;p&gt;Copyright &copy; <span class="removed"><del><strong>1996, 1997, 1998, 
1999, 2000, 2001, 2002, 2003, 2004,
-2005, 2006, 2007, 2008, 2009, 2014</strong></del></span> <span 
class="inserted"><ins><em>1996-2009, 2014-2018, 2020</em></ins></span> Free 
Software Foundation, Inc.&lt;/p&gt;
+&lt;p&gt;Copyright &copy; <span class="removed"><del><strong>1996-2009, 
2014-2018, 2020,</strong></del></span> <span 
class="inserted"><ins><em>1996-2010, 2015,</em></ins></span> 2021 Free Software 
Foundation, Inc.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
-<span 
class="removed"><del><strong>href="http://creativecommons.org/licenses/by-nd/3.0/us/"&gt;Creative</strong></del></span>
-<span 
class="inserted"><ins><em>href="http://creativecommons.org/licenses/by-nd/4.0/"&gt;Creative</em></ins></span>
-Commons <span class="removed"><del><strong>Attribution-NoDerivs 3.0 United 
States</strong></del></span> <span 
class="inserted"><ins><em>Attribution-NoDerivatives 4.0 
International</em></ins></span> License&lt;/a&gt;.&lt;/p&gt;
+href="https://creativecommons.org/licenses/by-nd/4.0/"&gt;Creative
+Commons Attribution-NoDerivatives 4.0 International 
License&lt;/a&gt;.&lt;/p&gt;
 
 &lt;!--#include virtual="/server/bottom-notes.html" --&gt;
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2020/07/08 17:01:36 $
+$Date: 2021/08/14 22:30:25 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;
-<span class="removed"><del><strong>&lt;/div&gt;</strong></del></span>
-<span class="inserted"><ins><em>&lt;/div&gt;&lt;!-- for class="inner", starts 
in the banner include --&gt;</em></ins></span>
+&lt;/div&gt;&lt;!-- for class="inner", starts in the banner include --&gt;
 &lt;/body&gt;
 &lt;/html&gt;
 </pre></body></html>

Index: po/irc-rules.de-diff.html
===================================================================
RCS file: /web/www/www/server/po/irc-rules.de-diff.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/irc-rules.de-diff.html   2 Mar 2018 06:35:55 -0000       1.1
+++ po/irc-rules.de-diff.html   14 Aug 2021 22:30:25 -0000      1.2
@@ -11,15 +11,25 @@
 </style></head>
 <body><pre>
 &lt;!--#include virtual="/server/header.html" --&gt;
-&lt;!-- Parent-Version: 1.84 --&gt;
+&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.86</strong></del></span> <span 
class="inserted"><ins><em>1.96</em></ins></span> --&gt;
 &lt;title&gt;GNU and FSF related IRC channels
 - GNU Project - Free Software Foundation&lt;/title&gt;
 
 &lt;!--#include virtual="/server/po/irc-rules.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
-
+<span class="inserted"><ins><em>&lt;div 
class="reduced-width"&gt;</em></ins></span>
 &lt;h2&gt;Rules and guidelines for the official GNU and FSF IRC 
channels&lt;/h2&gt;
 
+<span class="inserted"><ins><em>&lt;div class="important"&gt;
+&lt;p&gt;&lt;strong&gt;GNU and FSF move official IRC channels to the 
Libera.Chat
+network effective immediately.&lt;/strong&gt;&lt;/p&gt;
+&lt;p&gt;Please see the
+&lt;a 
href="https://lists.gnu.org/archive/html/info-gnu/2021-06/msg00005.html"&gt;original
+announcement&lt;/a&gt; and the follow-up
+&lt;a 
href="https://lists.gnu.org/archive/html/info-gnu/2021-06/msg00007.html"&gt;update
+announcement&lt;/a&gt; for more details.&lt;/p&gt;
+&lt;/div&gt;</em></ins></span>
+
 &lt;p&gt;IRC (Internet Relay Chat) provides a wonderful resource to connect
 free software users and developers together.  Our channels try to be
 welcoming to both new people and long-time regulars.  These guidelines
@@ -31,37 +41,50 @@
 and talk about free software and other issues which affect the rights
 of computer users, such as Digital Restrictions Management.&lt;/p&gt;
 
-&lt;p&gt;&lt;b&gt;If you have problems with any of these channels, with trolls 
or
+<span class="removed"><del><strong>&lt;p&gt;&lt;b&gt;If you have problems with 
any of these channels, with trolls or
 abusive members, please email us at: &lt;a
-href="mailto:campaigns@fsf.org"&gt;campaigns@fsf.org&lt;/a&gt;.&lt;/b&gt;&lt;/p&gt;
+href="mailto:campaigns@fsf.org"&gt;campaigns@fsf.org&lt;/a&gt;.&lt;/b&gt;&lt;/p&gt;</strong></del></span>
 
 &lt;h3&gt;List of channels&lt;/h3&gt;
+
 &lt;p&gt;This is a list of our channels.&lt;/p&gt;
 &lt;ul&gt;
-&lt;li&gt;&lt;a href="irc://irc.gnu.org/gnu"&gt;#gnu&lt;/a&gt; &mdash;
+&lt;li&gt;&lt;a href="ircs://irc.libera.chat:6697/gnu"&gt;#gnu&lt;/a&gt; 
&mdash;
 the &lt;em&gt;official&lt;/em&gt; GNU Project Channel&lt;/li&gt;
-&lt;li&gt;&lt;a href="irc://irc.gnu.org/gnu-women"&gt;#gnu-women&lt;/a&gt; 
&mdash; a channel for women in GNU and other free software&lt;/li&gt;
-&lt;li&gt;&lt;a href="irc://irc.gnu.org/gnu-es"&gt;#gnu-es&lt;/a&gt; &mdash; 
GNU in Spanish&lt;/li&gt;
-&lt;li&gt;&lt;a href="irc://irc.gnu.org/gnu-mx"&gt;#gnu-mx&lt;/a&gt; &mdash; 
Discussion
-  about GNU Mexico chapter&lt;/li&gt;
-&lt;li&gt;&lt;a href="irc://irc.gnu.org/fsf"&gt;#fsf&lt;/a&gt; &mdash; 
Discussion about the
-&lt;a href="http://www.fsf.org/"&gt;FSF (Free Software Foundation) and 
fsf.org&lt;/a&gt;
+&lt;li&gt;&lt;a 
href="ircs://irc.libera.chat:6697/gnu-women"&gt;#gnu-women&lt;/a&gt;
+&mdash; a channel for women in GNU and other free software&lt;/li&gt;
+&lt;li&gt;&lt;a href="ircs://irc.libera.chat:6697/gnu-es"&gt;#gnu-es&lt;/a&gt; 
&mdash;
+GNU in Spanish&lt;/li&gt;
+&lt;li&gt;&lt;a href="ircs://irc.libera.chat:6697/gnu-mx"&gt;#gnu-mx&lt;/a&gt; 
&mdash;
+Discussion about GNU Mexico chapter&lt;/li&gt;
+&lt;li&gt;&lt;a href="ircs://irc.libera.chat:6697/fsf"&gt;#fsf&lt;/a&gt; 
&mdash;
+Discussion about the &lt;a href="https://www.fsf.org/"&gt;FSF (Free Software
+Foundation) and fsf.org&lt;/a&gt;
 &lt;/li&gt;
-&lt;li&gt;&lt;a href="irc://irc.gnu.org/libreplanet"&gt;#libreplanet&lt;/a&gt; 
&mdash; Discussion of the LibrePlanet website, and &lt;a 
href="http://www.fsf.org/conference/"&gt;conference&lt;/a&gt;.&lt;/li&gt;
-&lt;li&gt;&lt;a href="irc://irc.gnu.org/emacs"&gt;#emacs&lt;/a&gt; &mdash; 
Discussion
-regarding &lt;a href="/software/emacs/"&gt;Emacs&lt;/a&gt;&lt;/li&gt;
-&lt;li&gt;&lt;a href="irc://irc.gnu.org/hurd"&gt;#hurd&lt;/a&gt; &mdash; 
Discussion regarding
-&lt;a href="/software/hurd/"&gt;Hurd&lt;/a&gt;&lt;/li&gt;
-&lt;li&gt;&lt;a href="irc://irc.gnu.org/grub"&gt;#grub&lt;/a&gt; &mdash; for 
the GNU bootloader, &lt;a href="/software/grub/"&gt;GRUB&lt;/a&gt;.&lt;/li&gt;
-&lt;li&gt;&lt;a href="irc://irc.oftc.net/savannah"&gt;#savannah&lt;/a&gt; 
&mdash;
-&lt;a href="http://savannah.gnu.org/"&gt;Savannah.GNU.org&lt;/a&gt; hangout 
channel&lt;/li&gt;
-&lt;li&gt;&lt;a 
href="irc://irc.gnu.org/gnu-webmasters"&gt;#gnu-webmasters&lt;/a&gt; &mdash; The
-&lt;a href="http://www.gnu.org/people/webmeisters.html"&gt;GNU 
Webmasters&lt;/a&gt;
+&lt;li&gt;&lt;a 
href="ircs://irc.libera.chat:6697/libreplanet"&gt;#libreplanet&lt;/a&gt;
+&mdash; Discussion of the LibrePlanet website, and
+&lt;a 
href="https://www.fsf.org/conference/"&gt;conference&lt;/a&gt;.&lt;/li&gt;
+&lt;li&gt;&lt;a href="ircs://irc.libera.chat:6697/emacs"&gt;#emacs&lt;/a&gt; 
&mdash;
+Discussion regarding &lt;a 
href="/software/emacs/"&gt;Emacs&lt;/a&gt;&lt;/li&gt;
+&lt;li&gt;&lt;a href="ircs://irc.libera.chat:6697/hurd"&gt;#hurd&lt;/a&gt; 
&mdash;
+Discussion regarding &lt;a href="/software/hurd/"&gt;Hurd&lt;/a&gt;&lt;/li&gt;
+&lt;li&gt;&lt;a href="ircs://irc.libera.chat:6697/grub"&gt;#grub&lt;/a&gt; 
&mdash; for
+the GNU bootloader, &lt;a href="/software/grub/"&gt;GRUB&lt;/a&gt;&lt;/li&gt;
+&lt;li&gt;&lt;a 
href="ircs://irc.libera.chat:6697/savannah"&gt;#savannah&lt;/a&gt;
+&mdash; GNU and NonGNU &lt;a 
href="https://savannah.gnu.org"&gt;Savannah&lt;/a&gt;
+hangout and support channel&lt;/li&gt;
+&lt;li&gt;&lt;a 
href="ircs://irc.libera.chat:6697/gnu-webmasters"&gt;#gnu-webmasters&lt;/a&gt; 
&mdash; The
+&lt;a href="/people/webmeisters.html"&gt;GNU Webmasters&lt;/a&gt;
 channel, for discussions about www.gnu.org&lt;/li&gt;
-&lt;li&gt;&lt;a href="irc://irc.gnu.org/erc"&gt;#erc&lt;/a&gt; &mdash; IRC 
channel about ERC, an IRC client for Emacs&lt;/li&gt;
-&lt;li&gt;&lt;a 
href="irc://irc.gnu.org/emacs-beginners"&gt;#emacs-beginners&lt;/a&gt; &mdash; 
IRC channel for helping out Emacs beginners&lt;/li&gt;
-&lt;li&gt;&lt;a href="irc://irc.gnu.org/emacsconf"&gt;#emacsconf&lt;/a&gt; 
&mdash; Discussion about the Emacs Conference&lt;/li&gt;
-&lt;li&gt;&lt;a href="irc://irc.gnu.org/pspp"&gt;#pspp&lt;/a&gt; &mdash; 
Discussion regarding &lt;a href="/software/pspp/"&gt;PSPP&lt;/a&gt;&lt;/li&gt;
+&lt;li&gt;&lt;a href="ircs://irc.libera.chat:6697/erc"&gt;#erc&lt;/a&gt; 
&mdash; IRC
+channel about ERC, an IRC client built into GNU Emacs&lt;/li&gt;
+&lt;li&gt;&lt;a 
href="ircs://irc.libera.chat:6697/emacs-beginners"&gt;#emacs-beginners&lt;/a&gt;
+&mdash; IRC channel for helping out Emacs beginners&lt;/li&gt;
+&lt;li&gt;&lt;a 
href="ircs://irc.libera.chat:6697/emacsconf"&gt;#emacsconf&lt;/a&gt;
+&mdash; Discussion about the Emacs Conference&lt;/li&gt;
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="ircs://irc.libera.chat:6697/pspp"&gt;#pspp&lt;/a&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="ircs://irc.libera.chat:6697/gnu-librejs"&gt;#librejs&lt;/a&gt;</em></ins></span>
 
+&mdash; Discussion regarding &lt;a <span 
class="removed"><del><strong>href="/software/pspp/"&gt;PSPP&lt;/a&gt;&lt;/li&gt;</strong></del></span>
 <span class="inserted"><ins><em>href="/software/librejs/"&gt;LibreJS&lt;/a&gt; 
+and how to free your JavaScript&lt;/li&gt;</em></ins></span>
 &lt;/ul&gt;
 
 &lt;h3&gt;Channel rules&lt;/h3&gt;
@@ -100,27 +123,48 @@
 instead of trying to blame operators for this, blame the users who are
 not willing to be in our community.&lt;/p&gt;
 
-&lt;hr /&gt;
+&lt;hr <span class="inserted"><ins><em>class="column-limit"</em></ins></span> 
/&gt;
 
 &lt;p&gt;Rules end here, but here are some helpful 
suggestions&hellip;&lt;/p&gt;
 
 &lt;h3&gt;Getting help&lt;/h3&gt;
 
-&lt;p&gt;Speak to one of the operators.  If an operator is unable to help
-you immediately, please be patient.  Ask other members of the channel
-for help and contact details for the operator.&lt;/p&gt;
-
-&lt;p&gt;You can find a list of operators by typing &lt;tt&gt;/msg chanserv 
access
-#gnu list&lt;/tt&gt; (where #gnu is the channel you are interested 
in).&lt;/p&gt;
-
-&lt;h3&gt;Freenode guidelines&lt;/h3&gt;
-
-&lt;p&gt;Freenode also
-maintains &lt;a href="http://freenode.net/changuide"&gt;a
-list of channel guidelines&lt;/a&gt; which you should also consider.
-Certain discussions such as GNU vs BSD, vi
-vs &lt;a href="/software/emacs/"&gt;Emacs&lt;/a&gt; are often healthy to free
-software discussion and we encourage healthy debate.&lt;/p&gt;
+<span class="removed"><del><strong>&lt;p&gt;Speak</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;p&gt;
+If you had any problem with trolls, abusers, or people violating channels' 
rules,
+please reach out</em></ins></span> to <span class="removed"><del><strong>one 
of</strong></del></span> the <span 
class="inserted"><ins><em>channel's</em></ins></span> operators.
+If an operator is unable to help you immediately, please be patient.  <span 
class="removed"><del><strong>Ask</strong></del></span>
+<span class="inserted"><ins><em>&lt;/p&gt;
+&lt;p&gt;
+Prefer to ask general questions generally;</em></ins></span>
+other <span class="removed"><del><strong>members of the</strong></del></span> 
channel
+<span class="removed"><del><strong>for help and contact details 
for</strong></del></span> <span class="inserted"><ins><em>members can help, as 
much as</em></ins></span> the <span 
class="removed"><del><strong>operator.&lt;/p&gt;
+
+&lt;p&gt;You</strong></del></span> <span class="inserted"><ins><em>operators, 
in most cases.
+&lt;/p&gt;
+&lt;p&gt;
+You</em></ins></span> can <span class="removed"><del><strong>find a list 
of</strong></del></span> <span class="inserted"><ins><em>identify 
the</em></ins></span> operators by <span 
class="removed"><del><strong>typing</strong></del></span> <span 
class="inserted"><ins><em>typing:
+&lt;/p&gt;
+&lt;p class="emph-box"&gt;</em></ins></span>
+&lt;code&gt;/msg ChanServ flags
+<span class="removed"><del><strong>#gnu&lt;/code&gt; (where 
#gnu</strong></del></span> <span 
class="inserted"><ins><em>&lt;var&gt;channel&lt;/var&gt;&lt;/code&gt;
+&lt;/p&gt;
+&lt;p&gt;where 
&lt;code&gt;&lt;var&gt;channel&lt;/var&gt;&lt;/code&gt;</em></ins></span> is 
the channel <span class="removed"><del><strong>you</strong></del></span> <span 
class="inserted"><ins><em>name, for example
+&lt;code&gt;#gnu&lt;/code&gt;.
+If the operators</em></ins></span> are <span 
class="removed"><del><strong>interested in).&lt;/p&gt;</strong></del></span> 
<span class="inserted"><ins><em>unable to help you,
+or if your concern is of a more sensitive nature,
+please email &lt;a 
href="mailto:campaigns@fsf.org"&gt;&lt;campaigns@fsf.org&gt;&lt;/a&gt;.
+&lt;/p&gt;</em></ins></span>
+
+&lt;h3&gt;Libera.Chat guidelines&lt;/h3&gt;
+
+&lt;p&gt;Libera.Chat also
+maintains &lt;a href="https://libera.chat/guidelines"&gt;a list of channel
+guidelines&lt;/a&gt; which you should also consider.  Certain discussions
+such as GNU vs BSD, vi vs &lt;a href="/software/emacs/"&gt;Emacs&lt;/a&gt; are
+often healthy to free software discussion and we encourage healthy
+debate.&lt;/p&gt;
 
 &lt;h3&gt;Remember&lt;/h3&gt;
 
@@ -128,10 +172,11 @@
 unreasonable to expect everyone to ignore a user who is misbehaving,
 and if you have a GNU or FSF cloak, you may be reassigned an
 &ldquo;unaffiliated&rdquo; cloak if you continue to abuse your 
privileges.&lt;/p&gt;
+<span class="inserted"><ins><em>&lt;/div&gt;</em></ins></span>
 
 &lt;/div&gt;&lt;!-- for id="content", starts in the include above --&gt;
 &lt;!--#include virtual="/server/footer.html" --&gt;
-&lt;div id="footer"&gt;
+&lt;div <span 
class="removed"><del><strong>id="footer"&gt;</strong></del></span> <span 
class="inserted"><ins><em>id="footer" role="contentinfo"&gt;</em></ins></span>
 &lt;div class="unprintable"&gt;
 
 &lt;p&gt;Please send general FSF &amp; GNU inquiries to
@@ -149,13 +194,13 @@
         to &lt;a href="mailto:web-translators@gnu.org"&gt;
         &lt;web-translators@gnu.org&gt;&lt;/a&gt;.&lt;/p&gt;
 
-        &lt;p&gt;For information on coordinating and submitting translations of
+        &lt;p&gt;For information on coordinating and <span 
class="removed"><del><strong>submitting</strong></del></span> <span 
class="inserted"><ins><em>contributing</em></ins></span> translations of
         our web pages, see &lt;a
         href="/server/standards/README.translations.html"&gt;Translations
         README&lt;/a&gt;. --&gt;
 Please see the &lt;a
 href="/server/standards/README.translations.html"&gt;Translations
-README&lt;/a&gt; for information on coordinating and submitting translations
+README&lt;/a&gt; for information on coordinating and <span 
class="removed"><del><strong>submitting</strong></del></span> <span 
class="inserted"><ins><em>contributing</em></ins></span> translations
 of this article.&lt;/p&gt;
 &lt;/div&gt;
 
@@ -176,22 +221,21 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. --&gt;
 
-&lt;p&gt;Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-2005, 2006, 2007, 2008, 2009, 2014, 2015, 2016, <span 
class="removed"><del><strong>2017</strong></del></span> <span 
class="inserted"><ins><em>2017, 2018</em></ins></span> Free Software 
Foundation, Inc.&lt;/p&gt;
+&lt;p&gt;Copyright &copy; <span class="removed"><del><strong>1996-2009, 
2014-2018, 2020,</strong></del></span> <span 
class="inserted"><ins><em>1996-2010, 2015,</em></ins></span> 2021 Free Software 
Foundation, Inc.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
-href="http://creativecommons.org/licenses/by-nd/4.0/"&gt;Creative
+href="https://creativecommons.org/licenses/by-nd/4.0/"&gt;Creative
 Commons Attribution-NoDerivatives 4.0 International 
License&lt;/a&gt;.&lt;/p&gt;
 
 &lt;!--#include virtual="/server/bottom-notes.html" --&gt;
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2018/03/02 06:35:55 $
+$Date: 2021/08/14 22:30:25 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;
-&lt;/div&gt;
+&lt;/div&gt;&lt;!-- for class="inner", starts in the banner include --&gt;
 &lt;/body&gt;
 &lt;/html&gt;
 </pre></body></html>



reply via email to

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