diff options
author | Lennart Poettering <lennart@poettering.net> | 2021-06-30 18:45:32 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2021-07-07 15:27:28 +0200 |
commit | fc20b9b5983699775fee736e6af26a51dec817fa (patch) | |
tree | 5c9b777b4a2b57823e3fd799b975f76a8ca7baad | |
parent | 378e9d2b6d701a1385c4bf72dfc0697c2c37bd57 (diff) | |
download | systemd-fc20b9b5983699775fee736e6af26a51dec817fa.tar.gz |
Revert "Add systemd-resolve backwards compatibility section to resolvectl docs"
This reverts commit 9fcfc0470df856c870dcfc6df78bfbc714da6bd2.
-rw-r--r-- | man/resolvectl.xml | 13 | ||||
-rw-r--r-- | man/rules/meson.build | 2 |
2 files changed, 1 insertions, 14 deletions
diff --git a/man/resolvectl.xml b/man/resolvectl.xml index 674d8fd108..3ef2e51902 100644 --- a/man/resolvectl.xml +++ b/man/resolvectl.xml @@ -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> @@ -474,18 +473,6 @@ </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> <example> diff --git a/man/rules/meson.build b/man/rules/meson.build index a62d568861..0f6519106a 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', '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', |