diff options
| author | Michael Biebl <biebl@debian.org> | 2012-08-07 22:16:17 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2012-08-07 22:16:17 +0200 |
| commit | 44826499c23720be3d74ab674c4fd38912c5b8c2 (patch) | |
| tree | 613bec9c2242e5e0700bef1ba87ca2d25d755795 /docs/api/settings-spec.xml | |
| parent | 9a8ff86a032d1e4dd04238fcde856b145406df6f (diff) | |
| parent | 8c98b34228abb4dfde822ad89106b4d8b2287639 (diff) | |
Merge tag 'upstream/0.9.6.0' into experimental
Upstream version 0.9.6.0
Diffstat (limited to 'docs/api/settings-spec.xml')
| -rw-r--r-- | docs/api/settings-spec.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/api/settings-spec.xml b/docs/api/settings-spec.xml index d90814d7..1e7eead4 100644 --- a/docs/api/settings-spec.xml +++ b/docs/api/settings-spec.xml @@ -983,13 +983,13 @@ <entry><screen>interface-name</screen></entry> <entry><screen>string</screen></entry> <entry><screen></screen></entry> - <entry>If given, specifies the kernel name of the VLAN interface. If not given, a default name will be constructed from the interface described by the parent interface and the 'id' property, ex 'eth2.1'. The parent interface may be given by the 'parent' property or by a hardware address property, eg the 'wired' or 'infiniband' settings' 'mac-address' property.</entry> + <entry>If given, specifies the kernel name of the VLAN interface. If not given, a default name will be constructed from the interface described by the parent interface and the 'id' property, ex 'eth2.1'. The parent interface may be given by the 'parent' property or by a hardware address property, eg the 'wired' settings' 'mac-address' property.</entry> </row> <row> <entry><screen>parent</screen></entry> <entry><screen>string</screen></entry> <entry><screen></screen></entry> - <entry>If given, specifies the parent interface name or parent connection UUID from which this VLAN interface should be created. If this property is not specified, the connection must contain a hardware address in a hardware-specific setting, like the 'wired' or 'infiniband' settings' 'mac-address' property.</entry> + <entry>If given, specifies the parent interface name or parent connection UUID from which this VLAN interface should be created. If this property is not specified, the connection must contain a hardware address in a hardware-specific setting, like the 'wired' settings' 'mac-address' property.</entry> </row> <row> <entry><screen>id</screen></entry> |