Merge branch 'dev' into Issue-29

.github/workflows/build-adocs.yml

@@ -17,12 +17,7 @@ jobs:
       id: adocbuild-datasets
       uses: avattathil/asciidoctor-action@master
       with:
-          program: "asciidoctor -a variant-dataset -a docinfo1 -T templates -E slim 'docs/*.asciidoc' 'docs/*.adoc'"
-    - name: Build services variant
-      id: adocbuild-services
-      uses: avattathil/asciidoctor-action@master
-      with:
-          program: "asciidoctor -a variant-service -a docinfo1  -T templates -E slim 'docs/*.asciidoc' 'docs/*.adoc'"
+          program: "asciidoctor -a docinfo1 -T templates -E slim 'docs/*.asciidoc' 'docs/*.adoc'"
     - name: Deploy docs to ghpages
       uses: peaceiris/actions-gh-pages@v3
       with: 

.github/workflows/dev-build.yml

@@ -18,12 +18,7 @@ jobs:
       id: adocbuild-datasets
       uses: avattathil/asciidoctor-action@master
       with:
-          program: "asciidoctor -a variant-dataset -a docinfo1  -T docs/templates -E slim 'docs/*.asciidoc' 'docs/*.adoc'"
-    - name: Build services variant
-      id: adocbuild-services
-      uses: avattathil/asciidoctor-action@master
-      with:
-          program: "asciidoctor -a variant-service -a docinfo1  -T docs/templates -E slim 'docs/*.asciidoc' 'docs/*.adoc'"
+          program: "asciidoctor -a docinfo1  -T docs/templates -E slim 'docs/*.asciidoc' 'docs/*.adoc'"
     - name: Deploy docs to ghpages
       uses: peaceiris/actions-gh-pages@v3
       with: 

README.md

@@ -3,6 +3,8 @@ Resources relating to the UK Gemini metadata profile
 
 Pull requests accepted to this branch get published to the GitPages repository at https://agiorguk.github.io/gemini/
 
-The published version of GEMINI 2.3 lives at https://www.agi.org.uk/gemini/1037-uk-gemini-standard-and-inspire-implementing-rules/
+The published version of GEMINI 2.3 lives at https://agiorguk.github.io/gemini/1037-uk-gemini-introduction.html
 
-This is the place to raise and manage issues
+Old home page: https://agiorguk.github.io/gemini/1037-uk-gemini-standard-and-inspire-implementing-rules.html (redirect from https://www.agi.org.uk/gemini/1037-uk-gemini-standard-and-inspire-implementing-rules/)
+
+This GitHub repository is the place to raise and manage issues

docs/1037-uk-gemini-introduction.asciidoc

@@ -5,45 +5,27 @@ This page describes the requirements and guidance for metadata
 conforming to the UK standard known as UK GEMINI. There are several
 entry points to the guidance:
 
-* link:1062-gemini-datasets-and-data-series.html[GEMINI
-for datasets and series]
-* link:1063-gemini-services.html[GEMINI for
-services]
+* link:1062-gemini-datasets-and-data-series.html[GEMINI for datasets and series]
+* link:1063-gemini-services.html[GEMINI for services]
+
 * Other material
-** link:1052-metadata-guidelines-for-geospatial-data-resources-part-1.html[General
-introduction to metadata for geographic information]
-** link:1051-uk-gemini-v2-2-specification-for-discovery-metadata-for-geospatial-resources.html[General
-introduction to GEMINI]
-** link:1049-metadata-guidelines-for-geospatial-data-resources-part-2.html[General
-guidance for GEMINI]
-** link:048-uk-gemini-encoding-guidance.html[General
-guidance on the XML encoding of GEMINI]
-** https://github.com/AGIGemini/Schematron[Schematron rules for
-validating GEMINI records (GitHub link)]
-** link:40-gemini/1056-glossary.html[Glossary of terms]
-** link:1047-metadata-guidelines-for-geospatial-data-resources-part-3.html[List
-of references]
-** link:053-common-metadata-errors-uk-location-discovery-metadata-service.html[Common
-errors]
-
-Conformance to GEMINI should ensure conformance to the INSPIRE
-Implementing Rules. UK specific guidance is provided. If you're
-thinking, why GEMINI? Why not just use the INSPIRE Metadata guidance or
-the ISO standards?{nbsp}https://www.agi.org.uk/why-uk-gemini/[Click here for
-some
-reasons.]{nbsp}The{nbsp}https://www.gov.uk/government/publications/recommended-open-standards-for-government/using-metadata-to-describe-data-shared-within-government[UK
-Government Digital Service recommends using GEMINI when describing
-geographic data]{nbsp}and it is the preferred way to catalogue geographic
-data and services at Data.gov.uk.
-
-Both UK GEMINI and the INSPIRE Technical Guidance have been developed
-from the International
-Standard{nbsp}http://www.iso.org/iso/catalogue_detail?csnumber=26020[ISO
-19115:2003]{nbsp}Geographic information - Metadata, with supplementary
-material from ISO 19119:2005 Geographic information - Services. The XML
-encoding follows ISO 19139:2007 Geographic information - Metadata - XML
-encoding. This means that a GEMINI record is widely understood by
-geospatial software and users internationally.
+** link:1052-metadata-guidelines-for-geospatial-data-resources-part-1.html[General introduction to metadata for geographic information]
+** link:1051-uk-gemini-v2-2-specification-for-discovery-metadata-for-geospatial-resources.html[General introduction to GEMINI]
+** link:1049-metadata-guidelines-for-geospatial-data-resources-part-2.html[General guidance for GEMINI]
+** link:1048-uk-gemini-encoding-guidance.html[General guidance on the XML encoding of GEMINI]
+** https://github.com/AGIGemini/Schematron[Schematron rules for validating GEMINI records (GitHub link)]
+** link:1040-gemini/1056-glossary.html[Glossary of terms]
+** link:1047-metadata-guidelines-for-geospatial-data-resources-part-3.html[List of references]
+** link:1053-common-metadata-errors-uk-location-discovery-metadata-service.html[Common errors]
+
+Conformance to GEMINI should ensure conformance to the INSPIRE Implementing Rules. UK specific guidance is provided. +
+If you're thinking, why GEMINI? Why not just use the INSPIRE Metadata guidance or the ISO standards?{nbsp}https://www.agi.org.uk/why-uk-gemini/[Click here for some reasons.] +
+The https://www.gov.uk/government/publications/recommended-open-standards-for-government/using-metadata-to-describe-data-shared-within-government[UK Government Digital Service recommends using GEMINI when describing geographic data] 
+and it is the preferred way to catalogue geographic data and services at Data.gov.uk.
+
+Both UK GEMINI and the INSPIRE Technical Guidance have been developed from the International Standard
+http://www.iso.org/iso/catalogue_detail?csnumber=26020[ISO 19115:2003] Geographic information - Metadata, with supplementary material from ISO 19119:2005 Geographic information - Services.
+The XML encoding follows ISO 19139:2007 Geographic information - Metadata - XML encoding. This means that a GEMINI record is widely understood by geospatial software and users internationally.
 
 Note that GEMINI (and the INSPIRE Guidance) are about metadata for
 datasets, series, and services (collectively, 'resources'); not
@@ -55,26 +37,19 @@ here may not be appropriate and the resulting record could not be
 validated as a GEMINI (or INSPIRE) record.
 
 Here is
-a{nbsp}link:055-uk-gemini-major-changes-since-1-0.html[summary
-of changes]{nbsp}from earlier versions.
+a link:1055-uk-gemini-major-changes-since-1-0.html[summary of changes] from earlier versions.
 
-Here is
-a{nbsp}link:1250-element-summary.html/[summary]{nbsp}of
-the GEMINI elements (similar to Table 1 and Table 2 in GEMINI 2.2).
+Here is a link:1250-element-summary.html/[summary] of the GEMINI elements (similar to Table 1 and Table 2 in GEMINI 2.2).
 
 Note: in GEMINI 2.3, the GEMINI Element number is called "GEMINI id";
-the actual numbers have not changed, where the same element was in
-GEMINI 2.2.
+the actual numbers have not changed, where the same element was in GEMINI 2.2.
 
 == Software that implements GEMINI 2.3
 
 Several software implementations exist and are in use across the UK:
 
-* https://geonetwork-opensource.org/[GeoNetwork Open
-Source]{nbsp}-{nbsp}https://github.com/AstunTechnology/iso19139.gemini23[GEMINI
-plugin]: server software in use in several government departments
-* https://www.medin.org.uk/data/submit-metadata[MEDIN metadata editors]:
-online and downloadable client editors for the MEDIN community profile
+* https://geonetwork-opensource.org/[GeoNetwork Open Source] {nbsp}-{nbsp}https://github.com/AstunTechnology/iso19139.gemini23[GEMINI plugin]: server software in use in several government departments
+* https://www.medin.org.uk/data/submit-metadata[MEDIN metadata editors]: online and downloadable client editors for the MEDIN community profile
 
 == Feedback
 
@@ -83,13 +58,9 @@ that there may be some errors and inconsistencies in the content,
 therefore we would like to hear from you if you spot any of these or you
 would like to see improvements in terms of presentation and usability.
 
-Please send any comments
-to{nbsp}mailto:gemini@agi.org.uk?subject=GEMINI2.3%20feedback[gemini@agi.org.uk]
+Please send any comments to{nbsp}mailto:gemini@agi.org.uk?subject=GEMINI2.3%20feedback[gemini@agi.org.uk]
 
 _Last updated: June 2021_
 
-http://creativecommons.org/licenses/by/4.0/[image:https://i.creativecommons.org/l/by/4.0/88x31.png[Creative
-Commons Licence]] +
-This work is licensed under
-a{nbsp}http://creativecommons.org/licenses/by/4.0/[Creative Commons
-Attribution 4.0 International License]
+http://creativecommons.org/licenses/by/4.0/[image:https://i.creativecommons.org/l/by/4.0/88x31.png[Creative Commons Licence]] +
+This work is licensed under a{nbsp}http://creativecommons.org/licenses/by/4.0/[Creative Commons Attribution 4.0 International License]

docs/1048-uk-gemini-encoding-guidance.asciidoc

@@ -491,7 +491,7 @@ only one date with type 'revision'.
      <gco:Date>2010-01-13</gco:Date> 
    </gmd:date> 
    <gmd:dateType> 
-     <gmd:CI_DateTypeCode codeList="https://schemas.isotc211.org/schemas/19139/resources/gmxCodelists.xml#CI_DateTypeCode" codeListValue="revision">revision</gmd:CI_DateTypeCode> 
+     <gmd:CI_DateTypeCode codeList="https://schemas.isotc211.org/schemas/19139/-/resources/codelist/gmxCodelists.xml#CI_DateTypeCode" codeListValue="revision">revision</gmd:CI_DateTypeCode> 
    </gmd:dateType> 
  </gmd:CI_Date> 
 </gmd:date> 
@@ -553,7 +553,7 @@ only one date with type 'revision'.
  </gmd:CI_Contact> 
 </gmd:contactInfo> 
 <gmd:role> 
- <gmd:CI_RoleCode codeList="https://schemas.isotc211.org/schemas/19139/resources/gmxCodelists.xml#CI_RoleCode" codeListValue="author">author</gmd:CI_RoleCode> 
+ <gmd:CI_RoleCode codeList="https://schemas.isotc211.org/schemas/19139/-/resources/codelist/gmxCodelists.xml#CI_RoleCode" codeListValue="author">author</gmd:CI_RoleCode> 
 </gmd:role> 
 </gmd:CI_ResponsibleParty> 
 ...
@@ -591,7 +591,8 @@ Figure 13 shows the encoding where a code list is specified in ISO
 19115. The value of the codeList attribute should be the URL for the ISO
 19115 code list catalogue that is published on the ISO website:
 
-https://standards.iso.org/iso/19139/resources/gmxCodelists.xml[https://schemas.isotc211.org/schemas/19139/resources/gmxCodelists.xml]
+https://standards.iso.org/iso/19139/resources/gmxCodelists.xml[https://standards.iso.org/iso/19139/resources/gmxCodelists.xml]
+or on the ISO/TC 211 resources site https://schemas.isotc211.org/schemas/19139/-/resources/codelist/gmxCodelists.xml[https://schemas.isotc211.org/schemas/19139/-/resources/codelist/gmxCodelists.xml]
 
 Plus a hash character acting as a delimiter, and then the identifier of
 the code list, in this case ‘MD_ScopeCode’, that contains the code list
@@ -612,7 +613,7 @@ attribute gmd:codeListValue.
 *Figure 13 - Code list*
 [source, xml]
 ----
-<gmd:MD_ScopeCode codeList="https://schemas.isotc211.org/schemas/19139/resources/gmxCodelists.xml#MD_ScopeCode"  
+<gmd:MD_ScopeCode codeList="https://standards.iso.org/iso/19139/-/resources/codelist/gmxCodelists.xml#MD_ScopeCode"  
 codeListValue="dataset">dataset</gmd:MD_ScopeCode>
 ----
 
@@ -905,7 +906,7 @@ for IPR reasons, and with a web page describing licences
 	<gmd:MD_LegalConstraints>
 		<gmd:accessConstraints>
 			<gmd:MD_RestrictionCode
-			codeList="https://schemas.isotc211.org/schemas/19139/resources/gmxCodelists.xml#MD_RestrictionCode"
+			codeList="https://standards.iso.org/iso/19139/-/resources/codelist/gmxCodelists.xml#MD_RestrictionCode"
 			codeListValue="otherRestrictions">otherRestrictions</gmd:MD_RestrictionCode>
 		</gmd:accessConstraints>
 		<gmd:otherConstraints>
@@ -919,7 +920,7 @@ for IPR reasons, and with a web page describing licences
 	<gmd:MD_LegalConstraints>
 		<gmd:useConstraints>
 			<gmd:MD_RestrictionCode
-				codeList="https://schemas.isotc211.org/schemas/19139/resources/gmxCodelists.xml#MD_RestrictionCode"
+				codeList="https://schemas.isotc211.org/schemas/19139/-/resources/codelist/gmxCodelists.xml#MD_RestrictionCode"
 				codeListValue="otherRestrictions">otherRestrictions</gmd:MD_RestrictionCode>
 		</gmd:useConstraints>
 		<gmd:otherConstraints>
@@ -943,7 +944,7 @@ text.
 	<gmd:MD_LegalConstraints>
 		<gmd:accessConstraints>
 			<gmd:MD_RestrictionCode
-			codeList="https://schemas.isotc211.org/schemas/19139/resources/gmxCodelists.xml#MD_RestrictionCode"
+			codeList="https://schemas.isotc211.org/schemas/19139/-/resources/codelist/gmxCodelists.xml#MD_RestrictionCode"
 			codeListValue="otherRestrictions">otherRestrictions</gmd:MD_RestrictionCode>
 		</gmd:accessConstraints>
 		<gmd:otherConstraints>
@@ -957,7 +958,7 @@ text.
 	<gmd:MD_LegalConstraints> <!-- change existing example here, was MD_Constraints -->
 		<gmd:useConstraints>
 			<gmd:MD_RestrictionCode
-				codeList="https://schemas.isotc211.org/schemas/19139/resources/gmxCodelists.xml#MD_RestrictionCode"
+				codeList="https://schemas.isotc211.org/schemas/19139/-/resources/codelist/gmxCodelists.xml#MD_RestrictionCode"
 				codeListValue="otherRestrictions">otherRestrictions</gmd:MD_RestrictionCode>
 		</gmd:useConstraints>
 		<gmd:otherConstraints>
@@ -980,7 +981,7 @@ access, but plain text conditions of use.
 	<gmd:MD_LegalConstraints>
 		<gmd:accessConstraints>
 			<gmd:MD_RestrictionCode
-				codeList="https://schemas.isotc211.org/schemas/19139/resources/gmxCodelists.xml#MD_RestrictionCode"
+				codeList="https://schemas.isotc211.org/schemas/19139/-/resources/codelist/gmxCodelists.xml#MD_RestrictionCode"
 				codeListValue="otherRestrictions">otherRestrictions</gmd:MD_RestrictionCode>
 		</gmd:accessConstraints>
 		<gmd:otherConstraints>
@@ -994,7 +995,7 @@ access, but plain text conditions of use.
 	<gmd:MD_LegalConstraints> <!-- change existing example here, was MD_Constraints -->
 		<gmd:useConstraints>
 			<gmd:MD_RestrictionCode
-				codeList="https://schemas.isotc211.org/schemas/19139/resources/gmxCodelists.xml#MD_RestrictionCode"
+				codeList="https://schemas.isotc211.org/schemas/19139/-/resources/codelist/gmxCodelists.xml#MD_RestrictionCode"
 				codeListValue="otherRestrictions">otherRestrictions</gmd:MD_RestrictionCode>
 		</gmd:useConstraints>
 		<gmd:otherConstraints>
@@ -1029,7 +1030,7 @@ series, ISO 19115 hierarchyLevelName element must also be set, to
 <gmd:MD_Metadata> 
 ... 
 <gmd:hierarchyLevel> 
-	<gmd:MD_ScopeCode codeList="https://schemas.isotc211.org/schemas/19139/resources/gmxCodelists.xml#MD_ScopeCode" codeListValue="dataset">dataset</gmd:MD_ScopeCode> 
+	<gmd:MD_ScopeCode codeList="https://schemas.isotc211.org/schemas/19139/-/resources/codelist/gmxCodelists.xml#MD_ScopeCode" codeListValue="dataset">dataset</gmd:MD_ScopeCode> 
 </gmd:hierarchyLevel> 
 ... 
 <gmd:identificationInfo> 
@@ -1067,7 +1068,7 @@ set, to "service".
 ... 
 <gmd:hierarchyLevel> 
 	 <gmd:MD_ScopeCode  
-	   codeList="https://schemas.isotc211.org/schemas/19139/resources/codelist/gmxCodelists.xml#MD_ScopeCode"  
+	   codeList="https://schemas.isotc211.org/schemas/19139/-/resources/codelist/gmxCodelists.xml#MD_ScopeCode"  
 	   codeListValue="service">service 
  	</gmd:MD_ScopeCode> 
 </gmd:hierarchyLevel> 

docs/1049-metadata-guidelines-for-geospatial-data-resources-part-2.asciidoc

@@ -78,9 +78,9 @@ service. The type of resource is identified in the element Resource Type
 Detailed guidance on how to create each of these elements can be found
 here:
 
-link:datasets.html[GEMINI - Datasets and data series]
+link:1062-gemini-datasets-and-data-series.html[GEMINI - Datasets and data series]
 
-link:services.html[GEMINI - Services]
+link:1063-gemini-services.html[GEMINI - Services]
 
 === Additional metadata elements
 

docs/1053-common-metadata-errors-uk-location-discovery-metadata-service.asciidoc

@@ -203,7 +203,7 @@ gmd:DQ_Scope/gmd:levelDescription element, such as:
 ----
 <gmd:DQ_Scope>
 	<gmd:level>
-		<gmd:MD_ScopeCode codeList="http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_19139_Schemas/resources/codelist/gmxCodelists.xml#MD_ScopeCode" codeListValue="service">service</gmd:MD_ScopeCode>
+		<gmd:MD_ScopeCode codeList="https://standards.iso.org/iso/19139/Schemas/resources/codelist/gmxCodelists.xml#MD_ScopeCode" codeListValue="service">service</gmd:MD_ScopeCode>
 	</gmd:level>
 	<gmd:levelDescription>
 		<gmd:MD_ScopeDescription>
@@ -374,14 +374,14 @@ in most records.
 
 [source,xml]
 ----
-<gmd:CI_OnLineFunctionCode codeList="http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_19139_Schemas/resources/Codelist/gmxCodelists.xml#CI_OnLineFunctionCode" codeListValue="information">information</gmd:CI_OnLineFunctionCode>
+<gmd:CI_OnLineFunctionCode codeList="https://standards.iso.org/iso/19139/Schemas/resources/Codelist/gmxCodelists.xml#CI_OnLineFunctionCode" codeListValue="information">information</gmd:CI_OnLineFunctionCode>
 ----
 
 Should be
 
 [source,xml]
 ----
-<gmd:CI_OnLineFunctionCode codeList="http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_19139_Schemas/resources/codelist/gmxCodelists.xml#CI_OnLineFunctionCode" codeListValue="information">information</gmd:CI_OnLineFunctionCode>
+<gmd:CI_OnLineFunctionCode codeList="https://standards.iso.org/iso/19139/Schemas/resources/codelist/gmxCodelists.xml#CI_OnLineFunctionCode" codeListValue="information">information</gmd:CI_OnLineFunctionCode>
 ----
 
 (a lower case ‘c’ in the first occurrence of ‘codelist’ within the URL)

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

@@ -57,9 +57,15 @@ longer just be the century.
 
 === Editorial changes since the launch of GEMINI 2.3
 
+==== November 2023
+
+link:1062-gemini-datasets-and-data-series.html#41[Conformity] 
+
+* Clarified guidance and comments, including how to specify that the resource hasn't been tested against INSPIRE
+
 ==== October 2023
 
-Simplified home page ("introduction" / "landing page") as requested by Geospatial Commission
+Simplified home page ("introduction" / "landing page") as requested by Geospatial Commission. 
 This included resolution of some specific requests for things to mention: https://github.com/agiorguk/gemini/issues/31; https://github.com/agiorguk/gemini/issues/58; https://github.com/agiorguk/gemini/issues/24
 
 Remove mention of IPSV from guidance on Keyword (https://github.com/agiorguk/gemini/issues/19)