summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiří Klimeš <jklimes@redhat.com>2015-09-17 12:39:56 +0200
committerJiří Klimeš <jklimes@redhat.com>2015-09-21 16:59:04 +0200
commit9f1e9913b98d7227ba546d0727ce22a906aefbbb (patch)
treeda72bc4a3ac7515bdb3998ffa00070a271bc5309
parentbbc772521816d57ba103ae092a07a692fafcf485 (diff)
downloadNetworkManager-9f1e9913b98d7227ba546d0727ce22a906aefbbb.tar.gz
man: document that vpn.timeout property supports a default value
-rw-r--r--man/NetworkManager.conf.xml.in5
1 files changed, 5 insertions, 0 deletions
diff --git a/man/NetworkManager.conf.xml.in b/man/NetworkManager.conf.xml.in
index ccef393084..3dcf97e082 100644
--- a/man/NetworkManager.conf.xml.in
+++ b/man/NetworkManager.conf.xml.in
@@ -511,6 +511,7 @@ unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth
[connection]
ipv6.ip6-privacy=0
connection.autoconnect-slaves=1
+vpn.timeout=120
[connection-wifi-wlan0]
match-device=interface-name:wlan0
@@ -589,6 +590,10 @@ ipv6.ip6-privacy=1
<term><varname>ipv6.route-metric</varname></term>
</varlistentry>
</variablelist>
+ <varlistentry>
+ <term><varname>vpn.timeout</varname></term>
+ <listitem><para>If left unspecified, default value of 60 seconds is used.</para></listitem>
+ </varlistentry>
</para>
</refsect1>