diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 10:49:37 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 10:49:37 +0100 |
| commit | 404ebe62622150e77e311777dff8617eb974e834 (patch) | |
| tree | cc7f73d3e435d5b3ee85e2bef833e8de1fb133e3 /docs/api/html/settings-ipv4.html | |
| parent | 227c401a10a930af6fd5f123aef345fcd130d6aa (diff) | |
| parent | 3626b425d1bc017fdc6f1ea0cfd329d1e1681641 (diff) | |
Merge remote-tracking branch 'salsa/upstream' into upstream
Diffstat (limited to 'docs/api/html/settings-ipv4.html')
| -rw-r--r-- | docs/api/html/settings-ipv4.html | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/docs/api/html/settings-ipv4.html b/docs/api/html/settings-ipv4.html index e0c5fd09..f1755230 100644 --- a/docs/api/html/settings-ipv4.html +++ b/docs/api/html/settings-ipv4.html @@ -8,7 +8,7 @@ <link rel="up" href="ch01.html" title="Configuration Settings"> <link rel="prev" href="settings-infiniband.html" title="infiniband"> <link rel="next" href="settings-ipv6.html" title="ipv6"> -<meta name="generator" content="GTK-Doc V1.29 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -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.15.2"></a><h2> +<a name="id-1.3.3.17.2"></a><h2> Properties </h2> <div class="table"> -<a name="id-1.3.3.15.2.2.1"></a><p class="title"><b>Table 69. </b></p> +<a name="id-1.3.3.17.2.2.1"></a><p class="title"><b>Table 79. </b></p> <div class="table-contents"><table class="table" border="1"> <colgroup> <col> @@ -153,13 +153,7 @@ <td><pre class="screen">method</pre></td> <td><pre class="screen">string</pre></td> <td><pre class="screen"></pre></td> -<td>IP configuration method. NMSettingIP4Config and NMSettingIP6Config both support "auto", "manual", and "link-local". See the subclass-specific documentation for other values. In general, for the "auto" method, properties such as "dns" and "routes" specify information that is added on to the information returned from automatic configuration. The "ignore-auto-routes" and "ignore-auto-dns" properties modify this behavior. For methods that imply no upstream network, such as "shared" or "link-local", these properties must be empty. For IPv4 method "shared", the IP subnet can be configured by adding one manual IPv4 address or otherwise 10.42.x.0/24 is chosen.</td> -</tr> -<tr> -<td><pre class="screen">name</pre></td> -<td><pre class="screen">string</pre></td> -<td><pre class="screen">ipv4</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> +<td>IP configuration method. NMSettingIP4Config and NMSettingIP6Config both support "auto", "manual", and "link-local". See the subclass-specific documentation for other values. In general, for the "auto" method, properties such as "dns" and "routes" specify information that is added on to the information returned from automatic configuration. The "ignore-auto-routes" and "ignore-auto-dns" properties modify this behavior. For methods that imply no upstream network, such as "shared" or "link-local", these properties must be empty. For IPv4 method "shared", the IP subnet can be configured by adding one manual IPv4 address or otherwise 10.42.x.0/24 is chosen. Note that the shared method must be configured on the interface which shares the internet to a subnet, not on the uplink which is shared.</td> </tr> <tr> <td><pre class="screen">never-default</pre></td> @@ -198,6 +192,6 @@ </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.29</div> +<hr>Generated by GTK-Doc V1.29.1</div> </body> </html> \ No newline at end of file |