diff options
| author | Jeremy Bicha <jeremy.bicha@canonical.com> | 2022-11-28 16:28:37 -0500 |
|---|---|---|
| committer | Jeremy Bicha <jeremy.bicha@canonical.com> | 2022-11-28 16:28:52 -0500 |
| commit | 23b72b08c0e0079ce1c6e6daa5b2a95602290cf3 (patch) | |
| tree | 423b7ab020011c905b18e4706558537d01758b8e /man/nm-settings-nmcli.5 | |
| parent | 54a11b421d2f5e43f9c88eb38a0a5992e9636290 (diff) | |
| parent | dbc388c3d1132f291cf4d62455d77e71d0918dcc (diff) | |
Merge tag 'debian/1.40.4-1' into ubuntu/master
network-manager Debian release 1.40.4-1
Diffstat (limited to 'man/nm-settings-nmcli.5')
| -rw-r--r-- | man/nm-settings-nmcli.5 | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/man/nm-settings-nmcli.5 b/man/nm-settings-nmcli.5 index be46876f..5ae4274f 100644 --- a/man/nm-settings-nmcli.5 +++ b/man/nm-settings-nmcli.5 @@ -2,12 +2,12 @@ .\" Title: nm-settings-nmcli .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 08/26/2022 +.\" Date: 11/18/2022 .\" Manual: Configuration -.\" Source: NetworkManager 1.40.0 +.\" Source: NetworkManager 1.40.4 .\" Language: English .\" -.TH "NM\-SETTINGS\-NMCLI" "5" "" "NetworkManager 1\&.40\&.0" "Configuration" +.TH "NM\-SETTINGS\-NMCLI" "5" "" "NetworkManager 1\&.40\&.4" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -1853,8 +1853,6 @@ Format: int32 .RS 4 The Vendor Class Identifier DHCP option (60)\&. Special characters in the data string may be escaped using C\-style escapes, nevertheless this property cannot contain nul bytes\&. If the per\-profile value is unspecified (the default), a global connection default gets consulted\&. If still unspecified, the DHCP option is not sent to the server\&. .sp -Since 1\&.28 -.sp Format: string .RE .PP @@ -1945,8 +1943,6 @@ Enable and disable the IPv4 link\-local configuration independently of the ipv4\ .sp When set to "auto", the value is dependent on "ipv4\&.method"\&. When set to "default", it honors the global connection default, before falling back to "auto"\&. Note that if "ipv4\&.method" is "disabled", then link local addressing is always disabled too\&. The default is "default"\&. .sp -Since 1\&.40 -.sp Format: int32 .RE .PP |