From 85563b7fc7ec2cd21e38debb9b28db342e2e8e7c Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Sun, 21 Apr 2019 21:09:51 +0200
Subject: New upstream version 1.18.0

---
 docs/api/html/nm-settings-ifcfg-rh.html | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

(limited to 'docs/api/html/nm-settings-ifcfg-rh.html')

diff --git a/docs/api/html/nm-settings-ifcfg-rh.html b/docs/api/html/nm-settings-ifcfg-rh.html
index e184de29..5452c021 100644
--- a/docs/api/html/nm-settings-ifcfg-rh.html
+++ b/docs/api/html/nm-settings-ifcfg-rh.html
@@ -628,6 +628,14 @@ Allowed values: </strong></span>1 - 65535</td>
 <td align="left">yes</td>
 <td align="left">Hairpin mode of the bridge port.</td>
 </tr>
+<tr>
+<td align="left">vlans</td>
+<td align="left">BRIDGE_PORT_VLANS</td>
+<td align="left"> </td>
+<td align="left">List of VLANs on the bridge port<span class="bold"><strong>
+
+Example: </strong></span>BRIDGE_PORT_VLANS="1 pvid untagged,20,300-400 untagged"</td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -708,6 +716,30 @@ Allowed values: </strong></span>0 - 1000000</td>
 
 Allowed values: </strong></span>0 or 1</td>
 </tr>
+<tr>
+<td align="left">vlan-filtering</td>
+<td align="left">BRIDGING_OPTS: vlan_filtering=</td>
+<td align="left">0</td>
+<td align="left">VLAN filtering support.<span class="bold"><strong>
+
+Allowed values: </strong></span>0 or 1</td>
+</tr>
+<tr>
+<td align="left">vlan-default-pvid</td>
+<td align="left">BRIDGING_OPTS: default_pvid=</td>
+<td align="left">1</td>
+<td align="left">default VLAN PVID.<span class="bold"><strong>
+
+Allowed values: </strong></span>0 - 4094</td>
+</tr>
+<tr>
+<td align="left">vlans</td>
+<td align="left">BRIDGE_VLANS</td>
+<td align="left"> </td>
+<td align="left">List of VLANs on the bridge<span class="bold"><strong>
+
+Example: </strong></span>BRIDGE_VLANS="1 pvid untagged,20,300-400 untagged"</td>
+</tr>
 </tbody>
 </table></div>
 </div>
-- 
cgit 1.3.0-6-gf8a5