From 0a4aed1c8e0a6da9219cccb6f55882d916f49916 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Thu, 29 Aug 2013 21:58:48 -0400
Subject: documentation for hybrid url generation

---
 CHANGES.txt | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'CHANGES.txt')

diff --git a/CHANGES.txt b/CHANGES.txt
index 657c50009..cfa77283f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,12 @@ Next Release
 Features
 --------
 
+- You can now generate "hybrid" urldispatch/traversal URLs more easily
+  by using the new ``route_name`` and ``route_kw`` arguments to 
+  ``request.resource_url`` and ``request.resource_path``.  See the new section 
+  of the "Combining Traversal and URL Dispatch" documentation chapter entitled 
+  "Hybrid URL Generation".
+
 - It is now possible to escape double braces in Pyramid scaffolds (unescaped, 
   these represent replacement values).  You can use ``\{\{a\}\}`` to
   represent a "bare" ``{{a}}``.  See 
-- 
cgit v1.2.3