923a60
From fdc7b6b2af0b80e13bebae8d2f461f54cb71c9d2 Mon Sep 17 00:00:00 2001
923a60
From: Jan Synacek <jsynacek@redhat.com>
923a60
Date: Fri, 27 Apr 2018 08:57:08 +0200
923a60
Subject: [PATCH] doc: fix links to binfmt_misc kernel documentation
923a60
923a60
Resolves: #1572244
923a60
---
923a60
 man/binfmt.d.xml                        | 2 +-
923a60
 src/test/test-util.c                    | 2 +-
923a60
 units/proc-sys-fs-binfmt_misc.automount | 2 +-
923a60
 units/proc-sys-fs-binfmt_misc.mount     | 2 +-
923a60
 units/systemd-binfmt.service.in         | 2 +-
923a60
 5 files changed, 5 insertions(+), 5 deletions(-)
923a60
923a60
diff --git a/man/binfmt.d.xml b/man/binfmt.d.xml
923a60
index 5b63cfb4c3..1a57517d0c 100644
923a60
--- a/man/binfmt.d.xml
923a60
+++ b/man/binfmt.d.xml
923a60
@@ -67,7 +67,7 @@
923a60
 
923a60
     <para>Each file contains a list of binfmt_misc kernel binary
923a60
     format rules. Consult 
923a60
-    url="https://www.kernel.org/doc/Documentation/binfmt_misc.txt">binfmt_misc.txt</ulink>
923a60
+    url="https://www.kernel.org/doc/Documentation/admin-guide/binfmt-misc.rst">binfmt_misc.rst</ulink>
923a60
     for more information on registration of additional binary formats
923a60
     and how to write rules.</para>
923a60
 
923a60
diff --git a/src/test/test-util.c b/src/test/test-util.c
923a60
index fcf5416c02..f2c52edcee 100644
923a60
--- a/src/test/test-util.c
923a60
+++ b/src/test/test-util.c
923a60
@@ -1213,7 +1213,7 @@ static void test_files_same(void) {
923a60
 
923a60
 static void test_is_valid_documentation_url(void) {
923a60
         assert_se(documentation_url_is_valid("http://www.freedesktop.org/wiki/Software/systemd"));
923a60
-        assert_se(documentation_url_is_valid("https://www.kernel.org/doc/Documentation/binfmt_misc.txt"));
923a60
+        assert_se(documentation_url_is_valid("https://www.kernel.org/doc/Documentation/admin-guide/binfmt-misc.rst"));
923a60
         assert_se(documentation_url_is_valid("file:/foo/foo"));
923a60
         assert_se(documentation_url_is_valid("man:systemd.special(7)"));
923a60
         assert_se(documentation_url_is_valid("info:bar"));
923a60
diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount
923a60
index 6be38937b1..b28bf9bb8a 100644
923a60
--- a/units/proc-sys-fs-binfmt_misc.automount
923a60
+++ b/units/proc-sys-fs-binfmt_misc.automount
923a60
@@ -7,7 +7,7 @@
923a60
 
923a60
 [Unit]
923a60
 Description=Arbitrary Executable File Formats File System Automount Point
923a60
-Documentation=https://www.kernel.org/doc/Documentation/binfmt_misc.txt
923a60
+Documentation=https://www.kernel.org/doc/Documentation/admin-guide/binfmt-misc.rst
923a60
 Documentation=http://www.freedesktop.org/wiki/Software/systemd/APIFileSystems
923a60
 DefaultDependencies=no
923a60
 Before=sysinit.target
923a60
diff --git a/units/proc-sys-fs-binfmt_misc.mount b/units/proc-sys-fs-binfmt_misc.mount
923a60
index 8c7c386318..8d22dc9089 100644
923a60
--- a/units/proc-sys-fs-binfmt_misc.mount
923a60
+++ b/units/proc-sys-fs-binfmt_misc.mount
923a60
@@ -7,7 +7,7 @@
923a60
 
923a60
 [Unit]
923a60
 Description=Arbitrary Executable File Formats File System
923a60
-Documentation=https://www.kernel.org/doc/Documentation/binfmt_misc.txt
923a60
+Documentation=https://www.kernel.org/doc/Documentation/admin-guide/binfmt-misc.rst
923a60
 Documentation=http://www.freedesktop.org/wiki/Software/systemd/APIFileSystems
923a60
 DefaultDependencies=no
923a60
 
923a60
diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in
923a60
index 02dfe774df..e066f7fec9 100644
923a60
--- a/units/systemd-binfmt.service.in
923a60
+++ b/units/systemd-binfmt.service.in
923a60
@@ -8,7 +8,7 @@
923a60
 [Unit]
923a60
 Description=Set Up Additional Binary Formats
923a60
 Documentation=man:systemd-binfmt.service(8) man:binfmt.d(5)
923a60
-Documentation=https://www.kernel.org/doc/Documentation/binfmt_misc.txt
923a60
+Documentation=https://www.kernel.org/doc/Documentation/admin-guide/binfmt-misc.rst
923a60
 DefaultDependencies=no
923a60
 Conflicts=shutdown.target
923a60
 After=systemd-readahead-collect.service systemd-readahead-replay.service proc-sys-fs-binfmt_misc.automount