From e126f3e804c35480c4f075777430419d6ece23da Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Sun, 23 Sep 2018 10:10:27 +0200
Subject: New upstream version 1.12.4

---
 docs/api/html/settings-macvlan.html | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

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

diff --git a/docs/api/html/settings-macvlan.html b/docs/api/html/settings-macvlan.html
index b605cdd6..b8fc4521 100644
--- a/docs/api/html/settings-macvlan.html
+++ b/docs/api/html/settings-macvlan.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="NetworkManager Reference Manual">
 <link rel="up" href="ch01.html" title="Configuration Settings">
 <link rel="prev" href="settings-macsec.html" title="macsec">
-<link rel="next" href="settings-match.html" title="match">
+<link rel="next" href="settings-802-11-olpc-mesh.html" title="802-11-olpc-mesh">
 <meta name="generator" content="GTK-Doc V1.28 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
@@ -22,7 +22,7 @@
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><a accesskey="u" href="ch01.html"><img src="up.png" width="16" height="16" border="0" alt="Up"></a></td>
 <td><a accesskey="p" href="settings-macsec.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
-<td><a accesskey="n" href="settings-match.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
+<td><a accesskey="n" href="settings-802-11-olpc-mesh.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="refentry">
 <a name="settings-macvlan"></a><div class="titlepage"></div>
@@ -34,11 +34,11 @@
 <td class="gallery_image" valign="top" align="right"></td>
 </tr></table></div>
 <div class="refsect1">
-<a name="id-1.3.3.21.2"></a><h2>
+<a name="id-1.3.3.19.2"></a><h2>
             Properties
         </h2>
 <div class="table">
-<a name="id-1.3.3.21.2.2.1"></a><p class="title"><b>Table 83. </b></p>
+<a name="id-1.3.3.19.2.2.1"></a><p class="title"><b>Table 73. </b></p>
 <div class="table-contents"><table class="table" border="1">
 <colgroup>
 <col>
@@ -60,6 +60,12 @@
 <td>The macvlan mode, which specifies the communication mechanism between multiple macvlans on the same lower device.</td>
 </tr>
 <tr>
+<td><pre class="screen">name</pre></td>
+<td><pre class="screen">string</pre></td>
+<td><pre class="screen">macvlan</pre></td>
+<td>The setting's name, which uniquely identifies the setting within the connection.  Each setting type has a name unique to that type, for example "ppp" or "wireless" or "wired".</td>
+</tr>
+<tr>
 <td><pre class="screen">parent</pre></td>
 <td><pre class="screen">string</pre></td>
 <td><pre class="screen"></pre></td>
-- 
cgit 1.3.0-6-gf8a5