diff options
Diffstat (limited to 'helpcontent2/source/text/shared/guide/collab.xhp')
| -rw-r--r-- | helpcontent2/source/text/shared/guide/collab.xhp | 34 |
1 files changed, 24 insertions, 10 deletions
diff --git a/helpcontent2/source/text/shared/guide/collab.xhp b/helpcontent2/source/text/shared/guide/collab.xhp index bcc7c384ee..d0222dcbd6 100644 --- a/helpcontent2/source/text/shared/guide/collab.xhp +++ b/helpcontent2/source/text/shared/guide/collab.xhp @@ -6,7 +6,7 @@ *********************************************************************** * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,11 +44,11 @@ <bookmark_value>collaboration</bookmark_value> </bookmark> <comment>MW changed the index entries to one level entries.</comment> - <paragraph xml-lang="en-US" id="hd_id130008" role="heading" level="1" l10n="NEW"><variable id="collab"><link href="text/shared/guide/collab.xhp">Collaboration</link> + <paragraph xml-lang="en-US" id="hd_id130008" role="heading" level="1" l10n="NEW"><variable id="collab"><link href="text/shared/guide/collab.xhp">Collaboration</link> </variable></paragraph> <paragraph xml-lang="en-US" id="par_id5821710" role="paragraph" l10n="NEW">In %PRODUCTNAME Writer, Impress, and Draw, only one user at a time can open any document for writing. In Calc, many users can open the same spreadsheet for writing at the same time.</paragraph> <comment>Tools - Share Document menu</comment> - + <bookmark xml-lang="en-US" branch="hid/.uno:ShareDocument" id="bm_id8779564" localize="false"/> <paragraph xml-lang="en-US" id="par_id9590136" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Opens the Share Document dialog where you can enable or disable collaborative sharing of the document.</ahelp></paragraph> <comment>Share Document dialog - Share this spreadsheet with other users</comment> @@ -83,23 +83,23 @@ </listitem> </list> <comment>Resolve Conflicts dialog</comment> - + <bookmark xml-lang="en-US" branch="hid/HID_SCDLG_CONFLICTS" id="bm_id9671926" localize="false"/> <paragraph xml-lang="en-US" id="par_id5800653" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">If the same contents are changed by different users, the Resolve Conflicts dialog opens. For each conflict, decide which changes to keep.</ahelp></paragraph> <comment>Keep Mine</comment> - + <bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPMINE" id="bm_id1640369" localize="false"/> <paragraph xml-lang="en-US" id="par_id6263924" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Keeps your change, voids the other change.</ahelp></paragraph> <comment>Keep Other</comment> - + <bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPOTHER" id="bm_id1640360" localize="false"/> <paragraph xml-lang="en-US" id="par_id3609118" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Keeps the change of the other user, voids your change.</ahelp></paragraph> <comment>Keep All Mine</comment> - + <bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPALLMINE" id="bm_id1640361" localize="false"/> <paragraph xml-lang="en-US" id="par_id7184057" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Keeps all your changes, voids all other changes.</ahelp></paragraph> <comment>Keep All Others</comment> - + <bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPALLOTHERS" id="bm_id1640363" localize="false"/> <paragraph xml-lang="en-US" id="par_id786767" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Keeps the changes of all other users, voids your changes.</ahelp></paragraph> <paragraph xml-lang="en-US" id="hd_id2934965" role="heading" level="3" l10n="NEW">Saving a shared spreadsheet document</paragraph> @@ -120,6 +120,7 @@ </listitem> </list> <paragraph xml-lang="en-US" id="par_id7186498" role="paragraph" l10n="NEW">When a user successfully saves a shared spreadsheet, the document will be reloaded after the save command, so that the spreadsheet shows the latest version of all changes that got saved by all users. A message shows that "foreign changes have been added" when another user did change some contents.</paragraph> + <paragraph xml-lang="en-US" id="hd_id2871791" role="heading" level="2" l10n="NEW">Collaboration in Writer, Impress, and Draw</paragraph> <paragraph xml-lang="en-US" id="par_id2675862" role="paragraph" l10n="NEW">For all modules Writer, Impress, Draw, and for Calc when document sharing is not enabled, a file locking is possible. This file locking is available even when accessing the same document from different operating systems:</paragraph> <paragraph xml-lang="en-US" id="par_id7333597" role="paragraph" l10n="NEW">User A opens a document. The following conditions can apply:</paragraph> @@ -137,10 +138,23 @@ <paragraph xml-lang="en-US" id="par_id206610" role="paragraph" l10n="NEW">User A sees a dialog that tells the user the document is locked. The dialog offers to open the document in read-only mode, or to open a copy for editing, or to cancel the Open command.</paragraph> </listitem> </list> + + <paragraph xml-lang="en-US" id="hd_id29349651" role="heading" level="2" l10n="NEW">User access permissions and sharing documents</paragraph> + <paragraph xml-lang="en-US" id="par_id11746571" role="paragraph" l10n="NEW">Some conditions must be met on operating systems with a user permission management.</paragraph> + <list type="unordered"> + <listitem> + <paragraph xml-lang="en-US" id="par_id25775931" role="paragraph" l10n="NEW">The shared file needs to reside in a location which is accessible by all collaborators.</paragraph> + </listitem> + <listitem> + <paragraph xml-lang="en-US" id="par_id90496531" role="paragraph" l10n="NEW">The file permissions for both the document and the corresponding lock file need to be set so that all collaborators can create, delete, and change the files.</paragraph> + </listitem> + </list> + <paragraph xml-lang="en-US" id="par_id71864981" role="warning" l10n="NEW">Write access also enables other users to (accidentally or deliberately) delete or change a file.</paragraph> + <section id="relatedtopics"> - + <paragraph xml-lang="en-US" id="par_id4263740" role="paragraph" l10n="NEW"><link href="text/shared/01/01070000.xhp" name="Save As">Save As</link></paragraph> - + </section> </body> </helpdocument> |