summaryrefslogtreecommitdiff
path: root/CHANGES.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2010-12-19 19:17:44 -0500
committerChris McDonough <chrism@plope.com>2010-12-19 19:17:44 -0500
commit8dabcb4c5e162075c3418549fc22eb5b7a55200b (patch)
tree9b104bfc13c64d7f948b2fe7775e460ff0e217aa /CHANGES.txt
parent53f1bb24eb51ac994185f2365930220a9d87e77e (diff)
parent7b9066cccb09d1e93df88f8b3ebc9a74ec84730c (diff)
downloadpyramid-8dabcb4c5e162075c3418549fc22eb5b7a55200b.tar.gz
pyramid-8dabcb4c5e162075c3418549fc22eb5b7a55200b.tar.bz2
pyramid-8dabcb4c5e162075c3418549fc22eb5b7a55200b.zip
Merge branch 'jahmad-typos'
Diffstat (limited to 'CHANGES.txt')
-rw-r--r--CHANGES.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index b3f78947b..3986fb7e9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -67,7 +67,7 @@ Terminology Changes
- The setting previously known as ``BFG_RELOAD_RESOURCES`` (envvar) or
``reload_resources`` (config file) is now known, respectively, as
- ``BFG_RELOAD_ASSETS`` and ``reload_assets``.
+ ``PYRAMID_RELOAD_ASSETS`` and ``reload_assets``.
Backwards compatibility shims have been left in place in all cases. They
will continue to work "forever".
@@ -103,7 +103,7 @@ Documentation
- Added "Debugging Route Matching" section to the urldispatch narrative
documentation chapter.
-- Added reference to ``BFG_DEBUG_ROUTEMATCH`` envvar and ``debug_routematch``
+- Added reference to ``PYRAMID_DEBUG_ROUTEMATCH`` envvar and ``debug_routematch``
config file setting to the Environment narrative docs chapter.
- Changed "Project" chapter slightly to expand on use of ``paster pshell``.