update resources.md with latest approved CS

- update icon to new style
- typos or minor changes

README.md

@@ -6,10 +6,9 @@ This repository is a GitHub Pages site storing non-normative information about t
 
 ## Developing
 
-Setting up a development environment requires a working Ruby environment (for Jekyll)
-and a working Python environment (for running git hooks and validating examples).
+Setting up a development environment requires a working Ruby environment (for Jekyll), and a working Python environment (for running git hooks and validating examples).
 
-The following commmands should help:
+The following commands should help:
 
 ```bash
 gem install bundler

contribute.md

@@ -19,7 +19,6 @@ Contribute and Join The Global Community
       </a>
     </div>
   </div>
-
   <div class="info-box well pull-left">
     <p>Want to stay up-to-date on the latest STIX discussions?</p>
       <div>
@@ -30,31 +29,29 @@ Contribute and Join The Global Community
   </div>
 </div>
 
-### Contribute Tools and Libaries
+### Contribute Tools and Libraries
 
 To have code commited to OASIS repositories a Contributor License Agreement(CLA) must be submitted and approved.
-Bug reports, suggestions and help requests about specific OASIS github projects should be done through Github issues on their respective repository.
+Bug reports, suggestions and help requests about specific OASIS GitHub projects should be done through GitHub issues on their respective repository.
 
 <div class="row">
   <div class="col-md-4 info-box well pull-left">
     <p>Contributor License Agreement</p>
     <div>
-        <a class="btn btn-primary btn-spec" data-toggle="tooltip" title="Contributor License Agreement" target="_blank" href="https://www.oasis-open.org/resources/open-repositories/cla">
-          <span class="glyphicon glyphicon-th-list"></span> License Agreement
-        </a>
+      <a class="btn btn-primary btn-spec" data-toggle="tooltip" title="Contributor License Agreement" target="_blank" href="https://www.oasis-open.org/resources/open-repositories/cla">
+        <span class="glyphicon glyphicon-th-list"></span> License Agreement
+      </a>
     </div>
   </div>
-
   <div class="col-md-6 info-box well pull-left">
     <p>Resources</p>
     <div>
-        <a class="btn btn-primary btn-spec" data-toggle="tooltip" title="Notable Resources" href="{{ site.baseurl }}/resources">
-          <span class="glyphicon glyphicon-th-list"></span> Notable Resources
-        </a>
-
-        <a style="margin-left: 20px;" class="btn btn-primary btn-spec" data-toggle="tooltip" title="CTI OASIS Open Repositories" target="_blank" href="https://github.com/oasis-open?utf8=%E2%9C%93&q=cti&type=&language=">
-          <img class="icon github-icon" alt="GitHub Octocat" src="{{ site.baseurl }}/img/GitHub-Mark-Light.png"> CTI OASIS Open Repositories
-        </a>
+      <a class="btn btn-primary btn-spec" data-toggle="tooltip" title="Notable Resources" href="{{ site.baseurl }}/resources">
+        <span class="glyphicon glyphicon-th-list"></span> Notable Resources
+      </a>
+      <a style="margin-left: 20px;" class="btn btn-primary btn-spec" data-toggle="tooltip" title="CTI OASIS Open Repositories" target="_blank" href="https://github.com/oasis-open?utf8=%E2%9C%93&q=cti&type=&language=">
+        <img class="icon github-icon" alt="GitHub Octocat" src="{{ site.baseurl }}/img/GitHub-Mark-Light.png"> CTI OASIS Open Repositories
+      </a>
     </div>
   </div>
 </div>
@@ -68,8 +65,8 @@ To be directly involved in the development of the STIX specification one must jo
     <div>
       <p>Join the Technical Committee</p>
       <a class="btn btn-primary btn-spec" data-toggle="tooltip" title="Join Technical Committee" target="_blank" href="https://www.oasis-open.org/join">
-            <span class="glyphicon glyphicon-envelope"></span> Join Technical Committee
-          </a>
+        <span class="glyphicon glyphicon-envelope"></span> Join Technical Committee
+      </a>
     </div>
   </div>
 </div>

faq.md

@@ -9,15 +9,15 @@ Frequently Asked Questions
 ===================================================
 
 <div class="faq-btn">
-<a class="btn btn-primary btn-spec" data-toggle="tooltip" title="Official FAQ Google Doc" target="_blank" href="https://docs.google.com/document/d/1V5tE78N10McUq1xUOHV1RTVsOoYmiq_xt2PY1YI8bsU/pub">
+  <a class="btn btn-primary btn-spec" data-toggle="tooltip" title="Official FAQ Google Doc" target="_blank" href="https://docs.google.com/document/d/1V5tE78N10McUq1xUOHV1RTVsOoYmiq_xt2PY1YI8bsU/pub">
     <span class="glyphicon glyphicon-list-alt"></span> Official FAQ Google Doc
-</a>
+  </a>
 
-<a class="btn btn-primary btn-spec" data-toggle="tooltip" title="Question Submition" target="_blank" href="https://www.oasis-open.org/committees/comments/index.php?wg_abbrev=cti">
+  <a class="btn btn-primary btn-spec" data-toggle="tooltip" title="Question Submission" target="_blank" href="https://www.oasis-open.org/committees/comments/index.php?wg_abbrev=cti">
     <span class="glyphicon glyphicon-envelope"></span> Question not found? Send it in!
-</a>
+  </a>
 </div>
 
 <div>
-    <iframe class="faq" title="FAQ" src="https://docs.google.com/document/d/1V5tE78N10McUq1xUOHV1RTVsOoYmiq_xt2PY1YI8bsU/pub?embedded=true"></iframe>
+  <iframe class="faq" title="FAQ" src="https://docs.google.com/document/d/1V5tE78N10McUq1xUOHV1RTVsOoYmiq_xt2PY1YI8bsU/pub?embedded=true"></iframe>
 </div>

js/main.js

@@ -16,3 +16,9 @@ $(document).ready(function($) {
 
   $('.btn-spec').tooltip();
 });
+
+
+$('#toggle-tabs a').click(function (e) {
+  e.preventDefault()
+  $(this).tab('show')
+});

resources.md

@@ -15,21 +15,36 @@ categories: resources
 
 ### Individual Specification Documents
 
+<div>
+<ul style="margin-left: 0px;" class="nav nav-tabs" role="tablist" id="toggle-tabs">
+  <li role="presentation" class="active"><a href="#v21" aria-controls="v21" role="tab" data-toggle="tab">STIX/TAXII 2.1</a></li>
+  <li role="presentation"><a href="#v20" aria-controls="v20" role="tab" data-toggle="tab">STIX/TAXII 2.0</a></li>
+</ul>
+
+<!-- Tab panes -->
+<div class="tab-content">
+  <div role="tabpanel" class="tab-pane active" id="v21" markdown="1">
 
 #### STIX 2.1 Specification
 
 | HTML | PDF | Word | Description |
 | --- | --- | --- | --- |
-| [**STIX 2.1 Specification**](https://docs.oasis-open.org/cti/stix/v2.1/cs01/stix-v2.1-cs01.html) | [**STIX 2.1 Specification**](https://docs.oasis-open.org/cti/stix/v2.1/cs01/stix-v2.1-cs01.pdf) | [**STIX 2.1 Specification**](https://docs.oasis-open.org/cti/stix/v2.1/cs01/stix-v2.1-cs01.docx) | Defines concepts and structure of the STIX language, domain objects, relationship objects, cyber observable objects, and meta objects. Defines the patterning language to enable the detection of possibly malicious activity on networks and endpoints |
+| [**STIX 2.1 Specification**](https://docs.oasis-open.org/cti/stix/v2.1/cs02/stix-v2.1-cs02.html) | [**STIX 2.1 Specification**](https://docs.oasis-open.org/cti/stix/v2.1/cs02/stix-v2.1-cs02.pdf) | [**STIX 2.1 Specification**](https://docs.oasis-open.org/cti/stix/v2.1/cs02/stix-v2.1-cs02.docx) | Defines concepts and structure of the STIX language, domain objects, relationship objects, cyber observable objects, and meta objects. Defines the patterning language to enable the detection of possibly malicious activity on networks and endpoints |
 
-Note: This version of the specification is no longer a multipart document.
+Note: This version of the specification is no longer a multipart document. Older STIX 2.1 documents can be found [**here**](https://docs.oasis-open.org/cti/stix/v2.1/)
 
 #### TAXII 2.1 Specification
 
 | HTML | PDF | Word | Description |
 | --- | --- | --- | --- |
 | [**TAXII 2.1 Specification**](https://docs.oasis-open.org/cti/taxii/v2.1/cs01/taxii-v2.1-cs01.html) | [**TAXII 2.1 Specification**](https://docs.oasis-open.org/cti/taxii/v2.1/cs01/taxii-v2.1-cs01.pdf) | [**TAXII 2.1 Specification**](https://docs.oasis-open.org/cti/taxii/v2.1/cs01/taxii-v2.1-cs01.docx) | Defines the TAXII RESTful API and its resources along with the requirements for TAXII Client and Server implementations |
 
+#### STIX/TAXII 2.1 Interoperability Documents
+
+**These documents are currently in progress.**
+
+  </div>
+  <div role="tabpanel" class="tab-pane" id="v20" markdown="1">
 
 #### STIX 2.0 Specification
 
@@ -54,6 +69,9 @@ Note: This version of the specification is no longer a multipart document.
 | [**Part 1: STIX/TAXII 2.0 Interoperability Test Document**](https://docs.oasis-open.org/cti/stix-taxii-2-interop-p1/v1.1/stix-taxii-2-interop-p1-v1.1.html) | [**Part 1: STIX/TAXII 2.0 Interoperability Test Document**](https://docs.oasis-open.org/cti/stix-taxii-2-interop-p1/v1.1/stix-taxii-2-interop-p1-v1.1.pdf) | [**Part 1: STIX/TAXII 2.0 Interoperability Test Document**](https://docs.oasis-open.org/cti/stix-taxii-2-interop-p1/v1.1/stix-taxii-2-interop-p1-v1.1.docx) | Document that provides detailed requirements on how producers of products within the threat intelligence ecosystem may demonstrate conformity with STIX/TAXII 2.0 if they wish to self-certify that their software is verified as interoperable |
 | [**Part 2: STIX/TAXII 2.0 Interoperability Test Document**](https://docs.oasis-open.org/cti/stix-taxii-2-interop-p2/v1.0/stix-taxii-2-interop-p2-v1.0.html) | [**Part 2: STIX/TAXII 2.0 Interoperability Test Document**](https://docs.oasis-open.org/cti/stix-taxii-2-interop-p2/v1.0/stix-taxii-2-interop-p2-v1.0.pdf) | [**Part 2: STIX/TAXII 2.0 Interoperability Test Document**](https://docs.oasis-open.org/cti/stix-taxii-2-interop-p2/v1.0/stix-taxii-2-interop-p2-v1.0.docx) | Document that provides detailed requirements on how producers of products within the threat intelligence ecosystem may demonstrate conformity with STIX/TAXII 2.0 if they wish to self-certify that their software is verified as interoperable |
 
+  </div>
+</div>
+</div>
 
 ### OASIS CTI TC [Open Repositories](https://www.oasis-open.org/resources/open-repositories/){: target="_blank"}