]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Revert "Add systemd-resolve backwards compatibility section to resolvectl docs"
authorLennart Poettering <lennart@poettering.net>
Wed, 30 Jun 2021 16:45:32 +0000 (18:45 +0200)
committerLennart Poettering <lennart@poettering.net>
Wed, 7 Jul 2021 13:27:28 +0000 (15:27 +0200)
This reverts commit 9fcfc0470df856c870dcfc6df78bfbc714da6bd2.

man/resolvectl.xml
man/rules/meson.build

index 674d8fd108cd0da743ebfaae35f13dec1e37ea36..3ef2e5190224ec67235811712f60d95064b16311 100644 (file)
@@ -19,7 +19,6 @@
   <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>
 
     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>
 
index a62d568861b179ddd92a6c9d15eb4ed1aaaa4653..0f6519106a44ab51b3137dbba388487ca442122c 100644 (file)
@@ -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', 'systemd-resolve'], 'ENABLE_RESOLVE'],
+ ['resolvectl', '1', ['resolvconf'], 'ENABLE_RESOLVE'],
  ['resolved.conf', '5', ['resolved.conf.d'], 'ENABLE_RESOLVE'],
  ['runlevel', '8', [], 'HAVE_SYSV_COMPAT'],
  ['sd-bus-errors',