Dear all, I've started similar topic on xwiki-users list, but it got to the stage I would like to continue with you and your opinions. What I'd like to achieve are section locks. Just a brief context: Currently users can do concurrent editing but it's somewhat simplified and could lead to data loss. The lacking part of that process is well described in this old jira issue pointed out by Sergiu: http://jira.xwiki.org/jira/browse/XWIKI-175 That would need to create procedure checking whether something has changed since user opened a document to edit and if so get him to merge screen. Now it's just saving latest data over the previous changes. That should be done, but what would help right away to limit such errors is to add more granularity to the document locks. Now when user edits a section within a page other users see the message "This object is currently locked by.." which is confusing for them because they might want to edit different section simultaneously and then there is no conflict at all. I would like to get your advices how that could be achieved, Sergiu answered to my question in the following way: or they are also mapped to the application's model ? Somewhere in between. The whole content is stored in one piece, but there are some APIs to access sections. Here you have the original thread: http://lists.xwiki.org/pipermail/users/2010-November/022404.html Could someone elaborate a little bit more on this topic ?