From f3ae9e141783df381e1f8742199032dbb51c5ed4 Mon Sep 17 00:00:00 2001
From: Carol Tong <ctong@edx.org>
Date: Mon, 27 Oct 2014 11:52:33 -0400
Subject: [PATCH] Add doc for new Show Reset Button setting

---
 .../course_authors/source/change_log.rst      |  3 +++
 .../creating_content/create_problem.rst       | 26 +++++++++++++++++--
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/docs/en_us/course_authors/source/change_log.rst b/docs/en_us/course_authors/source/change_log.rst
index 781121d937..586a2b8f16 100644
--- a/docs/en_us/course_authors/source/change_log.rst
+++ b/docs/en_us/course_authors/source/change_log.rst
@@ -13,6 +13,9 @@ October, 2014
 
    * - Date
      - Change
+   * - 10/28/14
+     - Added section for :ref:`Show Reset Button` in :ref:`Problem Settings`
+       and clarified Reset button behavior in :ref:`Problem Student View`.
    * - 10/27/14
      - Fixed the code sample in :ref:`Script Tag Format` in the :ref:`Write
        Your Own Grader` chapter.
diff --git a/docs/en_us/course_authors/source/creating_content/create_problem.rst b/docs/en_us/course_authors/source/creating_content/create_problem.rst
index b7da289256..d3a75c2cbe 100644
--- a/docs/en_us/course_authors/source/creating_content/create_problem.rst
+++ b/docs/en_us/course_authors/source/creating_content/create_problem.rst
@@ -91,8 +91,13 @@ All problems on the edX platform have several component parts.
 #. **Explanation.** The instructor may include an explanation that
    appears when a student clicks **Show Answer**.
 
-#. **Reset button.** This button clears the student input, so that the
-   problem looks the way it did originally.
+#. **Reset button.** Students can click **Reset** to clear any input that has
+   not yet been submitted, and try again to answer the question. If the student
+   has already submitted an answer, clicking **Reset** clears the submission
+   and, if the problem contains randomized variables and randomization is set
+   to **On Reset**, changes the values the student sees in the problem. If the
+   number of Maximum Attempts that was set for this problem has been reached,
+   the **Reset** button is not visible.
 
 #. **Hide Answer button.**
 
@@ -260,6 +265,7 @@ Problem component have the following settings. These settings appear on the
 *  **Problem Weight**
 *  **Randomization**
 *  **Show Answer**
+*  **Show Reset Button**
 
 .. image:: ../Images/ProbComponent_Attributes.png
  :alt: Image of the Settings tab in a Problem component
@@ -456,6 +462,22 @@ This setting has the following options.
 |                   | or in the LMS.                       |
 +-------------------+--------------------------------------+
 
+.. _Show Reset Button:
+
+=================
+Show Reset Button
+=================
+
+This setting defines whether a **Reset** button is visible on the problem.
+Students can click **Reset** to clear any input that has not yet been submitted,
+and try again to answer the problem. If the student has already submitted an
+answer, clicking **Reset** clears the submission and, if the problem contains
+randomized variables and randomization is set to **On Reset**, changes the
+values the student sees in the problem. If the number of Maximum  Attempts that
+was set for this problem has been reached, the **Reset** button is not visible.
+
+This problem-level settimg overrides the course-level **Show Reset Button for Problems** setting.
+
 .. _Modifying a Released Problem:
 
 *********************************