Merge pull request #186 from agiorguk/dev

Updated changelog and re-added incorrectly removed example from services keyword

Author: archaeogeek

docs/1055-uk-gemini-major-changes-since-1-0.asciidoc

@@ -57,10 +57,21 @@ longer just be the century.
 
 === Editorial changes since the launch of GEMINI 2.3
 
-==== TBC
-
-link:1062-gemini-datasets-and-data-series.html#19[Resource locator]: Add guidance on selecting appropriate OnLineFunctionCode
-link:1062-gemini-datasets-and-data-series.html#25[Limitations on public access]: For each reason to limit, add link to UK Statutory Instrument
+==== March 2025
+
+* link:1062-gemini-datasets-and-data-series.html#19[Resource locator]: Added guidance on selecting appropriate OnLineFunctionCode
+* link:1062-gemini-datasets-and-data-series.html#25[Limitations on public access]: For each reason to limit, added link to UK Statutory Instrument, and expanded guidance on the approach to use for Limitations where there is no applicable INSPIRE reason
+* Fixed some broken links
+* link:1062-gemini-datasets-and-data-series.html#6[Keywords]: Updated link to ISO/TC211 code list location
+* Updated pages throughout to show that the Gemini documentation is released under CC-BY
+* link:1062-gemini-datasets-and-data-series.html#16[Vertical Extent-Datasets] and link:1063-gemini-services.html#16[Vertical Extent-Services] Updated link to EPSG registry
+* Updated pages throughout for consistent use of "resource" rather than "data" to avoid confusion in the guidance when referring to services
+* Updated link:1049-metadata-guidelines-for-geospatial-data-resources-part-2[Metadata Guidelines part 2] and link:1051-uk-gemini-v2-2-specification-for-discovery-metadata-for-geospatial-resources[UK Gemini v2.2 Specification for Discovery Metadata] to remove unnecessary duplication
+* link:1062-gemini-datasets-and-data-series/#23[Use Constraints]: Updated encoding guidance for consistency
+* link:1062-gemini-datasets-and-data-series/#19[Resource Locator]: Expanded and updated guidance on Function sub-element for clarification and to better match DCAT definition
+* Added "Metadata Standard Name" and "Metadata Standard Version" in link:1046-xml-element-order[XML Element Order]
+* link:1062-gemini-datasets-and-data-series.html#23[Responsible Party]: updated guidance on use of Individual Names
+* link:1063-gemini-services#8[Date of Publication- Services]: clarified guidance on multiplicity of resource reference dates
 
 ==== May 2024
 

docs/partials/keyword.asciidoc

@@ -54,7 +54,7 @@ from a controlled vocabulary
 . Keyword values should if possible be taken from a list of standard
 subject categories, identified in the element 'Originating controlled
 vocabulary'.
-. Possible vocabularies include http://www.eionet.europa.eu/gemet/en/themes/[GEMET] and the https://inspire.ec.europa.eu/featureconcept[the INSPIRE Feature Concept Dictionary]
+. Possible vocabularies include http://www.eionet.europa.eu/gemet/en/themes/[GEMET] and the https://inspire.ec.europa.eu/featureconcept[INSPIRE Feature Concept Dictionary]
 . For other Keywords, if drawn from a Controlled Vocabulary, this must
 be stated.
 . Terms covering the subject of the data resource should be selected.
@@ -186,7 +186,7 @@ include::../snippets/dataset-keyword-controlled.xml[]
 ----
 include::../snippets/service-keyword-freetext.xml[]
 ----
-| Example Two (services) - service keyword from part D4 on the INSPIRE Metadata Implementing Rules
+| Example Two (services) - service keyword from part D4 of the INSPIRE Metadata Implementing Rules
 |
 [source,xml]
 ----
@@ -204,6 +204,12 @@ include::../snippets/service-keyword-gemet.xml[]
 ----
 include::../snippets/service-keyword-controlled.xml[]
 ----
+| Example Five (services) - keywords in the srv namespace (this encoding is not to be used)
+|
+[source,xml]
+----
+include::../snippets/service-keyword-incorrect.xml[]
+----
 // end::service[]
 |===
 ====

docs/snippets/service-keyword-incorrect.xml

@@ -0,0 +1,17 @@
+<gmd:MD_Metadata>
+  ...
+  <gmd:identificationInfo>
+    <srv:SV_ServiceIdentification>
+      ...
+      <srv:keywords>
+        <gmd:MD_Keywords>
+          <gmd:keyword>
+            <gco:CharacterString>humanCatalogueViewer</gco:CharacterString>
+          </gmd:keyword>
+        </gmd:MD_Keywords>
+      </srv:keywords>
+      ...
+    </srv:SV_ServiceIdentification>
+  </gmd:identificationInfo>
+  ...
+</gmd:MD_Metadata>