Add multi-party-conflict-detection.rst.

[tahoe-lafs/tahoe-lafs.git] / docs / magic-folder-howto.rst

diff --git a/docs/magic-folder-howto.rst b/docs/magic-folder-howto.rst
index 53f7050f067d2349f44f1b39f0591d7f4c414f87..0992ce22ca557bc48cae99e626d5841d80ddde14 100644 (file)
--- a/docs/magic-folder-howto.rst
+++ b/docs/magic-folder-howto.rst
@@ -37,7 +37,7 @@ Linux
 Install ``git`` from your distribution's package manager.
 Then run these commands::
 
-  git clone -b 2438.magic-folder-stable.5 https://github.com/tahoe-lafs/tahoe-lafs.git
+  git clone -b 2438.magic-folder-stable.8 https://github.com/tahoe-lafs/tahoe-lafs.git
   cd tahoe-lafs
   python setup.py test
 
@@ -86,10 +86,10 @@ then run::
 
   bin\tahoe --version-and-path
 
-It is normal for this command to print warnings and
-debugging output on some systems. Do not run
-``python setup.py test``, because it currently hangs on
-Windows.
+It is normal for this command to print warnings and debugging output
+on some systems. ``python setup.py test`` can also be run, but there
+are some known sources of nondeterministic errors in tests on Windows
+that are unrelated to Magic Folder.
 
 
 Setting up a local test grid
@@ -223,7 +223,7 @@ other directory will be renamed to a filename ending in ``.backup``.
 Deleting a directory will have no effect.
 
 For other known issues and limitations, see
-https://github.com/tahoe-lafs/tahoe-lafs/blob/2438.magic-folder-stable.5/docs/frontends/magic-folder.rst#known-issues-and-limitations
+https://github.com/tahoe-lafs/tahoe-lafs/blob/2438.magic-folder-stable.8/docs/frontends/magic-folder.rst#known-issues-and-limitations
 
 As mentioned earlier, it is also possible to run the nodes on
 different machines, to synchronize between three or more clients,