Taxonomies updated

taxonomies.html

@@ -431,6 +431,13 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <h1>MISP taxonomies and classification as machine tags</h1>
 <div id="toc" class="toc2">
 <div id="toctitle">Table of Contents</div>
+<ul class="sectlevel0">
+<li><a href="#_introduction">Introduction</a>
+<ul class="sectlevel1">
+<li><a href="#_funding_and_support">Funding and Support</a></li>
+</ul>
+</li>
+<li><a href="#_misp_taxonomies">MISP taxonomies</a>
 <ul class="sectlevel1">
 <li><a href="#_dml">DML</a></li>
 <li><a href="#_pap">PAP</a></li>
@@ -479,28 +486,49 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_tor">tor</a></li>
 <li><a href="#_veris">veris</a></li>
 <li><a href="#_vocabulaire_des_probabilites_estimatives">vocabulaire-des-probabilites-estimatives</a></li>
+</ul>
+</li>
 <li><a href="#_mapping_of_taxonomies">Mapping of taxonomies</a></li>
 </ul>
 </div>
 </div>
 <div id="content">
-<div id="preamble">
+<h1 id="_introduction" class="sect0">Introduction</h1>
-<div class="sectionbody">
-<div class="paragraph">
-<p>Generated from <a href="https://github.com/MISP/misp-taxonomies" class="bare">https://github.com/MISP/misp-taxonomies</a>.</p>
-</div>
 <div class="imageblock">
 <div class="content">
 <img src="https://raw.githubusercontent.com/MISP/MISP/2.4/INSTALL/logos/misp-logo.png" alt="MISP logo">
 </div>
 </div>
-<div class="literalblock">
+<div class="paragraph">
-<div class="content">
+<p>The MISP threat sharing platform is a free and open source software helping information sharing of threat intelligence including cyber security indicators, financial fraud or counter-terrorism information. The MISP project includes multiple sub-projects to support the operational requirements of analysts and improve the overall quality of information shared.</p>
-<pre>Taxonomies that can be used in MISP (2.4) and other information sharing tool and expressed in Machine Tags (Triple Tags). A machine tag is composed of a namespace (MUST), a predicate (MUST) and an (OPTIONAL) value. Machine tags are often called triple tag due to their format.</pre>
+</div>
-</div>
+<div class="paragraph">
-</div>
+<p>Taxonomies that can be used in MISP (2.4) and other information sharing tool and expressed in Machine Tags (Triple Tags). A machine tag is composed of a namespace (MUST), a predicate (MUST) and an (OPTIONAL) value. Machine tags are often called triple tag due to their format.
+The following document is generated from the machine-readable JSON describing the <a href="https://github.com/MISP/misp-taxonomies">MISP taxonomies</a>.</p>
+</div>
+<div style="page-break-after: always;"></div>
+<div class="sect1">
+<h2 id="_funding_and_support">Funding and Support</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>The MISP project is financially and resource supported by <a href="https://www.circl.lu/">CIRCL Computer Incident Response Center Luxembourg </a>.</p>
+</div>
+<div class="paragraph">
+<p><span class="image"><img src="https://www.misp-project.org/assets/images/logo.png" alt="CIRCL logo"></span></p>
+</div>
+<div class="paragraph">
+<p>A CEF (Connecting Europe Facility) funding under CEF-TC-2016-3 - Cyber Security has been granted from 1st September 2017 until 31th August 2019 as <strong><strong>Improving MISP as building blocks for next-generation information sharing</strong></strong>.</p>
+</div>
+<div class="paragraph">
+<p><span class="image"><img src="https://www.misp-project.org/assets/images/en_cef.png" alt="CEF funding"></span></p>
+</div>
+<div class="paragraph">
+<p>If you are interested to co-fund projects around MISP, feel free to get in touch with us.</p>
+</div>
+<div style="page-break-after: always;"></div>
 </div>
 </div>
+<h1 id="_misp_taxonomies" class="sect0">MISP taxonomies</h1>
 <div class="sect1">
 <h2 id="_dml">DML</h2>
 <div class="sectionbody">
@@ -20191,7 +20219,7 @@ vocabulaire-des-probabilites-estimatives namespace available in JSON format at <
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2017-11-04 10:52:14 CET
+Last updated 2017-11-04 14:09:38 CET
 </div>
 </div>
 </body>