Merge pull request #14 from mitre-attack/#7-trademarks

Update trademarks, notice and changelog

Author: isaisabel

CHANGELOG.md

@@ -1,3 +1,10 @@
+# V1.3 - 8 January 2019
+## New Scripts
+- Added [diff_stix.py](scripts/diff_stix.py).
+
+# V1.2 - 24 October 2019
+- Added ATT&CKcon 2.0 Detection Training. See [the readme](/trainings/detection-training/README.md) for details.
+
 # V1.1 - 29 March 2019
 ## New Scripts
 - Added [techniques_from_data_source.py](scripts/techniques_from_data_source.py).

NOTICE.txt

@@ -0,0 +1,18 @@
+Copyright 2020 The MITRE Corporation
+
+Approved for Public Release; Distribution Unlimited. Case Number 19-0486.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+This project makes use of ATT&CK®
+ATT&CK Terms of Use — https://attack.mitre.org/resources/terms-of-use/

README.md

@@ -24,7 +24,7 @@ This repository also contains Jupyter notebooks and other material for ATT&CK tr
 [Cyber Threat Intelligence repository](https://github.com/mitre/cti) of the ATT&CK catalog expressed in STIX 2.0 JSON.
 
 #### ATT&CK
-ATT&CK<sup>™</sup> is a curated knowledge base and model for cyber adversary behavior, reflecting the various phases of an adversary’s lifecycle and the platforms they are known to target. ATT&CK is useful for understanding security risk against known adversary behavior, for planning security improvements, and verifying defenses work as expected.
+ATT&CK® is a curated knowledge base and model for cyber adversary behavior, reflecting the various phases of an adversary’s lifecycle and the platforms they are known to target. ATT&CK is useful for understanding security risk against known adversary behavior, for planning security improvements, and verifying defenses work as expected.
 
 https://attack.mitre.org
 
@@ -39,7 +39,7 @@ https://oasis-open.github.io/cti-documentation/
 
 ## Notice
 
-Copyright 2019 The MITRE Corporation
+Copyright 2020 The MITRE Corporation
 
 Approved for Public Release; Distribution Unlimited. Case Number 19-0486.
 
@@ -55,6 +55,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 
-This project makes use of ATT&CK<sup>™</sup>
+This project makes use of ATT&CK®
 
 [ATT&CK Terms of Use](https://attack.mitre.org/resources/terms-of-use/)