public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Ulrich Müller" <ulm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/devmanual:master commit in: general-concepts/, ebuild-maintenance/collisions/, ebuild-maintenance/, ...
Date: Tue, 28 Jan 2020 00:26:05 +0000 (UTC)	[thread overview]
Message-ID: <1580171012.a520cba59f0d0a062a90de47ab963916ab1c3180.ulm@gentoo> (raw)

commit:     a520cba59f0d0a062a90de47ab963916ab1c3180
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 25 17:59:42 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 28 00:23:32 2020 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=a520cba5

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 <AT> gentoo.org>

 ebuild-maintenance/text.xml                                             | 1 -
 .../collisions => general-concepts/package-collisions}/text.xml         | 2 +-
 general-concepts/text.xml                                               | 1 +
 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
similarity index 97%
rename from ebuild-maintenance/collisions/text.xml
rename to 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/"/>


                 reply	other threads:[~2020-01-28  0:26 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1580171012.a520cba59f0d0a062a90de47ab963916ab1c3180.ulm@gentoo \
    --to=ulm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox