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/settings-bridge.html | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'docs/api/html/settings-bridge.html')

diff --git a/docs/api/html/settings-bridge.html b/docs/api/html/settings-bridge.html
index d5657511..f137d4e9 100644
--- a/docs/api/html/settings-bridge.html
+++ b/docs/api/html/settings-bridge.html
@@ -113,6 +113,24 @@
 <td><pre class="screen">TRUE</pre></td>
 <td>Controls whether Spanning Tree Protocol (STP) is enabled for this bridge.</td>
 </tr>
+<tr>
+<td><pre class="screen">vlan-default-pvid</pre></td>
+<td><pre class="screen">uint32</pre></td>
+<td><pre class="screen">1</pre></td>
+<td>The default PVID for the ports of the bridge, that is the VLAN id assigned to incoming untagged frames.</td>
+</tr>
+<tr>
+<td><pre class="screen">vlan-filtering</pre></td>
+<td><pre class="screen">boolean</pre></td>
+<td><pre class="screen">FALSE</pre></td>
+<td>Control whether VLAN filtering is enabled on the bridge.</td>
+</tr>
+<tr>
+<td><pre class="screen">vlans</pre></td>
+<td><pre class="screen">array of vardict</pre></td>
+<td><pre class="screen">[]</pre></td>
+<td>Array of bridge VLAN objects. In addition to the VLANs specified here, the bridge will also have the default-pvid VLAN configured  by the bridge.vlan-default-pvid property. In nmcli the VLAN list can be specified with the following syntax: $vid [pvid] [untagged] [, $vid [pvid] [untagged]]... where $vid is either a single id between 1 and 4094 or a range, represented as a couple of ids separated by a dash.</td>
+</tr>
 </tbody>
 </table></div>
 </div>
-- 
cgit 1.3.0-6-gf8a5