commit:     811a6da37d00d3871d90f95085355d6d62a5d1c7
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  5 12:17:45 2019 +0000
Commit:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Wed Oct 16 18:48:54 2019 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=811a6da3

general-concepts: Remove Herds and rename the sub to 'Projects'

Herds are gone for over 3.5 years, so it's time to finally remove them
from documentation.  Remove the relevant section of 'Herds and Projects'
article, and rename it to just 'Projects' accordingly.

Acked-by: Michael Orlitzky <mjo <AT> gentoo.org>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
Signed-off-by: Göktürk Yüksek <gokturk <AT> gentoo.org>

 ebuild-writing/misc-files/metadata/text.xml        |  2 +-
 .../{herds-and-projects => projects}/text.xml      | 53 ++--------------------
 general-concepts/text.xml                          |  2 +-
 3 files changed, 7 insertions(+), 50 deletions(-)

diff --git a/ebuild-writing/misc-files/metadata/text.xml 
b/ebuild-writing/misc-files/metadata/text.xml
index 1af54fa..953ffa2 100644
--- a/ebuild-writing/misc-files/metadata/text.xml
+++ b/ebuild-writing/misc-files/metadata/text.xml
@@ -333,7 +333,7 @@ There are also some attributes that can be used with these 
tags:
     Defines the type of the maintainer for a package. There are only
     two valid values: <c>"person"</c> and <c>"project"</c>. The latter
     denotes an official
-    <uri link="::general-concepts/herds-and-projects">
+    <uri link="::general-concepts/projects">
     Gentoo project</uri>.
   </ti>
 </tr>

diff --git a/general-concepts/herds-and-projects/text.xml 
b/general-concepts/projects/text.xml
similarity index 67%
rename from general-concepts/herds-and-projects/text.xml
rename to general-concepts/projects/text.xml
index 72b4060..0ed004b 100644
--- a/general-concepts/herds-and-projects/text.xml
+++ b/general-concepts/projects/text.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0"?>
-<guide self="general-concepts/herds-and-projects/">
+<guide self="general-concepts/projects/">
 <chapter>
-<title>Projects and Herds</title>
-
-<body>
-
-<section>
 <title>Projects</title>
 <body>
 
@@ -33,7 +28,7 @@ api.gentoo.org</uri> or on the
 <uri link="https://wiki.gentoo.org/wiki/Project:Gentoo";>wiki</uri>.
 </p>
 
-<subsection>
+<section>
 <title>Starting New Projects</title>
 <body>
 
@@ -61,8 +56,9 @@ project with the same goals.
 </p>
 
 </body>
-</subsection>
-<subsection>
+</section>
+
+<section>
 <title>Joining and Leaving a Project</title>
 <body>
 
@@ -84,48 +80,9 @@ located at <c>/var/mail/alias/misc/devmanual</c>, which 
corresponds to
 the project's email address <c>[email protected]</c>.
 </p>
 
-</body>
-</subsection>
-
-</body>
-</section>
-
-<section>
-<title>Herds</title>
-<body>
-
-<warning>
-Herds have been declared obsolete as per the Gentoo Council's <uri
-link="https://projects.gentoo.org/council/meeting-logs/20160110-summary.txt";>
-decision on January 10, 2016</uri>. The following section is preserved
-for historical purposes.
-</warning>
-
-<p>
-A <e>herd</e> is a collection of packages with an associated set of 
maintainers.
-It can happen for example because of retirement that a herd has no developers
-but this should be avoided if at all possible. A herd has an associated email
-address which can be used for bugzilla assignments. This email address is
-<b>not</b> always <c>[email protected]</c> <d/> for example, because of the
-way Gentoo's email aliases are set up, the <c>cron</c> herd use
-<c>[email protected]</c> (aliases cannot match system usernames).
-</p>
-
-<p>
-A <e>project</e> is a group formed for handling a particular general area. A 
project
-may have herds associated with it.
-</p>
-
-<p>
-Sometimes herd and project names overlap <d/> for example, the <c>sparc</c> 
project
-has an associated <c>sparc</c> herd which maintains sparc-specific packages 
(such
-as the <c>silo</c> bootloader). This is <e>not</e> always the case.
-</p>
-
 </body>
 </section>
 
 </body>
 </chapter>
 </guide>
-

diff --git a/general-concepts/text.xml b/general-concepts/text.xml
index 1e40785..3117299 100644
--- a/general-concepts/text.xml
+++ b/general-concepts/text.xml
@@ -28,7 +28,6 @@ writing ebuilds or working with the Gentoo repository.
 <include href="emerge-and-ebuild/"/>
 <include href="features/"/>
 <include href="filesystem/"/>
-<include href="herds-and-projects/"/>
 <include href="install-destinations/"/>
 <include href="licenses/"/>
 <include href="mirrors/"/>
@@ -36,6 +35,7 @@ writing ebuilds or working with the Gentoo repository.
 <include href="overlay/"/>
 <include href="pic/"/>
 <include href="portage-cache/"/>
+<include href="projects/"/>
 <include href="sandbox/"/>
 <include href="slotting/"/>
 <include href="tree/"/>

Reply via email to