[DocBuilder] Combine abstract and discussion in page overview.

realm · Dec 26, 2014 · f0060d8 · f0060d8
1 parent 49140df
commit f0060d8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,7 +8,9 @@ None.
 
 ##### Enhancements
 
-None.
+* Combine abstract and discussion in page overview.  
+  [JP Simard](https://github.com/jpsim)
+  [#115](https://github.com/realm/jazzy/issues/115)
 
 ##### Bug Fixes
 

diff --git a/lib/jazzy/doc_builder.rb b/lib/jazzy/doc_builder.rb
@@ -267,7 +267,9 @@ def self.document(source_module, doc_model, path_to_root)
       doc[:name] = doc_model.name
       doc[:kind] = doc_model.type.name
       doc[:dash_type] = doc_model.type.dash_type
-      doc[:overview] = Jazzy.markdown.render(doc_model.abstract || '')
+      doc[:overview] = Jazzy.markdown.render(
+        (doc_model.abstract || '') + (doc_model.discussion || ''),
+      )
       doc[:structure] = source_module.doc_structure
       doc[:tasks] = render_tasks(source_module, doc_model.children)
       doc[:module_name] = source_module.name