projects
/
NetworkManager.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
bbc7725
)
man: document that vpn.timeout property supports a default value
author
Jiří Klimeš
<jklimes@redhat.com>
Thu, 17 Sep 2015 10:39:56 +0000
(12:39 +0200)
committer
Jiří Klimeš
<jklimes@redhat.com>
Mon, 21 Sep 2015 14:59:04 +0000
(16:59 +0200)
man/NetworkManager.conf.xml.in
patch
|
blob
|
history
diff --git
a/man/NetworkManager.conf.xml.in
b/man/NetworkManager.conf.xml.in
index
ccef393
..
3dcf97e
100644
(file)
--- 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>