From 8c98b34228abb4dfde822ad89106b4d8b2287639 Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Tue, 7 Aug 2012 22:16:03 +0200
Subject: Imported Upstream version 0.9.6.0

---
 docs/libnm-util/html/NMSettingVlan.html | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'docs/libnm-util/html/NMSettingVlan.html')

diff --git a/docs/libnm-util/html/NMSettingVlan.html b/docs/libnm-util/html/NMSettingVlan.html
index cc50161e..013c31f1 100644
--- a/docs/libnm-util/html/NMSettingVlan.html
+++ b/docs/libnm-util/html/NMSettingVlan.html
@@ -681,8 +681,7 @@ 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 <a class="link" href="NMSettingVlan.html#NMSettingVlan--id" title='The "id" property'><span class="type">"id"</span></a> , ex 'eth2.1'. The parent
 interface may be given by the <a class="link" href="NMSettingVlan.html#NMSettingVlan--parent" title='The "parent" property'><span class="type">"parent"</span></a> property or by a
-hardware address property, eg <a class="link" href="NMSettingWired.html#NMSettingWired--mac-address" title='The "mac-address" property'><span class="type">"mac-address"</span></a> or
-<a class="link" href="NMSettingInfiniband.html#NMSettingInfiniband--mac-address" title='The "mac-address" property'><span class="type">"mac-address"</span></a>.
+hardware address property, eg <a class="link" href="NMSettingWired.html#NMSettingWired--mac-address" title='The "mac-address" property'><span class="type">"mac-address"</span></a>.
 </p>
 <p>Default value: NULL</p>
 </div>
@@ -694,8 +693,7 @@ hardware address property, eg <a class="link" href="NMSettingWired.html#NMSettin
 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 <a class="link" href="NMSettingWired.html#NMSettingWired--mac-address" title='The "mac-address" property'><span class="type">"mac-address"</span></a> or
-<a class="link" href="NMSettingInfiniband.html#NMSettingInfiniband--mac-address" title='The "mac-address" property'><span class="type">"mac-address"</span></a>.
+hardware-specific setting, like <a class="link" href="NMSettingWired.html#NMSettingWired--mac-address" title='The "mac-address" property'><span class="type">"mac-address"</span></a>.
 </p>
 <p>Default value: NULL</p>
 </div>
-- 
cgit 1.3.0-6-gf8a5