summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-10-17fix documentation for csrf checkingMichael Merickel
2013-10-14Address #866; don't run the tests when the docs build, this means that 'make ↵Chris McDonough
html' must be run using a SPHINXBUILD=/path/to/virtualenv/with/pyramid
2013-10-14temporarily dont run tests to see impact on readthedocsChris McDonough
2013-10-14make these tests pass on python 3.2+Chris McDonough
2013-10-14add note about custom args to python when using command-line scriptsChris McDonough
2013-10-14Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-10-11Merge pull request #1157 from tshepang/diffMichael Merickel
some doc fixes/improvements
2013-10-11docs: typosTshepang Lekhonkhobe
2013-10-11docs: capitaliseTshepang Lekhonkhobe
2013-10-11docs: rm redundancyTshepang Lekhonkhobe
2013-10-09Merge pull request #1152 from Pylons/feature.run-scripts-directlyChris McDonough
run console scripts directly
2013-10-09Merge remote-tracking branch 'origin/master'Paul Everitt
2013-10-09Hedge a little while the compendium of session add-ons is written.Paul Everitt
2013-10-09update changelogMichael Merickel
2013-10-09add the ability to run the scripts using "python -m"Michael Merickel
for example:: env/bin/python -3 -m pyramid.scripts.pserve development.ini
2013-10-08fix stupid missing named arguments, whyyyMichael Merickel
2013-10-08Merge branch 'origin/master'Steve Piercy
2013-10-08grammar polishSteve Piercy
2013-10-08Merge pull request #1148 from kpinc/docs_nobeakerSteve Piercy
Docs: introduction.rst: Beaker -> Redis.
2013-10-08Small quick tutorial fixes post conference.Paul Everitt
2013-10-08Merge branch 'origin/master'Steve Piercy
2013-10-08print() not printf()Steve Piercy
2013-10-08Docs: introduction.rst: Beaker -> Redis.Karl O. Pinc
2013-10-08Docs: project.rst: Oops, print(), not printf().Karl O. Pinc
2013-10-08Docs: project.rst: Printf()s can be used for debugging. Output goes to the ↵Karl O. Pinc
server console. The main point of the second sentence is to setup the reader with mental context for the 3rd sentence, so that the 3rd sentence sinks in. Likewise, the parenthetical in the second sentence about server startup messages gives the reader some clue as to what the rest of the sentence it talking about. I suspect that some readers won't know what a console is, and the rest will be confused by a server run on a console.
2013-10-08remove unused renderer argChris McDonough
2013-10-08Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-10-08- remove . from end of URLSteve Piercy
2013-10-08Merge branch 'conf' of github.com:tshepang/pyramid into tshepang-conf.Steve Piercy
2013-10-07- use clearer subjectSteve Piercy
2013-10-07Merge branch 'kpinc-doc_interactive_dev'Steve Piercy
2013-10-07wrap to 79Steve Piercy
2013-10-07Merge branch 'doc_interactive_dev' of github.com:kpinc/pyramid into ↵Steve Piercy
kpinc-doc_interactive_dev
2013-10-07- straighten out difference between content and its presentation, re: ↵Steve Piercy
admonitions of note, seealse, sidebar
2013-10-07- Merge branch 'docs_dict_note' of github.com:kpinc/pyramid into ↵Steve Piercy
kpinc-docs_dict_note - Got note vs. sidebar vs. seealso admonitions worked out
2013-10-07Docs: introduction.rst: Note that printf() works.Karl O. Pinc
2013-10-07Merge branch 'master' into doc_interactive_devKarl O. Pinc
2013-10-07Merge branch 'doc_interactive_dev' of github.com:kpinc/pyramid into ↵Steve Piercy
kpinc-doc_interactive_dev
2013-10-07Merge branch 'doc_reload_template_note' of github.com:kpinc/pyramid into ↵Steve Piercy
kpinc-doc_reload_template_note
2013-10-07Merge branch 'doc_render_to_response2' of github.com:kpinc/pyramid into ↵Steve Piercy
kpinc-doc_render_to_response2
2013-10-07Docs: project.rst: Reword template reload note per Steve Piercy's suggestions.Karl O. Pinc
Take care to retain the thought that the defaults setup by the scaffold cause automatic template reload. This patch should be applied before the docs_dict_note branch.
2013-10-07fix some broken positional args to sqlalchemy modelsMichael Merickel
2013-10-07Docs: renders.rst: Make sentences that everybody's happy with.Karl O. Pinc
2013-10-07Docs: renders.rst: Make sentences short per IRC chat with committers.Karl O. Pinc
2013-10-07Docs: renders.rst: Break sentence into two to simplify.Karl O. Pinc
2013-10-07Docs: renders.rst: Use punctuation to make sentence simpler.Karl O. Pinc
2013-10-07Docs: introduction.rst: Improve wording.Karl O. Pinc
2013-10-07Doc: introduction.rst: Broaden debug toolbar feature description to include ↵Karl O. Pinc
other interactive development features.
2013-10-07Docs: project.rst: Move note that tempates get values from dictionaries down ↵Karl O. Pinc
a paragraph.
2013-10-07Docs: project.rst: Utilize sidebars for out-of-band text.Karl O. Pinc