aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2020-01-25 18:59:42 +0100
committerUlrich Müller <ulm@gentoo.org>2020-01-28 01:23:32 +0100
commita520cba59f0d0a062a90de47ab963916ab1c3180 (patch)
tree3c02545fa155ef0a733d15f2390ee71ee12d19bb
parentbin/gen-eclass-html.sh: Whitespace. (diff)
downloaddevmanual-a520cba59f0d0a062a90de47ab963916ab1c3180.tar.gz
devmanual-a520cba59f0d0a062a90de47ab963916ab1c3180.tar.bz2
devmanual-a520cba59f0d0a062a90de47ab963916ab1c3180.zip
general-concepts/package-collisions: Moved here from ebuild-maintenance.
This section is about a general concept, not a particular maintenance operation. Signed-off-by: Ulrich Müller <ulm@gentoo.org>
-rw-r--r--ebuild-maintenance/text.xml1
-rw-r--r--general-concepts/package-collisions/text.xml (renamed from ebuild-maintenance/collisions/text.xml)2
-rw-r--r--general-concepts/text.xml1
3 files changed, 2 insertions, 2 deletions
diff --git a/ebuild-maintenance/text.xml b/ebuild-maintenance/text.xml
index 3576fbc..270230e 100644
--- a/ebuild-maintenance/text.xml
+++ b/ebuild-maintenance/text.xml
@@ -23,6 +23,5 @@ familiar with.
<include href="new-ebuild/"/>
<include href="git/"/>
<include href="package-moves/"/>
-<include href="collisions/"/>
<include href="removal/"/>
</guide>
diff --git a/ebuild-maintenance/collisions/text.xml b/general-concepts/package-collisions/text.xml
index 6f5cec6..7b1b5f8 100644
--- a/ebuild-maintenance/collisions/text.xml
+++ b/general-concepts/package-collisions/text.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<guide self="ebuild-maintenance/collisions/">
+<guide self="general-concepts/package-collisions/">
<chapter>
<title>Package Collisions</title>
<body>
diff --git a/general-concepts/text.xml b/general-concepts/text.xml
index e832db0..ace731e 100644
--- a/general-concepts/text.xml
+++ b/general-concepts/text.xml
@@ -34,6 +34,7 @@ writing ebuilds or working with the Gentoo repository.
<include href="mirrors/"/>
<include href="news/"/>
<include href="overlay/"/>
+<include href="package-collisions/"/>
<include href="package-maintainers/"/>
<include href="pic/"/>
<include href="portage-cache/"/>