RedHatTraining/pyramid.git

Chris McDonough

2010-01-11 9ec2d646eb23b88e4ef8119b0b46240081953daf

refs
author	Chris McDonough <chrism@agendaless.com>
	Monday, January 11, 2010 19:58 +0100
committer	Chris McDonough <chrism@agendaless.com>
	Monday, January 11, 2010 19:58 +0100
commit	9ec2d646eb23b88e4ef8119b0b46240081953daf
tree	80296b92edb8310bfb7699d165e92a1ea9e36256 tree \| zip \| gz
parent	96d63068ba033809ed73834e095f274800e4d4e8 view \| diff

Merge of andrew-docs branch.

2 files deleted

3 files added

37 files modified

	TODO.txt	24 ●●●●● diff \| view \| raw \| blame \| history
	docs/authorintro.rst	64 ●●●●● diff \| view \| raw \| blame \| history
	docs/build_book	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/conf.py	101 ●●●●● diff \| view \| raw \| blame \| history
	docs/copyright.rst	41 ●●●●● diff \| view \| raw \| blame \| history
	docs/glossary.rst	15 ●●●●● diff \| view \| raw \| blame \| history
	docs/index.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/latexindex.rst	5 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/configuration.rst	949 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/environment.rst	12 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/events.rst	88 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/extending.rst	64 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/firstapp.rst	767 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/hybrid.rst	205 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/install.rst	99 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/introduction.rst	245 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/models.rst	107 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/project.rst	384 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/router.rst	82 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/scanning.rst	202 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/security.rst	263 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/startup.rst	37 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/templates.rst	454 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/unittesting.rst	44 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/urldispatch.rst	60 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/urlmapping.rst	43 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/vhosting.rst	50 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/views.rst	353 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/webob.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/thanks.rst	17 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/bfgwiki/authorization.rst	3 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/bfgwiki/basiclayout.rst	3 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/bfgwiki/definingmodels.rst	3 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/bfgwiki/definingviews.rst	12 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/bfgwiki/index.rst	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/bfgwiki2/authorization.rst	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/bfgwiki2/basiclayout.rst	3 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/bfgwiki2/definingmodels.rst	3 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/bfgwiki2/definingviews.rst	12 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/bfgwiki2/index.rst	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/whatsnew-1.2.rst	4 ●●●●● diff \| view \| raw \| blame \| history
	repoze/bfg/events.py	12 ●●●●● diff \| view \| raw \| blame \| history