diff options
| author | Jeremy Bicha <jeremy.bicha@canonical.com> | 2022-02-03 09:24:19 -0500 |
|---|---|---|
| committer | Jeremy Bicha <jeremy.bicha@canonical.com> | 2022-02-03 12:01:26 -0500 |
| commit | 240934659cd8326a14324c73d4f0f88eecfddcab (patch) | |
| tree | e07cde48aa0a143bebf10ca7103cc0e69febad25 /docs/libnm/html/NMSettingProxy.html | |
| parent | fbe61ddadf4a89800a8e3651ae91099259ddf2ad (diff) | |
| parent | 1628eda029ba4dede8d4d45572c6b60367882436 (diff) | |
Merge tag 'debian/1.34.0-2' into ubuntu/master
network-manager Debian release 1.34.0-2
Diffstat (limited to 'docs/libnm/html/NMSettingProxy.html')
| -rw-r--r-- | docs/libnm/html/NMSettingProxy.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/libnm/html/NMSettingProxy.html b/docs/libnm/html/NMSettingProxy.html index 0ed60245..bba60204 100644 --- a/docs/libnm/html/NMSettingProxy.html +++ b/docs/libnm/html/NMSettingProxy.html @@ -126,7 +126,7 @@ <a name="NMSettingProxy.description"></a><h2>Description</h2> <p>The <a class="link" href="NMSettingProxy.html" title="NMSettingProxy"><span class="type">NMSettingProxy</span></a> object is a <a class="link" href="NMSetting.html" title="NMSetting"><span class="type">NMSetting</span></a> subclass that describes properties related to Proxy settings like PAC URL, PAC script etc.</p> -<p>NetworkManager support 2 values for the <a href="NMSettingProxy.html#NMSettingProxy--method"><span class="type">“method”</span></a> property for +<p>NetworkManager support 2 values for the <span class="type">“method”</span> property for proxy. If "auto" is specified then WPAD takes place and the appropriate details are pushed into PacRunner or user can override this URL with a new PAC URL or a PAC script. If "none" is selected then no proxy configuration is given to PacRunner |