aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ebuild-writing/misc-files/metadata/text.xml2
-rw-r--r--general-concepts/projects/text.xml (renamed from general-concepts/herds-and-projects/text.xml)53
-rw-r--r--general-concepts/text.xml2
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
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>
@@ -85,47 +81,8 @@ the project's email address <c>devmanual@gentoo.org</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>herdname@gentoo.org</c> <d/> for example, because of the
-way Gentoo's email aliases are set up, the <c>cron</c> herd use
-<c>cron-bugs@gentoo.org</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/"/>