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/api/html/settings-802-3-ethernet.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/api/html/settings-802-3-ethernet.html')
| -rw-r--r-- | docs/api/html/settings-802-3-ethernet.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/api/html/settings-802-3-ethernet.html b/docs/api/html/settings-802-3-ethernet.html index 28eeeb1b..3b38ba11 100644 --- a/docs/api/html/settings-802-3-ethernet.html +++ b/docs/api/html/settings-802-3-ethernet.html @@ -38,7 +38,7 @@ Properties </h2> <div class="table"> -<a name="id-1.3.3.45.2.2.1"></a><p class="title"><b>Table 88. </b></p> +<a name="id-1.3.3.45.2.2.1"></a><p class="title"><b>Table 89. </b></p> <div class="table-contents"><table class="table" border="1"> <colgroup> <col> @@ -123,7 +123,7 @@ <td><pre class="screen">s390-options</pre></td> <td><pre class="screen">dict of string to string</pre></td> <td><pre class="screen">{}</pre></td> -<td>Dictionary of key/value pairs of s390-specific device options. Both keys and values must be strings. Allowed keys include "portno", "layer2", "portname", "protocol", among others. Key names must contain only alphanumeric characters (ie, [a-zA-Z0-9]).</td> +<td>Dictionary of key/value pairs of s390-specific device options. Both keys and values must be strings. Allowed keys include "portno", "layer2", "portname", "protocol", among others. Key names must contain only alphanumeric characters (ie, [a-zA-Z0-9]). Currently, NetworkManager itself does nothing with this information. However, s390utils ships a udev rule which parses this information and applies it to the interface.</td> </tr> <tr> <td><pre class="screen">s390-subchannels</pre></td> |