summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-01-06grammarTshepang Lekhonkhobe
2013-01-05fix up sphinx config:Goodwill Coding
- make sure the versioning in title, uid is done automatically - automatically generate copyright years - excluded additional .js files that were stopping epub from generating correctly - also adjust the remake script to use env not env27
2013-01-04Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-01-04Merge pull request #767 from lmctv/sphinx_latex_imagesChris McDonough
Fix pdf document generation
2013-01-04Fix pdf document generationLorenzo M. Catucci
by making sphinx aware about the images referenced in the latex preamble.
2013-01-02Merge pull request #761 from tshepang/wikiChris McDonough
Reduce duplicated installation instructions from the tutorials
2013-01-02Reduce duplicated installation instructions from the tutorialsTshepang Lekhonkhobe
* This also removes the mention of running 'source bin/activate' (see #759).
2013-01-01Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-01-01Merge pull request #760 from tshepang/typosChris McDonough
lots of typos
2013-01-01Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-01-01Merge branch 'tshepang-pyvenv'Chris McDonough
2013-01-01reflow, typoChris McDonough
2013-01-01Merge branch 'pyvenv' of git://github.com/tshepang/pyramid into tshepang-pyvenvChris McDonough
2013-01-01Merge pull request #749 from irskep/patch-1Chris McDonough
Mention ZopeTransactionExtension and pyramid_tm in SQLAlchemy scaffold tutorial
2013-01-01Merge branch 'tshepang-issue746'Chris McDonough
2013-01-01fix rationale and typoChris McDonough
2013-01-01Merge branch 'issue746' of git://github.com/tshepang/pyramid into ↵Chris McDonough
tshepang-issue746
2013-01-01Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-01-02eliminate other repeated wordsTshepang Lekhonkhobe
2013-01-01eliminate repeated "the" wordsTshepang Lekhonkhobe
2013-01-01improve wording regarding pyvenvTshepang Lekhonkhobe
2013-01-01typosTshepang Lekhonkhobe
2013-01-01fix #746: explain why a dev package is installedTshepang Lekhonkhobe
2013-01-01Small fix for RST misfire.Paul Everitt
2013-01-01Merge pull request #752 from tshepang/masterChris McDonough
give virtualenv directory a more generic name
2013-01-01give virtualenv directory a more generic name, "venv"Tshepang Lekhonkhobe
pros: * Installation instructions uses the same name * The old name assumes user would be using Python 2.6
2013-01-01Merge pull request #751 from tshepang/masterChris McDonough
"usernames" is a more correct term
2013-01-01"usernames" is a more correct termTshepang Lekhonkhobe
2012-12-31Merge pull request #750 from tshepang/masterChris McDonough
fix typo
2013-01-01typoTshepang Lekhonkhobe
2012-12-31Mention ZopeTxnExt and pyramid_tm in tutorialSteve Johnson
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.
2012-12-28Merge pull request #748 from tshepang/masterChris McDonough
fix typo
2012-12-29typoTshepang Lekhonkhobe
2012-12-22Merge pull request #745 from reinout/patch-1Carlos de la Guardia
Typo pakage => package fixed
2012-12-22Typo pakage => packageReinout van Rees
2012-12-18prep for 1.4Chris McDonough
2012-12-18gardenChris McDonough
2012-12-18Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-12-17Merge pull request #741 from ppaez/zodb-tutorial-fixesChris McDonough
Fix functional tests in the ZODB tutorial
2012-12-13Improvements to the ZODB tutorial Tests chapterPatricio Paez
- Standardize with the SQL tutorial
2012-12-13Make ZODB tutorial functional tests passPatricio Paez
- Synchronize with the changes in pyramid_zodbdbconn in commit 64b0c468d4ae320d720d03d0cbc8e9a0b0e42f1f
2012-12-10Merge branch '1.4-branch'Chris McDonough
2012-12-10prep for 1.4b3Chris McDonough
2012-12-10Merge branch '1.4-branch'Chris McDonough
2012-12-10prep for 1.4b2Chris McDonough
2012-12-10Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2012-12-10Merge pull request #736 from msabramo/docs-tutorials-wiki2-tweaksChris McDonough
A bunch of minor tweaks to the wiki2 tutorial in docs/tutorials/wiki2
2012-12-10Merge pull request #738 from ppaez/pep8_scaffoldsChris McDonough
Improve pep8 compliance of scaffolds
2012-12-06add changenoteChris McDonough
2012-12-06make _backframes work like _depth (but still leave undocumented)Chris McDonough