Merge remote-tracking branch 'origin/v1.5-dev' into v1.5-dev

Author: stevespringett

docgen/json/.gitignore

@@ -0,0 +1 @@
+/docs/

docgen/xml/.gitignore

@@ -0,0 +1,2 @@
+/docs/
+/Saxon-HE-*.jar

schema/bom-1.5.schema.json

@@ -915,12 +915,14 @@
       }
     },
     "licenseChoice": {
-      "type": "array",
       "title": "License Choice",
-      "description": "EITHER (a list of SPDX and/or named licenses) OR (a list of one SPDX License Expression)",
+      "description": "EITHER (list of SPDX licenses and/or named licenses) OR (tuple of one SPDX License Expression)",
+      "type": "array",
       "oneOf": [
         {
-          "description": "a list of SPDX and/or named licenses",
+          "title": "Multiple licenses",
+          "description": "A list of SPDX licenses and/or named licenses.",
+          "type": "array",
           "items": {
             "type": "object",
             "required": ["license"],
@@ -931,7 +933,9 @@
           }
         },
         {
-          "description": "a list of one SPDX License Expression",
+          "title": "SPDX License Expression",
+          "description": "A tuple of exactly one SPDX License Expression.",
+          "type": "array",
           "additionalItems": false,
           "minItems": 1,
           "maxItems": 1,