[PATCH 1/2] Documentation/admin-guide/{binfmt-misc,java,mono}: Consolidate into one directory

[PATCH 1/2] Documentation/admin-guide/{binfmt-misc,java,mono}: Consolidate into one directory

[Mingye Wang]

Binfmt stuff has potential. Sorting them together makes sense.
---
 .../admin-guide/{ => binfmt-misc}/binfmt-misc.rst   |  0
 Documentation/admin-guide/binfmt-misc/index.rst     | 13 +++++++++++++
 .../admin-guide/{ => binfmt-misc}/java.rst          |  0
 .../admin-guide/{ => binfmt-misc}/mono.rst          |  0
 Documentation/admin-guide/index.rst                 |  4 +---
 5 files changed, 14 insertions(+), 3 deletions(-)
 rename Documentation/admin-guide/{ => binfmt-misc}/binfmt-misc.rst (100%)
 create mode 100644 Documentation/admin-guide/binfmt-misc/index.rst
 rename Documentation/admin-guide/{ => binfmt-misc}/java.rst (100%)
 rename Documentation/admin-guide/{ => binfmt-misc}/mono.rst (100%)

diff --git a/Documentation/admin-guide/binfmt-misc.rst b/Documentation/admin-guide/binfmt-misc/binfmt-misc.rst
similarity index 100%
rename from Documentation/admin-guide/binfmt-misc.rst
rename to Documentation/admin-guide/binfmt-misc/binfmt-misc.rst
diff --git a/Documentation/admin-guide/binfmt-misc/index.rst b/Documentation/admin-guide/binfmt-misc/index.rst
new file mode 100644
index 00000000000..4ec76f7500d
--- /dev/null
+++ b/Documentation/admin-guide/binfmt-misc/index.rst
@@ -0,0 +1,13 @@
+.. SPDX-License-Identifier: GPL-2.0
+
+=============================================================
+Kernel Support for miscellaneous Binary Formats (binfmt_misc)
+=============================================================
+
+.. toctree::
+   :maxdepth: 2
+
+   binfmt-misc
+   java
+   mono
+
diff --git a/Documentation/admin-guide/java.rst b/Documentation/admin-guide/binfmt-misc/java.rst
similarity index 100%
rename from Documentation/admin-guide/java.rst
rename to Documentation/admin-guide/binfmt-misc/java.rst
diff --git a/Documentation/admin-guide/mono.rst b/Documentation/admin-guide/binfmt-misc/mono.rst
similarity index 100%
rename from Documentation/admin-guide/mono.rst
rename to Documentation/admin-guide/binfmt-misc/mono.rst
diff --git a/Documentation/admin-guide/index.rst b/Documentation/admin-guide/index.rst
index 259d79fbeb9..76eae29c5d8 100644
--- a/Documentation/admin-guide/index.rst
+++ b/Documentation/admin-guide/index.rst
@@ -108,9 +108,7 @@ documents are ... old ...
 .. toctree::
    :maxdepth: 1
 
-   binfmt-misc
-   java
-   mono
+   binfmt-misc/index
 
 
 Block-layer and filesystem administration
-- 
2.49.0.windows.1

[PATCH 2/2] Documentation/admin-guide/binfmt-misc/mono: add Caveats

[Mingye Wang]

This will clash with wine. Spell it out.
---
 Documentation/admin-guide/binfmt-misc/mono.rst | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/Documentation/admin-guide/binfmt-misc/mono.rst b/Documentation/admin-guide/binfmt-misc/mono.rst
index c6dab568006..a11655c72b5 100644
--- a/Documentation/admin-guide/binfmt-misc/mono.rst
+++ b/Documentation/admin-guide/binfmt-misc/mono.rst
@@ -68,3 +68,16 @@ other program after you have done the following:
 
       If this fails with a permission denied error, check
       that the ``.exe`` file has execute permissions.
+
+Caveats
+^^^^^^^
+
+You may have noticed that our registration line is virtually the same
+as the one for wine, with ``MZ`` as the magic number and no offset.
+This means that if you have both wine and mono installed, only one
+of them will work, depending on which one was registered last.
+
+To solve this problem, you can use a wrapper script for either wine
+or mono that checks the file type and invokes the correct interpreter.
+For example, ``file`` is able to distinguish between .NET CLR binaries
+and regular Windows binaries.
-- 
2.49.0.windows.1