From d68596c361580c2105257b6d3ddab48396ff31c5 Mon Sep 17 00:00:00 2001
From: Brad Hards <bradh@frogmouth.net>
Date: Thu, 29 Sep 2016 14:33:06 +1000
Subject: [PATCH 1/4] Typo fix

---
 estimative-language/machinetag.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/estimative-language/machinetag.json b/estimative-language/machinetag.json
index d782100..7693d6b 100644
--- a/estimative-language/machinetag.json
+++ b/estimative-language/machinetag.json
@@ -20,7 +20,7 @@
         },
         {
           "value": "very-unlikely",
-          "expanded": "Very unlikely - highly improbale - 05-20%"
+          "expanded": "Very unlikely - highly improbable - 05-20%"
         },
         {
           "value": "unlikely",

From 3122ff269d0846ed4131c27fb149e87a16339885 Mon Sep 17 00:00:00 2001
From: Michael Hamm <michael.hamm@smile.public.lu>
Date: Thu, 29 Sep 2016 11:39:02 +0200
Subject: [PATCH 2/4] Status of events used in Request Tracker.

---
 rt_event_status/machinetag.json | 42 +++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 rt_event_status/machinetag.json

diff --git a/rt_event_status/machinetag.json b/rt_event_status/machinetag.json
new file mode 100644
index 0000000..003b84b
--- /dev/null
+++ b/rt_event_status/machinetag.json
@@ -0,0 +1,42 @@
+{
+  "namespace": "rt_event_status",
+  "description": "Status of events used in Request Tracker.",
+  "version": "1.0",
+  "predicates": [
+    {
+      "value": "event-status",
+      "expanded": "Event Status"
+    }
+  ],
+  "values": [
+    {
+      "predicate": "event-status",
+      "entry": [
+        {
+          "value": "new",
+          "expanded": "New"
+        },
+        {
+          "value": "open",
+          "expanded": "Open"
+        },
+        {
+          "value": "stalled",
+          "expanded": "Stalled"
+        },
+        {
+          "value": "rejected",
+          "expanded": "rejected"
+        },
+        {
+          "value": "resolved",
+          "expanded": "Resolved"
+        },
+        {
+          "value": "deleted",
+          "expanded": "Deleted"
+        }
+      ]
+    }
+  ]
+}

From 1868fe7b3771114143ac662c537042caa39e1993 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= <raphael@vinot.info>
Date: Wed, 5 Oct 2016 14:42:41 +0200
Subject: [PATCH 3/4] Fix inconsistencies between MANIFEST, directory names and
 taxonomies

---
 MANIFEST.json                                             | 8 ++++----
 {pap => PAP}/machinetag.json                              | 0
 .../machinetag.json                                       | 0
 {europol-events => europol-event}/machinetag.json         | 0
 {open-threat => open_threat}/machinetag.json              | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename {pap => PAP}/machinetag.json (100%)
 rename {eu-critical-sectors => eu-marketop-and-publicadmin}/machinetag.json (100%)
 rename {europol-events => europol-event}/machinetag.json (100%)
 rename {open-threat => open_threat}/machinetag.json (100%)

diff --git a/MANIFEST.json b/MANIFEST.json
index b7be674..3015a73 100644
--- a/MANIFEST.json
+++ b/MANIFEST.json
@@ -67,12 +67,12 @@
     },
     {
       "description": "Market operators and public administrations that must comply to some notifications requirements under EU NIS directive.",
-      "name": "eu-critical-sectors",
+      "name": "eu-marketop-and-publicadmin",
       "version": 2
     },
     {
       "description": "EUROPOL type of events taxonomy.",
-      "name": "europol-events",
+      "name": "europol-event",
       "version": 1
     },
     {
@@ -127,7 +127,7 @@
     },
     {
       "description": "Open Threat Taxonomy v1.1 base on James Tarala of SANS ref. - http://www.auditscripts.com/resources/open_threat_taxonomy_v1.1a.pdf",
-      "name": "open-threat",
+      "name": "open_threat",
       "version": 1
     },
     {
@@ -137,7 +137,7 @@
     },
     {
       "description": "The Permissible Actions Protocol - or short: PAP - was designed to indicate how the received information can be used.",
-      "name": "pap",
+      "name": "PAP",
       "version": 1
     },
     {
diff --git a/pap/machinetag.json b/PAP/machinetag.json
similarity index 100%
rename from pap/machinetag.json
rename to PAP/machinetag.json
diff --git a/eu-critical-sectors/machinetag.json b/eu-marketop-and-publicadmin/machinetag.json
similarity index 100%
rename from eu-critical-sectors/machinetag.json
rename to eu-marketop-and-publicadmin/machinetag.json
diff --git a/europol-events/machinetag.json b/europol-event/machinetag.json
similarity index 100%
rename from europol-events/machinetag.json
rename to europol-event/machinetag.json
diff --git a/open-threat/machinetag.json b/open_threat/machinetag.json
similarity index 100%
rename from open-threat/machinetag.json
rename to open_threat/machinetag.json

From 365580b5f9c6220128c2791e6ab6954ed36058b3 Mon Sep 17 00:00:00 2001
From: Christophe Vandeplas <christophe@vandeplas.com>
Date: Fri, 7 Oct 2016 10:04:02 +0200
Subject: [PATCH 4/4] added OSINT source-type expansion

---
 osint/machinetag.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osint/machinetag.json b/osint/machinetag.json
index ee2f869..d3ae3af 100644
--- a/osint/machinetag.json
+++ b/osint/machinetag.json
@@ -25,6 +25,10 @@
         {
           "expanded": "Mailing-list",
           "value": "mailing-list"
+        },
+        {
+          "expanded": "Expansion",
+          "value": "expansion"
         }
       ],
       "predicate": "source-type"