Update documentation to work with latest nsparser changes.

STIXProject · Sep 27, 2017 · bebac4e · bebac4e
1 parent 2515a03
commit bebac4e
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 46 deletions.
diff --git a/docs/api/common/identity.rst b/docs/api/common/identity.rst
@@ -13,13 +13,8 @@ Classes
 .. autoclass:: RelatedIdentities
 	:show-inheritance:
 	:members:
-	
+
 Functions
 ---------
 
 .. autofunction:: add_extension
-
-Constants
----------
-
-.. autodata:: _EXTENSION_MAP
diff --git a/docs/api/common/vocabs.rst b/docs/api/common/vocabs.rst
@@ -138,8 +138,4 @@ Functions
 ---------
 
 .. autofunction:: add_vocab
-
-Constants
----------
-
-.. autodata:: _VOCAB_MAP
+.. autofunction:: register_vocab
diff --git a/docs/api/data_marking.rst b/docs/api/data_marking.rst
@@ -22,8 +22,3 @@ Functions
 ---------
 
 .. autofunction:: add_extension
-
-Constants
----------
-
-.. autodata:: _EXTENSION_MAP
diff --git a/docs/api/index.rst b/docs/api/index.rst
@@ -16,6 +16,7 @@ Modules located in the base `stix`_ package
 .. toctree::
    :titlesonly:
 
+   stix
    base
    data_marking
 

diff --git a/docs/api/indicator/test_mechanism.rst b/docs/api/indicator/test_mechanism.rst
@@ -14,8 +14,3 @@ Functions
 ---------
 
 .. autofunction:: add_extension
-
-Constants
----------
-
-.. autodata:: _EXTENSION_MAP
diff --git a/docs/api/stix.rst b/docs/api/stix.rst
@@ -0,0 +1,12 @@
+:mod:`stix` Module
+==================================
+
+.. module:: stix
+
+Classes
+-------
+
+.. autofunction:: supported_stix_version
+.. autofunction:: register_extension
+.. autofunction:: lookup_extension
+.. autofunction:: add_extension
diff --git a/docs/api/ttp/malware_instance.rst b/docs/api/ttp/malware_instance.rst
@@ -14,8 +14,3 @@ Functions
 ---------
 
 .. autofunction:: add_extension
-
-Constants
----------
-
-.. autodata:: _EXTENSION_MAP
diff --git a/docs/api/utils/nsparser.rst b/docs/api/utils/nsparser.rst
@@ -1,24 +1,6 @@
 :mod:`stix.utils.nsparser` Module
 ==================================
 
-.. module:: stix.utils.nsparser
-
-Classes
--------
-
-.. autoclass:: NamespaceParser
-	:show-inheritance:
+.. automodule:: stix.utils.nsparser
 	:members:
-
-Constants
----------
-
-.. autodata:: XML_NAMESPACES
-
-.. autodata:: STIX_NS_TO_SCHEMALOCATION
-
-.. autodata:: EXT_NS_TO_SCHEMALOCATION
-
-.. autodata:: DEFAULT_STIX_NS_TO_PREFIX
-
-.. autodata:: DEFAULT_EXT_TO_PREFIX
+	:undoc-members:
diff --git a/stix/utils/nsparser.py b/stix/utils/nsparser.py
@@ -1,5 +1,8 @@
 # Copyright (c) 2016, The MITRE Corporation. All rights reserved.
 # See LICENSE.txt for complete terms.
+"""
+This module automatically registers all STIX namespaces into mixbox.
+"""
 
 import mixbox.namespaces