Merge pull request #23 from krmaxwell/qa

Fixes to grammar and spelling
This commit is contained in:
Herman Slatman 2016-03-15 09:42:14 +01:00
commit 4d4f2305ca

View File

@ -64,7 +64,7 @@ A certain amount of (domain- or business-specific) analysis is necessary to crea
<a href="http://hailataxii.com/" target="_blank">Hail a TAXII</a> <a href="http://hailataxii.com/" target="_blank">Hail a TAXII</a>
</td> </td>
<td> <td>
Hail a TAXII.com is a repository of Open Source Cyber Threat Intellegence feeds in STIX format. They offer several feeds, including some that are listed here already in a different format, like the Emerging Threats rules and PhishTank feeds. Hail a TAXII.com is a repository of Open Source Cyber Threat Intelligence feeds in STIX format. They offer several feeds, including some that are listed here already in a different format, like the Emerging Threats rules and PhishTank feeds.
</td> </td>
</tr> </tr>
<tr> <tr>
@ -87,7 +87,7 @@ A certain amount of (domain- or business-specific) analysis is necessary to crea
<td> <td>
<a href="https://openphish.com/phishing_feeds.html" target="_blank">OpenPhish Feeds</a> <a href="https://openphish.com/phishing_feeds.html" target="_blank">OpenPhish Feeds</a>
</td> </td>
<td>Conf <td>
OpenPhish receives URLs from multiple streams and analyzes them using its proprietary phishing detection algorithms. There are free and commercial offerings available. OpenPhish receives URLs from multiple streams and analyzes them using its proprietary phishing detection algorithms. There are free and commercial offerings available.
</td> </td>
</tr> </tr>
@ -95,7 +95,7 @@ A certain amount of (domain- or business-specific) analysis is necessary to crea
<td> <td>
<a href="https://www.phishtank.com/developer_info.php" target="_blank">PhishTank</a> <a href="https://www.phishtank.com/developer_info.php" target="_blank">PhishTank</a>
</td> </td>
<td>Conf <td>
PhishTank delivers a list of suspected phishing URLs. Their data comes from human reports, but they also ingest external feeds where possible. It's a free service, but registering for an API key is sometimes necessary. PhishTank delivers a list of suspected phishing URLs. Their data comes from human reports, but they also ingest external feeds where possible. It's a free service, but registering for an API key is sometimes necessary.
</td> </td>
</tr> </tr>
@ -125,7 +125,7 @@ Standardized formats for sharing Threat Intelligence (mostly IOCs).
<table> <table>
<tr> <tr>
<td> <td>
<a href=https://capec.mitre.org/" target="_blank">CAPEC</a> <a href="https://capec.mitre.org/" target="_blank">CAPEC</a>
</td> </td>
<td> <td>
The Common Attack Pattern Enumeration and Classification (CAPEC) is a comprehensive dictionary and classification taxonomy of known attacks that can be used by analysts, developers, testers, and educators to advance community understanding and enhance defenses. The Common Attack Pattern Enumeration and Classification (CAPEC) is a comprehensive dictionary and classification taxonomy of known attacks that can be used by analysts, developers, testers, and educators to advance community understanding and enhance defenses.
@ -271,7 +271,7 @@ Frameworks, platforms and services for collecting, analyzing, creating and shari
<a href="https://github.com/Intelworks/OpenTAXII" target="_blank">OpenTAXII</a> <a href="https://github.com/Intelworks/OpenTAXII" target="_blank">OpenTAXII</a>
</td> </td>
<td> <td>
OpenTAXII is a robust Python implementation of TAXII Services that delivers a rich feature set and a friendly pythonic API built on top of a well designed application. OpenTAXII is a robust Python implementation of TAXII Services that delivers a rich feature set and a friendly Pythonic API built on top of a well designed application.
</td> </td>
</tr> </tr>
<tr> <tr>
@ -344,7 +344,7 @@ Frameworks, platforms and services for collecting, analyzing, creating and shari
## Tools ## Tools
All kinds of tools for parsing, creating and editing Theat Intelligence. Mostly IOC based. All kinds of tools for parsing, creating and editing Threat Intelligence. Mostly IOC based.
<table> <table>
<tr> <tr>
@ -416,7 +416,7 @@ All kinds of tools for parsing, creating and editing Theat Intelligence. Mostly
<a href="https://github.com/mandiant/ioc_writer" target="_blank">ioc_writer</a> <a href="https://github.com/mandiant/ioc_writer" target="_blank">ioc_writer</a>
</td> </td>
<td> <td>
Provides a python library that allows for basic creation and editing of OpenIOC objects. Provides a Python library that allows for basic creation and editing of OpenIOC objects.
</td> </td>
</tr> </tr>
<tr> <tr>