Merge remote-tracking branch 'origin/2.4'

1 files changed, 9 insertions, 7 deletions

diff --git a/doc/faq.rst b/doc/faq.rst
index 7b9c85344..a07fb79e2 100644
--- a/doc/faq.rst
+++ b/doc/faq.rst
@@ -11,13 +11,15 @@ continually changes all files, unless you remove
 from the windows registry.
 See http://petersteier.wordpress.com/2011/10/22/windows-indexer-changes-modification-dates-of-eml-files/ for more information.
 
-Syncing breaks when attempting to sync deeper than 50 sub-directories, but the sync client does not report an error (RC=0)
---------------------------------------------------------------------------------------------------------------------------
-
-The sync client has been intentionally limited to sync no deeper than
-fifty sub-directories, to help prevent memory problems. 
-Unfortunately, it, *currently*, does not report an error when this occurs. 
-However, a UI notification is planned for a future release of ownCloud.
+Syncing stops when attempting to sync deeper than 100 sub-directories.
+----------------------------------------------------------------------
+
+The sync client has been intentionally limited to sync no deeper than 100
+sub-directories. The hard limit exists to guard against bugs with cycles
+like symbolic link loops.
+When a deeply nested directory is excluded from synchronization it will be
+listed with other ignored files and directories in the "Not synced" tab of
+the "Activity" pane.
 
 I want to move my local sync folder
 -----------------------------------