summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-05-03Merge pull request #1332 from stevepiercy/masterSteve Piercy
- looks like _ are now - in RTD
2014-05-03- looks like _ are now - in RTDSteve Piercy
2014-05-03Merge pull request #1331 from stevepiercy/masterSteve Piercy
- add cookbook to intersphinx mapping
2014-05-03- add cookbook to intersphinx mappingSteve Piercy
2014-05-03Merge pull request #1330 from stevepiercy/masterSteve Piercy
- spelling
2014-05-03- spellingSteve Piercy
2014-05-01fix #1253Michael Merickel
2014-04-29require ISession.invalidate to leave behind a usable sessionMichael Merickel
2014-04-27Merge pull request #1327 from invisibleroads/patch-1Steve Piercy
Replaced five minutes with one hour
2014-04-27Update static.pyRoy Hyunjin Han
2014-04-27Replaced five minutes with one hourRoy Hyunjin Han
2014-04-24Merge pull request #1321 from omidraha/patch-1Steve Piercy
Improving `X-Vhm-Root` paragraphs.
2014-04-24Merge pull request #1323 from bmess/narrative_typoMichael Merickel
Typo found in second Declarative code block
2014-04-23Typo found in second Declarative code blockbobby
There were two import statements for Configurator. I removed the second import statement in the "__main__" since most of the documentation declares all imports on the top of the source. modified: configuration.rst
2014-04-23remove redundant testsMichael Merickel
2014-04-23Merge pull request #1320 from bertjwregeer/feature.raise_valueerror_wsgiMichael Merickel
Feature: raise ValueError if wrapped is None in wsgiapp/wsgiapp2
2014-04-24Improving `X-Vhm-Root` paragraphs.Omid Raha
Improving text of `X-Vhm-Root` paragraphs in `Other Backwards Incompatibilities` section.
2014-04-23Remove repeated word.Omid Raha
Remove repeated `use` word.
2014-04-22Update CHANGES for wsgiapp and wsgiapp2Bert JW Regeer
2014-04-22Verify that wrapped is not NoneBert JW Regeer
If wrapped is None we raise a ValueError to let the user know that we are unable to continue.
2014-04-21Merge pull request #1318 from stevepiercy/masterSteve Piercy
port to master branch - Update background section same as quick_tour.rst
2014-04-21Update background section same as quick_tour.rstSteve Piercy
Update text of ``background`` section same as ``sessions`` section of ``quick_tour.rst``
2014-04-20Merge pull request #1313 from goodwillcoding/scaffold_versiongoodwillcoding
Issue: #1300, pyramid versiona and scaffold docs, add correct handling for dev docs which now points to 'master' docs
2014-04-20add correct handling for dev docs which now points to 'master' docsgoodwillcoding
2014-04-20Merge branch 'pull.1300'Michael Merickel
2014-04-20remove special case for dev branchesMichael Merickel
the way pyramid's RTD works is that doc changes are rendered automatically on each release branch, so dev versions should actually point at their parent branch for the most up-to-date docs
2014-04-20update the version detection to use better regex matching for versiongoodwillcoding
and add more test cases
2014-04-20refine language some more to say 'Pyramid' lessgoodwillcoding
2014-04-20standardize on scaffold over template naminggoodwillcoding
2014-04-20update change me with the scaffold changesgoodwillcoding
2014-04-20Merge branch 'master' of github.com:Pylons/pyramid into scaffold_versiongoodwillcoding
2014-04-20clean up the language to say "Generated by"goodwillcoding
2014-04-20Merge pull request #1309 from omidraha/patch-1Steve Piercy
Correct question to adapt to the the text.
2014-04-20Remove repeated word.Omid Raha
Remove repeated `operations` word.
2014-04-20- Correct 80-column lines specification to 79 to be compliant with PEP8 and ↵Steve Piercy
consistent with doc to which this line refers.
2014-04-19Merge branch 'master' of github.com:Pylons/pyramid into scaffold_versiongoodwillcoding
2014-04-19Move the docs and pyramid version to scaffold template generation andgoodwillcoding
out of the views. Add pyramid docs version to all the .ini file scaffolds Update alchemy, zodb, and starter to have respective names
2014-04-18Merge pull request #1306 from bertjwregeer/fix.add_predicates_maybe_dottedMichael Merickel
Fix: add predicates maybe dotted
2014-04-18Add information to CHANGESBert JW Regeer
2014-04-18_add_subscriber should resolve dotted namesBert JW Regeer
2014-04-18Merge pull request #1304 from thapar/patch-2Steve Piercy
Typo fix "not more"-->"no longer"
2014-04-18Corrected the comment's languagethapar
2014-04-18Typo fix "not"-->"no"thapar
2014-04-17Merge pull request #1303 from flibustenet/patch-2Michael Merickel
More explicit example of set_property
2014-04-17More explicit example of set_propertyflibustenet
cleanup callback has a "request" parameter (and not "_") cleanup callback know (since 1.5) if an exception occurred or not (to commit or rollback) (same as #1302 on 1.5)
2014-04-16update the alchemy template to use pyramid version and doc versionMichael R
2014-04-16add pyramid version and pyramid docs branch to the scaffold generationMichael R
machinery so it is available in scaffold templates, this will help generate proper links in scaffolds and not confiuse people when they go to documentation
2014-04-16minor tweaks based on toolbar changes in 2.xMichael Merickel
2014-04-16Merge pull request #1298 from tylereaves/masterMichael Merickel
Fix wording in debug toolbar tutorial
2014-04-16Update debugtoolbar.rsttylereaves
grammar fix