diff --git a/common/lib/xmodule/xmodule/course_module.py b/common/lib/xmodule/xmodule/course_module.py
index 37a678b1d4..35acd24931 100644
--- a/common/lib/xmodule/xmodule/course_module.py
+++ b/common/lib/xmodule/xmodule/course_module.py
@@ -266,7 +266,7 @@ class CourseFields(object):
     )
     cohort_config = Dict(
         display_name=_("Cohort Configuration"),
-        help=_("Cohorts are not currently supported by edX."),
+        help=_("Enter policy keys and values to enable the cohort feature, define automated student assignment to groups, or identify any course-wide discussion topics as private to cohort members."),
         scope=Scope.settings
     )
     is_new = Boolean(
diff --git a/common/static/coffee/spec/discussion/discussion_spec_helper.coffee b/common/static/coffee/spec/discussion/discussion_spec_helper.coffee
index f7d6835363..a957570696 100644
--- a/common/static/coffee/spec/discussion/discussion_spec_helper.coffee
+++ b/common/static/coffee/spec/discussion/discussion_spec_helper.coffee
@@ -331,7 +331,7 @@ browser and pasting the output.  When that file changes, this one should be rege
                     <% }); %>
                  </select>
             </label><div class="field-help">
-                Instructors can set whether a post in a cohorted topic is visible to all cohorts or only to a specific cohort.
+                Discussion admins, moderators, and TAs can make their posts visible to all students or specify a single cohort group.
             </div>
         </div>
         <% } %>
diff --git a/lms/templates/discussion/_underscore_templates.html b/lms/templates/discussion/_underscore_templates.html
index cf9ca04d65..8cdd031b60 100644
--- a/lms/templates/discussion/_underscore_templates.html
+++ b/lms/templates/discussion/_underscore_templates.html
@@ -421,7 +421,7 @@
                     ${'<% }); %>'}
                  </select>
             </label><div class="field-help">
-                ${_("Instructors can set whether a post in a cohorted topic is visible to all cohorts or only to a specific cohort.")}
+                ${_("Discussion admins, moderators, and TAs can make their posts visible to all students or specify a single cohort group.")}
             </div>
         </div>
         ${'<% } %>'}
diff --git a/lms/templates/instructor/instructor_dashboard_2/cohort-editor.underscore b/lms/templates/instructor/instructor_dashboard_2/cohort-editor.underscore
index 8b22401b70..9c7c37fad1 100644
--- a/lms/templates/instructor/instructor_dashboard_2/cohort-editor.underscore
+++ b/lms/templates/instructor/instructor_dashboard_2/cohort-editor.underscore
@@ -17,10 +17,11 @@
         <div class="setup-value">
             <% if (cohort.get('assignment_type') == "none") { %>
                 <%= gettext("Students are added to this group only when you provide their email addresses or usernames on this page.") %>
+                <a href="http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/cohorts/cohort_config.html#assign-students-to-cohort-groups-manually" class="incontext-help action-secondary action-help"><%= gettext("What does this mean?") %></a>
             <% } else { %>
                 <%= gettext("Students are added to this group automatically.") %>
+                <a href="http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/cohorts/cohorts_overview.html#all-automated-assignment" class="incontext-help action-secondary action-help"><%= gettext("What does this mean?") %></a>
             <% } %>
-            <a href="http://edx.readthedocs.org" class="incontext-help action-secondary action-help"><%= gettext("What does this mean?") %></a>
         </div>
         <div class="setup-actions">
             <% if (advanced_settings_url != "None") { %>