doc: poor merge resolved

Signed-off-by: Paul Horton <[email protected]>

Author: madpah

docs/schema-support.rst

@@ -21,16 +21,19 @@ The following sub-sections aim to explain what support this library provides and
 by calling out support for data as defined in the latest CycloneDX standard specification, regardless of whether it is
 supported in prior versions of the CycloneDX schema.
 
+Root Level Schema Support
+-------------------------
+
 +----------------------------+---------------+---------------------------------------------------------------------------------------------------+
 | Data Path                  | Supported?    | Notes                                                                                             |
 +============================+===============+===================================================================================================+
 | ``bom[@version]``          | Yes           |                                                                                                   |
 +----------------------------+---------------+---------------------------------------------------------------------------------------------------+
 | ``bom[@serialNumber]``     | Yes           |                                                                                                   |
 +----------------------------+---------------+---------------------------------------------------------------------------------------------------+
-| ``bom.metadata``           | Yes           |                                                                                                   |
+| ``bom.metadata``           | Yes           | Not supported: ``lifecycles``                                                                     |
 +----------------------------+---------------+---------------------------------------------------------------------------------------------------+
-| ``bom.components``         | Yes           | Not supported: ``modified`` (as it is deprecated), ``signature``.                                 |
+| ``bom.components``         | Yes           | Not supported: ``modified`` (as it is deprecated), ``modelCard``, ``data``, ``signature``.        |
 +----------------------------+---------------+---------------------------------------------------------------------------------------------------+
 | ``bom.services``           | Yes           | Not supported: ``signature``.                                                                     |
 +----------------------------+---------------+---------------------------------------------------------------------------------------------------+
@@ -56,5 +59,22 @@ supported in prior versions of the CycloneDX schema.
 | ``bom.signature``          | No            |                                                                                                   |
 +----------------------------+---------------+---------------------------------------------------------------------------------------------------+
 
+Internal Model Schema Support
+-----------------------------
+
++----------------------------+---------------+----------------------------------------------------------------------------------------------+
+| Internal Model             | Supported?    | Notes                                                                                        |
++============================+===============+==============================================================================================+
+| ``ComponentEvidence``      |Yes            | Not currently supported: ``callstack``, ``identity``, ``occurrences``.                       |
++----------------------------+---------------+----------------------------------------------------------------------------------------------+
+| ``DisjunctiveLicense``     |Yes            | Not currently supported: ``@bom-ref``, ``licensing``, ``properties``.                        |
++----------------------------+---------------+----------------------------------------------------------------------------------------------+
+| ``LicenseExpression``      |Yes            | Not currently supported: ``@bom-ref``                                                        |
++----------------------------+---------------+----------------------------------------------------------------------------------------------+
+| ``OrganizationalContact``  |Yes            | Not currently supported: ``@bom-ref``                                                        |
++----------------------------+---------------+----------------------------------------------------------------------------------------------+
+| ``OrganizationalEntity``   |Yes            | Not currently supported: ``@bom-ref``                                                        |
++----------------------------+---------------+----------------------------------------------------------------------------------------------+
 
 .. _schema specification bug 130: https://github.com/CycloneDX/specification/issues/130
+