summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-01-16Merge pull request #2237 from stevepiercy/masterSteve Piercy
minor grammar, rewrap 79 columns, up through traversal/url dispatch d…
2016-01-15Merge remote-tracking branch 'upstream/master'Steve Piercy
2016-01-15minor grammar, rewrap 79 columns, up through traversal/url dispatch debateSteve Piercy
2016-01-14Merge pull request #2227 from mmerickel/fix/py3-is-the-defaultBert JW Regeer
expect py3 and special-case py2 behavior
2016-01-14add comment about PY2 vs PY3Michael Merickel
2016-01-14Merge pull request #2234 from stevepiercy/masterSteve Piercy
Rename Cookbook to Pyramid Community Cookbook
2016-01-14Rename Cookbook to Pyramid Community CookbookSteve Piercy
- use .rst intersphinx labels for pages instead of broken URLs
2016-01-13Merge pull request #2231 from stevepiercy/masterSteve Piercy
update for python 3.5
2016-01-13update for python 3.5Steve Piercy
2016-01-13Merge pull request #2228 from stevepiercy/masterSteve Piercy
add python 3.5
2016-01-13add python 3.5Steve Piercy
2016-01-12expect py3 and special-case py2 behaviorMichael Merickel
previously py3 was the special case, but as we move toward the future we want the py2 codebase to be considered legacy with py3 as the default
2016-01-12Merge pull request #2224 from stevepiercy/masterSteve Piercy
bump sphinx to 1.3.4
2016-01-12note to self: check the branch and be consistent when viewing docs on RTDSteve Piercy
2016-01-12hail marySteve Piercy
2016-01-12maybe == ?Steve Piercy
2016-01-12try bump to sphinx 1.3.4 in rtd.txtSteve Piercy
2016-01-12Try upper case "S" for SphinxSteve Piercy
2016-01-12use lower case "s" for sphinxSteve Piercy
2016-01-12bump Sphinx to 1.3.4. Fixes #2209.Steve Piercy
2016-01-09Merge pull request #2220 from stevepiercy/masterSteve Piercy
Minor grammar, rewrap to 79 columns, in Ameliorations section
2016-01-09Minor grammar, rewrap to 79 columns, in Ameliorations sectionSteve Piercy
2016-01-08Merge pull request #2216 from stevepiercy/masterSteve Piercy
update glossary with cookbook rst syntax. closes #2215
2016-01-08revert glossary entry name for tox on 3.5. I'll get this on a massive update ↵Steve Piercy
on another pass. See https://github.com/Pylons/pyramid_cookbook/issues/155
2016-01-08update glossary with cookbook rst syntax. closes #2215Steve Piercy
2016-01-07Merge pull request #2214 from stevepiercy/masterSteve Piercy
add trypyramid.com to update for releases
2016-01-07add trypyramid.com to update for releasesSteve Piercy
2016-01-05Merge pull request #2213 from stevepiercy/masterSteve Piercy
remove unused "awesome" directory from quick_tour. it had references …
2016-01-05remove unused "awesome" directory from quick_tour. it had references to ↵Steve Piercy
pylonshq.com, which no longer exists.
2016-01-05Merge pull request #2212 from stevepiercy/masterSteve Piercy
update links to tutorials in cookbook
2016-01-05update links to tutorials in cookbookSteve Piercy
2016-01-03undo patch of sphinxSteve Piercy
2016-01-03attempt to install a patched release of sphinx 1.3.3. See ↵Steve Piercy
https://github.com/sphinx-doc/sphinx/issues/2189
2016-01-03copy whatsnew-1.6 from 1.6-branchMichael Merickel
2016-01-03fix grammar on whatsnew document titlesMichael Merickel
2016-01-03add a note about serving cache busted assetsMichael Merickel
2016-01-02Merge pull request #2208 from stevepiercy/masterSteve Piercy
Python 3.4 compatibility
2016-01-02- minor grammar in "problems", rewrap to 79 columnsSteve Piercy
2015-12-30Merge pull request #2201 from stevepiercy/masterSteve Piercy
- minor grammar in "problems", rewrap to 79 columns
2015-12-30- minor grammar in "problems", rewrap to 79 columnsSteve Piercy
2015-12-26Merge pull request #2200 from stevepiercy/masterSteve Piercy
Update glossary.rst
2015-12-26Update glossary.rstBastien
fixed typo (cherry picked from commit 0a5c9a2)
2015-12-23Merge pull request #2193 from stevepiercy/masterSteve Piercy
- Add Python compatibility to history, hacking, releasing
2015-12-23- Add Python compatibility to history, hacking, releasingSteve Piercy
- Use 1.X for version number
2015-12-23Merge pull request #2191 from stevepiercy/masterSteve Piercy
add p* scripts output for --help
2015-12-23Add documentation of command line programs/p* scriptsSteve Piercy
2015-12-23Merge branch 'master' of https://github.com/Pylons/pyramidSteve Piercy
2015-12-23Merge pull request #2 from kpinc/patch-2Steve Piercy
Update prequest.py
2015-12-23Merge pull request #1 from kpinc/patch-1Steve Piercy
Expound. Punctuation.
2015-12-22Update prequest.pykpinc