[PATCH] Documentation: Fix some broken references

[PATCH] Documentation: Fix some broken references

[Martin Walch]

From de5c61cdfe16218aaf133464eaec3ec88fdfe49f Mon Sep 17 00:00:00 2001
From: Martin Walch <walch.martin@web.de>
Date: Mon, 4 May 2020 12:31:15 +0200
Subject: [PATCH] Documentation: Fix some broken references

filesystems/fsverity.rst:
* device-mapper/verity.txt is now admin-guide/device-mapper/verity.rst

filesystems/ubifs-authentication.rst:
* device-mapper has moved into admin-guide

process/submit-checklist.rst:
translations/it_IT/process/submit-checklist.rst:
translations/zh_CN/process/submit-checklist.rst:
* ioctl has moved into userspace-api

Signed-off-by: Martin Walch <walch.martin@web.de>
---
 Documentation/filesystems/fsverity.rst                        | 2 +-
 Documentation/filesystems/ubifs-authentication.rst            | 4 ++--
 Documentation/process/submit-checklist.rst                    | 2 +-
 Documentation/translations/it_IT/process/submit-checklist.rst | 2 +-
 Documentation/translations/zh_CN/process/submit-checklist.rst | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Documentation/filesystems/fsverity.rst b/Documentation/filesystems/fsverity.rst
index a95536b6443c..6cfa671c90d7 100644
--- a/Documentation/filesystems/fsverity.rst
+++ b/Documentation/filesystems/fsverity.rst
@@ -16,7 +16,7 @@ filesystems.  Like fscrypt, not too much filesystem-specific code is
 needed to support fs-verity.
 
 fs-verity is similar to `dm-verity
-<https://www.kernel.org/doc/Documentation/device-mapper/verity.txt>`_
+<https://www.kernel.org/doc/Documentation/admin-guide/device-mapper/verity.rst>`_
 but works on files rather than block devices.  On regular files on
 filesystems supporting fs-verity, userspace can execute an ioctl that
 causes the filesystem to build a Merkle tree for the file and persist
diff --git a/Documentation/filesystems/ubifs-authentication.rst b/Documentation/filesystems/ubifs-authentication.rst
index 16efd729bf7c..960b690f5f44 100644
--- a/Documentation/filesystems/ubifs-authentication.rst
+++ b/Documentation/filesystems/ubifs-authentication.rst
@@ -437,9 +437,9 @@ References
 
 [DMC-CBC-ATTACK]     http://www.jakoblell.com/blog/2013/12/22/practical-malleability-attack-against-cbc-encrypted-luks-partitions/
 
-[DM-INTEGRITY]       https://www.kernel.org/doc/Documentation/device-mapper/dm-integrity.rst
+[DM-INTEGRITY]       https://www.kernel.org/doc/Documentation/admin-guide/device-mapper/dm-integrity.rst
 
-[DM-VERITY]          https://www.kernel.org/doc/Documentation/device-mapper/verity.rst
+[DM-VERITY]          https://www.kernel.org/doc/Documentation/admin-guide/device-mapper/verity.rst
 
 [FSCRYPT-POLICY2]    https://www.spinics.net/lists/linux-ext4/msg58710.html
 
diff --git a/Documentation/process/submit-checklist.rst b/Documentation/process/submit-checklist.rst
index 8e56337d422d..3f8e9d5d95c2 100644
--- a/Documentation/process/submit-checklist.rst
+++ b/Documentation/process/submit-checklist.rst
@@ -107,7 +107,7 @@ and elsewhere regarding submitting Linux kernel patches.
     and why.
 
 26) If any ioctl's are added by the patch, then also update
-    ``Documentation/ioctl/ioctl-number.rst``.
+    ``Documentation/userspace-api/ioctl/ioctl-number.rst``.
 
 27) If your modified source code depends on or uses any of the kernel
     APIs or features that are related to the following ``Kconfig`` symbols,
diff --git a/Documentation/translations/it_IT/process/submit-checklist.rst b/Documentation/translations/it_IT/process/submit-checklist.rst
index 995ee69fab11..3e575502690f 100644
--- a/Documentation/translations/it_IT/process/submit-checklist.rst
+++ b/Documentation/translations/it_IT/process/submit-checklist.rst
@@ -117,7 +117,7 @@ sottomissione delle patch, in particolare
     sorgenti che ne spieghi la logica: cosa fanno e perché.
 
 25) Se la patch aggiunge nuove chiamate ioctl, allora aggiornate
-    ``Documentation/ioctl/ioctl-number.rst``.
+    ``Documentation/userspace-api/ioctl/ioctl-number.rst``.
 
 26) Se il codice che avete modificato dipende o usa una qualsiasi interfaccia o
     funzionalità del kernel che è associata a uno dei seguenti simboli
diff --git a/Documentation/translations/zh_CN/process/submit-checklist.rst b/Documentation/translations/zh_CN/process/submit-checklist.rst
index 8738c55e42a2..50386e0e42e7 100644
--- a/Documentation/translations/zh_CN/process/submit-checklist.rst
+++ b/Documentation/translations/zh_CN/process/submit-checklist.rst
@@ -97,7 +97,7 @@ Linux内核补丁提交清单
 24) 所有内存屏障例如 ``barrier()``, ``rmb()``, ``wmb()`` 都需要源代码中的注
     释来解释它们正在执行的操作及其原因的逻辑。
 
-25) 如果补丁添加了任何ioctl，那么也要更新 ``Documentation/ioctl/ioctl-number.rst``
+25) 如果补丁添加了任何ioctl，那么也要更新 ``Documentation/userspace-api/ioctl/ioctl-number.rst``
 
 26) 如果修改后的源代码依赖或使用与以下 ``Kconfig`` 符号相关的任何内核API或
     功能，则在禁用相关 ``Kconfig`` 符号和/或 ``=m`` （如果该选项可用）的情况
-- 
2.26.2

Re: [PATCH] Documentation: Fix some broken references

[Federico Vaga]

On Monday, May 4, 2020 12:59:12 PM CEST Martin Walch wrote:
> From de5c61cdfe16218aaf133464eaec3ec88fdfe49f Mon Sep 17 00:00:00 2001
> From: Martin Walch <walch.martin@web.de>
> Date: Mon, 4 May 2020 12:31:15 +0200
> Subject: [PATCH] Documentation: Fix some broken references
> 
> filesystems/fsverity.rst:
> * device-mapper/verity.txt is now admin-guide/device-mapper/verity.rst
> 
> filesystems/ubifs-authentication.rst:
> * device-mapper has moved into admin-guide
> 
> process/submit-checklist.rst:
> translations/it_IT/process/submit-checklist.rst:
> translations/zh_CN/process/submit-checklist.rst:
> * ioctl has moved into userspace-api

these changes (submit-checklist) are already in the docs-next branch

> 
> Signed-off-by: Martin Walch <walch.martin@web.de>
> ---
>  Documentation/filesystems/fsverity.rst                        | 2 +-
>  Documentation/filesystems/ubifs-authentication.rst            | 4 ++--
>  Documentation/process/submit-checklist.rst                    | 2 +-
>  Documentation/translations/it_IT/process/submit-checklist.rst | 2 +-
>  Documentation/translations/zh_CN/process/submit-checklist.rst | 2 +-
>  5 files changed, 6 insertions(+), 6 deletions(-)

Re: [PATCH v2] Documentation: Fix some broken references

[Martin Walch]

From a4c8874109227995524ee598e84404edcb78cf64 Mon Sep 17 00:00:00 2001
From: Martin Walch <walch.martin@web.de>
Date: Mon, 4 May 2020 16:36:47 +0200
Subject: [PATCH] Documentation: Fix some broken references

filesystems/fsverity.rst:
* device-mapper/verity.txt is now admin-guide/device-mapper/verity.rst

filesystems/ubifs-authentication.rst:
* device-mapper has moved into admin-guide

Signed-off-by: Martin Walch <walch.martin@web.de>
---
On Monday, May 4, 2020 14:13:26 CEST Federico Vaga wrote:
> these changes (submit-checklist) are already in the docs-next branch

Sorry, I missed that. Thank you for pointing out.
This is a reduced patched without conflicts with docs-next.

 Documentation/filesystems/fsverity.rst             | 2 +-
 Documentation/filesystems/ubifs-authentication.rst | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Documentation/filesystems/fsverity.rst b/Documentation/filesystems/fsverity.rst
index a95536b6443c..6cfa671c90d7 100644
--- a/Documentation/filesystems/fsverity.rst
+++ b/Documentation/filesystems/fsverity.rst
@@ -16,7 +16,7 @@ filesystems.  Like fscrypt, not too much filesystem-specific code is
 needed to support fs-verity.

 fs-verity is similar to `dm-verity
-<https://www.kernel.org/doc/Documentation/device-mapper/verity.txt>`_
+<https://www.kernel.org/doc/Documentation/admin-guide/device-mapper/verity.rst>`_
 but works on files rather than block devices.  On regular files on
 filesystems supporting fs-verity, userspace can execute an ioctl that
 causes the filesystem to build a Merkle tree for the file and persist
diff --git a/Documentation/filesystems/ubifs-authentication.rst b/Documentation/filesystems/ubifs-authentication.rst
index 16efd729bf7c..960b690f5f44 100644
--- a/Documentation/filesystems/ubifs-authentication.rst
+++ b/Documentation/filesystems/ubifs-authentication.rst
@@ -437,9 +437,9 @@ References

 [DMC-CBC-ATTACK]     http://www.jakoblell.com/blog/2013/12/22/practical-malleability-attack-against-cbc-encrypted-luks-partitions/

-[DM-INTEGRITY]       https://www.kernel.org/doc/Documentation/device-mapper/dm-integrity.rst
+[DM-INTEGRITY]       https://www.kernel.org/doc/Documentation/admin-guide/device-mapper/dm-integrity.rst

-[DM-VERITY]          https://www.kernel.org/doc/Documentation/device-mapper/verity.rst
+[DM-VERITY]          https://www.kernel.org/doc/Documentation/admin-guide/device-mapper/verity.rst

 [FSCRYPT-POLICY2]    https://www.spinics.net/lists/linux-ext4/msg58710.html

--
2.26.2