# HG changeset patch # User Paul Boddie # Date 1318780675 -7200 # Node ID cd9c2eb3f0c1f6c6255489ce11b82922f7f3239e # Parent 6f45d61cf27c05bcf549cd73413a3d9dc469c42c Improved the help text. diff -r 6f45d61cf27c -r cd9c2eb3f0c1 pages/HelpOnApproveChanges --- a/pages/HelpOnApproveChanges Sat Oct 15 21:58:55 2011 +0200 +++ b/pages/HelpOnApproveChanges Sun Oct 16 17:57:55 2011 +0200 @@ -5,7 +5,7 @@ == ApproveChanges == -The !ApproveChanges action for !MoinMoin permits the approval of page changes made by untrusted users. Such changes are queued on a separate subpage of each page edited by untrusted users, and by using the !ApproveChanges action, reviewers can approve acceptable changes and incorporate them into the original (parent) page. +The !ApproveChanges action for !MoinMoin permits the approval of page changes made by untrusted users. Such changes are queued on a separate subpage of each page edited by untrusted users, so if such a user edits !FrontPage, the edited version will be saved as a revision of !FrontPage/ApprovalQueue. By using the !ApproveChanges action, reviewers can approve acceptable changes and incorporate them into the original (parent) page. The !ApprovalQueue subpage is never seen by anyone other than reviewers. <> @@ -35,11 +35,11 @@ This indicates that the parent page has changed since the untrusted user made their edits, with a possible consequence of this being that their changes no longer fit in with the page as it is now. In many cases, the queued changes made by the untrusted user and the changes made in competition with the queued changes can be reconciled and the parent page updated with both sets of changes intact. Sometimes, however, the changes will conflict with each other and need to be reconciled manually. In this latter case, the page editor will be opened for the editing of the parent page with conflict indicators present in the page text showing the problematic regions where conflicts have arisen. -Once changes have been approved from a queued changes page, that page will be deleted and will not appear in any search for queued changes. However, the page revisions will still exist, and approval of other revisions from the queue can still occur. +Once changes have been approved from a queued changes page, the !ApprovalQueue subpage will be deleted and will not appear in any search for queued changes. However, the page revisions will still exist, and approval of other revisions from the queue can still occur. == Rejecting Changes == -Where no changes present in a queued changes page are of interest, the page itself can be deleted. This effectively rejects all queued changes. +Where no changes present in a queued changes page are of interest, the !ApprovalQueue subpage itself can be deleted. This effectively rejects all queued changes. == Approving Users ==