From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 10 May 2023 15:39:30 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1pwk2V-00Cp8k-BT for lore@lore.pengutronix.de; Wed, 10 May 2023 15:39:30 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1pwk2T-0007Mp-Bb; Wed, 10 May 2023 15:39:29 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pwk2L-0007Mb-65; Wed, 10 May 2023 15:39:21 +0200 Received: from [2a0a:edc0:0:1101:1d::ac] (helo=dude04.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1pwk2K-002VBa-Hv; Wed, 10 May 2023 15:39:20 +0200 Received: from rhi by dude04.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pwk2K-007Eh5-03; Wed, 10 May 2023 15:39:20 +0200 From: Roland Hieber To: distrokit@pengutronix.de Date: Wed, 10 May 2023 15:39:15 +0200 Message-Id: <20230510133915.1724757-1-rhi@pengutronix.de> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [DistroKit] [PATCH 1/2] doc: use layered documentation instead of overwriting doc/guru.rsto X-BeenThere: distrokit@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: DistroKit Mailinglist List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Roland Hieber Sender: "DistroKit" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: distrokit-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Since PTXdist 2023.01.0, all files named index-layer-*.rst are included in the main toctree by upstream PTXdist, so there is no need anymore to fork the upstream guru.rst. See the docs for more info. We have to remove the :numbered: argument because the main toctree in the upstream guru.rst is already numbered, otherwise this will generate a warning. Link: https://www.ptxdist.org/doc/daily_work_section.html#integrate-project-specific-documentation-into-the-manual Signed-off-by: Roland Hieber --- doc/guru.rst | 17 ----------------- doc/{index.rst => index-layer-1-distrokit.rst} | 2 -- 2 files changed, 19 deletions(-) delete mode 100644 doc/guru.rst rename doc/{index.rst => index-layer-1-distrokit.rst} (87%) diff --git a/doc/guru.rst b/doc/guru.rst deleted file mode 100644 index 19294647df49..000000000000 --- a/doc/guru.rst +++ /dev/null @@ -1,17 +0,0 @@ -Welcome to the PTXdist Universe -=============================== - -.. toctree:: - :glob: - :maxdepth: 3 - - welcome - environment - user_manual_section - dev_manual - ref_manual - daily_work_section - contributing - getting_help - faq - diff --git a/doc/index.rst b/doc/index-layer-1-distrokit.rst similarity index 87% rename from doc/index.rst rename to doc/index-layer-1-distrokit.rst index f76f48c1a059..751ef3fb8d2f 100644 --- a/doc/index.rst +++ b/doc/index-layer-1-distrokit.rst @@ -3,12 +3,10 @@ Welcome to DistroKit .. toctree:: :glob: - :numbered: :maxdepth: 2 intro hardware - guru testing * :ref:`search` -- 2.39.2