From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1138136-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 74C65138350
	for <garchives@archives.gentoo.org>; Wed, 15 Jan 2020 21:30:04 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 80CE5E0856;
	Wed, 15 Jan 2020 21:30:03 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(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 1104EE0857
	for <gentoo-commits@lists.gentoo.org>; Wed, 15 Jan 2020 21:30:03 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(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 C1A2734E0C2
	for <gentoo-commits@lists.gentoo.org>; Wed, 15 Jan 2020 21:30:00 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 6FEC63B
	for <gentoo-commits@lists.gentoo.org>; Wed, 15 Jan 2020 21:29:59 +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: <1579123723.ff53ac24e95bd08d7911b31ae7031385cfd0cdc4.ulm@gentoo>
Subject: [gentoo-commits] proj/devmanual:master commit in: appendices/, appendices/contributing/, appendices/contributors/, ...
X-VCS-Repository: proj/devmanual
X-VCS-Files: appendices/contributing/devbook-guide/text.xml appendices/contributing/text.xml appendices/contributors/text.xml appendices/devbook-guide/text.xml appendices/text.xml
X-VCS-Directories: appendices/ appendices/contributing/ appendices/devbook-guide/ appendices/contributors/ appendices/contributing/devbook-guide/
X-VCS-Committer: ulm
X-VCS-Committer-Name: Ulrich Müller
X-VCS-Revision: ff53ac24e95bd08d7911b31ae7031385cfd0cdc4
X-VCS-Branch: master
Date: Wed, 15 Jan 2020 21:29:59 +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: ad15ef4d-a50e-4828-b705-f14e589c1370
X-Archives-Hash: 4b2a44cccb74aa27cc022eff123d92b1

commit:     ff53ac24e95bd08d7911b31ae7031385cfd0cdc4
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 11 21:23:32 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 15 21:28:43 2020 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=ff53ac24

devbook-guide: Move directly under appendices.

Move one level up, it makes more sense as an own appendix, rather than
a sub-document of contributing.

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

 appendices/contributing/text.xml                     | 6 +-----
 appendices/contributors/text.xml                     | 6 +++---
 appendices/{contributing => }/devbook-guide/text.xml | 3 +--
 appendices/text.xml                                  | 1 +
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/appendices/contributing/text.xml b/appendices/contributing/text.xml
index 6e11298..9efe6c8 100644
--- a/appendices/contributing/text.xml
+++ b/appendices/contributing/text.xml
@@ -64,8 +64,7 @@ conversion used in some of the figures throughout the document.
 <body>
 
 <p>
-DevBook XML is heavily based on
-<uri link="::appendices/contributing/devbook-guide/">
+DevBook XML is heavily based on <uri link="::appendices/devbook-guide/">
 GuideXML</uri> and many tags are similar, if not the same. The main differences
 occur in layout which are designed to make a large-scale publication easier
 to produce and manage using a hierarchical tree system. Before starting off you
@@ -138,7 +137,4 @@ really should first examine the GuideXML guide in a reasonable amount of depth.
 </body>
 </section>
 </chapter>
-
-<include href="devbook-guide/"/>
-
 </guide>

diff --git a/appendices/contributors/text.xml b/appendices/contributors/text.xml
index db96557..db7694d 100644
--- a/appendices/contributors/text.xml
+++ b/appendices/contributors/text.xml
@@ -78,13 +78,13 @@ Misc
   Misc
 </author>
 <author name="Xavier Neys" email="neysx@gentoo.org">
-  <uri link="::appendices/contributing/devbook-guide/">GuideXML guide</uri>
+  <uri link="::appendices/devbook-guide/">GuideXML guide</uri>
 </author>
 <author name="Daniel Robbins" email="drobbins@gentoo.org">
-  <uri link="::appendices/contributing/devbook-guide/">GuideXML guide</uri>
+  <uri link="::appendices/devbook-guide/">GuideXML guide</uri>
 </author>
 <author name="John P. Davis" email="zhen@gentoo.org">
-  <uri link="::appendices/contributing/devbook-guide/">GuideXML guide</uri>
+  <uri link="::appendices/devbook-guide/">GuideXML guide</uri>
 </author>
 
 </authors>

diff --git a/appendices/contributing/devbook-guide/text.xml b/appendices/devbook-guide/text.xml
similarity index 99%
rename from appendices/contributing/devbook-guide/text.xml
rename to appendices/devbook-guide/text.xml
index ce3fab9..453820e 100644
--- a/appendices/contributing/devbook-guide/text.xml
+++ b/appendices/devbook-guide/text.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<guide self="appendices/contributing/devbook-guide/">
+<guide self="appendices/devbook-guide/">
 <chapter>
 <title>Gentoo GuideXML Guide</title>
 

diff --git a/appendices/text.xml b/appendices/text.xml
index dc326a6..f5439b7 100644
--- a/appendices/text.xml
+++ b/appendices/text.xml
@@ -21,6 +21,7 @@ This section incorporates various auxiliary documents which may be useful as a r
 <include href="common-problems/"/>
 <include href="further-reading/"/>
 <include href="contributing/"/>
+<include href="devbook-guide/"/>
 <include href="contributors/"/>
 <include href="todo-list/"/>