Skip to content

Commit cbc5d5d

Browse files
MitchC1999kemister85shanmen-tiny
authored
Apply suggestions from code review
Co-authored-by: Karl Kemister-Sheppard <[email protected]> Co-authored-by: Shan <[email protected]>
1 parent 32434fc commit cbc5d5d

File tree

1 file changed

+19
-14
lines changed

1 file changed

+19
-14
lines changed

modules/ROOT/pages/suggestededits.adoc

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,18 @@ include::partial$misc/admon-iframe-only.adoc[]
2222
The {pluginname} plugin keeps track of every suggested edit made to the document by the current user, as the edits are made, and stores this metadata in an internal model of the document. These suggestions can then be reviewed in the `'suggestededits'` xref:custom-view.adoc[editor view], where each edit is highlighted in the document, and where you can accept, reject, or provide feedback. The `'suggestededits'` view is accessible via either the `suggestededits` toolbar button or menu button within the `View` menu. These edits, and any feedback provided, are stored in the model provided by the plugin xref:#get_model[`+get_model()+` API].
2323

2424
[IMPORTANT]
25-
This model should be saved externally alongside the document, and loaded into the editor with the xref:#suggestededits_model[`+suggestededits_model+` option]. This will ensure that both the document and the model are in sync, and that every user's contributions are tracked correctly.
25+
This model should be saved externally alongside the document, and loaded into the editor with the xref:#suggestededits_model[`+suggestededits_model+`] option. This ensures that both the document and the model are in sync, and that every user's contributions are tracked correctly.
2626

2727
== Reviewing edits
2828

29-
The {pluginname} plugin provides a dedicated `'suggestededits'` xref:custom-view.adoc[editor view] for viewing and reviewing edits made by multiple authors. Which actions you can take in this view depends on the xref:#suggestededits_access[`+suggestededits_access+` option].
29+
The {pluginname} plugin provides a dedicated `'suggestededits'` xref:custom-view.adoc[editor view] for viewing and reviewing edits made by multiple authors. The available actions in this view depends on the xref:#suggestededits_access[`+suggestededits_access+` option].
3030

3131
=== Header
3232

3333
The view contains a few controls to manage the review process:
3434

3535
* Show edits: Toggles whether suggested edits are shown. When hidden, the view shows what the document will look like if the review is completed.
36-
* Complete review: Ends the review, applying resolved suggestions to the document.
36+
* Complete review: Ends the review, applying resolved suggestions to the document. Unresolved changes remain in the document for future review.
3737
* Cancel: Ignores any resolved suggestions and makes no change to the document. Feedback given on suggestions will be retained.
3838

3939
=== Document
@@ -65,21 +65,26 @@ At the top of the sidebar, there is also a dropdown menu to apply review actions
6565

6666
=== Finishing a review
6767

68-
When you complete a review, any resolved suggestions will be applied to the document and will no longer be tracked in the model as suggestions, including any feedback on resolved suggestions. This means that any accepted edits will remain in the docuemnt, and any rejected edits will be reverted to the state before the suggestion was made. More specifically, review actions will apply the following to the document:
68+
When completing a review, any resolved suggestions will be applied to the document and will no longer be tracked in the model as a suggestion, including any feedback on "resolved" suggestions. Any "accepted" edits will remain in the document, and any "rejected" edits will be reverted to the state before the suggestion was made.
6969

70-
* When added content is -
71-
** Accepted: The content will remain in the document.
72-
** Rejected: The content will be removed from the document.
70+
Review actions will apply the following to the document:
7371

74-
* When modified content is -
75-
** Accepted: The content will keep the current formats and attributes.
76-
** Rejected: The content will revert to the formats and attributes it had before the edit was made.
72+
When added content is:
7773

78-
* When removed content is -
79-
** Accepted: The content will be remain removed from the document.
80-
** Rejected: The content will be restored to the document.
74+
* Accepted: The content will remain in the document.
75+
* Rejected: The content will be removed from the document.
8176

82-
If you cancel your review, no resolved suggestions will be applied to the document and all suggestions will remain in the model, including any feedback provided during that review session.
77+
When modified content is:
78+
79+
* Accepted: The content will retain the current formats and attributes.
80+
* Rejected: The content will revert to modified formats and attributes to match the content state before the edit was made.
81+
82+
When removed content is:
83+
84+
* Accepted: The content will be removed from the document.
85+
* Rejected: The removed content will be restored to the document.
86+
87+
If a review is canceled, no resolved suggestions will be applied to the document. All suggestions, including any feedback provided during that review session, will remain stored in the model.
8388

8489
== Initial setup
8590

0 commit comments

Comments
 (0)