Merge branch 'development/v3.0.1' into gitignore-exclude-docs

docs/annexes/RDF-object-model-and-identifier-syntax.md

@@ -1,23 +1,38 @@
 # Annex B: RDF object model and identifier syntax (Normative)
 
-TODO: update for SPDXv3
-
 ## B.1 Introduction <a name="B.1"></a>
 
-SPDX ® Vocabulary Specification
+SPDX ® Vocabulary Specification Version: 3.0.1
 
 [SPDX 3.0.1 Model SHACL](https://spdx.org/rdf/3.0.1/spdx-model.ttl)
 
-Version: 3.0.1
+### Core and Software Profiles
+
+[![SPDX 3.0 Core and Software Profiles diagram][fig_core_software]][fig_core_software]
+
+### AI Profile
+
+[![SPDX 3.0 AI Profile diagram][fig_ai]][fig_ai]
+
+### Build Profile
+
+[![SPDX 3.0 Build Profile diagram][fig_build]][fig_build]
+
+### Dataset Profile
 
-![SPDX 3.0.1 Core and Software models diagram](../images/model Core+Software.png)
+[![SPDX 3.0 Dataset Profile diagram][fig_dataset]][fig_dataset]
 
-![SPDX 3.0.1 Dataset model diagram](../images/model Dataset.png)
+### Licensing Profile
 
-![SPDX 3.0.1 AI model diagram](../images/model AI.png)
+[![SPDX 3.0 Licensing Profile diagram][fig_licensing]][fig_licensing]
 
-![SPDX 3.0.1 Build model diagram](../images/model Build.png)
+### Security Profile
 
-![SPDX 3.0.1 Licensing model diagram](../images/model Licensing.png)
+[![SPDX 3.0 Security Profile diagram][fig_security]][fig_security]
 
-![SPDX 3.0.1 Security model diagram](../images/model Security.png)
+[fig_core_software]: ../images/model-core-software.png "SPDX 3.0 Core and Software Profiles diagram"
+[fig_ai]: ../images/model-ai.png "SPDX 3.0 AI Profile diagram"
+[fig_build]: ../images/model-build.png "SPDX 3.0 Build Profile diagram"
+[fig_dataset]: ../images/model-dataset.png "SPDX 3.0 Dataset Profile diagram"
+[fig_licensing]: ../images/model-licensing.png "SPDX 3.0 Licensing Profile diagram"
+[fig_security]: ../images/model-security.png "SPDX 3.0 Security Profile diagram"