From 582be1bf61145ac9a14d0587c918b397f27be403 Mon Sep 17 00:00:00 2001
From: Andrew Chow <achow101-github@achow101.com>
Date: Sun, 21 May 2017 22:38:50 -0400
Subject: [PATCH] Add uasf and masf gloassary terms

---
 _data/glossary/en/masf.yaml | 29 +++++++++++++++++++++++++++++
 _data/glossary/en/uasf.yaml | 28 ++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+)
 create mode 100644 _data/glossary/en/masf.yaml
 create mode 100644 _data/glossary/en/uasf.yaml

diff --git a/_data/glossary/en/masf.yaml b/_data/glossary/en/masf.yaml
new file mode 100644
index 00000000..ae14cbdf
--- /dev/null
+++ b/_data/glossary/en/masf.yaml
@@ -0,0 +1,29 @@
+---
+# This file is licensed under the MIT License (MIT) available on
+# http://opensource.org/licenses/MIT.
+
+required:
+                                           #-------------40 characters-------------#
+    title_max_40_characters_no_formatting: Miner Activated Soft Fork, MASF
+
+    summary_max_255_characters_no_formatting: >
+        A Soft Fork activated by through miner signalling.
+
+    synonyms_shown_in_glossary_capitalize_first_letter:
+        - Miner-activated soft fork
+        - MASF
+
+optional:
+    synonyms_and_pluralizations_not_shown_in_glossary:
+
+    not_to_be_confused_with_capitalize_first_letter:
+        - User Activated Soft Fork (a soft fork activated by flag day or node enforcement instead of miner signalling.)
+        - Fork (a regular fork where all nodes follow the same consensus rules, so the fork is resolved once one chain has more proof of work than another)
+        - Hard fork (a permanent divergence in the block chain caused by non-upgraded nodes not following new consensus rules)
+        - Soft fork (a temporary divergence in the block chain caused by non-upgraded nodes not following new consensus rules)
+        - Software fork (when one or more developers permanently develops a codebase separately from other developers)
+        - Git fork (when one or more developers temporarily develops a codebase separately from other developers
+
+    links_html_or_markdown_style_capitalize_first_letter:
+
+---
diff --git a/_data/glossary/en/uasf.yaml b/_data/glossary/en/uasf.yaml
new file mode 100644
index 00000000..53e3295c
--- /dev/null
+++ b/_data/glossary/en/uasf.yaml
@@ -0,0 +1,28 @@
+---
+# This file is licensed under the MIT License (MIT) available on
+# http://opensource.org/licenses/MIT.
+
+required:
+                                           #-------------40 characters-------------#
+    title_max_40_characters_no_formatting: User Activated Soft Fork, UASF
+
+    summary_max_255_characters_no_formatting: >
+        A Soft Fork activated by flag day or node enforcement instead of miner signalling.
+
+    synonyms_shown_in_glossary_capitalize_first_letter:
+        - User-activated soft fork
+        - UASF
+
+optional:
+    synonyms_and_pluralizations_not_shown_in_glossary:
+
+    not_to_be_confused_with_capitalize_first_letter:
+        - Fork (a regular fork where all nodes follow the same consensus rules, so the fork is resolved once one chain has more proof of work than another)
+        - Hard fork (a permanent divergence in the block chain caused by non-upgraded nodes not following new consensus rules)
+        - Soft fork (a temporary divergence in the block chain caused by non-upgraded nodes not following new consensus rules)
+        - Software fork (when one or more developers permanently develops a codebase separately from other developers)
+        - Git fork (when one or more developers temporarily develops a codebase separately from other developers
+
+    links_html_or_markdown_style_capitalize_first_letter:
+
+---