From 42ecca2e6839aa4a36e335564461731ceee9180a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 20 Apr 2020 09:20:01 +0200 Subject: [PATCH] man: use manpages.ubuntu.com for resolvconf(8) link Add manpages.debian.org as a man citeref "project", so we can refer to man pages hosted there. resolvconf(8) doesn't seem to appear on any of the ones we currently have defined. We are doing a trick, where our man page is installed as resolvconf(1), and we refer the reader to resolvconf(8). This can be pretty confusing, so the least we can do is to provide a non-broken symlink ;) v2: - link to manpages.d.o instead of manpages.ubuntu.com, because debian is the upstream here, and because with debian we can use /unstable/ as the version, and ubuntu doesn't seem to have any such shortcut, so the version would need to be periodically updated. --- man/custom-html.xsl | 21 ++++++++++++++++----- man/resolvectl.xml | 10 +++++++--- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/man/custom-html.xsl b/man/custom-html.xsl index fccaf51ff5e..7eebfdb5a14 100644 --- a/man/custom-html.xsl +++ b/man/custom-html.xsl @@ -1,9 +1,5 @@ - - + @@ -96,6 +92,21 @@ + + + + https://manpages.debian.org/unstable/ + + / + + . + + .en.html + + + + + diff --git a/man/resolvectl.xml b/man/resolvectl.xml index 4911980823b..a7de5a309f4 100644 --- a/man/resolvectl.xml +++ b/man/resolvectl.xml @@ -288,11 +288,13 @@ - Compatibility with <citerefentry><refentrytitle>resolvconf</refentrytitle><manvolnum>8</manvolnum></citerefentry> + Compatibility with + <citerefentry project="debian"><refentrytitle>resolvconf</refentrytitle><manvolnum>8</manvolnum></citerefentry> resolvectl is a multi-call binary. When invoked as resolvconf (generally achieved by means of a symbolic link of this name to the resolvectl binary) it - is run in a limited resolvconf8 + is run in a limited + resolvconf8 compatibility mode. It accepts mostly the same arguments and pushes all data into systemd-resolved.service8, similar to how and commands operate. Note that @@ -367,7 +369,9 @@ - See resolvconf8 for details on this command line options. + See + resolvconf8 + for details on those command line options. -- 2.47.3