From f03abe66cd7cd580c4056f48d602422a78c0d9cd Mon Sep 17 00:00:00 2001
From: Brian Warner <warner@lothar.com>
Date: Sat, 6 Feb 2016 17:18:16 -0800
Subject: [PATCH] NEWS: add notes about all changes since 1.10.2

Needs expansion, pruning, editing, but this should include everything up
to this point.
---
 NEWS.rst | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/NEWS.rst b/NEWS.rst
index 8e19c018..1e860f4d 100644
--- a/NEWS.rst
+++ b/NEWS.rst
@@ -12,7 +12,37 @@ Compatibility and Dependency Updates
 Tahoe now requires Python 2.7 on all platforms. (#2445)
 
 Tahoe now requires Foolscap 0.10.1, which fixes incompatibilities with recent
-Twisted releases. (#2722, #2567)
+Twisted releases. (#2510, #2722, #2567)
+
+Tests should work with both Nevow 0.11 and 0.12 (#2663)
+
+Configuration Changes
+---------------------
+
+Leif's "preferred storage servers" was landed in revision 96eaca6. This adds
+"peers.preferred" to tahoe.cfg
+
+Aliases can (probably) be unicode.
+
+The introducer's "set_encoding_parameters" feature was removed.
+
+Other Fixes
+-----------
+
+Note: if these tickets are not user visible, they do not need to be explained
+here: merely listing the ticket numbers is sufficient.
+
+#2493: OS-X packaging improvements, so new installs will remove previous ones
+
+2499, 2511, 2567, 2556, 2663, 2723, 2543
+
+#1077: use standard time format in all WUI messages
+
+#1973: welcome-page cleanup: durations instead of timestamps, replace
+"announced" with "last received", remove "storage" column
+
+#1949, #2137: tahoe ls: remove -u shortcut for "--uri", leaving it for
+global --node-url option.
 
 Release 1.10.2 (2015-07-30)
 '''''''''''''''''''''''''''
-- 
2.45.2