Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

76966: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      68048: Reverse 68032 MNT-10822 - committed to wrong branch


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77807 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers 2014-07-23 11:35:17 +00:00
parent 3a1aaf5a7c
commit c5cb3ce87a

View File

@ -39,11 +39,8 @@ public enum LockType
*/ */
@Deprecated @Deprecated
READ_ONLY_LOCK, READ_ONLY_LOCK,
/** /**
* The owner can update or delete the locked node. * READ_ONLY_LOCK - no-one can update or delete the locked node. No one can add children to the locked node.
* <p>
* The owner can add children to the locked node.
* *
* @deprecated Deprecated in 4.1.6. Will be replaced by a more descriptive name. * @deprecated Deprecated in 4.1.6. Will be replaced by a more descriptive name.
*/ */
@ -52,6 +49,7 @@ public enum LockType
/** /**
* No-one can update or delete the locked node. * No-one can update or delete the locked node.
* <p> * <p>
* There are no restrictions on adding children to the locked node. * There are no restrictions on adding children to the locked node.