Strict Standards: strftime(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected 'America/New_York' for 'EST/-5.0/no DST' instead in /homepages/20/d126302133/htdocs/landmark-project.com/htdocs/aup20/pmwiki.php on line 305

Warning: Cannot modify header information - headers already sent by (output started at /homepages/20/d126302133/htdocs/landmark-project.com/htdocs/aup20/pmwiki.php:305) in /homepages/20/d126302133/htdocs/landmark-project.com/htdocs/aup20/pmwiki.php on line 893
School AUP 2.0 | PmWiki / SimultaneousEdits browse

HomePage

Resources

PmWiki

Developed & Supported by David Warlick

edit SideBar

PmWiki has support for handling the case where multiple authors attempt to edit the same page nearly simultaneously. Here's the basic scenario for systems where simultaneous edits are not handled:

PmWiki's simultaneous edit feature detects when this occurs, and instead of saving Alice's edits PmWiki presents Alice with a message that someone else changed the page while she was editing it. Furthermore, Bob's changes are merged into Alice's copy of the page, with any conflicts highlighted by <<<<<<< and >>>>>>>. Alice can then fix things as appropriate and save the updated page, or, if Alice is lazy, she can just hit "save" a second time and leave it to someone else to fix.

The simultaneous edits feature is also invoked whenever someone requests a page preview; thus if a page changes while previewing a page the author gets notification and can see the merged results.

How can I test/experiment with this feature?

  1. Open up two browser windows and select the same page to be edited in each window (e.g., try WikiSandbox?action=edit).
  2. In one browser window, make some changes to the page and then save those changes.
  3. In the second browser window, make some different changes to the same page and hit "save". Since the page changed after the edit form was loaded into the second window, there's a potential edit conflict and you'll receive the "edit conflict message".
  4. You can make any adjustments in the second window, and press "Save" again to save the changes.

Notice

Some environments such as Windows and PHP running in safe_mode are unable to use the simultaneous edits capability distributed with PmWiki. See Cookbook:SimultaneousEdits for a solution for these environments.

<< Markup master index | DocumentationIndex | Wiki structure >>


Strict Standards: strftime(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected 'America/New_York' for 'EST/-5.0/no DST' instead in /homepages/20/d126302133/htdocs/landmark-project.com/htdocs/aup20/pmwiki.php(600) : eval()'d code on line 1
Page last modified on March 04, 2006, at 02:20 PM
RSS feed for edits of this page
maintained by The Landmark Project
RSS Feed for all Edits
Search School AUP 2.0

RSS Feed of recent blog entries that mention school and AUP:

edit SideBar