Add multi-party-conflict-detection.rst.

[tahoe-lafs/tahoe-lafs.git] / docs / quickstart.rst

diff --git a/docs/quickstart.rst b/docs/quickstart.rst
index 28061435cf086d3f7654d513f5828730378427de..ebef68b499a82a4b412b5cbdbb412d28f9cf95dc 100644 (file)
--- a/docs/quickstart.rst
+++ b/docs/quickstart.rst
@@ -31,22 +31,22 @@ Install Python
 --------------
 
 Check if you already have an adequate version of Python installed by running
-``python -V``. Python v2.6 (v2.6.6 or greater recommended) or Python v2.7
-will work. Python v3 does not work. On Windows, we recommend the use of
-native Python v2.7, not Cygwin Python. If you don't have one of these
-versions of Python installed, `download`_ and install the latest version of
-Python v2.7. Make sure that the path to the installation directory has no
-spaces in it (e.g. on Windows, do not install Python in the "Program Files"
-directory).
+``python -V``. The latest version of Python v2.7 is recommended. Python v2.6.x
+is no longer officially supported, but might still work. Python v3 does not
+work. On Windows, we recommend the use of native Python v2.7, not Cygwin
+Python. If you don't have one of these versions of Python installed,
+`download`_ and install the latest version of Python v2.7. Make sure that the
+path to the installation directory has no spaces in it (e.g. on Windows, do not
+install Python in the "Program Files" directory).
 
 .. _download: https://www.python.org/downloads/
 
 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
 -----------------