diff options
| author | Jeremy Bicha <jeremy.bicha@canonical.com> | 2023-01-04 18:29:22 -0500 |
|---|---|---|
| committer | Jeremy Bicha <jeremy.bicha@canonical.com> | 2023-01-04 18:29:22 -0500 |
| commit | b40fb4d87dea97023ceae223cc8f3ded60726fe0 (patch) | |
| tree | 26768660a2db4134bde3c42e99bf1c84fb631adf /src/nmcli | |
| parent | 47995cc5a8e379555be2d010c4201bdc56c8fca4 (diff) | |
| parent | b2ca000f0e0a915aba25f7d16b34bd092055ad59 (diff) | |
Merge tag 'debian/1.40.8-1' into ubuntu/master
network-manager Debian release 1.40.8-1
Diffstat (limited to 'src/nmcli')
| -rw-r--r-- | src/nmcli/generate-docs-nm-settings-nmcli.xml | 4 | ||||
| -rw-r--r-- | src/nmcli/generate-docs-nm-settings-nmcli.xml.in | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/nmcli/generate-docs-nm-settings-nmcli.xml b/src/nmcli/generate-docs-nm-settings-nmcli.xml index 5da5c979..f78c5f42 100644 --- a/src/nmcli/generate-docs-nm-settings-nmcli.xml +++ b/src/nmcli/generate-docs-nm-settings-nmcli.xml @@ -774,12 +774,12 @@ description="Whether the transmitted traffic must be encrypted." /> <property name="mka-cak" alias="cak" - description="The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement." /> + description="The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement. Must be a string of 32 hexadecimal characters." /> <property name="mka-cak-flags" description="Flags indicating how to handle the "mka-cak" property." /> <property name="mka-ckn" alias="ckn" - description="The pre-shared CKN (Connectivity-association Key Name) for MACsec Key Agreement." /> + description="The pre-shared CKN (Connectivity-association Key Name) for MACsec Key Agreement. Must be a string of hexadecimal characters with a even length between 2 and 64." /> <property name="port" alias="port" description="The port component of the SCI (Secure Channel Identifier), between 1 and 65534." /> diff --git a/src/nmcli/generate-docs-nm-settings-nmcli.xml.in b/src/nmcli/generate-docs-nm-settings-nmcli.xml.in index 5da5c979..f78c5f42 100644 --- a/src/nmcli/generate-docs-nm-settings-nmcli.xml.in +++ b/src/nmcli/generate-docs-nm-settings-nmcli.xml.in @@ -774,12 +774,12 @@ description="Whether the transmitted traffic must be encrypted." /> <property name="mka-cak" alias="cak" - description="The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement." /> + description="The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement. Must be a string of 32 hexadecimal characters." /> <property name="mka-cak-flags" description="Flags indicating how to handle the "mka-cak" property." /> <property name="mka-ckn" alias="ckn" - description="The pre-shared CKN (Connectivity-association Key Name) for MACsec Key Agreement." /> + description="The pre-shared CKN (Connectivity-association Key Name) for MACsec Key Agreement. Must be a string of hexadecimal characters with a even length between 2 and 64." /> <property name="port" alias="port" description="The port component of the SCI (Secure Channel Identifier), between 1 and 65534." /> |