From a3654e4866303695478fb7bd01dcdd602a717b4e Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Tue, 12 Nov 2013 01:36:10 -0600
Subject: update docs

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

(limited to 'CHANGES.txt')

diff --git a/CHANGES.txt b/CHANGES.txt
index 895dc572f..bf1c1ea01 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -29,6 +29,17 @@ Features
   timeouts, and conformance with the ``ISession`` API.
   See https://github.com/Pylons/pyramid/pull/1142
 
+- Allow ``pyramid.request.Request.route_url`` and
+  ``pyramid.request.Request.resource_url`` to accept strings for their
+  query string to enable alternative encodings. Also the anchor argument
+  will now be escaped to ensure minimal conformance.
+  See https://github.com/Pylons/pyramid/pull/1183
+
+- Allow sending of ``_query`` and ``_anchor`` options to
+  ``pyramid.request.Request.static_url`` when an external URL is being
+  generated.
+  See https://github.com/Pylons/pyramid/pull/1183
+
 Bug Fixes
 ---------
 
-- 
cgit v1.2.3