summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-08-30 15:13:09 -0400
committerChris McDonough <chrism@plope.com>2013-08-30 15:13:09 -0400
commitf21a765b0872468873061cf15400c54ddfedbaaa (patch)
treed0199183059ba1826f4e55513c381a1c0ba8cf0d /docs
parent891100b3ec95dc83dc09f0895af399c5b1061c88 (diff)
parent00bb95f513ddcedcaf025bb528e4d7f20b1f7a4b (diff)
downloadpyramid-f21a765b0872468873061cf15400c54ddfedbaaa.tar.gz
pyramid-f21a765b0872468873061cf15400c54ddfedbaaa.tar.bz2
pyramid-f21a765b0872468873061cf15400c54ddfedbaaa.zip
Merge branch '1.5-branch'
Diffstat (limited to 'docs')
-rw-r--r--docs/whatsnew-1.5.rst7
1 files changed, 5 insertions, 2 deletions
diff --git a/docs/whatsnew-1.5.rst b/docs/whatsnew-1.5.rst
index 18c50c997..2a01f43bc 100644
--- a/docs/whatsnew-1.5.rst
+++ b/docs/whatsnew-1.5.rst
@@ -222,8 +222,11 @@ Deprecations
Documentation Enhancements
--------------------------
-Many documentation enhancements have been added, but there were too many
-changes for us to keep track of. The docs are greatly enhanced.
+- A new documentation chapter named :ref:`quick_tour` was added. It describes
+ starting out with Pyramid from a high level.
+
+- Many other enhancements.
+
Dependency Changes
------------------