diff options
| author | Michael Biebl <biebl@debian.org> | 2016-08-03 22:59:23 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-08-03 22:59:23 +0200 |
| commit | d6201f5d8daada3d64a0a3e0038e14eebec683ce (patch) | |
| tree | 035500728cc23e7ee5368c3fd605270265a077f7 /docs/api/html/nm-settings.html | |
| parent | 73e152af6e3fb4f5848bfb8394484026ff119003 (diff) | |
Imported Upstream version 1.2.4 upstream/1.2.4
Diffstat (limited to 'docs/api/html/nm-settings.html')
| -rw-r--r-- | docs/api/html/nm-settings.html | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/docs/api/html/nm-settings.html b/docs/api/html/nm-settings.html index b677ece9..4b300bc7 100644 --- a/docs/api/html/nm-settings.html +++ b/docs/api/html/nm-settings.html @@ -1128,6 +1128,12 @@ <td>Array of DNS options. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties.</td> </tr> <tr> +<td align="left">dns-priority</td> +<td align="left">int32</td> +<td align="left">0</td> +<td>DNS priority. The relative priority to be used when determining the order of DNS servers in resolv.conf. A lower value means that servers will be on top of the file. Zero selects the default value, which is 50 for VPNs and 100 for other connections. When multiple devices have configurations with the same priority, the one with an active default route will be preferred. Note that when using dns=dnsmasq the order is meaningless since dnsmasq forwards queries to all known servers at the same time. Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from configurations with the lowest priority value will be used.</td> +</tr> +<tr> <td align="left">dns-search</td> <td align="left">array of string</td> <td align="left">[]</td> @@ -1267,6 +1273,12 @@ <td>Array of DNS options. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties.</td> </tr> <tr> +<td align="left">dns-priority</td> +<td align="left">int32</td> +<td align="left">0</td> +<td>DNS priority. The relative priority to be used when determining the order of DNS servers in resolv.conf. A lower value means that servers will be on top of the file. Zero selects the default value, which is 50 for VPNs and 100 for other connections. When multiple devices have configurations with the same priority, the one with an active default route will be preferred. Note that when using dns=dnsmasq the order is meaningless since dnsmasq forwards queries to all known servers at the same time. Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from configurations with the lowest priority value will be used.</td> +</tr> +<tr> <td align="left">dns-search</td> <td align="left">array of string</td> <td align="left">[]</td> |