RedHatTraining/pyramid.git

Merge remote-tracking branch 'origin/master' into docs.gettingstarted

Paul Everitt

2013-08-13 a66e00e9bd51fdffd85fef14e83f12502f2d864e

refs
author	Paul Everitt <paul@agendaless.com>
	Tuesday, August 13, 2013 19:58 +0200
committer	Paul Everitt <paul@agendaless.com>
	Tuesday, August 13, 2013 19:58 +0200
commit	a66e00e9bd51fdffd85fef14e83f12502f2d864e
tree	43eb06f24df2818e2db5a947e9866c8076257e91 tree \| zip \| gz
parent	bf84d90b4dccb9fc52c8fe385e52f7a63e9a5535 view \| diff 5ae91a8ef06c4484bf748c7be578b28d0ca0f12c view \| diff

Merge remote-tracking branch 'origin/master' into docs.gettingstarted

Conflicts:
	docs/index.rst
	docs/latexindex.rst
	setup.py

3 files added

47 files modified

	CHANGES.txt	97 ●●●●● diff \| view \| raw \| blame \| history
	CONTRIBUTORS.txt	8 ●●●●● diff \| view \| raw \| blame \| history
	HACKING.txt	2 ●●●●● diff \| view \| raw \| blame \| history
	HISTORY.txt	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/Makefile	9 ●●●●● diff \| view \| raw \| blame \| history
	docs/_themes @ 8673c4	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/api/config.rst	1 ●●●●● diff \| view \| raw \| blame \| history
	docs/api/registry.rst	9 ●●●●● diff \| view \| raw \| blame \| history
	docs/api/request.rst	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/authorintro.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/conf.py	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/foreword.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/index.rst	13 ●●●●● diff \| view \| raw \| blame \| history
	docs/latexindex.rst	6 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/commandline.rst	24 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/events.rst	89 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/i18n.rst	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/introduction.rst	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/project.rst	12 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/renderers.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/sessions.rst	17 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/templates.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/traversal.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/urldispatch.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/viewconfig.rst	43 ●●●●● diff \| view \| raw \| blame \| history
	docs/whatsnew-1.1.rst	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/whatsnew-1.5.rst	155 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/authentication.py	40 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/config/__init__.py	5 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/config/adapters.py	4 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/config/predicates.py	1 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/config/routes.py	4 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/config/util.py	72 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/interfaces.py	2 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/renderers.py	4 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/router.py	6 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/scaffolds/alchemy/+package+/models.py	5 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/scaffolds/alchemy/+package+/tests.py_tmpl	26 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/scripts/pdistreport.py	37 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/scripts/prequest.py	23 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/scripts/pserve.py	43 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/testing.py	2 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_authentication.py	24 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_config/test_util.py	47 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_router.py	8 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_scripts/test_pdistreport.py	74 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_scripts/test_prequest.py	43 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_scripts/test_pserve.py	2 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/url.py	2 ●●●●● diff \| view \| raw \| blame \| history
	setup.py	3 ●●●●● diff \| view \| raw \| blame \| history