daandemeyer / rpms / systemd

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