Merge pull request #674 from edx/ahodges/rerun_cohorts

Ahodges/rerun cohorts

en_us/course_authors/source/front_matter/change_log.rst

@@ -22,6 +22,9 @@ November 2015
 
    * - Date
      - Change
+   * - 9 November 2015
+     - Updated the :ref:`Rerun a Course` topic to clarify that cohorts must be
+       redefined in a course created by the re-run feature.
    * - 3 November 2015
      - Added the :ref:`Timed Exams` topic.
    * - 2 November 2015

en_us/open_edx_course_authors/source/front_matter/change_log.rst

@@ -12,6 +12,9 @@ November 2015
 
    * - Date
      - Change
+   * - 9 November 2015
+     - Updated the :ref:`Rerun a Course` topic to clarify that cohorts must be
+       redefined in a course created by the re-run feature.
    * - 3 November 2015
      - Added the :ref:`Timed Exams` topic.
    * - 2 November 2015

en_us/release_notes/source/2015/documentation/doc_1104_2015.rst

@@ -33,5 +33,5 @@ Added the :ref:`opencoursestaff:Timed Exams` section.
 Installing, Configuring, and Running the Open edX Platform
 ************************************************************
 
-Added the :ref:`installation:Installing an XBlock Topic` to provide guidance
+Added the :ref:`installation:Installing an XBlock` topic to provide guidance
 about expanding the Open edX platform by adding XBlocks.

en_us/shared/building_and_running_chapters/building_course/course_rerun.rst

@@ -30,14 +30,14 @@ Data Duplicated When You Re-Run a Course
      - Yes. You must update all release dates and due dates.
    * - Course structure (sections, subsections, units) and state (published,
        hidden)
-     - Yes. 
+     - Yes.
    * - Individual problems and other components
      - Yes.
    * - Files uploaded to the course, including videos and textbooks
      - Yes.
    * - Pages added to the course
      - Yes, including all page content and the defined page order.
-   * - Course Updates 
+   * - Course Updates
      - Yes.
    * - Advanced Settings
      - Yes.
@@ -48,8 +48,8 @@ Data Duplicated When You Re-Run a Course
    * - Course team privileges, including admins, discussion moderators, beta
        testers
      - No. Only the user who created the new course has access to it.
-   * - Manually created cohort groups
-     - No. 
+   * - Manually created cohorts
+     - No.
    * - Student answers, progress, and grading data
      - No.
    * - Certificates
@@ -75,9 +75,9 @@ Using Re-Run to Create a Course
 
 .. only:: Partners
 
-   Only edX Partner Managers have the permissions needed to re-run a course.
-   To re-run a course that is hosted on the `edx.org`_ or `edge.edx.org`_
-   sites, contact your edX Partner Manager. After your Partner Manager creates
+   Only edX Program Managers have the permissions needed to re-run a course.
+   To re-run a course that is hosted on the `edx.org`_ or `edX Edge`_
+   sites, contact your edX Program Manager. After your Program Manager creates
    the new course using the re-run feature, you can complete the steps to
    :ref:`update the new course<Update the New Course>`.
 
@@ -88,9 +88,9 @@ Using Re-Run to Create a Course
    system administrator creates a new course using the re-run feature, you can
    complete the steps to :ref:`update the new course<Update the New Course>`.
 
-.. note:: Before you re-run a course, ensure that the course content is
-   complete. Additions and changes that you make to the original course after
-   creating the new course are not propagated to the new course.
+.. note:: Before you re-run a course, make sure that its settings and content
+  are complete. Additions and changes that you make to the original course
+  after you create the new course are not propagated to the new course.
 
 .. Comment out the procedure to create rerun, since only Global Admin (i.e.
 .. edX internal can do this) Done as part of DOC-2236 (CT, Sept 11, 2015)
@@ -103,21 +103,21 @@ Using Re-Run to Create a Course
       Course** and **View Live** options appear for each course.
 
       .. image:: ../../../shared/building_and_running_chapters/Images/Rerun_link.png
-        :alt: A course listed on the dashboard with the Re-run Course and View 
-           Live options shown 
+        :alt: A course listed on the dashboard with the Re-run Course and View
+           Live options shown
         :width: 600
 
    #. Locate the course you want to re-run and select **Re-Run Course**. The
       **Create a re-run of a course** page opens with values already supplied
       in the **Course Name**, **Organization**, and **Course Number** fields.
 
       .. image:: ../../../shared/building_and_running_chapters/Images/rerun_course_info.png
-        :alt: The course creation page for a rerun, with the course name, 
+        :alt: The course creation page for a rerun, with the course name,
            organization, and course number supplied.
         :width: 600
 
-   #. Supply a **Course Run** to indicate when the new course will be offered. 
-   
+   #. Supply a **Course Run** to indicate when the new course will be offered.
+
    Together, the course number, the organization, and the course run are used
    to create the URL for the new course. The combination of these three values
    must be unique for the new course. In addition, the total number of
@@ -150,7 +150,7 @@ course for release.
 
 * Add course team members, including discussion admins, moderators, and
   community TAs. See :ref:`Add Course Team Members` or :ref:`Course_Staffing`.
-  
+
 * Update course-wide dates, including course and enrollment start and end
   dates. See :ref:`Scheduling Your Course`.
 
@@ -166,12 +166,12 @@ course for release.
 * Review the files on the **Files & Uploads** page. To update a file that
   contains references to course-related dates, you must complete the
   following steps.
-  
+
   1. Locate the source file.
   2. Change course-related dates in the file.
   3. Upload the revised version of the file.
-  
-  .. note:: If you use the same file name when you upload a revised file, 
+
+  .. note:: If you use the same file name when you upload a revised file,
    links to that file in course components and course handouts will continue to
    work correctly. If you rename a file and then upload it, you must also
    update all links to the original file name. See :ref:`Add Course Handouts`
@@ -184,14 +184,17 @@ course for release.
   post. See :ref:`Discussions`.
 
 * Add initial wiki articles.
-
+
+* For a course that includes :ref:`learner cohorts<Enabling and Configuring
+  Cohorts>`, set up the cohorts and select a strategy for assigning learners to
+  the cohorts.
+
 You can use the :ref:`course checklists<Use the Course Checklist>` to work
 through the course and verify that it is ready for release. You can also refer
 to the :ref:`Launch` topic for tools and ideas that help you prepare the
 course for launch.
 
-.. note:: 
+.. note::
   Changes you make in the new course are not propagated to the original course.
 
-.. _edge.edx.org: http://edge.edx.org
-.. _edx.org: http://edx.org
+.. include:: ../../../links/links.rst

en_us/shared/building_and_running_chapters/cohorts/cohorts_overview.rst

@@ -28,18 +28,18 @@ If you use cohorts in your course, you define a set of cohorts that reflect
 communities of learners, then select a strategy for :ref:`assigning learners to
 cohorts<Options for Assigning Learners to Cohorts>`.
 
-.. note::    
+.. note::
    * Every learner must be assigned to a cohort. This ensures that
      every learner has the ability to read and contribute to course discussion
      topics.
 
-   * Each learner can be in one and only one cohort. 
+   * Each learner can be in one and only one cohort.
 
    To provide learners with a consistent experience throughout the course run,
    do not change cohort configuration or a learner's cohort assignment after
    your course begins.
 
-For more information about using cohorts, see:
+For more information about using cohorts, see the following topics.
 
 * :ref:`Enabling and Configuring Cohorts`
 
@@ -75,7 +75,7 @@ combination of automated and manual cohorts. Typically, your purpose in
 including the cohort feature determines which assignment option you use for
 your course.
 
-.. note:: You can add learners manually to any cohort, whether it was created 
+.. note:: You can add learners manually to any cohort, whether it was created
    as an automated cohort or a manual cohort.
 
 .. note:: Although you can change the assignment method of a cohort at any time
@@ -126,7 +126,7 @@ automated cohorts to define for your course.
   include between 200 and 500 members.
 
 * For every 10,000 students who enroll, approximately 200 to 400 students
-  remain active in the discussions throughout the course run. 
+  remain active in the discussions throughout the course run.
 
 * Divide the estimated total enrollment of the course run by 10,000.
 
@@ -162,7 +162,7 @@ that your learners already belong to. You enable cohorts and then create
 assign each learner to a cohort. Every learner who enrolls, including those who
 enroll after the course starts, must be assigned to a cohort.
 
-.. note:: To ensure that every learner is assigned to a cohort, you can set up 
+.. note:: To ensure that every learner is assigned to a cohort, you can set up
    a single automated cohort, as described for the :ref:`hybrid assignment
    strategy<Hybrid Assignment>`. If you do not create an automated cohort, the
    system automatically creates a :ref:`default cohort<Default Cohort Group>`
@@ -231,7 +231,7 @@ cohort, you can change its name. For details about renaming cohorts, see
 :ref:`Renaming a Cohort`.
 
 .. image:: ../../../shared/building_and_running_chapters/Images/post_visible_default.png
- :alt: A discussion topic post with "This post is visible to Default Group" 
+ :alt: A discussion topic post with "This post is visible to Default Group"
        above the title.
  :width: 600
 

en_us/shared/subsections/open_response_assessments/OpenResponseAssessments.rst

@@ -51,9 +51,9 @@ by step instructions, see the following sections.
 * :ref:`PA Create an ORA Assignment`
 * :ref:`Accessing ORA Assignment Information`
 
-  
+
 For information about viewing metrics and learner responses for released open
-response assessments, see :ref:`Accessing ORA Assignment Information`.  
+response assessments, see :ref:`Accessing ORA Assignment Information`.
 
 For information about the learner experience with open response assessments,
 see `Open Response Assessments <http://edx-guide-for-
@@ -93,7 +93,7 @@ open response assessments in your courses.
 
 * Provide an ungraded practice ORA assignment prior to the first graded ORA
   assignment in the course, so that learners can understand the peer grading
-  process and get the most out of the eventual graded ORA assignment. 
+  process and get the most out of the eventual graded ORA assignment.
 
 * Consider using ungraded ORA assignments to generate learner interaction and
   feedback without affecting grades.
@@ -144,7 +144,7 @@ elements:
 
 * The :ref:`rubric <PA Rubric>`. One rubric is used to grade all the prompts in
   the assessment.
-  
+
 * One or more :ref:`assessment steps <PA Assessment Steps>`. Assignments can
   include a learner training step, a peer assessment step, and a self
   assessment step.
@@ -167,7 +167,7 @@ near the top of the page, followed by a field where the learner enters a
 response. You can require your learners to enter text as a response, or you can
 allow your learners to both enter text and upload an image.
 
-.. note:: If learners upload an image, the image file must be a .jpg or .png 
+.. note:: If learners upload an image, the image file must be a .jpg or .png
  file, and it must be smaller than 5 MB in size.
 
 .. image:: ../../../../shared/building_and_running_chapters/Images/PA_QandRField.png
@@ -176,7 +176,7 @@ allow your learners to both enter text and upload an image.
 
 When you write each question, you can include helpful information for your
 learners, such as what they can expect after they submit responses, or the
-approximate number of words or sentences that their response should have. 
+approximate number of words or sentences that their response should have.
 
 .. note:: Each learner is limited to a total word count of 10,000 for all
    responses in an ORA assignment.
@@ -214,7 +214,7 @@ grading. Learners compare their peers' responses to the rubric.
 
 Rubrics consist of *criteria* and *options*.
 
-* Each criterion has a *name*, a *prompt*, and one or more *options*. 
+* Each criterion has a *name*, a *prompt*, and one or more *options*.
 
    * The name is a very short summary of the criterion, such as "Ideas" or
      "Content". Criterion names generally have just one word. Because the system
@@ -226,7 +226,7 @@ Rubrics consist of *criteria* and *options*.
      .. image:: ../../../../shared/building_and_running_chapters/Images/PA_CriterionName.png
         :alt: A final score page with call-outs for the criterion names
 
-   * The prompt is a description of the criterion. 
+   * The prompt is a description of the criterion.
 
    * Options describe how well the response satisfies the criterion.
 
@@ -288,10 +288,10 @@ points possible)
        dynastic disagreement between Edward III and Philip VI, leading to the
        Hundred Years' War.
 
-.. note:: For peer grading, the most effective rubrics are as concrete 
-   and specific as possible. Many novice learners will be unqualified 
+.. note:: For peer grading, the most effective rubrics are as concrete
+   and specific as possible. Many novice learners will be unqualified
    to make the types of value judgments required for more holistic
-   rubrics. In addition, edX suggests using clear, simple language in 
+   rubrics. In addition, edX suggests using clear, simple language in
    rubrics.
 
 
@@ -324,7 +324,7 @@ self assessments ("Assess Your Response").
   :width: 600
 
 
-.. _PA Learner Training Assessments:
+.. _PA Student Training Step:
 
 
 Learner Training Step
@@ -365,7 +365,7 @@ above the response.
 
   Learning to Assess Responses
   Your assessment differs from the instructor's assessment of this response. Review the
-  response and consider why the instructor may have assessed it differently. Then, try 
+  response and consider why the instructor may have assessed it differently. Then, try
   the assessment again.
 
 For each of the criteria, the learner sees one of the following two messages,
@@ -604,7 +604,7 @@ in height in the list. (For longer responses, learners can scroll to see the
 entire response.) EdX recommends that you specify 20 or fewer responses to
 prevent the page from becoming too long.
 
-.. note:: It may take up to an hour for a high-scoring response to appear in 
+.. note:: It may take up to an hour for a high-scoring response to appear in
  the **Top Responses** list.
 
    If a high-scoring response is :ref:`removed from peer assessment<Remove a