Merge branch '534-update-config-options-docs'

ckan/config/deployment.ini_tmpl

@@ -79,9 +79,6 @@ who.config_file = %(here)s/who.ini
 who.log_level = warning
 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 cached local version of ckan group)
 #licenses_group_url = http://licenses.opendefinition.org/licenses/groups/ckan.json
 

doc/apps-ideas.rst

@@ -4,4 +4,4 @@ Apps & Ideas
 
 Since 1.7 CKAN has a feature called Apps & Ideas which allows users to provide information on apps, ideas, visualizations, articles etc that are related to a specific dataset. Once created these items will be shown against the dataset but also shown on the apps dashboard which will allow users to filter the results based on popularity, or type, or the data when the items were created.
 
-This feature is enabled by default but can be disabled using the :ref:`config-apps-ideas` setting to hide the tab on the dataset pages.
+This feature is enabled by default but can be disabled using the :ref:`ckan.dataset.show_apps_ideas` setting to hide the tab on the dataset pages.

doc/authorization.rst

@@ -75,33 +75,9 @@ Configuration File Options
 The following configuration file options can be used to customize CKAN's
 authorization behavior:
 
-``ckan.auth.anon_create_dataset``
-  Allow users to create datasets without registering and logging in,
-  default: false.
-
-``ckan.auth.create_unowned_dataset``
-  Allow the creation of datasets not owned by any organization, default: true.
-
-``ckan.auth.create_dataset_if_not_in_organization``
-  Allow users who are not members of any organization to create datasets,
-  default: true. ``create_unowned_dataset`` must also be true, otherwise
-  setting ``create_dataset_if_not_in_organization`` to true is meaningless.
-
-``ckan.auth.user_create_groups``
-  Allow users to create groups, default: true.
-
-``ckan.auth.user_create_organizations``
-  Allow users to create organizations, default: true.
-
-``ckan.auth.user_delete_groups``
-  Allow users to delete groups, default: true.
-
-``ckan.auth.user_delete_organizations``
-  Allow users to delete organizations, default: true.
-
-``ckan.auth.create_user_via_api``
-  Allow new user accounts to be created via the API, default: false.
-
+.. include:: /configuration.rst
+    :start-after: start_config-authorization
+    :end-before: end_config-authorization
 
 Extensions
 ----------