Re: [PATCH: ]new repo-criteria v1.2

[bill-auger]

Index: www/software/repo-criteria.html
===================================================================
RCS file: /web/www/www/software/repo-criteria.html,v
retrieving revision 1.15
diff -u -r1.15 repo-criteria.html
--- www/software/repo-criteria.html     5 May 2022 22:31:08 -0000       1.15
+++ www/software/repo-criteria.html     16 Apr 2024 22:47:43 -0000
@@ -24,11 +24,7 @@
 
href="https://lists.gnu.org/mailman/listinfo/repo-criteria-discuss";>repo-criteria-discuss</a>
   mailing list.</p>
 
-<p>You can also help us by providing feedback on
-our <a href="/software/proposed-new-repo-criteria.html">proposed
-updates</a> to the repo criteria.</p>
-
-<h3>Version 1.1</h3>
+<h3>GNU ERC Version 1.2</h3>
 
 <h4 id="F">F &mdash; Unacceptable</h4>
 
@@ -90,8 +86,8 @@
     <li id="C4"><p>The site's terms of service contain no odious
         conditions.  <strong>(C4)</strong></p></li>
 
-    <li id="C5"><p>Recommends and encourages GPL 3-or-later licensing at
-        least as much as any other kind of licensing.  
<strong>(C5)</strong></p></li>
+    <li id="C5"><p>No other license is recommended over GPL-3-or-later.
+        <strong>(C5)</strong></p></li>
 
     <li id="C6"><p>Support HTTPS properly and securely, including the site's
         certificates.  <strong>(C6)</strong></p></li>
@@ -110,11 +106,26 @@
     <li id="B1"><p>Does not report visitors to other organizations; in
         particular, no tracking tags in the pages. This means the
         site must avoid most advertising networks.
-        <strong>(B1)</strong></p></li>
+        <strong>(B1)</strong></p>
+      <ul>
+        <li id="B1-0"><p>Explains each of the licensing options,
+            distinguishing between GPL 2 only and GPL 2-or-later, as well as
+            between GPL 3 only and GPL 3-or-later. Makes recommendations about
+            whether and when to use each option.
+            <strong>(B1.0)</strong></p></li>
+      </ul>
+    </li>
 
     <li id="B2"><p>Does not encourage bad licensing practices (no
         license, unclear licensing, GPL N only).
-        <strong>(B2)</strong></p></li>
+        <strong>(B2)</strong></p>
+      <ul>
+      <li id="B2-0"><p>In particular, explains the importance of
+          including a license notice in all nontrivial source files, not
+          just in a few places.
+          <strong>(B2.0)</strong></p></li>
+      </ul>
+    </li>
 
     <li id="B3"><p>Does not recommend nonfree licenses for works of
         practical use.  <strong>(B3)</strong></p></li>
@@ -132,7 +143,7 @@
   <li id="A1"><p>Server code released as free software.
       <strong>(A1)</strong></p></li>
 
-  <li id="A2"><p>Encourages use of GPL 3-or-later as preferred option.
+  <li id="A2"><p>Recommends GPL 3-or-later over other licensing options.
       <strong>(A2)</strong></p></li>
 
   <li id="A3"><p>Offers use of AGPL 3-or-later as an option.
@@ -166,7 +177,10 @@
   <li id="A-plus-0"><p>Allows visitors to look and download without 
authenticating.
       <strong>(A+0)</strong></p></li>
 
-  <li id="A-plus-1"><p>Does not log anything about visitors.
+  <li id="A-plus-1"><p>Does not log anything about visitors. Note that
+      this criterion is based solely on the good faith of the forge's
+      administrator. There is no way to be certain that the forge refrains
+      from logging connections.
       <strong>(A+1)</strong></p></li>
 
   <li id="A-plus-2"><p>Follows the criteria in The Electronic Frontier
@@ -176,7 +190,7 @@
 
   <li id="A-plus-3"><p>Follows
       the <a href="https://www.w3.org/WAI/WCAG20/quickref/";>Web
-        &ldquo;Content&rdquo; Accessibility Guidelines 2.0</a> (WCAG 2.0)
+      &ldquo;Content&rdquo; Accessibility Guidelines 2.0</a> (WCAG 2.0)
       standard.
       <strong>(A+3)</strong></p></li>
 
@@ -189,6 +203,14 @@
   <li id="A-plus-5"><p>All data contributed by the project owner and 
contributors
       is exportable in a machine-readable format.
       <strong>(A+5)</strong></p></li>
+
+  <li id="A-plus-6"><p>Encourages use of AGPL 3-or-later as a
+      preferred option.
+      <strong>(A+6)</strong></p></li>
+
+  <li id="A-plus-7"><p>Helps or reminds users to put license notices
+      in their source files to go with whichever license they have chosen.
+      <strong>(A+7)</strong></p></li>
 </ul>
 
 <h3 id="volunteers">Acknowledgements</h3>
@@ -199,8 +221,10 @@
 
 <ul>
   <li>Aaron Wolf</li>
+  <li>Bill Auger</li>
   <li id="oitofelix">Bruno Félix Rezende Ribeiro
     <a href="mailto:oitofelix@gnu.org";>&lt;oitofelix@gnu.org&gt;</a></li>
+  <li>Greg Farough</li>
   <li>Josh Triplett</li>
   <li>Mike Gerwitz <a href="mailto:mtg@gnu.org";>&lt;mtg@gnu.org&gt;</a></li>
   <li>Richard Stallman</li>
@@ -235,13 +259,13 @@
         to <a href="mailto:web-translators@gnu.org";>
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
 Please see the <a
 href="/server/standards/README.translations.html">Translations
-README</a> for information on coordinating and submitting translations
+README</a> for information on coordinating and contributing translations
 of this article.</p>
 </div>
 
@@ -272,7 +296,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2022/05/05 22:31:08 $
+$Date: 2024/04/20 15:15:23 $
 <!-- timestamp end -->
 </p>
 </div>