RedHatTraining/pyramid.git

Merge branch 'master' of github.com:Pylons/pyramid

Chris McDonough

2013-04-03 d64fa6136d0dec6717b273362de548d8f3bf47e8

refs
author	Chris McDonough <chrism@plope.com>
	Wednesday, April 3, 2013 23:37 +0200
committer	Chris McDonough <chrism@plope.com>
	Wednesday, April 3, 2013 23:37 +0200
commit	d64fa6136d0dec6717b273362de548d8f3bf47e8
tree	23c77ac62ab9d6c93131874f835ae3166d4af53b tree \| zip \| gz
parent	2ca9bde9d2862655ddee276cd14a375e6a5adec6 view \| diff 84e455cf7c8d9cbfe6658548a61af2ecbbc1749e view \| diff

Merge branch 'master' of github.com:Pylons/pyramid

2 files added

76 files modified

	CHANGES.txt	17 ●●●●● diff \| view \| raw \| blame \| history
	CONTRIBUTORS.txt	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/api/paster.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/conf.py	17 ●●●●● diff \| view \| raw \| blame \| history
	docs/conventions.rst	21 ●●●●● diff \| view \| raw \| blame \| history
	docs/designdefense.rst	3 ●●●●● diff \| view \| raw \| blame \| history
	docs/glossary.rst	20 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/assets.rst	8 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/commandline.rst	8 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/configuration.rst	1 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/extending.rst	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/firstapp.rst	3 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/hooks.rst	21 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/install.rst	46 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/introduction.rst	8 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/logging.rst	8 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/muchadoabouttraversal.rst	18 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/project.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/renderers.rst	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/router.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/security.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/sessions.rst	43 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/startup.rst	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/subrequest.rst	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/templates.rst	1 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/testing.rst	13 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/traversal.rst	25 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/urldispatch.rst	10 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/viewconfig.rst	10 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/views.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/webob.rst	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/zca.rst	12 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/basiclayout.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/authorization/tutorial/templates/edit.pt	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/authorization/tutorial/templates/login.pt	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/authorization/tutorial/templates/mytemplate.pt	3 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/authorization/tutorial/templates/view.pt	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt	3 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt	3 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/tests/tutorial/templates/edit.pt	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/tests/tutorial/templates/login.pt	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/tests/tutorial/templates/mytemplate.pt	3 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/src/tests/tutorial/templates/view.pt	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/authorization.rst	8 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/basiclayout.rst	28 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/definingmodels.rst	11 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/definingviews.rst	42 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/design.rst	8 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/installation.rst	186 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/basiclayout/tutorial/templates/mytemplate.pt	3 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/models/tutorial/templates/mytemplate.pt	3 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/tests/tutorial/templates/edit.pt	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/tests/tutorial/templates/login.pt	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/tests/tutorial/templates/mytemplate.pt	3 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/tests/tutorial/templates/view.pt	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/views/tutorial/templates/edit.pt	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/views/tutorial/templates/mytemplate.pt	3 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/views/tutorial/templates/view.pt	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/whatsnew-1.1.rst	8 ●●●●● diff \| view \| raw \| blame \| history
	docs/whatsnew-1.2.rst	20 ●●●●● diff \| view \| raw \| blame \| history
	docs/whatsnew-1.3.rst	12 ●●●●● diff \| view \| raw \| blame \| history
	docs/whatsnew-1.4.rst	9 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/config/__init__.py	6 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/config/views.py	4 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/decorator.py	18 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/mako_templating.py	14 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/paster.py	22 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/scaffolds/alchemy/+package+/scripts/initializedb.py	9 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl	3 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl	3 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt	3 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/fixtures/dummy.ini	4 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/fixtures/hello .world.mako	3 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_config/test_views.py	3 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_mako_templating.py	28 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_paster.py	44 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/util.py	21 ●●●●● diff \| view \| raw \| blame \| history
	setup.py	2 ●●●●● diff \| view \| raw \| blame \| history