summaryrefslogtreecommitdiffstats
path: root/docs/netctl.profile.5.txt
diff options
context:
space:
mode:
authorJouke Witteveen <j.witteveen@gmail.com>2013-07-24 10:57:48 +0200
committerJouke Witteveen <j.witteveen@gmail.com>2013-07-24 11:39:21 +0200
commit20c66d6499f22adad6c1dae854a627f061c5fbcb (patch)
tree5c21c28ce2f17814559188c2ba49ef4bf73dfd2a /docs/netctl.profile.5.txt
parentcbd00d5652700792a7833617d947f8a78bb34ccc (diff)
downloadnetctl-20c66d6499f22adad6c1dae854a627f061c5fbcb.tar.gz
netctl-20c66d6499f22adad6c1dae854a627f061c5fbcb.tar.xz
Use iproute2 for bridging (FS#36165)
This sheds the dependency on the old bridge-utils (brctl).
Diffstat (limited to 'docs/netctl.profile.5.txt')
-rw-r--r--docs/netctl.profile.5.txt10
1 files changed, 4 insertions, 6 deletions
diff --git a/docs/netctl.profile.5.txt b/docs/netctl.profile.5.txt
index fe0073e..ec36f47 100644
--- a/docs/netctl.profile.5.txt
+++ b/docs/netctl.profile.5.txt
@@ -286,14 +286,12 @@ connections of the `bond' type.
OPTIONS FOR `bridge' CONNECTIONS
--------------------------------
The interfaces of 'BindsToInterfaces' take part in the bridge named by
-'Interface'. Next to the *ip options*, the following are understood for
+'Interface'. Next to the *ip options*, the following is understood for
connections of the `bridge' type:
-'FwdDelay='::
- Forward delay of the bridge. See *brctl*(8) for details.
-
-'MaxAge='::
- Maximum age parameter. See *brctl*(8) for details.
+'SkipForwardingDelay='::
+ Skip \(R)STP and immediately activate all bridge members. This can
+ be useful when DHCP is used on the bridge.
OPTIONS FOR `pppoe' CONNECTIONS