--- a/farol/templates/document/edit_note.j2	Mon Oct 06 15:19:09 2014 +0200
+++ b/farol/templates/document/edit_note.j2	Mon Oct 06 15:40:14 2014 +0200
@@ -32,14 +32,22 @@
 
 {% call selectinput("type", "Type", types, note and note._type or '') %}
 <p><em>Type</em> can be one of the following:</p>
-<ul>
-  <li><strong>General</strong>: A general, high-level note (<em>Title</em> may have more information).</li>
-  <li><strong>Details</strong>: A low-level detailed discussion (<em>Title</em> may have more information).</li>
-  <li><strong>Description</strong>: A description of something (<em>Title</em> may have more information).</li>
-  <li><strong>Summary</strong>: A summary of something (<em>Title</em> may have more information).</li>
-  <li><strong>FAQ</strong>: A list of frequently asked questions.</li>
-  <li><strong>Legal Disclaimer</strong>: Any possible legal discussion, including constraints, surrounding the document.</li>
-  <li><strong>Other</strong>: Something that doesn’t fit (<em>Title</em> should have more information).</li>
+<dl class="dl-horizontal">
+  <dt>General:</dt>
+  <dd>A general, high-level note (<em>Title</em> may have more information).</dd>
+  <dt>Details:</dt>
+  <dd>A low-level detailed discussion (<em>Title</em> may have more information).</dd>
+  <dt>Description:</dt>
+  <dd>A description of something (<em>Title</em> may have more information).</dd>
+  <dt>Summary:</dt>
+  <dd>A summary of something (<em>Title</em> may have more information).</dd>
+  <dt>FAQ:</dt>
+  <dd>A list of frequently asked questions.</dd>
+  <dt>Legal Disclaimer:</dt>
+  <dd>Any possible legal discussion, including constraints, surrounding the document.</dd>
+  <dt>Other:</dt>
+  <dd>Something that doesn’t fit (<em>Title</em> should have more information).</dd>
+</dl>
 {% endcall %}
 {% call textinput("ordinal", "Ordinal", "", ordinal or note._ordinal, type="number", required=True, extras={'min': '1'}) %}
 <p><em>Ordinal</em> is a mandatory, locally significant value used to track notes inside a CVRF document at the root (document) level. It is provided to uniquely identify a <strong>Note</strong>.</p>

--- a/farol/templates/document/edit_publisher.j2	Mon Oct 06 15:19:09 2014 +0200
+++ b/farol/templates/document/edit_publisher.j2	Mon Oct 06 15:40:14 2014 +0200
@@ -32,12 +32,17 @@
 
 {% call selectinput("type", "Type", types, publisher._type) %}
 <p>The <strong>Document Publisher</strong> <em>Type</em> attribute is an enumerated list containing an array of different document publisher types. Types include:</p>
-<ul>
-  <li><strong>Vendor</strong>: Developers or maintainers of information system products or services. This includes all authoritative product vendors, Product Security Incident Response Teams (PSIRTs), and product resellers and distributors, including authoritative vendor partners.</li>
-  <li><strong>Discoverer</strong>: Individuals or organizations that find vulnerabilities or security weaknesses. This includes all manner of researchers.</li>
-  <li><strong>Coordinator</strong>: Individuals or organizations that manage a single vendor’s response or multiple vendors’ responses to a vulnerability, a security flaw, or an incident. This includes all Computer Emergency/Incident Response Teams (CERTs/CIRTs) or agents acting on the behalf of a researcher.</li>
-  <li><strong>User</strong>: Everyone using a vendor’s product.</li>
-  <li><strong>Other</strong>: Catchall for everyone else. Currently this includes forwarders, republishers, language translators, and miscellaneous contributors.</li>
+<dl class="dl-horizontal">
+  <dt>Vendor:</dt>
+  <dd>Developers or maintainers of information system products or services. This includes all authoritative product vendors, Product Security Incident Response Teams (PSIRTs), and product resellers and distributors, including authoritative vendor partners.</dd>
+  <dt>Discoverer:</dt>
+  <dd>Individuals or organizations that find vulnerabilities or security weaknesses. This includes all manner of researchers.</dd>
+  <dt>Coordinator:</dt>
+  <dd>Individuals or organizations that manage a single vendor’s response or multiple vendors’ responses to a vulnerability, a security flaw, or an incident. This includes all Computer Emergency/Incident Response Teams (CERTs/CIRTs) or agents acting on the behalf of a researcher.</dd>
+  <dt>User:</dt>
+  <dd>Everyone using a vendor’s product.</dd>
+  <dt>Other:</dt>
+  <dd>Catchall for everyone else. Currently this includes forwarders, republishers, language translators, and miscellaneous contributors.</dd>
 </ul>
 {% endcall %}
 {% call textinput("vendorid", "Vendor ID", "", publisher._vendorid or '') %}

--- a/farol/templates/document/edit_tracking.j2	Mon Oct 06 15:19:09 2014 +0200
+++ b/farol/templates/document/edit_tracking.j2	Mon Oct 06 15:40:14 2014 +0200
@@ -41,11 +41,14 @@
 {% call selectinput("status", "Status", statuses, tracking._status) %}
 <p><strong>Status</strong> refers to the condition of the document with regard to completeness and the likelihood of future editions.</p>
 <p>Status types are:</p>
-<ul>
-  <li><strong>Draft</strong>: Pre-release, intended for issuing party’s internal use only, or possibly used externally when the party is seeking feedback or indicating its intentions regarding a specific issue.</li>
-  <li><strong>Interim</strong>: The issuing party believes the content is subject to change.</li>
-  <li><strong>Final</strong>: The issuing party asserts the content is unlikely to change. “Final” status is an indication only, and does not preclude updates.</li>
-</ul>
+<dl class="dl-horizontal">
+  <dt>Draft:</dt>
+  <dd>Pre-release, intended for issuing party’s internal use only, or possibly used externally when the party is seeking feedback or indicating its intentions regarding a specific issue.</dd>
+  <dt>Interim:</dt>
+  <dd>The issuing party believes the content is subject to change.</dd>
+  <dt>Final:</dt>
+  <dd>The issuing party asserts the content is unlikely to change. <samp>Final</samp> status is an indication only, and does not preclude updates.</dd>
+</dl>
 <p>Issuing parties are strongly recommended to set <strong>Status</strong> to <samp>Draft</samp> when initiating a new document and to implement procedures to ensure that the status is changed to the appropriate value before the document is released.</p>
 {% endcall %}
 {% call textinput("version", "Version", value=version, required=True) %}