From: Dan Streetman <ddstreet@canonical.com>
Date: Tue, 29 Jun 2021 10:29:53 +0000 (-0400)
Subject: Add systemd-resolve backwards compatibility section to resolvectl docs
X-Git-Tag: v249-rc3~26
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9fcfc0470df856c870dcfc6df78bfbc714da6bd2;p=thirdparty%2Fsystemd.git

Add systemd-resolve backwards compatibility section to resolvectl docs
---

diff --git a/man/resolvectl.xml b/man/resolvectl.xml
index b9c4d1d768f..16c6b0c5b77 100644
--- a/man/resolvectl.xml
+++ b/man/resolvectl.xml
@@ -19,6 +19,7 @@
   <refnamediv>
     <refname>resolvectl</refname>
     <refname>resolvconf</refname>
+    <refname>systemd-resolve</refname>
     <refpurpose>Resolve domain names, IPV4 and IPv6 addresses, DNS resource records, and services; introspect and reconfigure the DNS resolver</refpurpose>
   </refnamediv>
 
@@ -472,6 +473,18 @@
     for details on those command line options.</para>
   </refsect1>
 
+  <refsect1>
+    <title>Backwards compatibility with <command>systemd-resolve</command></title>
+
+    <para><command>resolvectl</command> is a multi-call binary, which previously was named <literal>systemd-resolve</literal>
+    and used slightly different parameters. When it is invoked as <literal>systemd-resolve</literal>
+    (generally achieved by means of a symbolic link of this name to the <command>resolvectl</command> binary),
+    it runs in compatibility mode. For details on the specific parameters and calling syntax, see the output from
+    <command>systemd-resolve --help</command>. Calling the binary as <literal>systemd-resolve</literal> is
+    deprecated and should only be done for backwards compatibility. All current and new use should call the binary
+    as <literal>resolvectl</literal>.</para>
+  </refsect1>
+
   <refsect1>
     <title>Examples</title>
 
diff --git a/man/rules/meson.build b/man/rules/meson.build
index 0f6519106a4..a62d568861b 100644
--- a/man/rules/meson.build
+++ b/man/rules/meson.build
@@ -67,7 +67,7 @@ manpages = [
  ['portablectl', '1', [], 'ENABLE_PORTABLED'],
  ['pstore.conf', '5', ['pstore.conf.d'], 'ENABLE_PSTORE'],
  ['repart.d', '5', [], 'ENABLE_REPART'],
- ['resolvectl', '1', ['resolvconf'], 'ENABLE_RESOLVE'],
+ ['resolvectl', '1', ['resolvconf', 'systemd-resolve'], 'ENABLE_RESOLVE'],
  ['resolved.conf', '5', ['resolved.conf.d'], 'ENABLE_RESOLVE'],
  ['runlevel', '8', [], 'HAVE_SYSV_COMPAT'],
  ['sd-bus-errors',