Merge pull request #8892 from poettering/binfmt-misc-rst

binfmt_misc url fixes
This commit is contained in:
Lennart Poettering 2018-05-03 13:07:56 +02:00 committed by GitHub
commit 836f5c940c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions

View File

@ -54,11 +54,9 @@
<refsect1>
<title>Configuration Format</title>
<para>Each file contains a list of binfmt_misc kernel binary
format rules. Consult <ulink
url="https://www.kernel.org/doc/Documentation/admin-guide/binfmt-misc.rst">binfmt-misc.rst</ulink>
for more information on registration of additional binary formats
and how to write rules.</para>
<para>Each file contains a list of binfmt_misc kernel binary format rules. Consult the kernel's <ulink
url="https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.html">binfmt-misc.rst</ulink> documentation
file for more information on registration of additional binary formats and how to write rules.</para>
<para>Empty lines and lines beginning with ; and # are ignored.
Note that this means you may not use ; and # as delimiter in

View File

@ -10,7 +10,9 @@
static void test_is_valid_documentation_url(void) {
assert_se(documentation_url_is_valid("http://www.freedesktop.org/wiki/Software/systemd"));
assert_se(documentation_url_is_valid("https://www.kernel.org/doc/Documentation/binfmt_misc.txt"));
assert_se(documentation_url_is_valid("https://www.kernel.org/doc/Documentation/binfmt_misc.txt")); /* dead */
assert_se(documentation_url_is_valid("https://www.kernel.org/doc/Documentation/admin-guide/binfmt-misc.rst"));
assert_se(documentation_url_is_valid("https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.html"));
assert_se(documentation_url_is_valid("file:/foo/foo"));
assert_se(documentation_url_is_valid("man:systemd.special(7)"));
assert_se(documentation_url_is_valid("info:bar"));