Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Jonathan Corbet <corbet@lwn.net>
To:     linux-doc@vger.kernel.org
Cc:     linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org,
        Jonathan Corbet <corbet@lwn.net>,
        Geert Uytterhoeven <geert@linux-m68k.org>
Subject: [PATCH 4/4] docs: move m68k architecture documentation under Documentation/arch/
Date:   Thu, 30 Mar 2023 13:56:04 -0600
Message-Id: <20230330195604.269346-5-corbet@lwn.net>
In-Reply-To: <20230330195604.269346-1-corbet@lwn.net>
References: <20230330195604.269346-1-corbet@lwn.net>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Architecture-specific documentation is being moved into Documentation/arch/
as a way of cleaning up the top-level documentation directory and making
the docs hierarchy more closely match the source hierarchy.  Move
Documentation/m68k into arch/ and fix all in-tree references.

Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
---
 Documentation/admin-guide/kernel-parameters.rst            | 2 +-
 Documentation/arch/index.rst                               | 2 +-
 Documentation/{ => arch}/m68k/buddha-driver.rst            | 0
 Documentation/{ => arch}/m68k/features.rst                 | 0
 Documentation/{ => arch}/m68k/index.rst                    | 0
 Documentation/{ => arch}/m68k/kernel-options.rst           | 0
 Documentation/translations/zh_CN/arch/parisc/debugging.rst | 2 +-
 Documentation/translations/zh_CN/arch/parisc/index.rst     | 2 +-
 Documentation/translations/zh_CN/arch/parisc/registers.rst | 2 +-
 arch/m68k/Kconfig.machine                                  | 4 ++--
 10 files changed, 7 insertions(+), 7 deletions(-)
 rename Documentation/{ => arch}/m68k/buddha-driver.rst (100%)
 rename Documentation/{ => arch}/m68k/features.rst (100%)
 rename Documentation/{ => arch}/m68k/index.rst (100%)
 rename Documentation/{ => arch}/m68k/kernel-options.rst (100%)

diff --git a/Documentation/admin-guide/kernel-parameters.rst b/Documentation/admin-guide/kernel-parameters.rst
index c833eac3fe59..6385e3b9b879 100644
--- a/Documentation/admin-guide/kernel-parameters.rst
+++ b/Documentation/admin-guide/kernel-parameters.rst
@@ -131,7 +131,7 @@ parameter is applicable::
 	LOOP	Loopback device support is enabled.
 	M68k	M68k architecture is enabled.
 			These options have more detailed description inside of
-			Documentation/m68k/kernel-options.rst.
+			Documentation/arch/m68k/kernel-options.rst.
 	MDA	MDA console support is enabled.
 	MIPS	MIPS architecture is enabled.
 	MOUSE	Appropriate mouse support is enabled.
diff --git a/Documentation/arch/index.rst b/Documentation/arch/index.rst
index 6839cd46850d..80ee31016584 100644
--- a/Documentation/arch/index.rst
+++ b/Documentation/arch/index.rst
@@ -14,7 +14,7 @@ implementation.
    ../arm64/index
    ia64/index
    ../loongarch/index
-   ../m68k/index
+   m68k/index
    ../mips/index
    nios2/index
    openrisc/index
diff --git a/Documentation/m68k/buddha-driver.rst b/Documentation/arch/m68k/buddha-driver.rst
similarity index 100%
rename from Documentation/m68k/buddha-driver.rst
rename to Documentation/arch/m68k/buddha-driver.rst
diff --git a/Documentation/m68k/features.rst b/Documentation/arch/m68k/features.rst
similarity index 100%
rename from Documentation/m68k/features.rst
rename to Documentation/arch/m68k/features.rst
diff --git a/Documentation/m68k/index.rst b/Documentation/arch/m68k/index.rst
similarity index 100%
rename from Documentation/m68k/index.rst
rename to Documentation/arch/m68k/index.rst
diff --git a/Documentation/m68k/kernel-options.rst b/Documentation/arch/m68k/kernel-options.rst
similarity index 100%
rename from Documentation/m68k/kernel-options.rst
rename to Documentation/arch/m68k/kernel-options.rst
diff --git a/Documentation/translations/zh_CN/arch/parisc/debugging.rst b/Documentation/translations/zh_CN/arch/parisc/debugging.rst
index 9bd197eb0d41..c6b9de6d3175 100644
--- a/Documentation/translations/zh_CN/arch/parisc/debugging.rst
+++ b/Documentation/translations/zh_CN/arch/parisc/debugging.rst
@@ -1,4 +1,4 @@
-.. include:: ../disclaimer-zh_CN.rst
+.. include:: ../../disclaimer-zh_CN.rst
 
 :Original: Documentation/arch/parisc/debugging.rst
 
diff --git a/Documentation/translations/zh_CN/arch/parisc/index.rst b/Documentation/translations/zh_CN/arch/parisc/index.rst
index 848742539550..9f69283bd1c9 100644
--- a/Documentation/translations/zh_CN/arch/parisc/index.rst
+++ b/Documentation/translations/zh_CN/arch/parisc/index.rst
@@ -1,5 +1,5 @@
 .. SPDX-License-Identifier: GPL-2.0
-.. include:: ../disclaimer-zh_CN.rst
+.. include:: ../../disclaimer-zh_CN.rst
 
 :Original: Documentation/arch/parisc/index.rst
 
diff --git a/Documentation/translations/zh_CN/arch/parisc/registers.rst b/Documentation/translations/zh_CN/arch/parisc/registers.rst
index caf5f258248b..a55250afcc27 100644
--- a/Documentation/translations/zh_CN/arch/parisc/registers.rst
+++ b/Documentation/translations/zh_CN/arch/parisc/registers.rst
@@ -1,4 +1,4 @@
-.. include:: ../disclaimer-zh_CN.rst
+.. include:: ../../disclaimer-zh_CN.rst
 
 :Original: Documentation/arch/parisc/registers.rst
 
diff --git a/arch/m68k/Kconfig.machine b/arch/m68k/Kconfig.machine
index e2f961208f18..28eebabfd34b 100644
--- a/arch/m68k/Kconfig.machine
+++ b/arch/m68k/Kconfig.machine
@@ -11,7 +11,7 @@ config AMIGA
 	help
 	  This option enables support for the Amiga series of computers. If
 	  you plan to use this kernel on an Amiga, say Y here and browse the
-	  material available in <file:Documentation/m68k>; otherwise say N.
+	  material available in <file:Documentation/arch/m68k>; otherwise say N.
 
 config ATARI
 	bool "Atari support"
@@ -23,7 +23,7 @@ config ATARI
 	  This option enables support for the 68000-based Atari series of
 	  computers (including the TT, Falcon and Medusa). If you plan to use
 	  this kernel on an Atari, say Y here and browse the material
-	  available in <file:Documentation/m68k>; otherwise say N.
+	  available in <file:Documentation/arch/m68k>; otherwise say N.
 
 config ATARI_KBD_CORE
 	bool
-- 
2.39.2