From f9af0633d8da426cbcaed3ff05ab6d7128148bb0 Mon Sep 17 00:00:00 2001
From: Brian Warner <warner@lothar.com>
Date: Wed, 1 May 2013 10:25:40 -0700
Subject: [PATCH] update docs for 1.10 release

---
 NEWS.rst     | 10 +++++-----
 relnotes.txt | 31 ++++++++++++++++++++-----------
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/NEWS.rst b/NEWS.rst
index 5bc827bb..49f9eaf6 100644
--- a/NEWS.rst
+++ b/NEWS.rst
@@ -82,12 +82,12 @@ Compatibility and Dependencies
 Other Changes
 -------------
 
-- The flogtool utility, used to read detailed event logs, can now be accessed
-  as ``tahoe debug flogtool`` even when Foolscap is not installed
+- The ``flogtool`` utility, used to read detailed event logs, can now be
+  accessed as ``tahoe debug flogtool`` even when Foolscap is not installed
   system-wide. (`#1693`_)
 - The provisioning/reliability pages were removed from the main client's web
   interface, and moved into a standalone web-based tool. Use the ``run.py``
-  script in misc/operations_helpers/provisioning to access them.
+  script in ``misc/operations_helpers/provisioning/`` to access them.
 - Web clients can now cache (ETag) immutable directory pages. (`#443`_)
 - `<docs/convergence_secret.rst>`__ was added to document the adminstration
   of convergence secrets. (`#1761`_)
@@ -95,10 +95,10 @@ Other Changes
 Precautions when Upgrading
 --------------------------
 
-- When upgrading a grid from a recent version of trunk, follow the
+- When upgrading a grid from a recent revision of trunk, follow the
   precautions from this `message to the tahoe-dev mailing list`_, to ensure
   that announcements to the Introducer are recognized after the upgrade.
-  This is not necessary when upgrading from a previous release.
+  This is not necessary when upgrading from a previous release like 1.9.2.
 
 .. _`#166`: https://tahoe-lafs.org/trac/tahoe-lafs/ticket/166
 .. _`#443`: https://tahoe-lafs.org/trac/tahoe-lafs/ticket/443
diff --git a/relnotes.txt b/relnotes.txt
index 0f46b144..5ae94e62 100644
--- a/relnotes.txt
+++ b/relnotes.txt
@@ -1,7 +1,7 @@
-ANNOUNCING Tahoe, the Least-Authority File System, v1.9.2
+ANNOUNCING Tahoe, the Least-Authority File System, v1.10
 
 The Tahoe-LAFS team is pleased to announce the immediate
-availability of version 1.9.2 of Tahoe-LAFS, an extremely
+availability of version 1.10.0 of Tahoe-LAFS, an extremely
 reliable distributed storage system. Get it here:
 
 https://tahoe-lafs.org/source/tahoe-lafs/trunk/docs/quickstart.rst
@@ -14,11 +14,14 @@ unique security and fault-tolerance properties:
 
 https://tahoe-lafs.org/source/tahoe-lafs/trunk/docs/about.rst
 
-The previous stable release of Tahoe-LAFS was v1.9.1, released
-on January 12, 2012.
+The previous stable release of Tahoe-LAFS was v1.9.2, released
+on July 3, 2012.
 
-v1.9.2 is a bugfix release that primarily fixes regressions
-in mutable file support. See the NEWS file [1] for details.
+v1.10.0 is a feature release which adds a new Introducer
+protocol, improves the appearance of the web-based user
+interface, improves grid security by making introducer FURLs
+unguessable, and fixes many bugs. See the NEWS file [1] for
+details.
 
 
 WHAT IS IT GOOD FOR?
@@ -66,7 +69,12 @@ the test infrastructure to continuously verify that all new
 versions are interoperable with previous versions. We intend
 to build such an infrastructure in the future.
 
-This is the seventeenth release in the version 1 series. This
+The new Introducer protocol added in v1.10 is backwards
+compatible with older clients and introducer servers, however
+some features will be unavailable when an older node is
+involved. Please see docs/nodekeys.rst [14] for details.
+
+This is the eighteenth release in the version 1 series. This
 series of Tahoe-LAFS will be actively supported and maintained
 for the foreseeable future, and future versions of Tahoe-LAFS
 will retain the ability to read and write files compatible
@@ -130,16 +138,16 @@ Of Fame" [13].
 
 ACKNOWLEDGEMENTS
 
-This is the eleventh release of Tahoe-LAFS to be created solely
+This is the twelfth release of Tahoe-LAFS to be created solely
 as a labor of love by volunteers. Thank you very much to the
 team of "hackers in the public interest" who make Tahoe-LAFS
 possible.
 
-David-Sarah Hopwood
+Brian Warner
 on behalf of the Tahoe-LAFS team
 
-July 3, 2012
-Rainhill, Merseyside, UK
+May 1, 2013
+San Francisco, California, USA
 
 
 [1] https://tahoe-lafs.org/trac/tahoe-lafs/browser/NEWS.rst
@@ -155,3 +163,4 @@ Rainhill, Merseyside, UK
 [11] http://atlasnetworks.us/
 [12] https://leastauthority.com/
 [13] https://tahoe-lafs.org/hacktahoelafs/
+[14] https://tahoe-lafs.org/trac/tahoe-lafs/browser/docs/nodekeys.rst
-- 
2.45.2