From 8b89ced1da1e4a3126cc052dd339c74a090dd194 Mon Sep 17 00:00:00 2001 From: Rufus Pollock Date: Mon, 13 Feb 2012 11:21:04 +0000 Subject: [PATCH] [#1359,doc][xs]: minor updates to docs re license_group_url to reflect new setup. --- ckan/config/deployment.ini_tmpl | 4 ++-- doc/configuration.rst | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ckan/config/deployment.ini_tmpl b/ckan/config/deployment.ini_tmpl index adc875b7d19..85183c1757a 100644 --- a/ckan/config/deployment.ini_tmpl +++ b/ckan/config/deployment.ini_tmpl @@ -52,8 +52,8 @@ who.log_file = %(cache_dir)s/who_log.ini # Location of RDF versions of datasets #rdf_packages = http://semantic.ckan.net/record/ -# Location of licenses group (defaults to local Python licenses dataset) -#licenses_group_url = http://licenses.opendefinition.org/2.0/ckan_original +# Location of licenses group (defaults to cached local version of ckan group) +#licenses_group_url = http://licenses.opendefinition.org/licenses/groups/ckan.json # Dataset form to use package_form = standard diff --git a/doc/configuration.rst b/doc/configuration.rst index 7396b4a38bc..e087f20764b 100644 --- a/doc/configuration.rst +++ b/doc/configuration.rst @@ -392,17 +392,18 @@ A url pointing to a JSON file containing a list of licence objects. This list determines the licences offered by the system to users, for example when creating or editing a dataset. -This is entirely optional - by default, the system will use the CKAN list of -licences available in the `Python licenses package `_. +This is entirely optional - by default, the system will use an internal cached +version of the CKAN list of licences available from the +http://licenses.opendefinition.org/licenses/groups/ckan.json. -More details about the CKAN license objects - including the licence format and some +More details about the license objects - including the licence format and some example licence lists - can be found at the `Open Licenses Service `_. Examples:: - licenses_group_url = file:///path/to/my/local/json-list-of-licenses.js - licenses_group_url = http://licenses.opendefinition.org/2.0/ckan_original + licenses_group_url = file:///path/to/my/local/json-list-of-licenses.json + licenses_group_url = http://licenses.opendefinition.org/licenses/groups/od.json Messaging Settings