Merge branch 'master' of https://github.com/okfn/ckan

ckan · Aug 20, 2012 · d8a2b5f · d8a2b5f
2 parents eae560d + c465dd5
commit d8a2b5f
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/doc/configuration.rst b/doc/configuration.rst
@@ -272,7 +272,7 @@ Storage Settings
 ----------------
 
 .. index::
-   single: ckan.storage.bucket, ckan.storage.directory
+   single: ckan.storage.bucket, ofs.storage_dir
 
 ckan.storage.bucket
 ^^^^^^^^^^^^^^^^^^^
@@ -285,12 +285,12 @@ Default value:  ``None``
 
 This setting will change the bucket name for the uploaded files.
 
-ckan.storage.directory
-^^^^^^^^^^^^^^^^^^^^^^
+ofs.storage_dir
+^^^^^^^^^^^^^^^
 
 Example::
 
-  ckan.storage.directory = /data/uploads/
+  ofs.storage_dir = /data/uploads/
 
 Default value:  ``None``