summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2015-12-03 21:23:58 -0800
committerSteve Piercy <web@stevepiercy.com>2015-12-03 21:23:58 -0800
commit29e1002a108d045e1f80be3137f2cde4e47ca642 (patch)
tree71326dd0818307654fff740e236800c075400715
parent952cf40ad04acb0f65d81f343136b88bd75b3c40 (diff)
parent690fbb9dc7a1797fa81c217182766b150fc649b6 (diff)
downloadpyramid-29e1002a108d045e1f80be3137f2cde4e47ca642.tar.gz
pyramid-29e1002a108d045e1f80be3137f2cde4e47ca642.tar.bz2
pyramid-29e1002a108d045e1f80be3137f2cde4e47ca642.zip
Merge pull request #2157 from stevepiercy/feature/alchemy-scaffold-update
add updated tutorial and documentation files due to scaffold enhancements
-rw-r--r--docs/whatsnew-1.6.rst10
1 files changed, 8 insertions, 2 deletions
diff --git a/docs/whatsnew-1.6.rst b/docs/whatsnew-1.6.rst
index b99ebeec4..141a58f78 100644
--- a/docs/whatsnew-1.6.rst
+++ b/docs/whatsnew-1.6.rst
@@ -130,11 +130,11 @@ Feature Additions
extensions by going through Pyramid's router. See
https://github.com/Pylons/pyramid/pull/1581
-
- Make it possible to subclass ``pyramid.request.Request`` and also use
``pyramid.request.Request.add_request.method``. See
https://github.com/Pylons/pyramid/issues/1529
+
Deprecations
------------
@@ -151,13 +151,14 @@ Scaffolding Enhancements
debugging. See https://github.com/Pylons/pyramid/pull/1326
- Update scaffold generating machinery to return the version of pyramid and
- pyramid docs for use in scaffolds. Updated ``starter``, ``alchemy`` and
+ pyramid docs for use in scaffolds. Updated ``starter``, ``alchemy``, and
``zodb`` templates to have links to correctly versioned documentation and
reflect which pyramid was used to generate the scaffold.
- Removed non-ascii copyright symbol from templates, as this was
causing the scaffolds to fail for project generation.
+
Documentation Enhancements
--------------------------
@@ -168,3 +169,8 @@ Documentation Enhancements
- Improve and clarify the documentation on what Pyramid defines as a
``principal`` and a ``userid`` in its security APIs.
See https://github.com/Pylons/pyramid/pull/1399
+
+- Updated the Quick Tour and SQLAlchemy + URL Dispatch Wiki Tutorial narrative
+ documentation and source files for each step using the updated scaffold. For
+ a list of updated files, see
+ https://github.com/Pylons/pyramid/pull/2024#issue-112676079