diff --git a/templates/puppet/docs.html b/templates/puppet/docs.html
index f1e61d1b..f420dbe0 100644
--- a/templates/puppet/docs.html
+++ b/templates/puppet/docs.html
@@ -43,7 +43,8 @@ <h5>Parameters</h5>
 	<p>
 	{%- for p in data[class].param -%}
 		<strong><code>{{ p.name }}</code></strong><br/>
-		Data Type:&nbsp;{%- for t in p.types -%}<code>{{ t }}</code>,{%- endfor -%}</br>
+		Data Type:&nbsp;{%- for t in p.types -%}<code>{{ t }}</code>{{ "," if not loop.last }}{%- endfor -%}</br>
+		Description:&nbsp;{%- if p.text -%}{{ p.text }}{%- else -%}None{%- endif -%}<br/>
 	{%- endfor -%}
 	</p>
 {%- endif-%}