Merge branch 'master' into 1.4-branch

1 files changed, 25 insertions, 13 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index fbac16117..1eec21fc2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,15 +1,5 @@
-Next release
-============
-
-Features
---------
-
-- Allow multiple values to be specified to the ``request_param`` view/route
-  predicate as a sequence.  Previously only a single string value was allowed.
-  See https://github.com/Pylons/pyramid/pull/705
-
-- Comments with references to documentation sections placed in scaffold
-  ``.ini`` files.
+1.4a3 (2012-10-26)
+==================
 
 Bug Fixes
 ---------
@@ -30,13 +20,23 @@ Bug Fixes
 - When registering a view configuration that named a Chameleon ZPT renderer
   with a macro name in it (e.g. ``renderer='some/template#somemacro.pt``) as
   well as a view configuration without a macro name it it that pointed to the
-  same template (e.g. ``renderer='some/template.pt'), internal caching could
+  same template (e.g. ``renderer='some/template.pt'``), internal caching could
   confuse the two, and your code might have rendered one instead of the
   other.
 
 Features
 --------
 
+- Allow multiple values to be specified to the ``request_param`` view/route
+  predicate as a sequence.  Previously only a single string value was allowed.
+  See https://github.com/Pylons/pyramid/pull/705
+
+- Comments with references to documentation sections placed in scaffold
+  ``.ini`` files.
+
+- Added an HTTP Basic authentication policy
+  at ``pyramid.authentication.BasicAuthAuthenticationPolicy``.
+
 - The Configurator ``testing_securitypolicy`` method now returns the policy
   object it creates.
 
@@ -53,6 +53,18 @@ Features
   ``remembered`` value on the policy, which is the value of the ``principal``
   argument it's called with when its ``remember`` method is called.
 
+- New ``physical_path`` view predicate.  If specified, this value should be a
+  string or a tuple representing the physical traversal path of the context
+  found via traversal for this predicate to match as true.  For example:
+  ``physical_path='/'`` or ``physical_path='/a/b/c'`` or ``physical_path=('',
+  'a', 'b', 'c')``.  This is not a path prefix match or a regex, it's a
+  whole-path match.  It's useful when you want to always potentially show a
+  view when some object is traversed to, but you can't be sure about what kind
+  of object it will be, so you can't use the ``context`` predicate.  The
+  individual path elements inbetween slash characters or in tuple elements
+  should be the Unicode representation of the name of the resource and should
+  not be encoded in any way.
+
 1.4a2 (2012-09-27)
 ==================