Updated with UI changes in Studio and LMS, terminology

docs/en_us/course_authors/source/change_log.rst

@@ -13,6 +13,10 @@ July, 2014
 
    * - Date
      - Change
+   * - 07/10/14
+     - Updated the :ref:`Discussions` chapter to add an
+       :ref:`Overview_discussions` section and to reflect changes to the
+       Discussion list and to the Advanced Settings page in Studio.
    * - 07/01/14
      - Updated :ref:`The Course End Date` to specify when students can earn and
        access certificates.

docs/en_us/course_authors/source/getting_started/glossary.rst

@@ -18,7 +18,7 @@ A
 
   See :ref:`The Course Summary Page` for more information.
 
-.. _Advanced Editor-g:
+.. _Advanced Editor_g:
  
 **Advanced Editor**
 
@@ -75,9 +75,9 @@ C
 
 .. _Cohort:
  
-**Cohort**
+.. **Cohort**
 
-  A group of students that participate in the class together. A cohort can have forum discussions apart from the rest of the students.
+..  A group of students that participate in the class together. A cohort can have forum discussions apart from the rest of the students.
 
 
 .. _Component_g:
@@ -128,7 +128,8 @@ C
  
 
 **Courseware**
-  The page where students access the primary instructional materials for your course. Sections, subsections, units and components are all accessed from the Courseware page.
+
+  The page where students access the primary instructional materials for your course. Sections, subsections, units, and components are all accessed from the Courseware page.
 
 
 .. _Custom Response Problem:
@@ -155,20 +156,20 @@ D
 
 .. _edX Research Guide: http://edx.readthedocs.org/projects/devdata/en/latest/
 
-.. _Discussion Forum:
+.. _Discussion:
  
-**Discussion Forum**
+**Discussion**
 
-  The page where students can communicate with peers and staff by typing in questions and responding to each other. 
+  The set of topics defined to promote course-wide or unit-specific dialog. Students use the discussion topics to communicate with each other and the course staff in threaded excahnges. 
 
-  See :ref:`Working with Discussion Components` for more information.
+  See :ref:`Discussions` for more information.
 
 
 .. _Discussion Component:
  
 **Discussion Component**
 
-  Forums that course staff can add directly to units. For example, a Video component can be followed by a Discussion component so that students can discuss the video content without having to leave the page.
+  Discussion topics that course staff add directly to units. For example, a Video component can be followed by a Discussion component so that students can discuss the video content without having to leave the page.
 
   See :ref:`Working with Discussion Components` for more information.
 
@@ -189,7 +190,7 @@ E
  
 **edX101**
 
-  edX’s online course about how to create online courses. The intended audience is faculty and university administrators It is also the first course ever to have been developed entirely using edX Studio.
+  edX’s online course about how to create online courses. The intended audience is faculty and university administrators. It is also the first course ever to have been developed entirely using edX Studio.
 
 .. _edX101: https://edge.edx.org/courses/edX/edX101/How_to_Create_an_edX_Course/about
 
@@ -198,7 +199,7 @@ E
  
 **edX Edge**
 
-  A less restricted site than edX.org. While only consortium members can create and post content on edX.org, any users with course creator permissions can create courses with Studio  on studio.edge.edx.org, then view the courses on the learning management system at edge.edx.org.
+  A less restricted site than edX.org. While only consortium members can create and post content on edX.org, any users with course creator permissions can create courses with Studio on studio.edge.edx.org, then view the courses on the learning management system at edge.edx.org.
 
 .. _Edge: http://edge.edx.org
 
@@ -220,7 +221,15 @@ E
 
   Practice or practical problems interspersed in edX course content to keep the learner engaged. Exercises are also an important measure of teaching effectiveness and learner comprehension.
 
+.. _F:
+
+***
+F
+***
 
+**Forum**
+
+  See :ref:`Discussion`.
 
 .. _G:
 
@@ -311,7 +320,9 @@ L
  
 **Learning Management System (LMS)**
 
-  The platform that students use to view courses.
+  The platform that students use to view courses, and that course staff members
+  use to manage enrollment and staff privileges, moderate dicussions, and
+  access data while the course is running.
 
 
 
@@ -319,7 +330,7 @@ L
  
 **Live Mode**
 
-  A view that  allows course staff to review all public units as students see them,  regardless of the release dates of the section and subsection that contain the units.
+  A view that allows course staff to review all public units as students see them, regardless of the release dates of the section and subsection that contain the units.
 
   See :ref:`View Your Live Course` for more information.
 
@@ -385,7 +396,10 @@ P
  
 **Pages**
 
-  Pages that supplement the courseware for a course. Each page appears in your course's navigation bar. 
+  Pages organize course materials into categories that students select in the
+  learning management system. Pages provide access to the courseware and to
+  tools and uploaded files that supplement the course. Each page appears in
+  your course's navigation bar.
 
   See :ref:`Adding Pages to a Course` for more information.
 
@@ -464,11 +478,20 @@ S
  
 **Section**
 
-  The topmost category in your course. A section can represent a time period in your course, or another organizing principle.
+  The topmost category in your course. A section can represent a time period in your course or another organizing principle.
 
   See :ref:`Sections` for more information.
 
 
+.. _Short Course Description:
+ 
+**Short Course Description**
+
+  The description of your course that appears on the edX `Course List
+  <https://www.edx.org/course-list>`_ page.
+
+  See :ref:`Describe Your Course` for more information.
+
 
 .. _Simple Editor_g:
  
@@ -488,14 +511,6 @@ S
 
 
 
-.. _Short Course Description:
- 
-**Short Course Description**
-
-  The description of your course that appears on the edX `Course List <https://www.edx.org/course-list>`_ page.
-
-  See :ref:`Describe Your Course` for more information.
-
 
 .. _T:
 

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

@@ -68,11 +68,14 @@ Time sensitive problems
 
 * Please alert the course staff about problems that need to be dealt with quickly, such as problems with a graded assignment. Setting up a course email address that is checked frequently is a good way to manage these alerts. 
 
-* Content Questions 
+============================
+Content Questions 
+============================
 
- - Assist with content questions sensitively, but be careful not to post spoilers. Do not ask students to post their solutions!
+* Assist with content questions sensitively, but be careful not to post
+  spoilers. Do not ask students to post their solutions!
 
- - A good guiding question can be better than an answer.
+* A good guiding question can be better than an answer.
 
 ============================
 Redundant posts