From a3b9b661d44d2a0eb8cbe4816995ec6faf45233a Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Fri, 12 Jun 2020 12:09:30 +0200
Subject: [PATCH] docs: add "Alias" column to `man nm-settings-nmcli`

---
 man/nm-settings-nmcli.xsl                     | 4 +++-
 tools/generate-docs-nm-settings-docs-merge.py | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/man/nm-settings-nmcli.xsl b/man/nm-settings-nmcli.xsl
index a1dd94b6e0..a8deb1afd1 100644
--- a/man/nm-settings-nmcli.xsl
+++ b/man/nm-settings-nmcli.xsl
@@ -118,7 +118,8 @@
         <tgroup cols="4">
           <thead>
             <row>
-              <entry>Key Name</entry>
+              <entry>Property Name</entry>
+              <entry>Alias</entry>
               <entry>Value Type</entry>
               <entry>Default Value</entry>
               <entry>Value Description</entry>
@@ -136,6 +137,7 @@
     <xsl:variable name="setting_name" select="../@name"/>
     <row>
       <entry align="left"><xsl:attribute name="id">nm-settings-nmcli.property.<xsl:value-of select="../@name"/>.<xsl:value-of select="@name"/></xsl:attribute><xsl:value-of select="@name"/></entry>
+      <entry align="left"><xsl:value-of select="@alias"/></entry>
       <entry align="left"><xsl:value-of select="@type"/></entry>
       <entry align="left"><xsl:value-of select="@default"/></entry>
       <entry><xsl:value-of select="@description"/><xsl:if test="@type = 'NMSettingSecretFlags (uint32)'"> (see <xref linkend="secrets-flags"/> for flag values)</xsl:if></entry>
diff --git a/tools/generate-docs-nm-settings-docs-merge.py b/tools/generate-docs-nm-settings-docs-merge.py
index f749e37543..9115b61b22 100755
--- a/tools/generate-docs-nm-settings-docs-merge.py
+++ b/tools/generate-docs-nm-settings-docs-merge.py
@@ -166,5 +166,6 @@ for setting_name in iter_keys_of_dicts(settings_roots, key_fcn_setting_name):
 
         node_set_attr(property_node, 'default', properties_attrs)
         node_set_attr(property_node, 'description', properties_attrs)
+        node_set_attr(property_node, 'alias', properties_attrs)
 
 ET.ElementTree(root_node).write(gl_output_xml_file)