summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBeniamino Galvani <bgalvani@redhat.com>2015-04-20 14:45:09 +0200
committerBeniamino Galvani <bgalvani@redhat.com>2015-05-04 09:42:25 +0200
commitb1a81e5165e21eec82a68a3aece24027d58f5330 (patch)
treedc655f86b64f5e6ce06780a1354302c3e40e0f3a
parente573977b808409ccb26562ca8536d46be701f833 (diff)
downloadNetworkManager-bg/resolv-conf-bgo747821.tar.gz
man: document 'rc-manager' optionbg/resolv-conf-bgo747821
-rw-r--r--man/NetworkManager.conf.xml.in14
1 files changed, 14 insertions, 0 deletions
diff --git a/man/NetworkManager.conf.xml.in b/man/NetworkManager.conf.xml.in
index ae4ba88fd6..7807b1bf9d 100644
--- a/man/NetworkManager.conf.xml.in
+++ b/man/NetworkManager.conf.xml.in
@@ -254,6 +254,20 @@ no-auto-default=*
</varlistentry>
<varlistentry>
+ <term><varname>rc-manager</varname></term>
+ <listitem><para>Set the <filename>resolv.conf</filename>
+ management mode. The default value depends on how NetworkManager
+ was built.</para>
+ <para><literal>none</literal>: NetworkManager will directly
+ write changes to <filename>resolv.conf</filename>.</para>
+ <para><literal>resolvconf</literal>: NetworkManager will run
+ resolvconf to update the DNS configuration.</para>
+ <para><literal>netconfig</literal>: NetworkManager will run
+ netconfig to update the DNS configuration.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><varname>debug</varname></term>
<listitem><para>Comma separated list of options to aid
debugging. This value will be combined with the environment