summaryrefslogtreecommitdiff
path: root/docs
AgeCommit message (Collapse)Author
2013-03-21Merge pull request #921 from pzatrick/masterTres Seaver
Updates to Wiki2
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-20Merge branch 'pull.911'Michael Merickel
2013-03-21slightly re-organiseTshepang Lekhonkhobe
2013-03-21revert to a better paragraphTshepang Lekhonkhobe
2013-03-20Make installation explicit and discrete, combining suggestions from ↵Steve Piercy
@thesteve0, @tshepang, @mcdonc.
2013-03-20Add special section for Mac OS X users.Steve Piercy
2013-03-19Fix whitespace in CHANGES.txt to permit build.Steve Piercy
Add "Before You Begin" section.
2013-03-19Merge branch 'master' of madjar/pyramid into pull.911Michael Merickel
2013-03-19some improvements/fixes to a paragraphTshepang Lekhonkhobe
2013-03-19fixed the syntax for exporting the VENVSteven Citron-Pousty
2013-03-19More explanation around pcreateSteven Citron-Pousty
Not sure how much to explain there but it needed some more explanation. Perhaps we could link to a doc about pcreate?
2013-03-18Merge branch 'feature.callable-acl'Michael Merickel
2013-03-18reorder some imports to be alphabeticalMichael Merickel
2013-03-18support acl as a callableMichael Merickel
2013-03-17Merge pull request #919 from tshepang/patch-3Michael Merickel
that should be lower-case
2013-03-17that should be lower-caseTshepang Lekhonkhobe
2013-03-17no need to re-installTshepang Lekhonkhobe
This will continue working fine.
2013-03-17grammarTshepang Lekhonkhobe
2013-03-16improve description; fix spellingTshepang Lekhonkhobe
2013-03-14Added an options argument to pyramid.paste.get_appsettings, just like ↵Georges Dubus
get_app, that can be used to get the settings when interpolation is used in the config file.
2013-03-13typoTshepang Lekhonkhobe
2013-03-13consistency: use $VENV whenever virtualenv binaries are usedTshepang Lekhonkhobe
2013-03-12Merge pull request #893 from stevepiercy/masterMichael Merickel
traversal wiki tutorial docs updates
2013-03-12Merge pull request #874 from tshepang/paragraphMichael Merickel
improve paragraph
2013-03-12Merge pull request #871 from tshepang/repetitionMichael Merickel
remove info that was given in the preceding paragraph
2013-03-12Merge pull request #841 from tshepang/patch-1Michael Merickel
remove questionable sentence
2013-03-12Merge pull request #896 from tshepang/consistencyMichael Merickel
consistency fixes
2013-03-12Merge pull request #872 from tshepang/virtualenvMichael Merickel
virtualenv refers both to the tool and the concept
2013-03-12Merge pull request #885 from tshepang/hyperlinksMichael Merickel
fix/update hyperlinks
2013-03-12Merge pull request #890 from tshepang/miscMichael Merickel
miscellaneous doc improvements
2013-03-12Merge pull request #888 from tshepang/fixesMichael Merickel
miscellaneous doc fixes
2013-03-12fix whitespace issue... remove tabsTshepang Lekhonkhobe
2013-03-12use a Sphinx ref instead of raw urlTshepang Lekhonkhobe
Other than reducing ugliness, when building the doc with Python 3, the target is a Python 3 version of the class; same applies to Python 2.