- % if entry.description:
-${entry.description | javadoc}\
- % endif
- % if entry.notes:
-${entry.notes | javadoc}\
- % endif
+<%
+ # Dedent fixes markdown not to generate code blocks. Then do the rest.
+ description = ""
+ if entry.description:
+ description = dedent(entry.description) + "\n\n"
+ details = ""
+ if entry.details:
+ details = dedent(entry.details)
+ # Unconditionally add extra information if necessary
+ extra_detail = generate_extra_javadoc_detail(entry)("")
+
+ concatenated_info = description + details + extra_detail
+%>\
+## Glue description and details together before javadoc-izing. Otherwise @see in middle of javadoc.
+${concatenated_info | javadoc(metadata)}\