From 27b4afb166806eeb30d2966770f88349d3740793 Mon Sep 17 00:00:00 2001 From: Carla Schroder Date: Wed, 20 Jan 2016 14:30:32 -0800 Subject: [PATCH] clarification of file locking behavior --- .../configuration_files/files_locking_transactional.rst | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/admin_manual/configuration_files/files_locking_transactional.rst b/admin_manual/configuration_files/files_locking_transactional.rst index d80588b87..5981e2514 100644 --- a/admin_manual/configuration_files/files_locking_transactional.rst +++ b/admin_manual/configuration_files/files_locking_transactional.rst @@ -18,10 +18,11 @@ file corruption during normal operation. It performs these functions: What Transactional File locking is not for: it is not for preventing collisions in collaborative document editing (see -:doc:`collaborative_documents_configuration` to learn about collaboration). -Multiple users can open and edit a document at the same time and Transactional -File locking does not prevent this. Rather, it prevents simultaneous file -saving. +:doc:`collaborative_documents_configuration` to learn about collaboration with +the Documents app), nor will it prevent multiple users from editing the same +document, or give notice that other users are working on the same document. +Multiple users can open and edit a file at the same time and Transactional File +locking does not prevent this. Rather, it prevents simultaneous file saving. .. note:: Transactional file locking is in ownCloud core, and replaces the old File Locking app. The File Locking app has been removed from ownCloud in