From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1268536-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 627F51382C5
	for <garchives@archives.gentoo.org>; Wed,  7 Apr 2021 17:35:34 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id A0475E09BE;
	Wed,  7 Apr 2021 17:35:32 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 88EF8E09BE
	for <gentoo-commits@lists.gentoo.org>; Wed,  7 Apr 2021 17:35:32 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 17903335D89
	for <gentoo-commits@lists.gentoo.org>; Wed,  7 Apr 2021 17:35:31 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 907EE64D
	for <gentoo-commits@lists.gentoo.org>; Wed,  7 Apr 2021 17:35:28 +0000 (UTC)
From: "Ulrich Müller" <ulm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" <ulm@gentoo.org>
Message-ID: <1617816909.acfc48b80657c6221e1a4000ec046c65cd72fcc6.ulm@gentoo>
Subject: [gentoo-commits] proj/devmanual:master commit in: keywording/
X-VCS-Repository: proj/devmanual
X-VCS-Files: keywording/text.xml
X-VCS-Directories: keywording/
X-VCS-Committer: ulm
X-VCS-Committer-Name: Ulrich Müller
X-VCS-Revision: acfc48b80657c6221e1a4000ec046c65cd72fcc6
X-VCS-Branch: master
Date: Wed,  7 Apr 2021 17:35:28 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: b43746cb-54ec-452f-88de-1b0a06d8cddb
X-Archives-Hash: 58582013a4a7750db1dc42167aefbd81

commit:     acfc48b80657c6221e1a4000ec046c65cd72fcc6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 21 05:18:18 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Apr  7 17:35:09 2021 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=acfc48b8

keywording: call ~arch ("testing") and arch ("stable")

Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 keywording/text.xml | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/keywording/text.xml b/keywording/text.xml
index 6d7c394..0f08c7e 100644
--- a/keywording/text.xml
+++ b/keywording/text.xml
@@ -38,14 +38,14 @@ The different levels of keyword are:
 
 <dl>
   <dt>
-    <c>arch</c> (<c>x86</c>, <c>ppc-macos</c>)
+    <c>arch</c> (<c>x86</c>, <c>ppc-macos</c>) ("stable")
   </dt>
   <dd>
     Both the package version <e>and</e> the ebuild are widely tested, known to work
     and not have any serious issues on the indicated platform.
   </dd>
   <dt>
-    <c>~arch</c> (<c>~x86</c>, <c>~ppc-macos</c>)
+    <c>~arch</c> (<c>~x86</c>, <c>~ppc-macos</c>) ("testing")
   </dt>
   <dd>
     The package version and the ebuild are believed to work and do not have any
@@ -53,7 +53,7 @@ The different levels of keyword are:
     is considered suitable for <c>arch</c>.
   </dd>
   <dt>
-    No keyword
+    No keyword ("unkeyworded")
   </dt>
   <dd>
     If a package has no keyword for a given arch, it means it is not known
@@ -153,7 +153,7 @@ user system</b>.
 <body>
 
 <important>
-New packages should be marked as <c>~arch</c> only upon
+New packages should be marked as <c>~arch</c> ("testing") only upon
 architectures for which the committing developer has tested.
 </important>
 
@@ -185,7 +185,7 @@ keyworded.
 </p>
 
 <p>
-Do <b>not</b> commit straight to <c>arch</c>.
+Do <b>not</b> commit straight to <c>arch</c> ("stable").
 </p>
 
 </body>
@@ -196,10 +196,10 @@ Do <b>not</b> commit straight to <c>arch</c>.
 <body>
 
 <p>
-When upgrading, drop all existing keywords from <c>arch</c> to <c>~arch</c>, and leave
-any existing <c>~arch</c> keywords intact. This must be done even if you <e>think</e>
-you're just making a trivial fix <d /> there have been several examples of the
-stable tree getting broken this way.
+When upgrading, drop all existing keywords from <c>arch</c> to <c>~arch</c>
+("testing"), and leave any existing <c>~arch</c> keywords intact. This must be
+done even if you <e>think</e> you're just making a trivial fix <d /> there have
+been several examples of the stable tree getting broken this way.
 </p>
 
 <p>
@@ -237,10 +237,11 @@ to do this.
 <body>
 
 <p>
-Stabilization, i.e., moving an ebuild from <c>~arch</c> to <c>arch</c>, is done
-by the relevant architecture teams. If you have access to exotic hardware but
-are not on the arch teams, you may wish to make individual arrangements <d/>
-the arch teams are happy for help, so long as they know what is going on.
+Stabilization, i.e., moving an ebuild from <c>~arch</c> ("testing") to
+<c>arch</c> ("stable"), is done by the relevant architecture teams. If you have
+access to exotic hardware but are not on the arch teams, you may wish to make
+individual arrangements <d/> the arch teams are happy for help, so long as they
+know what is going on.
 </p>
 
 <p>