Merge branch 'master' into 1.7-dev

Author: jkowalleck

schema/bom-1.6.schema.json

@@ -25,7 +25,7 @@
       "type": "string",
       "title": "CycloneDX Specification Version",
       "description": "The version of the CycloneDX specification the BOM conforms to.",
-      "examples": ["1.6.1"]
+      "examples": ["1.6"]
     },
     "serialNumber": {
       "type": "string",
@@ -2237,7 +2237,7 @@
         "aggregate": {
           "$ref": "#/definitions/aggregateType",
           "title": "Aggregate",
-          "description": "Specifies an aggregate type that describe how complete a relationship is."
+          "description": "Specifies an aggregate type that describes how complete a relationship is."
         },
         "assemblies": {
           "type": "array",

schema/bom-1.6.xsd

@@ -2672,7 +2672,7 @@ limitations under the License.
             <xs:element name="copyright" type="bom:copyrightsType" minOccurs="0" maxOccurs="1">
                 <xs:annotation>
                     <xs:documentation>
-                        opyright evidence captures intellectual property assertions, providing evidence of possible ownership and legal protection.
+                        Copyright evidence captures intellectual property assertions, providing evidence of possible ownership and legal protection.
                     </xs:documentation>
                 </xs:annotation>
             </xs:element>
@@ -2715,7 +2715,7 @@ limitations under the License.
         <xs:sequence minOccurs="0" maxOccurs="unbounded">
             <xs:element name="aggregate" type="bom:aggregateType" default="not_specified">
                 <xs:annotation>
-                    <xs:documentation>Specifies an aggregate type that describe how complete a relationship is.</xs:documentation>
+                    <xs:documentation>Specifies an aggregate type that describes how complete a relationship is.</xs:documentation>
                 </xs:annotation>
             </xs:element>
             <xs:element name="assemblies" minOccurs="0" maxOccurs="1">