Merge branch 'master' of github.com:okfn/ckan into feature-1515-activ…

…ity-streams

ckan/lib/cli.py

@@ -140,7 +140,7 @@ def _get_postgres_cmd(self, command):
         pg_cmd += ' -U %(db_user)s' % self.db_details
         if self.db_details.get('db_pass') not in (None, ''):
             pg_cmd = 'export PGPASSWORD=%(db_pass)s && ' % self.db_details + pg_cmd
-        if self.db_details.get('db_host') not in (None, '', 'localhost'):
+        if self.db_details.get('db_host') not in (None, ''):
             pg_cmd += ' -h %(db_host)s' % self.db_details
         if self.db_details.get('db_port') not in (None, ''):
             pg_cmd += ' -p %(db_port)s' % self.db_details

ckan/templates/layout_base.html

@@ -202,7 +202,7 @@ <h3 class="widget-title">Languages</h3>
         <div class="xoxo span-6 last">
           <h3 class="widget-title">Meta</h3>
           <p id="credits">
-            &copy; 2011
+            &copy; 2012
             <img src="http://assets.okfn.org/images/logo/okf_logo_white_and_green_tiny.png" id="footer-okf-logo" />
             <a href="http://okfn.org/">Open Knowledge Foundation</a>
             Licensed under the <a href="http://opendatacommons.org/licenses/odbl/1.0/">Open Database License</a>

ckan/templates/package/edit.html

@@ -19,7 +19,7 @@
       <ul class="dataset-edit-nav">
         <!-- One button for each fieldset -->
         <li><a href="#section-basic-information">Basic Information</a></li>
-        <li><a href="#section-further-information">Futher Information</a></li>
+        <li><a href="#section-further-information">Further Information</a></li>
         <li><a href="#section-resources">Resources</a></li>
         <li><a href="#section-groups">Groups &amp; Tags</a></li>
         <li><a href="#section-extras">Extras</a></li>

doc/configuration.rst

@@ -314,7 +314,11 @@ Example::
 
 Default value:  ``standard``
 
-This sets the name of the form to use when editing a dataset. This can be a form defined in the core CKAN code or in another setuputils-managed python module. The only requirement is that the ``setup.py`` file has an entry point for the form defined in the ``ckan.forms`` section. 
+This sets the name of the Formalchemy form to use when editing a dataset. 
+
+.. note:: This setting only applies to the deprecated Formalchemy forms. For enabling forms defined with a Navl schema, see :doc:`forms`.
+
+The value for this setting can be a Formalchemy form defined in the core CKAN code or in another setuputils-managed python module. The only requirement is that the ``setup.py`` file has an entry point for the form defined in the ``ckan.forms`` section. 
 
 For more information on forms, see :doc:`forms`.