RedHatTraining/pyramid.git

Merge pull request #2666 from stevepiercy/1.6-branch

Steve Piercy

2016-07-02 987ef567e02ee5513fa45471cb0918851a62ff25

refs
author	Steve Piercy <web@stevepiercy.com>
	Saturday, July 2, 2016 13:59 +0200
committer	GitHub <noreply@github.com>
	Saturday, July 2, 2016 13:59 +0200
commit	987ef567e02ee5513fa45471cb0918851a62ff25
tree	3ca7d78115bf9272ca3b08239f3db9fd6f1f1d65 tree \| zip \| gz
parent	3f7c7ca4a5c62449b3b39caa5977cecb18c68ff7 view \| diff 8e25a7ab6425eb385ed5d83c94e95c1056922ba1 view \| diff

Merge pull request #2666 from stevepiercy/1.6-branch

Backport relevant docs changes from master to 1.6-branch

1 files deleted

62 files modified

	docs/Makefile	22 ●●●●● diff \| view \| raw \| blame \| history
	docs/conf.py	10 ●●●●● diff \| view \| raw \| blame \| history
	docs/conventions.rst	45 ●●●●● diff \| view \| raw \| blame \| history
	docs/copyright.rst	11 ●●●●● diff \| view \| raw \| blame \| history
	docs/designdefense.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/glossary.rst	138 ●●●●● diff \| view \| raw \| blame \| history
	docs/latexindex.rst	50 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/commandline.rst	67 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/firstapp.rst	8 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/hooks.rst	62 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/i18n.rst	40 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/install.rst	156 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/introduction.rst	34 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/logging.rst	3 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/muchadoabouttraversal.rst	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/project.rst	152 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/renderers.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/router.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/sessions.rst	57 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/startup.rst	8 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/templates.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/testing.rst	12 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/upgrading.rst	14 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/urldispatch.rst	7 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/webob.rst	6 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tutorial/authentication.rst	83 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tutorial/authorization.rst	88 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tutorial/conf.py	281 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tutorial/databases.rst	144 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tutorial/debugtoolbar.rst	56 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tutorial/forms.rst	8 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tutorial/functional_testing.rst	43 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tutorial/hello_world.rst	80 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tutorial/index.rst	10 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tutorial/ini.rst	94 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tutorial/jinja2.rst	51 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tutorial/json.rst	82 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tutorial/logging.rst	48 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tutorial/more_view_classes.rst	122 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tutorial/package.rst	77 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tutorial/request_response.rst	67 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tutorial/requirements.rst	108 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tutorial/routing.rst	49 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tutorial/scaffolds.rst	53 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tutorial/sessions.rst	66 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tutorial/static_assets.rst	41 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tutorial/templating.rst	75 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tutorial/tutorial_approach.rst	58 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tutorial/unit_testing.rst	96 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tutorial/view_classes.rst	56 ●●●●● diff \| view \| raw \| blame \| history
	docs/quick_tutorial/views.rst	68 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/modwsgi/index.rst	30 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/authorization.rst	40 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/background.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/basiclayout.rst	33 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/definingmodels.rst	9 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/definingviews.rst	24 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/design.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/distributing.rst	15 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/index.rst	1 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/installation.rst	214 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/tests.rst	6 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/decorator.py	40 ●●●●● diff \| view \| raw \| blame \| history