merge the NEWS about the security fix (#1528) with the work-in-progress NEWS

[tahoe-lafs/tahoe-lafs.git] / README.txt

diff --git a/README.txt b/README.txt
index 1127c0599e2bf42e31cd9008c9ee0c0084e441f0..422cbc43dbe5f72abb450e0cd9b5fcd156c9dc32 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -7,7 +7,7 @@ distributes your filesystem across multiple servers, and even if some of the
 servers fail or are taken over by an attacker, the entire filesystem continues
 to work correctly and to preserve your privacy and security.
 
-To get started please see `quickstart.rst`_.
+To get started please see `quickstart.rst`_ in the docs directory.
 
 LICENCE
 =======
@@ -17,12 +17,12 @@ your option, any later version.  You may use this package under the Transitive
 Grace Period Public Licence, version 1.0, or at your option, any later
 version. (You may choose to use this package under the terms of either licence,
 at your option.)  See the file `COPYING.GPL`_ for the terms of the GNU General
-Public License, version 2.  See the file `COPYING.TGPPL.html`_ for the terms of
+Public License, version 2.  See the file `COPYING.TGPPL.rst`_ for the terms of
 the Transitive Grace Period Public Licence, version 1.0.
 
 See `TGPPL.PDF`_ for why the TGPPL exists, graphically illustrated on three slides.
 
 .. _quickstart.rst: http://tahoe-lafs.org/source/tahoe-lafs/trunk/docs/quickstart.rst
-.. _COPYING.GPL: http://tahoe-lafs.org/trac/dupfilefind/browser/COPYING.GPL
-.. _COPYING.TGPPL.html: http://tahoe-lafs.org/source/dupfilefind/trunk/COPYING.TGPPL.html
+.. _COPYING.GPL: http://tahoe-lafs.org/trac/tahoe-lafs/browser/COPYING.GPL
+.. _COPYING.TGPPL.rst: http://tahoe-lafs.org/trac/tahoe-lafs/browser/COPYING.TGPPL.rst
 .. _TGPPL.PDF: http://tahoe-lafs.org/~zooko/tgppl.pdf