From a53d7f35acb2f4697d4b49817584e7861a992075 Mon Sep 17 00:00:00 2001
From: Adam Stus <adam.stus@snowflake.com>
Date: Thu, 7 Sep 2023 17:28:35 +0200
Subject: [PATCH] Updated docs templates (#368)

---
 .../dev/docs/templates/overview.rst.jinja2    |  4 ++--
 .../app/dev/docs/templates/usage.rst.jinja2   | 22 ++++++++++++++-----
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/snowcli/app/dev/docs/templates/overview.rst.jinja2 b/src/snowcli/app/dev/docs/templates/overview.rst.jinja2
index c84e21a02..25bcc284f 100644
--- a/src/snowcli/app/dev/docs/templates/overview.rst.jinja2
+++ b/src/snowcli/app/dev/docs/templates/overview.rst.jinja2
@@ -4,6 +4,6 @@
 Global options
 ===============================================================================
 {% for param in options if not param.hidden %}
-:samp:`{% for p in param.opts %}{{ p }}{{ ", " if not loop.last }}{% endfor %}{% if not param.is_flag %} <{{ param.name }}>{% endif %}`
-{% if param.help %}{{ param.help }}{% else %}TBD{% endif %}
+:samp:`{% for p in param.opts %}{{ p }}{{ ", " if not loop.last }}{% endfor %}{% if not param.is_flag %} {{ '{' }}{{ param.name }}{{ '}' }}{% endif %}`
+{% if param.help %}{{ "  " + param.help }}{% if param.help[-1] != '.' %}.{% endif %}{% else %}  TBD{% endif %}
 {% endfor %}
diff --git a/src/snowcli/app/dev/docs/templates/usage.rst.jinja2 b/src/snowcli/app/dev/docs/templates/usage.rst.jinja2
index 54ec17608..f71efbe1d 100644
--- a/src/snowcli/app/dev/docs/templates/usage.rst.jinja2
+++ b/src/snowcli/app/dev/docs/templates/usage.rst.jinja2
@@ -5,19 +5,31 @@ Syntax
 
 .. code-block:: console
 
-snow {% for part in path %}{{ part }}{{ " " if not loop.last }}{% endfor %} {% if options %}[OPTIONS]{% endif %} {% for param in arguments %}{{ param.name | upper }}{{ " " if not loop.last }}{% endfor %}
+  snow {% for part in path %}{{ part }}{{ " " if not loop.last }}{% endfor %}
+{%- for param in options if not param.hidden %}
+{{ "    " + param.opts[-1] }}{% if not param.is_flag %} <{{ param.name }}>{% endif %}
+{%- endfor %}
 
 Arguments
 ===============================================================================
 
+{%- if arguments %}
 {% for param in arguments %}
-:samp:`{% for p in param.opts %}{{ p }}{{ ", " if not loop.last }}{% endfor %} <{{ param.name }}>`
-{% if param.help %}{{ param.help }}{% else %}TBD{% endif %}
+:samp:`{% for p in param.opts %}{{ p }}{{ ", " if not loop.last }}{% endfor %} {{ '{' }}{{ param.name }}{{ '}' }}`
+{% if param.help %}{{ "  " + param.help }}{% if param.help[-1] != '.' %}.{% endif %}{% else %}  TBD{% endif %}
 {% endfor %}
+{% else %}
+
+None
+
+{% endif -%}
 
 Options
 ===============================================================================
+
+{%- if options %}
 {% for param in options if not param.hidden %}
-:samp:`{% for p in param.opts %}{{ p }}{{ ", " if not loop.last }}{% endfor %}{% if not param.is_flag %} <{{ param.name }}>{% endif %}`
-{% if param.help %}{{ param.help }}{% else %}TBD{% endif %}
+:samp:`{% for p in param.opts %}{{ p }}{{ ", " if not loop.last }}{% endfor %}{% if not param.is_flag %} {{ '{' }}{{ param.name }}{{ '}' }}{% endif %}`
+{% if param.help %}{{ "  " + param.help }}{% if param.help[-1] != '.' %}.{% endif %}{% else %}  TBD{% endif %}
 {% endfor %}
+{%- else %}None{% endif %}