From 7b24c19ce54d21d678ccd084a4c8747e966ec794 Mon Sep 17 00:00:00 2001 From: Daniel Roy Greenfeld Date: Mon, 9 May 2016 21:12:34 -0700 Subject: [PATCH] Fix #524 --- LICENSE | 4 ++-- docs/conf.py | 8 ++++---- docs/developing-locally.rst | 2 +- docs/faq.rst | 2 +- hooks/post_gen_project.py | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/LICENSE b/LICENSE index bf45127c..9a5d2fc0 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2013, Daniel Greenfeld +Copyright (c) 2013-2016, Daniel Greenfeld All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -11,7 +11,7 @@ are permitted provided that the following conditions are met: list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -* Neither the name of cookiecutter-django nor the names of its contributors may +* Neither the name of Cookiecutter Django nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/docs/conf.py b/docs/conf.py index f666389a..2fdeb69e 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -45,7 +45,7 @@ source_suffix = '.rst' master_doc = 'index' # General information about the project. -project = 'cookiecutter-django' +project = 'Cookiecutter Django' copyright = '2013-{}, Daniel Roy Greenfeld'.format(now.year) # The version info for the project you're documenting, acts as replacement for @@ -220,7 +220,7 @@ latex_documents = [ # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). man_pages = [ - ('index', 'cookiecutter-django', 'cookiecutter-django documentation', + ('index', 'Cookiecutter Django', 'Cookiecutter Django documentation', ['Daniel Roy Greenfeld'], 1) ] @@ -234,8 +234,8 @@ man_pages = [ # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - ('index', 'cookiecutter-django', 'cookiecutter-django documentation', - 'Daniel Roy Greenfeld', 'cookiecutter-django', + ('index', 'Cookiecutter Django', 'Cookiecutter Django documentation', + 'Daniel Roy Greenfeld', 'Cookiecutter Django', 'A Cookiecutter template for creating production-ready Django projects quickly.', 'Miscellaneous'), ] diff --git a/docs/developing-locally.rst b/docs/developing-locally.rst index 27460eb0..4963a9cd 100644 --- a/docs/developing-locally.rst +++ b/docs/developing-locally.rst @@ -23,7 +23,7 @@ Then, create a PostgreSQL database with the following command, where `[project_s $ createdb [project_slug] -`cookiecutter-django` uses the excellent `django-environ`_ package with its ``DATABASE_URL`` environment variable to simplify database configuration in your Django settings. Now all you have to do is compose a definition for ``DATABASE_URL``: +`Cookiecutter Django` uses the excellent `django-environ`_ package with its ``DATABASE_URL`` environment variable to simplify database configuration in your Django settings. Now all you have to do is compose a definition for ``DATABASE_URL``: .. parsed-literal:: diff --git a/docs/faq.rst b/docs/faq.rst index 3e6e4a7e..854e9ddd 100644 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -3,7 +3,7 @@ FAQ .. index:: FAQ, 12-Factor App -Why is there a django.contrib.sites directory in cookiecutter-django? +Why is there a django.contrib.sites directory in Cookiecutter Django? --------------------------------------------------------------------- It is there to add a migration so you don't have to manually change the ``sites.Site`` record from ``example.com`` to whatever your domain is. Instead, your ``{{cookiecutter.domain_name}}`` and {{cookiecutter.project_name}} value is placed by **Cookiecutter** in the domain and name fields respectively. diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py index bbc85242..cffb052e 100644 --- a/hooks/post_gen_project.py +++ b/hooks/post_gen_project.py @@ -39,7 +39,7 @@ def get_random_string( if using_sysrandom: return ''.join(random.choice(allowed_chars) for i in range(length)) print( - "cookiecutter-django couldn't find a secure pseudo-random number generator on your system." + "Cookiecutter Django couldn't find a secure pseudo-random number generator on your system." " Please change change your SECRET_KEY variables in conf/settings/local.py and env.example" " manually." )