RedHatTraining/pyramid.git

Chris McDonough

2011-02-05 62af268dba6c0f1abbe7abf07fd2ee31d2e51ce1

refs
author	Chris McDonough <chrism@plope.com>
	Saturday, February 5, 2011 20:48 +0100
committer	Chris McDonough <chrism@plope.com>
	Saturday, February 5, 2011 20:48 +0100
commit	62af268dba6c0f1abbe7abf07fd2ee31d2e51ce1
tree	971b72ff75c9a52267f3506fbaa79a6d66da4bf0 tree \| zip \| gz
parent	ce0e371e067f3628620a7db5a50056c9a045979f view \| diff 89585958ebd47e1fde477a48144ecd25c2b5f856 view \| diff

Merge branch 'cmbeelby-master'

10 files modified

	docs/authorintro.rst	7 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/muchadoabouttraversal.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/renderers.rst	12 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/security.rst	6 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/templates.rst	8 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/traversal.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/urldispatch.rst	7 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/viewconfig.rst	14 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/views.rst	23 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/basiclayout.rst	4 ●●●●● diff \| view \| raw \| blame \| history