RedHatTraining/pyramid.git

Merge pull request #3082 from stevepiercy/master

Michael Merickel

2017-06-11 06c28384c1217e054f530df511b434ff543e3132

refs
author	Michael Merickel <michael@merickel.org>
	Sunday, June 11, 2017 19:34 +0200
committer	GitHub <noreply@github.com>
	Sunday, June 11, 2017 19:34 +0200
commit	06c28384c1217e054f530df511b434ff543e3132
tree	2c88d3fe196a3a594eac3d74f49b20c39d0d7aae tree \| zip \| gz
parent	a503511cf82ab1db8c66eb949eeb30da92dd621f view \| diff fa13770dba3947ce78c2a67041cbd02272992104 view \| diff

Merge pull request #3082 from stevepiercy/master

Update docs to synch with cookiecutter updates

80 files modified

	docs/narr/myproject/setup.py	1 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/testing.rst	12 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour.rst	20 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/logging/setup.py	1 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/package/setup.py	1 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/sessions/setup.py	1 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/sqla_demo/development.ini	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/sqla_demo/production.ini	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/sqla_demo/setup.py	6 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tour/sqla_demo/sqla_demo/models/__init__.py	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/authorization.rst	8 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/basiclayout.rst	12 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/definingviews.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/installation.rst	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/authorization/development.ini	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/authorization/production.ini	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/authorization/setup.py	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/authorization/tutorial/__init__.py	3 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/basiclayout/README.txt	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/basiclayout/development.ini	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/basiclayout/production.ini	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/basiclayout/setup.py	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/basiclayout/tutorial/__init__.py	3 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/installation/README.txt	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/installation/development.ini	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/installation/production.ini	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/installation/setup.py	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/installation/tutorial/__init__.py	3 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/models/README.txt	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/models/development.ini	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/models/production.ini	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/models/setup.py	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/models/tutorial/__init__.py	3 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/tests/development.ini	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/tests/production.ini	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/tests/setup.py	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/tests/tutorial/__init__.py	3 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/views/development.ini	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/views/production.ini	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/views/setup.py	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/views/tutorial/__init__.py	3 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/authentication.rst	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/definingmodels.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/installation.rst	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/authentication/README.txt	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/authentication/development.ini	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/authentication/production.ini	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/authentication/setup.py	6 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/authentication/tutorial/models/__init__.py	3 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/authorization/README.txt	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/authorization/development.ini	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/authorization/production.ini	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/authorization/setup.py	6 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/authorization/tutorial/models/__init__.py	3 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/basiclayout/README.txt	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/basiclayout/development.ini	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/basiclayout/production.ini	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/basiclayout/setup.py	6 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/basiclayout/tutorial/models/__init__.py	3 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/installation/README.txt	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/installation/development.ini	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/installation/production.ini	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/installation/setup.py	6 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/installation/tutorial/models/__init__.py	3 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/models/README.txt	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/models/development.ini	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/models/production.ini	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/models/setup.py	6 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/models/tutorial/__init__.py	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/models/tutorial/models/__init__.py	3 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/tests/README.txt	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/tests/development.ini	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/tests/production.ini	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/tests/setup.py	6 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/tests/tutorial/models/__init__.py	3 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/views/README.txt	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/views/development.ini	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/views/production.ini	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/views/setup.py	6 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/views/tutorial/models/__init__.py	3 ●●●●● diff \| view \| raw \| blame \| history