RedHatTraining/pyramid.git

Steve Piercy

2016-04-17 9b0ac053084b0811111fdc33b969598e1b78f2e6

refs
author	Steve Piercy <web@stevepiercy.com>
	Sunday, April 17, 2016 01:21 +0200
committer	Steve Piercy <web@stevepiercy.com>
	Sunday, April 17, 2016 01:21 +0200
commit	9b0ac053084b0811111fdc33b969598e1b78f2e6
tree	9c047b0a07c8a647d1c0246598685b645676b412 tree \| zip \| gz
parent	d19e9902ede0b1cc40991b423c12e8a95d430e0e view \| diff 86e79cf1db4c789d4fcb1cf75a42189ef3fd21ec view \| diff

Merge pull request #2509 from stevepiercy/1.7-branch

replace ps1con with doscon for lexer and syntax highlighting

11 files modified

	docs/conventions.rst	36 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/i18n.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/install.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/project.rst	6 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/definingviews.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/distributing.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki/installation.rst	26 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/definingmodels.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/distributing.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/installation.rst	28 ●●●●● diff \| view \| raw \| blame \| history
	docs/tutorials/wiki2/tests.rst	2 ●●●●● diff \| view \| raw \| blame \| history