RedHatTraining/pyramid.git

Carlos de la Guardia

2011-06-07 fd5203000d4d051b51f804af023aefe59b832029

refs
author	Carlos de la Guardia <cguardia@yahoo.com>
	Tuesday, June 7, 2011 08:54 +0200
committer	Carlos de la Guardia <cguardia@yahoo.com>
	Tuesday, June 7, 2011 08:54 +0200
commit	fd5203000d4d051b51f804af023aefe59b832029
tree	f92f1f163aed0d2c282fb674069f987fe4dfba47 tree \| zip \| gz
parent	a5713863a80a493a1485057609578b907d04c770 view \| diff df75cee020e49cc4668448b83e0617b14904bfa2 view \| diff

Merge remote branch 'cito/master'

2 files added

21 files modified

	docs/narr/advconfig.rst	10 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/environment.rst	16 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/extending.rst	6 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/hooks.rst	35 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/i18n.rst	14 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/zca.rst	8 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/authorization.rst	6 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/definingviews.rst	6 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/index.rst	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/installation.rst	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/authorization.rst	6 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/basiclayout.rst	6 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/definingmodels.rst	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/definingviews.rst	98 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/index.rst	5 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/installation.rst	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/authorization/tutorial/models.py	7 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/authorization/tutorial/views.py	8 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/models/tutorial/models.py	7 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/tests/tutorial/tests.py	267 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/views/tutorial/models.py	5 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/src/views/tutorial/views.py	13 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/tests.rst	74 ●●●●● diff \| view \| raw \| blame \| history