about summary refs log tree commit diff
path: root/docs/api/html/ref-settings.html
diff options
context:
space:
mode:
Diffstat (limited to 'docs/api/html/ref-settings.html')
-rw-r--r--docs/api/html/ref-settings.html46
1 files changed, 23 insertions, 23 deletions
diff --git a/docs/api/html/ref-settings.html b/docs/api/html/ref-settings.html
index abdef1d7..45929d62 100644
--- a/docs/api/html/ref-settings.html
+++ b/docs/api/html/ref-settings.html
@@ -23,7 +23,7 @@
 <div class="titlepage"><div><div><h2 class="title">
 <a name="ref-settings"></a>Network Configuration Setting Specification</h2></div></div></div>
 <div class="toc"><dl>
-<dt><span class="section"><a href="ref-settings.html#id437745">Configuration Settings</a></span></dt>
+<dt><span class="section"><a href="ref-settings.html#id480831">Configuration Settings</a></span></dt>
 <dt><span class="section"><a href="secrets-flags.html">Secret flag types</a></span></dt>
 </dl></div>
 <p>
@@ -35,11 +35,11 @@
     </p>
 <div class="section">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="id437745"></a>Configuration Settings</h2></div></div></div>
+<a name="id480831"></a>Configuration Settings</h2></div></div></div>
 <p>
 </p>
 <div class="table">
-<a name="id439177"></a><p class="title"><b>Table 1. 802-1x setting</b></p>
+<a name="id455861"></a><p class="title"><b>Table 1. 802-1x setting</b></p>
 <div class="table-contents"><table summary="802-1x setting" border="1">
 <colgroup>
 <col>
@@ -246,7 +246,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="id425896"></a><p class="title"><b>Table 2. bluetooth setting</b></p>
+<a name="id464508"></a><p class="title"><b>Table 2. bluetooth setting</b></p>
 <div class="table-contents"><table summary="bluetooth setting" border="1">
 <colgroup>
 <col>
@@ -285,7 +285,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="id426028"></a><p class="title"><b>Table 3. bond setting</b></p>
+<a name="id464640"></a><p class="title"><b>Table 3. bond setting</b></p>
 <div class="table-contents"><table summary="bond setting" border="1">
 <colgroup>
 <col>
@@ -324,7 +324,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="id426161"></a><p class="title"><b>Table 4. cdma setting</b></p>
+<a name="id464773"></a><p class="title"><b>Table 4. cdma setting</b></p>
 <div class="table-contents"><table summary="cdma setting" border="1">
 <colgroup>
 <col>
@@ -375,7 +375,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="id426359"></a><p class="title"><b>Table 5. connection setting</b></p>
+<a name="id464971"></a><p class="title"><b>Table 5. connection setting</b></p>
 <div class="table-contents"><table summary="connection setting" border="1">
 <colgroup>
 <col>
@@ -462,7 +462,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="id426751"></a><p class="title"><b>Table 6. gsm setting</b></p>
+<a name="id465363"></a><p class="title"><b>Table 6. gsm setting</b></p>
 <div class="table-contents"><table summary="gsm setting" border="1">
 <colgroup>
 <col>
@@ -555,7 +555,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="id456458"></a><p class="title"><b>Table 7. infiniband setting</b></p>
+<a name="id495059"></a><p class="title"><b>Table 7. infiniband setting</b></p>
 <div class="table-contents"><table summary="infiniband setting" border="1">
 <colgroup>
 <col>
@@ -600,7 +600,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="id456596"></a><p class="title"><b>Table 8. ipv4 setting</b></p>
+<a name="id495198"></a><p class="title"><b>Table 8. ipv4 setting</b></p>
 <div class="table-contents"><table summary="ipv4 setting" border="1">
 <colgroup>
 <col>
@@ -699,7 +699,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="id456993"></a><p class="title"><b>Table 9. ipv6 setting</b></p>
+<a name="id495594"></a><p class="title"><b>Table 9. ipv6 setting</b></p>
 <div class="table-contents"><table summary="ipv6 setting" border="1">
 <colgroup>
 <col>
@@ -786,7 +786,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="id457340"></a><p class="title"><b>Table 10. 802-11-olpc-mesh setting</b></p>
+<a name="id495941"></a><p class="title"><b>Table 10. 802-11-olpc-mesh setting</b></p>
 <div class="table-contents"><table summary="802-11-olpc-mesh setting" border="1">
 <colgroup>
 <col>
@@ -831,7 +831,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="id457478"></a><p class="title"><b>Table 11. ppp setting</b></p>
+<a name="id496079"></a><p class="title"><b>Table 11. ppp setting</b></p>
 <div class="table-contents"><table summary="ppp setting" border="1">
 <colgroup>
 <col>
@@ -966,7 +966,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="id458143"></a><p class="title"><b>Table 12. pppoe setting</b></p>
+<a name="id496747"></a><p class="title"><b>Table 12. pppoe setting</b></p>
 <div class="table-contents"><table summary="pppoe setting" border="1">
 <colgroup>
 <col>
@@ -1017,7 +1017,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="id458349"></a><p class="title"><b>Table 13. serial setting</b></p>
+<a name="id496953"></a><p class="title"><b>Table 13. serial setting</b></p>
 <div class="table-contents"><table summary="serial setting" border="1">
 <colgroup>
 <col>
@@ -1074,7 +1074,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="id458588"></a><p class="title"><b>Table 14. vlan setting</b></p>
+<a name="id497192"></a><p class="title"><b>Table 14. vlan setting</b></p>
 <div class="table-contents"><table summary="vlan setting" border="1">
 <colgroup>
 <col>
@@ -1099,13 +1099,13 @@
 <td><pre class="screen">interface-name</pre></td>
 <td><pre class="screen">string</pre></td>
 <td><pre class="screen"></pre></td>
-<td>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.</td>
+<td>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.</td>
 </tr>
 <tr>
 <td><pre class="screen">parent</pre></td>
 <td><pre class="screen">string</pre></td>
 <td><pre class="screen"></pre></td>
-<td>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.</td>
+<td>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.</td>
 </tr>
 <tr>
 <td><pre class="screen">id</pre></td>
@@ -1137,7 +1137,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="id458863"></a><p class="title"><b>Table 15. vpn setting</b></p>
+<a name="id497467"></a><p class="title"><b>Table 15. vpn setting</b></p>
 <div class="table-contents"><table summary="vpn setting" border="1">
 <colgroup>
 <col>
@@ -1188,7 +1188,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="id459068"></a><p class="title"><b>Table 16. wimax setting</b></p>
+<a name="id497672"></a><p class="title"><b>Table 16. wimax setting</b></p>
 <div class="table-contents"><table summary="wimax setting" border="1">
 <colgroup>
 <col>
@@ -1227,7 +1227,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="id459207"></a><p class="title"><b>Table 17. 802-3-ethernet setting</b></p>
+<a name="id497811"></a><p class="title"><b>Table 17. 802-3-ethernet setting</b></p>
 <div class="table-contents"><table summary="802-3-ethernet setting" border="1">
 <colgroup>
 <col>
@@ -1320,7 +1320,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="id459647"></a><p class="title"><b>Table 18. 802-11-wireless setting</b></p>
+<a name="id498251"></a><p class="title"><b>Table 18. 802-11-wireless setting</b></p>
 <div class="table-contents"><table summary="802-11-wireless setting" border="1">
 <colgroup>
 <col>
@@ -1431,7 +1431,7 @@
 <p><br class="table-break">
 </p>
 <div class="table">
-<a name="id460191"></a><p class="title"><b>Table 19. 802-11-wireless-security setting</b></p>
+<a name="id498795"></a><p class="title"><b>Table 19. 802-11-wireless-security setting</b></p>
 <div class="table-contents"><table summary="802-11-wireless-security setting" border="1">
 <colgroup>
 <col>