diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 10:52:15 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 11:24:27 +0100 |
| commit | e8ac7dacdcf4b38addef4f8ac6ab038f9d29582c (patch) | |
| tree | 017883e210043859ee695250f6285380b795f8e4 /libnm/nm-settings-keyfile-docs.xml | |
| parent | b05c072fe2594e0369cbfb00a3fba176d2d309dc (diff) | |
| parent | 1b878e595ff7be634a4800ca6cc506046e49548e (diff) | |
Merge remote-tracking branch 'salsa/master' into disco
Diffstat (limited to 'libnm/nm-settings-keyfile-docs.xml')
| -rw-r--r-- | libnm/nm-settings-keyfile-docs.xml | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/libnm/nm-settings-keyfile-docs.xml b/libnm/nm-settings-keyfile-docs.xml index 561b0588..09b119a2 100644 --- a/libnm/nm-settings-keyfile-docs.xml +++ b/libnm/nm-settings-keyfile-docs.xml @@ -3,7 +3,9 @@ ]> <nm-keyfile-docs> - <setting name="802-1x"> + <setting name="6lowpan"> +</setting> +<setting name="802-1x"> </setting> <setting name="adsl"> </setting> @@ -26,6 +28,8 @@ or semicolon separated list of 6 decimal bytes (obsolete)"/> </setting> <setting name="dummy"> </setting> +<setting name="ethtool"> +</setting> <setting name="generic"> </setting> <setting name="gsm"> @@ -53,6 +57,8 @@ route2=7.7.0.0/16" description="List of IP routes."/> </setting> <setting name="macvlan"> </setting> +<setting name="match"> +</setting> <setting name="802-11-olpc-mesh"> </setting> <setting name="ovs-bridge"> @@ -74,6 +80,8 @@ route2=7.7.0.0/16" description="List of IP routes."/> versions of NetworkManager stored this as an integer: 69 ('E') for even, 111 ('o') for odd, or 110 ('n') for none."/> </setting> +<setting name="sriov"> +</setting> <setting name="tc"> </setting> <setting name="team-port"> @@ -117,4 +125,8 @@ under [vpn-secrets] section."/> (e.g. 0;34;104;18;121;178)."/> <property name="mac-address-blacklist" variable="mac-address-blacklist" format="list of MACs (separated with semicolons)" values="" default="" example="mac-address-blacklist= 00:22:68:12:79:A6;00:22:68:12:79:78" description="MAC address blacklist."/> </setting> +<setting name="wpan"> +<property name="mac-address" variable="mac-address" format="usual hex-digits-and-colons notation" values="" default="" example="" description="MAC address in hex-digits-and-colons notation +(e.g. 76:d8:9b:87:66:60:84:ee)."/> +</setting> </nm-keyfile-docs> \ No newline at end of file |