Merge pull request #3448 from edx/ahodges/documentation/DOC275

DOC-275, location & Language columns

docs/en_us/course_authors/source/change_log.rst

@@ -16,6 +16,8 @@ April, 2014
      - Expanded the :ref:`Grades` chapter to include topics on interpreting the grade reports and student progress page.
    * - 04/23/14
      - Reorganized info about problems into :ref:`Exercises and Tools Index` section  
+   * - 04/23/14
+     - Added more information about collecting language and location data from students to :ref:`Student Data`.  
    * - 04/22/14
      - Updated the :ref:`Bulk Email` section with information about the dashboard option to opt out of course email.
    * - 

docs/en_us/course_authors/source/running_course/course_enrollment.rst

@@ -167,7 +167,7 @@ To unenroll students, you supply the email addresses of enrolled students.
 
 .. note:: The **Auto Enroll** option has no effect when you click **Unenroll**.
 
-#. Click **Unenroll**. The course is no longer listed on the students'
+5. Click **Unenroll**. The course is no longer listed on the students'
    dashboards, and the students can no longer contribute to discussions or the
    wiki or access the courseware.
 

docs/en_us/course_authors/source/running_course/course_student.rst

@@ -60,7 +60,7 @@ You can access this self-reported information for all of the students who are en
 
 The student data that is available to course staff always reflects the set of live, current enrollments. Students can register for your course throughout the defined enrollment period, and they can unregister from a course at any time, which unenrolls them. Students can also change their email addresses and full names at any time. As a result, you may want to download student data periodically to gain insights into how the student population changes over time. 
 
-**Note**: In the future, edX may also request that students select a language and location. This data is not collected at this time.
+.. note:: In the future, edX may also request that students select a language and location. This data is not collected at this time.
 
 .. _View and download student data:
 
@@ -70,7 +70,10 @@ Download or view student data
 
 You can download student data to learn about population demographics at a specific point in time, compare demographics at different points in time, and plot trends in the population over time. 
 
-**Important**: Do not navigate away from this page while you wait for the data to be prepared. The larger the enrollment for your course, the longer it takes to create and output the data. 
+In addition to the data for enrolled students, data for the course staff is
+included in the file or display.
+
+.. important:: Do not navigate away from this page while you wait for the data to be prepared. The larger the enrollment for your course, the longer it takes to create and output the data. 
 
 For smaller courses, you also have the option to view student data on the Instructor Dashboard. 
 
@@ -82,18 +85,18 @@ To download or view student data:
 
 #. Click **Data Download**.
 
-#. To download student enrollment data in a CSV file, click **Download profile information as a CSV**.
+#. To download data about enrolled students in a CSV file, click **Download profile information as a CSV**.
 
    You are prompted to open or save the enrolled_profiles.csv file. All student-supplied data is included without truncation.
 
-#. To display student enrollment data, click **List enrolled students' profile information**. (This option is available only for courses with an enrollment of less than 200.)
+#. To display data about enrolled students, click **List enrolled students' profile information**. (This option is available only for courses with an enrollment of less than 200.)
 
    A table of the student data displays, with one row for each enrolled student. Longer values, such as student goals, are truncated.
 
  .. image:: ../Images/StudentData_Table.png
   :alt: Table with columns for the collected data points and rows for each student on the Instructor Dashboard
 
-**Note**: In addition to the data for enrolled students, data for the course staff is included in the file or display.
+.. note:: The columns for language and location are included in this report for backward compatibility only. This data is no longer collected during student registration.
 
 ==========================================
 View demographic distributions

docs/en_us/course_authors/source/running_course/discussions.rst

@@ -58,7 +58,7 @@ To create a discussion category:
 
 #. Change the second id value to a unique identifier. For example, append a reference to the category name.
 
-#. Add a comma between the two closing braces.
+#. Add a comma after the first closing brace.
 
  .. image:: ../Images/Discussion_Add_name.png
   :alt: Policy value of {"General": {"id": "i4x-test_doc-SB101-course-2014_Jan"}, "Course Q&A": {"id": "i4x-test_doc-SB101-course-2014_Jan_faq"}}
@@ -185,7 +185,7 @@ For information on setting up moderators for your course, see :ref:`Assigning_di
 Provide guidelines for students
 ========================================
 
-You can develop a set of best practices for discussion participation and make them avaiable to students as a course handout file or on a defined page in your course. These guidelines can define your expectations and optionally introduce features of edX discussions. 
+You can develop a set of best practices for discussion participation and make them available to students as a course handout file or on a defined page in your course. These guidelines can define your expectations and optionally introduce features of edX discussions. 
 
 .. For a template that you can use to develop your own guidelines, see :ref:`Discussion Forum Guidelines`.