Merge branch 'master' of github.com:Pylons/pyramid
typo
Merge pull request #748 from tshepang/master

fix typo
Mention ZopeTxnExt and pyramid_tm in tutorial

If this page is found via web search while trying to configure
SQLAlchemy from scratch without a scaffold, it is helpful to
mention pyramid_tm as a requirement somewhere. Otherwise, a
hapless user such as your humble author might spend lots of
time wondering why his sessions aren't getting committed after
his requests despite his best efforts to properly configure
SQLAlchemy and ZopeTransactionExtension.
typo
Merge pull request #750 from tshepang/master

fix typo
"usernames" is a more correct term
Merge pull request #751 from tshepang/master

"usernames" is a more correct term
give virtualenv directory a more generic name, "venv"

pros:

* Installation instructions uses the same name
* The old name assumes user would be using Python 2.6
Merge pull request #752 from tshepang/master

give virtualenv directory a more generic name
Small fix for RST misfire.
fix #746: explain why a dev package is installed
typos
improve wording regarding pyvenv
eliminate repeated "the" words
eliminate other repeated words
Merge branch 'master' of github.com:Pylons/pyramid
Merge branch 'issue746' of git://github.com/tshepang/pyramid into tshepang-issue746
fix rationale and typo
Merge branch 'tshepang-issue746'