Merge branch 'tomkralidis-master'

ckanext/spatial/commands/csw.py

@@ -55,7 +55,7 @@ option:
         if cmd == 'setup':
             ckan_pycsw.setup_db(config)
         elif cmd in ['load', 'set_keywords']:
-            ckan_url = self.options.ckan_url
+            ckan_url = self.options.ckan_url.rstrip('/') + '/'
             if cmd == 'load':
                 ckan_pycsw.load(config, ckan_url)
             else:

doc/csw.rst

@@ -160,7 +160,7 @@ Setting Service Metadata Keywords
 The CSW standard allows for administrators to set CSW service metadata. These
 values can be set in the pycsw configuration ``metadata:main`` section.  If you
 would like the CSW service metadata keywords to be reflective of the CKAN
-tags, run the following convenience command:
+tags, run the following convenience command::
 
     paster ckan-pycsw set_keywords -p /etc/ckan/default/pycsw.cfg