Merge pull request #276 from opendata-swiss/handbook-94-adjust-licenc…

…e-rights-page

Handbook 94 adjust licence rights page

source/content/glossar/bibliothek/dcat-ap-ch.rst

@@ -943,6 +943,16 @@ dct:rights (DCAT)
 
     .. include:: dcat-examples/distribution-rights-rdf.rst
 
+.. toggle-header::
+    :header: Deprecated: Property ``dct:rights`` of ``dcat:Distribution`` in Turtle
+
+    .. include:: dcat-examples/deprecated/distribution-rights-ttl.rst
+
+.. toggle-header::
+    :header: Deprecated: Property ``dct:rights`` of ``dcat:Distribution`` in Rdf/xml
+
+    .. include:: dcat-examples/deprecated/distribution-rights-rdf.rst
+
 .. _dcat-distribution-media-type:
 
 dcat:mediaType (DCAT)

source/content/glossar/bibliothek/dcat-definitions/distribution-license.rst

@@ -10,7 +10,7 @@
 
 :Usage Notes: Terms of use are no longer referenced under ``dct:rights``, but under ``dct:license``. 
 
-            Exception: If other licenses, such as CC-licenses, are used for the dataset besides the terms of use, the 
+            **Exception:** If other licenses, such as CC-licenses, are used for the dataset besides the terms of use, the 
             terms of use are referenced under dct:rights. Only the terms of use are displayed on opendata.swiss. If other
             licenses are included, they are passed on to the portal data.europa.eu.
 
@@ -22,6 +22,14 @@
     :caption: Values **acceptable** for opendata.swiss
     :emphasize-lines: 1,2,3,4
 
+    http://dcat-ap.ch/vocabulary/licenses/terms_open
+    http://dcat-ap.ch/vocabulary/licenses/terms_by
+    http://dcat-ap.ch/vocabulary/licenses/terms_ask
+    http://dcat-ap.ch/vocabulary/licenses/terms_by_ask
+
+.. code-block::
+    :caption: **Deprecated:** Values **acceptable** for opendata.swiss
+
     NonCommercialAllowed-CommercialAllowed-ReferenceNotRequired
     NonCommercialAllowed-CommercialAllowed-ReferenceRequired
     NonCommercialAllowed-CommercialWithPermission-ReferenceNotRequired

source/content/glossar/bibliothek/dcat-definitions/distribution-rights.rst

@@ -5,13 +5,21 @@
 :Description: This property refers to a statement that specifies rights associated with the Distribution. Only used in exceptional cases (see usage notes below).
 :Usage notes: Imporant: The property `dct:license <https://handbook.opendata.swiss/de/content/glossar/bibliothek/dcat-ap-ch.html#dct-license-dcat>`__ with the values accepted for opendata.swiss is now 
             requiered for the `terms of use <https://opendata.swiss/de/terms-of-use>`__. 
-            Exception: If someone uses datasets with CC-licenses in their catalogue, these can be kept under
+            **Exception:** If someone uses datasets with CC-licenses in their catalogue, these can be kept under
             dct:license, but in this case the terms of use must be entered under dct:rights. 
 
 .. code-block::
     :caption: Values **acceptable** for opendata.swiss
     :emphasize-lines: 1,2,3,4
 
+    http://dcat-ap.ch/vocabulary/licenses/terms_open
+    http://dcat-ap.ch/vocabulary/licenses/terms_by
+    http://dcat-ap.ch/vocabulary/licenses/terms_ask
+    http://dcat-ap.ch/vocabulary/licenses/terms_by_ask
+
+.. code-block::
+    :caption: **Deprecated:** Values **acceptable** for opendata.swiss
+
     NonCommercialAllowed-CommercialAllowed-ReferenceNotRequired
     NonCommercialAllowed-CommercialAllowed-ReferenceRequired
     NonCommercialAllowed-CommercialWithPermission-ReferenceNotRequired

source/content/glossar/bibliothek/dcat-examples/deprecated/distribution-rights-rdf.rst

@@ -0,0 +1,15 @@
+.. code-block:: xml
+    :caption: the rights statement comes from a controlled vocabulary
+    :emphasize-lines: 8
+
+    <?xml version="1.0" encoding="utf-8" ?>
+    <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+             xmlns:dcat="http://www.w3.org/ns/dcat#"
+             xmlns:dct="http://purl.org/dc/terms/">
+
+      <dcat:Distribution rdf:about="http://stratigraphy.org/ICSchart/ChronostratChart2017-02.jpg">
+        <dcat:accessURL rdf:resource="http://stratigraphy.org/ICSchart/ChronostratChart2017-02.jpg"/>
+        <dct:rights>NonCommercialAllowed-CommercialAllowed-ReferenceRequired</dct:rights>
+      </dcat:Distribution>
+
+    </rdf:RDF>

source/content/glossar/bibliothek/dcat-examples/deprecated/distribution-rights-ttl.rst

@@ -0,0 +1,12 @@
+.. code-block:: Turtle
+    :caption: the rights statement comes from a controlled vocabulary
+    :emphasize-lines: 8
+
+    @prefix dcat: <http://www.w3.org/ns/dcat#> .
+    @prefix dct: <http://purl.org/dc/terms/> .
+    @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+
+    <http://stratigraphy.org/ICSchart/ChronostratChart2017-02.jpg>
+       a dcat:Distribution ;
+       dcat:accessURL <http://stratigraphy.org/ICSchart/ChronostratChart2017-02.jpg> ;
+       dct:rights "NonCommercialAllowed-CommercialAllowed-ReferenceRequired" .

source/content/glossar/bibliothek/dcat-examples/distribution-license-rdf.rst

@@ -1,16 +1,14 @@
 .. code-block:: xml
     :caption: the license statement comes from a controlled vocabulary
-    :emphasize-lines: 7,8,9
+    :emphasize-lines: 7
 
     <?xml version="1.0" encoding="utf-8" ?>
     <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
              xmlns:dcat="http://www.w3.org/ns/dcat#"
              xmlns:dct="http://purl.org/dc/terms/">
 
       <dcat:Distribution rdf:about="http://stratigraphy.org/ICSchart/ChronostratChart2017-02.jpg">
-        <dct:license rdf:about="http://dcat-ap.ch/vocabulary/licenses/terms_by">
-          <rdf:type rdf:resource="http://purl.org/dc/terms/RightsStatement"/>
-        </dct:license>
+        <dct:license rdf:resource="http://dcat-ap.ch/vocabulary/licenses/terms_by"/>
       </dcat:Distribution>
 
     </rdf:RDF>

source/content/glossar/bibliothek/dcat-examples/distribution-license-ttl.rst

@@ -1,15 +1,11 @@
 .. code-block:: Turtle
     :caption: the license statement comes from a controlled vocabulary
-    :emphasize-lines: 7,8,9,10
+    :emphasize-lines: 7
 
     @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
     @prefix dcat: <http://www.w3.org/ns/dcat#> .
     @prefix dct: <http://purl.org/dc/terms/> .
 
     <http://stratigraphy.org/ICSchart/ChronostratChart2017-02.jpg>
        a dcat:Distribution ;
-       dct:license [
-		rdf:type dct:LicenseDocument ;
-		rdf:about <http://dcat-ap.ch/vocabulary/licenses/terms_by> ;
-		rdf:resource <http://purl.org/dc/terms/RightsStatement> ;
-	] .
+       dct:license <http://dcat-ap.ch/vocabulary/licenses/terms_by> .

source/content/glossar/bibliothek/dcat-examples/distribution-rights-rdf.rst

@@ -9,7 +9,7 @@
 
       <dcat:Distribution rdf:about="http://stratigraphy.org/ICSchart/ChronostratChart2017-02.jpg">
         <dcat:accessURL rdf:resource="http://stratigraphy.org/ICSchart/ChronostratChart2017-02.jpg"/>
-        <dct:rights>NonCommercialAllowed-CommercialAllowed-ReferenceRequired</dct:rights>
+        <dct:rights rdf:resource="http://dcat-ap.ch/vocabulary/licenses/terms_by"/>
       </dcat:Distribution>
 
     </rdf:RDF>

source/content/glossar/bibliothek/dcat-examples/distribution-rights-ttl.rst

@@ -9,4 +9,4 @@
     <http://stratigraphy.org/ICSchart/ChronostratChart2017-02.jpg>
        a dcat:Distribution ;
        dcat:accessURL <http://stratigraphy.org/ICSchart/ChronostratChart2017-02.jpg> ;
-       dct:rights "NonCommercialAllowed-CommercialAllowed-ReferenceRequired" .
+       dct:rights <http://dcat-ap.ch/vocabulary/licenses/terms_by> .