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 /man/nm-settings-nmcli.xsl | |
| 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 'man/nm-settings-nmcli.xsl')
| -rw-r--r-- | man/nm-settings-nmcli.xsl | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/man/nm-settings-nmcli.xsl b/man/nm-settings-nmcli.xsl index a31922a5..5a6b8ba1 100644 --- a/man/nm-settings-nmcli.xsl +++ b/man/nm-settings-nmcli.xsl @@ -150,12 +150,19 @@ Alias: <xsl:value-of select="@alias"/> </para> </xsl:if> - <para> - <xsl:value-of select="@description"/> - <xsl:if test="@type = 'NMSettingSecretFlags (uint32)'"> - See <xref linkend="secrets-flags"/> for flag values. - </xsl:if> - </para> + <xsl:choose> + <xsl:when test="description-docbook"> + <xsl:copy-of select="./description-docbook/*/."/> + </xsl:when> + <xsl:otherwise> + <para> + <xsl:value-of select="@description"/> + <xsl:if test="@type = 'NMSettingSecretFlags (uint32)'"> + See <xref linkend="secrets-flags"/> for flag values. + </xsl:if> + </para> + </xsl:otherwise> + </xsl:choose> <xsl:if test="@type"> <para> Format: <xsl:value-of select="@type"/> |