Merge pull request #289 from rpiazza/doc-fixes

doc for 4.1.7
oasis-open · Sep 28, 2022 · 2dbd49a · 2dbd49a
2 parents 5a819e9 + 6ced1b4
commit 2dbd49a
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 3 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,10 @@
 CHANGELOG
 =========
 
+4.1.7 - 2022-09-28
+
+    - A report or grouping is created to store the extra STIX package header information
+
 4.1.6 - 2022-06-10
 
     - fix functionality for --enable and --disable options

diff --git a/README.rst b/README.rst
@@ -44,7 +44,7 @@ Please enter any comments on how to improve the elevator into the issue tracker.
 Requirements
 ------------
 
-- Python 3.6+
+- Python 3.7+
 - `python-stix <https://stix.readthedocs.io/en/stable/>`_ and its dependencies
 
   .. note::
@@ -115,6 +115,7 @@ STIX 1.x content to STIX 2.x content:
 
     usage: stix2_elevator [-h]
               [--missing-policy {use-extensions,use-custom-properties,add-to-description,ignore}]
+              [--header-object-type {report,grouping}]
               [--custom-property-prefix CUSTOM_PROPERTY_PREFIX]
               [--infrastructure]
               [--acs]
@@ -134,7 +135,7 @@ STIX 1.x content to STIX 2.x content:
               file
 
 
-stix2-elevator v4.1.6
+stix2-elevator v4.1.7
 
 positional arguments:
 
@@ -154,6 +155,11 @@ optional arguments:
                 represented directly in STIX 2.x. The default is 'add-
                 to-description'.
 
+  --header-object-type {report,grouping}
+                What STIX 2 type to use to store extra information
+                from the STIX 1 package header.The default is
+                'report'.
+
   --custom-property-prefix CUSTOM_PROPERTY_PREFIX
                 Prefix to use for custom property names when missing
                 policy is 'use-custom-properties'. The default is

diff --git a/docs/command-line.rst b/docs/command-line.rst
@@ -8,6 +8,7 @@ STIX 1.x content to STIX 2.x content:
 
     usage: stix2_elevator [-h]
               [--missing-policy {use-extensions,use-custom-properties,add-to-description,ignore}]
+              [--header-object-type {report,grouping}]
               [--custom-property-prefix CUSTOM_PROPERTY_PREFIX]
               [--infrastructure]
               [--acs]
@@ -47,6 +48,11 @@ optional arguments:
                 represented directly in STIX 2.x. The default is 'add-
                 to-description'.
 
+  --header-object-type {report,grouping}
+                What STIX 2 type to use to store extra information
+                from the STIX 1 package header.The default is
+                'report'.
+
   --custom-property-prefix CUSTOM_PROPERTY_PREFIX
                 Prefix to use for custom property names when missing
                 policy is 'use-custom-properties'. The default is

diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 3.0.1
+current_version = 4.1.6
 commit = True
 tag = True