summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-03-25mention a coding conventionTshepang Lekhonkhobe
2013-03-25Merge pull request #940 from tshepang/diffChris McDonough
no need to qualify Python interactive sessions
2013-03-25Merge pull request #941 from stevepiercy/masterChris McDonough
place colon within strong style
2013-03-25give installation a colectomy; give it headings;Steve Piercy
2013-03-25Merge remote branch 'upstream/master'Steve Piercy
2013-03-24Merge pull request #944 from tshepang/hyperMichael Merickel
make example links clickable, for convenience
2013-03-25make example links clickable, for convenienceTshepang Lekhonkhobe
2013-03-24Merge pull request #943 from tshepang/hyperChris McDonough
make example links clickable, for convenience
2013-03-24make example links clickable, for convenienceTshepang Lekhonkhobe
2013-03-23Merge pull request #942 from tshepang/webobMichael Merickel
add webob to intersphinx list
2013-03-24add webob to intersphinx listTshepang Lekhonkhobe
With this change, we get hyperlinks for webob cross-references.
2013-03-23remove 'or find'Steve Piercy
2013-03-23place colon within strong styleSteve Piercy
2013-03-23no need to qualify Python interactive sessionsTshepang Lekhonkhobe
Sphinx automatically notices them as Python snippets and gives them syntax highlighting. These snippets are also too short to deserve linenos.
2013-03-23Merge pull request #938 from tshepang/noiseChris McDonough
remove visual noise
2013-03-23create optionality note for traversal chapter, see issue #879Chris McDonough
2013-03-23change some slightly awkward wordingChris McDonough
2013-03-23Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-03-23Merge pull request #939 from tshepang/licenceChris McDonough
update Copyright year
2013-03-22update Copyright yearTshepang Lekhonkhobe
2013-03-22remove visual noiseTshepang Lekhonkhobe
In addition, we also get syntax highlighting... for free.
2013-03-22Merge pull request #936 from tshepang/unusedChris McDonough
remove unused 'ignore-next-block' directive
2013-03-22Merge pull request #937 from tshepang/rmChris McDonough
rm unused glossary entry
2013-03-22rm unused glossary entryTshepang Lekhonkhobe
2013-03-22remove unused ignore-next-block directiveTshepang Lekhonkhobe
2013-03-21Merge pull request #935 from tshepang/consistencyMichael Merickel
some consistency fixes
2013-03-22some consistency fixesTshepang Lekhonkhobe
2013-03-21Merge pull request #933 from stevepiercy/masterMichael Merickel
Generalize Python versions in Windows section
2013-03-21Generalize Python versions in Windows section.Steve Piercy
2013-03-21Merge pull request #921 from pzatrick/masterTres Seaver
Updates to Wiki2
2013-03-21Merge pull request #932 from stevepiercy/masterTres Seaver
Clean up SQLite3 language; cd into venv; minor heading renames
2013-03-21Meh. git hate me.Steve Piercy
2013-03-21Update definingviews.rst to clarify that a template is a rendererPatrick Canfield
2013-03-21Update definingviews.rst to use active voice, reduce redundancy.Patrick Canfield
2013-03-21Update definingviews.rst to be more explicit, concise (?)Patrick Canfield
A make the first sentence a litte more explicit, default to present tense, remove unnecessary details and use python instead of english when it's cleared to do so.
2013-03-21Update definingviews.rst explain matchdict more explicitly, conciselyPatrick Canfield
2013-03-21Merge remote-tracking branch 'upstream/master'Steve Piercy
Conflicts: docs/tutorials/wiki2/installation.rst
2013-03-21Clean up:Steve Piercy
* SQLite3 language * cd into venv * minor heading names
2013-03-21Update basiclayout.rst, more deductive concept ordering, singular form of termsPatrick Canfield
2013-03-21Resolve conflict.Tres Seaver
2013-03-21Merge pull request #917 from tshepang/patch-2Tres Seaver
wiki2 tutorial: no need to re-install
2013-03-21Merge pull request #929 from tshepang/re-orgTres Seaver
slightly re-organise
2013-03-21update repoze.who to latest symlinkMichael Merickel
2013-03-21Merge pull request #931 from tshepang/sqlaMichael Merickel
add hyperlinks to SQLAlchemy docs
2013-03-21Merge pull request #928 from tshepang/revertTres Seaver
revert to a better paragraph
2013-03-21four spaces is standardTshepang Lekhonkhobe
2013-03-21use version-agnostic link, to avoid maintenanceTshepang Lekhonkhobe
2013-03-21add hyperlinks for SQLAlchemyTshepang Lekhonkhobe
2013-03-21Merge branch 'pull.930'Michael Merickel
2013-03-21Merge branch 'master' of madjar/pyramid into pull.930Michael Merickel