summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-04-05Merge pull request #972 from tshepang/diffMichael Merickel
fix some cross-references
2013-04-06trim commented-out parts of docs/conf.pyTshepang Lekhonkhobe
proposed here: https://groups.google.com/forum/?fromgroups=#!topic/pylons-devel/n2-7zvLWK3E
2013-04-06remove repetition; improve readabilityTshepang Lekhonkhobe
2013-04-06typoTshepang Lekhonkhobe
2013-04-06fix some cross-referencesTshepang Lekhonkhobe
Also, pyramid_zcml is cross-referenced, so add it to intersphinx_mapping dict.
2013-04-05Merge pull request #971 from tshepang/diffMichael Merickel
some doc improvements
2013-04-05fix some cross-referencesTshepang Lekhonkhobe
2013-04-05replace a sentence that doesn't quite fitTshepang Lekhonkhobe
It's as if pyramid_traversalwrapper was already introduced.
2013-04-05fix markupTshepang Lekhonkhobe
2013-04-05Merge pull request #970 from tshepang/diffMichael Merickel
fix some cross-references and markup
2013-04-05fix markupTshepang Lekhonkhobe
2013-04-05fix some cross-referencesTshepang Lekhonkhobe
2013-04-03Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-04-03Merge pull request #968 from tshepang/diffTres Seaver
add cross-refs for zope.component
2013-04-03add some more cross-referencesTshepang Lekhonkhobe
Also remove linenos setting, which is overkill for a one-liner.
2013-04-03add zope.component to intersphinx_mapping dictTshepang Lekhonkhobe
2013-04-03update changelogMichael Merickel
2013-04-03Merge branch 'fix.954'Michael Merickel
2013-04-03fix #954Michael Merickel
2013-04-03Merge branch 'master' of github.com:Pylons/pyramidChris McDonough
2013-04-03minor typo correction 'prepresents'-->'represents'thapar
2013-04-02Merge pull request #965 from tshepang/copyrightChris McDonough
remove copyright bits from the tutorial examples
2013-04-02remove copyright bits from the tutorial examplesTshepang Lekhonkhobe
We don't want to have to keep remembering these if there's a change, and apparently it's also overkill, according to https://github.com/Pylons/pyramid/pull/953#issuecomment-15654314.
2013-04-02fix #964Michael Merickel
2013-04-01update changelogMichael Merickel
2013-04-01Merge branch 'pull.952'Michael Merickel
2013-04-01Merge branch 'fix.950' of Beanfield/pyramid into pull.952Michael Merickel
2013-04-01Merge pull request #958 from tshepang/ripMichael Merickel
remove copyright bits from the scaffolds
2013-04-01Merge branch 'pull.963'Michael Merickel
2013-04-01remove extra wordMichael Merickel
2013-04-01Improve phrasingCatalin Iacob
2013-04-01Remove extra wordCatalin Iacob
2013-04-01Remove extra wordCatalin Iacob
2013-04-01Add missing wordCatalin Iacob
2013-04-01Consistently link middleware term to the glossaryCatalin Iacob
2013-04-01Fix grammarCatalin Iacob
2013-04-01Use into instead of in toCatalin Iacob
Seems more correct and is consistent with the usage a few words further.
2013-04-01Remove extra wordCatalin Iacob
2013-04-01Remove unused imports from code sampleCatalin Iacob
The import should be done only when actually using the global registry.
2013-04-01Fix typo that broke the reference to pyramid.events.NewRequestCatalin Iacob
2013-04-01my.package.MyJinja2Renderer is registered for .jinja2 files not .jinjaCatalin Iacob
2013-04-01Fix reST markupCatalin Iacob
2013-04-01Remove extra wordCatalin Iacob
2013-04-01Fix reST markup and spelling of "hand"Catalin Iacob
2013-04-01Fix wrong reference to non existent getAjax functionCatalin Iacob
2013-04-01Merge pull request #962 from tshepang/refsMichael Merickel
fix some cross-references
2013-04-01fix some cross-referencesTshepang Lekhonkhobe
2013-03-31Merge pull request #961 from tshepang/refsMichael Merickel
fix some cross-references
2013-03-31fix some cross-referencesTshepang Lekhonkhobe
2013-03-30Merge pull request #959 from tshepang/refsTres Seaver
fix some cross-references