From 3ffd40c295a1e37ec94b6123fff8fb4dd5f5abf5 Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Mon, 10 Nov 2014 01:39:53 -0600
Subject: update changelog

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

diff --git a/CHANGES.txt b/CHANGES.txt
index c1b729b3f..8083113ef 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -55,6 +55,13 @@ Bug Fixes
   add another callback to the list. See
   https://github.com/Pylons/pyramid/pull/1373
 
+Deprecations
+------------
+
+- Renamed the ``principal`` argument to ``pyramid.security.remember()`` to
+  ``userid`` in order to clarify its intended purpose.
+  See https://github.com/Pylons/pyramid/pull/1399
+
 Docs
 ----
 
@@ -65,6 +72,10 @@ Docs
 - Clarify a previously-implied detail of the ``ISession.invalidate`` API
   documentation.
 
+- Improve and clarify the documentation on what Pyramid defines as a
+  ``principal`` and a ``userid`` in its security APIs.
+  See https://github.com/Pylons/pyramid/pull/1399
+
 Scaffolds
 ---------
 
-- 
cgit v1.2.3