From 1941ddf320d7c4a67c438ca2f81effcccb22f199 Mon Sep 17 00:00:00 2001 From: Scott Klupfel Date: Mon, 21 Mar 2016 19:29:31 +1000 Subject: [PATCH] Clarify remote states when ignoreDelete selected As discussed on the forum: https://forum.syncthing.net/t/stuck-syncing-at-90/6991 --- advanced/folder-ignoredelete.rst | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/advanced/folder-ignoredelete.rst b/advanced/folder-ignoredelete.rst index 1db542a8f..2cd19b80e 100644 --- a/advanced/folder-ignoredelete.rst +++ b/advanced/folder-ignoredelete.rst @@ -18,9 +18,18 @@ Bob deletes a file, it is deleted for Alice as well. When Alice deletes a file, Bob ignores that update and does not delete the file. In this state, Bob is fully up to date from his own point of view, as is Alice -from her own point of view. However from the point of view of Bob, who ignored -the delete entry from Alice, Alice is now out of date because she is missing -the file that was deleted. +from her own point of view. + +However from the point of view of Alice, who deleted a file and propogated the +update, Bob is now out of date because he is yet to remove the file that was +deleted. + +From the point of view of Bob, who ignored the delete entry from Alice, Alice +is now out of date because she is missing the file that was deleted. + +.. note:: + Bob may continue to see Alice as up to date until the next time + Syncthing is restarted on his device. Should Bob modify any of the files that Alice has deleted, the update will be sent to Alice and Alice will download the now updated file.