diff --git a/docs/user/exams/instructors_guide.rst b/docs/user/exams/instructors_guide.rst index f2c74d318cca..62e42766fcef 100644 --- a/docs/user/exams/instructors_guide.rst +++ b/docs/user/exams/instructors_guide.rst @@ -349,7 +349,7 @@ The exam conduction starts when the exam becomes visible to the students and end Updating an Exercise during the Exam ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -In case you have to update the exercise during an exam for programming, modeling, text, or file-upload exercises, you can go to the exercise details page and click on |edit| to edit the exercise. At the bottom of this page, you can enter a notification text that is shown to the students in the exam mode. The screenshot below shows an example notification. You can see how the updated problem statement looks for the student in :ref:`Updated Problem Statement during the Exam `. +In case you have to update the exercise during an exam for programming, modeling, text, or file-upload exercises, you can go to the exercise details page and click on |edit| to edit the exercise. At the bottom of the exercise edit page, you can enter a notification text that is shown to the students in the exam mode. The screenshot below shows an example notification. You can see how the updated problem statement looks for the student in :ref:`Updated Problem Statement during the Exam `. .. figure:: instructor/exercise-notification.png :alt: Exercise Notification diff --git a/docs/user/exams/student/problem-statement-diff-view.png b/docs/user/exams/student/problem-statement-diff-view.png index cc738ebbdbc9..03dfbcc162be 100644 Binary files a/docs/user/exams/student/problem-statement-diff-view.png and b/docs/user/exams/student/problem-statement-diff-view.png differ diff --git a/docs/user/exams/student/problem-statement-normal-view.png b/docs/user/exams/student/problem-statement-normal-view.png index 887a0fa5d5e1..4f51d73794c7 100644 Binary files a/docs/user/exams/student/problem-statement-normal-view.png and b/docs/user/exams/student/problem-statement-normal-view.png differ diff --git a/docs/user/exams/student/student-notification.png b/docs/user/exams/student/student-notification.png index ac7817dc4b90..92d6651c65a0 100644 Binary files a/docs/user/exams/student/student-notification.png and b/docs/user/exams/student/student-notification.png differ diff --git a/docs/user/exams/students_guide.rst b/docs/user/exams/students_guide.rst index 4f82347d0a32..b36bd85e37e4 100644 --- a/docs/user/exams/students_guide.rst +++ b/docs/user/exams/students_guide.rst @@ -275,7 +275,10 @@ Participating in Programming Exercises If you work in the online code editor and a merge conflict occurs, the file browser will display the conflict state |conflict_state|. You can use the |resolve_conflict| button, which is then displayed instead of the submit button, to resolve the conflict within the online code editor. - This will reset your changes to the latest commit. Manual merging is not possible with the online code editor. + This will reset your changes to the latest commit. + + .. warning:: + Manual merging is not possible with the online code editor. .. _updated_problem_statement: