From befa4babea7f92609654207c164b6d07f3baf92b Mon Sep 17 00:00:00 2001
From: Brian Warner <warner@lothar.com>
Date: Thu, 30 Jul 2015 19:35:00 -0700
Subject: [PATCH] update docs for 1.10.2 release

---
 NEWS.rst              |  6 +++---
 docs/known_issues.rst |  2 +-
 docs/quickstart.rst   |  4 ++--
 relnotes.txt          | 28 +++++++++++++---------------
 4 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/NEWS.rst b/NEWS.rst
index 5e5e868a..7182a10b 100644
--- a/NEWS.rst
+++ b/NEWS.rst
@@ -4,8 +4,8 @@
 User-Visible Changes in Tahoe-LAFS
 ==================================
 
-Release 1.10.2 (?)
-''''''''''''''''''
+Release 1.10.2 (2015-07-30)
+'''''''''''''''''''''''''''
 
 Packaging Changes
 -----------------
@@ -32,7 +32,7 @@ read just part of the file. `#2459`_
 
 Using ``tahoe cp`` to copy two different files of the same name into the same
 target directory now raises an error, rather than silently overwriting one of
-the files. `#2447`_
+them. `#2447`_
 
 All tickets closed in this release: 2328 2436 2446 2447 2459 2460 2461 2462
 2465 2470.
diff --git a/docs/known_issues.rst b/docs/known_issues.rst
index 1afbb970..79f51b60 100644
--- a/docs/known_issues.rst
+++ b/docs/known_issues.rst
@@ -19,7 +19,7 @@ want to read `the "historical known issues" document`_.
 .. _the "historical known issues" document: historical/historical_known_issues.txt
 
 
-Known Issues in Tahoe-LAFS v1.10.1, released 15-Jun-2015
+Known Issues in Tahoe-LAFS v1.10.2, released 30-Jul-2015
 ========================================================
 
   *  `Unauthorized access by JavaScript in unrelated files`_
diff --git a/docs/quickstart.rst b/docs/quickstart.rst
index 28061435..d7161123 100644
--- a/docs/quickstart.rst
+++ b/docs/quickstart.rst
@@ -44,9 +44,9 @@ directory).
 Get Tahoe-LAFS
 --------------
 
-Download the latest stable release, `Tahoe-LAFS v1.10.1`_.
+Download the latest stable release, `Tahoe-LAFS v1.10.2`_.
 
-.. _Tahoe-LAFS v1.10.1: https://tahoe-lafs.org/source/tahoe-lafs/releases/allmydata-tahoe-1.10.1.zip
+.. _Tahoe-LAFS v1.10.2: https://tahoe-lafs.org/source/tahoe-lafs/releases/allmydata-tahoe-1.10.2.zip
 
 Set Up Tahoe-LAFS
 -----------------
diff --git a/relnotes.txt b/relnotes.txt
index 36db4cf4..e9471652 100644
--- a/relnotes.txt
+++ b/relnotes.txt
@@ -1,8 +1,8 @@
-ANNOUNCING Tahoe, the Least-Authority File System, v1.10.1
+ANNOUNCING Tahoe, the Least-Authority File System, v1.10.2
 
-The Tahoe-LAFS team is pleased to announce the immediate
-availability of version 1.10.1 of Tahoe-LAFS, an extremely
-reliable distributed storage system. Get it here:
+The Tahoe-LAFS team is pleased to announce version 1.10.2 of
+Tahoe-LAFS, an extremely reliable distributed storage system.
+Get it here:
 
 https://tahoe-lafs.org/source/tahoe-lafs/trunk/docs/quickstart.rst
 
@@ -14,15 +14,13 @@ 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.10.0,
-released on May 1, 2013.
+The previous stable release of Tahoe-LAFS was v1.10.1, released
+on June 15, 2015.
 
-v1.10.1 is mostly a bugfix release, but also improves the
-web-based user interface, adds public-key authentication to
-the SFTP frontend, improves the behavior of "tahoe cp -r", and
-offers more control over IP address autodetection. Preliminary
-(CLI-based) OS-X packages have been added. Over 75 bugs have
-been fixed. See the NEWS file [1] for details.
+v1.10.2 is a small bugfix release, which fixes a critical
+packaging error that prevented v1.10.1 from building against the
+latest version of the upstream "mock" library. A few small bugs
+were fixed too. See the NEWS file [1] for details.
 
 
 WHAT IS IT GOOD FOR?
@@ -132,14 +130,14 @@ HACK TAHOE-LAFS!
 
 If you can find a security flaw in Tahoe-LAFS which is serious
 enough that we feel compelled to warn our users and issue a fix,
-then we will award you with a customized t-shirts with your
+then we will award you with a customized t-shirt with your
 exploit printed on it and add you to the "Hack Tahoe-LAFS Hall
 Of Fame" [13].
 
 
 ACKNOWLEDGEMENTS
 
-This is the thirteenth release of Tahoe-LAFS to be created
+This is the fourteenth 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.
@@ -147,7 +145,7 @@ Tahoe-LAFS possible.
 Brian Warner
 on behalf of the Tahoe-LAFS team
 
-June 15, 2015
+July 30, 2015
 San Francisco, California, USA
 
 
-- 
2.45.2