This commit is contained in:
Daniel Roy Greenfeld 2016-05-09 21:12:34 -07:00
parent d79e09d0e2
commit 7b24c19ce5
5 changed files with 9 additions and 9 deletions

View File

@ -1,4 +1,4 @@
Copyright (c) 2013, Daniel Greenfeld Copyright (c) 2013-2016, Daniel Greenfeld
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, 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 list of conditions and the following disclaimer in the documentation and/or
other materials provided with the distribution. 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 be used to endorse or promote products derived from this software without
specific prior written permission. specific prior written permission.

View File

@ -45,7 +45,7 @@ source_suffix = '.rst'
master_doc = 'index' master_doc = 'index'
# General information about the project. # General information about the project.
project = 'cookiecutter-django' project = 'Cookiecutter Django'
copyright = '2013-{}, Daniel Roy Greenfeld'.format(now.year) copyright = '2013-{}, Daniel Roy Greenfeld'.format(now.year)
# The version info for the project you're documenting, acts as replacement for # 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 # One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section). # (source start file, name, description, authors, manual section).
man_pages = [ man_pages = [
('index', 'cookiecutter-django', 'cookiecutter-django documentation', ('index', 'Cookiecutter Django', 'Cookiecutter Django documentation',
['Daniel Roy Greenfeld'], 1) ['Daniel Roy Greenfeld'], 1)
] ]
@ -234,8 +234,8 @@ man_pages = [
# (source start file, target name, title, author, # (source start file, target name, title, author,
# dir menu entry, description, category) # dir menu entry, description, category)
texinfo_documents = [ texinfo_documents = [
('index', 'cookiecutter-django', 'cookiecutter-django documentation', ('index', 'Cookiecutter Django', 'Cookiecutter Django documentation',
'Daniel Roy Greenfeld', 'cookiecutter-django', 'Daniel Roy Greenfeld', 'Cookiecutter Django',
'A Cookiecutter template for creating production-ready Django projects quickly.', 'Miscellaneous'), 'A Cookiecutter template for creating production-ready Django projects quickly.', 'Miscellaneous'),
] ]

View File

@ -23,7 +23,7 @@ Then, create a PostgreSQL database with the following command, where `[project_s
$ createdb [project_slug] $ 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:: .. parsed-literal::

View File

@ -3,7 +3,7 @@ FAQ
.. index:: FAQ, 12-Factor App .. 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. 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.

View File

@ -39,7 +39,7 @@ def get_random_string(
if using_sysrandom: if using_sysrandom:
return ''.join(random.choice(allowed_chars) for i in range(length)) return ''.join(random.choice(allowed_chars) for i in range(length))
print( 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" " Please change change your SECRET_KEY variables in conf/settings/local.py and env.example"
" manually." " manually."
) )