Merge branch 'master' into macro

1 files changed, 9 insertions, 5 deletions

diff --git a/cmd2/cmd2.py b/cmd2/cmd2.py
index ccf463b2..57660331 100644
--- a/cmd2/cmd2.py
+++ b/cmd2/cmd2.py
@@ -2474,13 +2474,17 @@ class Cmd(cmd.Cmd):
                     doc_block = []
                     found_first = False
                     for doc_line in doc.splitlines():
-                        str(doc_line).strip()
-                        if len(doc_line.strip()) > 0:
-                            doc_block.append(doc_line.strip())
-                            found_first = True
-                        else:
+                        stripped_line = doc_line.strip()
+
+                        # Don't include :param type lines
+                        if stripped_line.startswith(':'):
                             if found_first:
                                 break
+                        elif stripped_line:
+                            doc_block.append(stripped_line)
+                            found_first = True
+                        elif found_first:
+                            break
 
                     for doc_line in doc_block:
                         self.stdout.write('{: <{col_width}}{doc}\n'.format(command,