Skip to content

Commit

Permalink
Merge pull request ckan#2963 from ckan/ckan-association-refs-without-…
Browse files Browse the repository at this point in the history
…copyright

OKF->CKAN Association/contributors
  • Loading branch information
amercader committed Apr 19, 2016
2 parents c422cf0 + ff883b6 commit e063b0d
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion ckan/templates/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
{% block footer_links_ckan %}
{% set api_url = 'http://docs.ckan.org/en/{0}/api/'.format(g.ckan_doc_version) %}
<li><a href="{{ api_url }}">{{ _('CKAN API') }}</a></li>
<li><a href="http://www.okfn.org/">{{ _('Open Knowledge International') }}</a></li>
<li><a href="http://www.ckan.org/">{{ _('CKAN Association') }}</a></li>
<li><a href="http://www.opendefinition.org/okd/"><img src="{{ h.url_for_static('/base/images/od_80x15_blue.png') }}"></a></li>
{% endblock %}
</ul>
Expand Down
2 changes: 1 addition & 1 deletion doc/_templates/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<hr></hr>

<p>An <a href="http://okfn.org">Open Knowledge Foundation</a> project.</p>
<p>Support the <a href="http://ckan.org">CKAN Association</a>.</p>

<p class="copyright">
{%- if show_copyright %}
Expand Down
2 changes: 1 addition & 1 deletion doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ def write_latest_release_file():
# (source start file, target name, title, author, document class [howto/manual]).
latex_documents = [
('contents', 'CKAN.tex', ur'CKAN documentation',
ur'Open Knowledge Foundation', 'manual'),
ur'CKAN contributors', 'manual'),
]

# The name of an image file (relative to this directory) to place at the top of
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,8 @@
setup(
name='ckan',
version=__version__,
author='Open Knowledge Foundation',
author_email='info@okfn.org',
author='https://github.com/ckan/ckan/graphs/contributors',
author_email='info@ckan.org',
license=__license__,
url='http://ckan.org/',
description=__description__,
Expand Down

0 comments on commit e063b0d

Please sign in to comment.