Merge branch 'gh-pages' into paper-reviews

# Conflicts:
#	profiles/config.js
#	profilesont/index.html
#	profilesont/profilesont.vsdx

dcat/config.js

@@ -88,7 +88,7 @@ var respecConfig = {
 	 "publisher":"ISO",
 	 "status":"International Standard",
 	 "date":"2012"
-      },	    
+      },
       "DDI" : {
          href : "http://www.ddialliance.org/explore-documentation",
          title : "Data Documentation Initiative",
@@ -183,6 +183,15 @@ var respecConfig = {
             publisher:"Hydra W3C Community Group",
             status:"Unofficial Draft"
       },
+      "LDP": {
+            authors: [
+                "Leigh Dodds",
+                "Ian Davis"
+            ],
+            href:"http://patterns.dataincubator.org/book/",
+            title:"Linked Data Patterns",
+            date:"31 May 2012"
+      },
       "ODRS": {
             authors: [
                 "Leigh Dodds"

dcat/examples/eea-csw.ttl

@@ -31,7 +31,7 @@ a:EEA
   v:organization-name "European Environment Agency"@en ;
 .
 a:EEA-CSW-Endpoint
-  rdf:type dcat:DiscoveryService ;
+  rdf:type dcat:DataService ;
   dc:subject "infoCatalogueService"@en ;
   dct:accessRights <http://publications.europa.eu/resource/authority/access-right/PUBLIC> ;
   dct:conformsTo <http://www.opengis.net/def/serviceType/ogc/csw> ;

profiles/config.js

@@ -35,36 +35,6 @@ var respecConfig = {
     github: "https://github.com/w3c/dxwg/issues/",
     issueBase: "https://github.com/w3c/dxwg/issues/",
     localBiblio: {
-        "DCAP": {
-            authors: [
-                "Karen Coyle",
-                "Thomas Baker"
-            ],
-            href: "http://dublincore.org/documents/dcmi-terms/",
-            title: "Guidelines for Dublin Core Application Profiles (Working Draft)",
-            date: " 2009-05-18",
-            status: "DCMI Recommended Resource"
-        },
-        "DCSF": {
-            authors: [
-                "Mikael Nilsson",
-                "Thomas Baker",
-                "Pete Johnston"
-            ],
-            href: "http://dublincore.org/documents/singapore-framework/",
-            title: "The Singapore Framework for Dublin Core Application Profiles",
-            date: " 2008-01-14",
-            status: "DCMI Recommended Resource"
-        },
-        "DCDSP": {
-            authors: [
-                "Nilsson, Mikael"
-            ],
-            href: "http://dublincore.org/documents/dc-dsp/",
-            title: "Description Set Profiles: A constraint language for Dublin Core Application Profiles",
-            date: " 2008-03-31",
-            status: "DCMI Working Draft"
-        },
         "PROF-CONNEG": {
             editors: [
                 "Lars G. Svensson",

profilesont/README.md

@@ -1,16 +1,19 @@
 # Profile Descriptions Ontology
-This ontology is for describing relationships between standards/specifications, profiles of them, and supporting artefacts such as validating resources.
+This ontology is for describing relationships between standards/specifications, profiles of them and supporting artifacts such as validating resources.
 
-This model starts with entities of type <http://dublincore.org/2012/06/14/dcterms#Standard>. A Standard can be either a Base Specification (a Standard not profiling any other Standard) or a Profile (a Standard which does profile others). Any Standard can have one or more associated Implementation Resource Descriptors, each of which defines implementing rules for it. The role played by each Implementation Resource Descriptor must be indicated (guidance, validation etc.), and the formalism they adhere to (dct:format) in order to support content negotiation. A preliminary set of Implementation Resource Roles is provided as a 'vocabulary' alongside this ontology.
+This model starts with [http://dublincore.org/2012/06/14/dcterms#Standard](dct:Standard) entities which can either be base specifications (Standards not profiling any other Standard) or Profiles (Standards which do profile others). Non-profiling Standards or Profiles can have Resource Descriptors associated with them that define implementing rules for the them. Resource Descriptors must indicate the role they play (to guide, to validate etc.) and the formalism they adhere to (dct:format) to allow for content negotiation. An extensible vocabulary of Resource Roles is provided alongside this ontology.
 
-Development of this ontology is part of the work of the [Data Exchange Working Group](https://www.w3.org/2017/dxwg/) (DXWG)'s [Profile Guidance](https://w3c.github.io/dxwg/profile-guidance/) work.
+![](profilesont.svg)  
+**Fig. 1**: Overview diagram of this ontology  
+
+Development of this ontology is part of the work of the [Data Exchange Working Group](https://www.w3.org/2017/dxwg/) (DXWG)'s [Profile Guidance](https://w3c.github.io/dxwg/profiles/) work.
 
 ## Ontology components
 The main files of this ontology are:
 
 * [index.html](https://w3c.github.io/dxwg/profilesont/) - ontology description as a web page (HTML)
 * [profilesont.ttl](profilesont.ttl) - ontology source (RDF, turtle)
-* [profilesont.png](profilesont.png) - ontology diagram (PNG)
+* [profilesont.svg](profilesont.svg) - ontology diagram (PNG)
 
 Additional components:
 
@@ -19,7 +22,7 @@ Additional components:
 * **Roles vocabulary** - a small vocabulary of Implementation Resource Descriptor Roles
   * [resource_roles.html](https://w3c.github.io/dxwg/profilesont/resource_roles.html) - vocab as a web page (HTML)
   * [resource_roles.ttl](resource_roles.ttl) - vocab source (RDF, turtle)
-  * [resource_roles.png](resource_roles.png) - vocab diagram (PNG)
+  * [resource_roles.svg](resource_roles.svg) - vocab diagram (PNG)
 * **Alignments**
   * within the main ontology document, Section 'Alignments'
   * [alignment_dcat.ttl](alignment_dcat.ttl) - alignment source (RDF, turtle)

profilesont/alignment_dcat.ttl

@@ -22,11 +22,6 @@
 .
 
 #################################################################
-###  https://w3c.github.io/dxwg/profilesont#hasProfile
-prof:hasProfile rdf:type owl:ObjectProperty ;
-                rdfs:comment "May be aligned as a subproperty of a (possible new) property for relationships between DCAT resources."@en ;
-.
-
 ###  https://w3c.github.io/dxwg/profilesont#profileOf
 prof:profileOf rdf:type owl:ObjectProperty ;
                rdfs:comment "May be aligned as a subproperty of a (possible new) property for relationships between DCAT resources."@en ;

profilesont/examples/README.md

@@ -10,7 +10,7 @@ The degree to which categorisation of roles is explicitly supported is a subject
 
 The RDF for this example is in [profilesont_examples.ttl](profilesont_examples.ttl).
 
-![](eg_dcat-ap.png)  
+![](dcat-ap.svg)  
 Figure 1: DCAT-AP profile of DCAT
 
 Additionally, there are a range of national DCAT-AP profiles, such as DCAT-AP IT (Italy) which profile DCAT-AP and also other non-national profiles such as GeoDCAT-AP. Note that GeoDCAT-AP profiles both DCAT-AP *and* GeoDCAT. The property `inheritedFrom` is used to show that at least some of the `Implementation Resource Descriptor` content for DCAT-AP-IT is inherited from DCAT & DCAT-AP from which DCAT-AP-IT derives.
@@ -23,7 +23,7 @@ Depending on backwards compatibility outcomes, it is possible that the original
 
 The RDF for this example is in [profilesont_examples.ttl](profilesont_examples.ttl).
 
-![](eg_dcat.png)  
+![](dcat.svg)  
 Figure 3: DCAT profiles
 
 ### EUDM

profilesont/examples/adms.ttl

@@ -39,7 +39,7 @@ padms:ADMS-rdf
 .
 
 padms:DCAT2014
-  rdf:type prof:BaseSpecification ;
+  rdf:type dct:Standard ;
   rdfs:label "DCAT 2014" ;
   prof:resource padms:DCAT2014-rdf ;
   prof:resource padms:DCAT2014-rec ;