diff --git a/cms/templates/js/advanced_entry.underscore b/cms/templates/js/advanced_entry.underscore
index 17bb386974a416b3f2f43cb5d8d8e82c17591abd..cf92419a4cf99bc7f55642dfa932390593309ee8 100644
--- a/cms/templates/js/advanced_entry.underscore
+++ b/cms/templates/js/advanced_entry.underscore
@@ -7,7 +7,8 @@
       <div class="field text value">
         <label class="sr" for="<%- valueUniqueId %>"><%- display_name %></label>
         <textarea class="json text" id="<%- valueUniqueId %>"><%- value %></textarea>
-        <span class="tip tip-stacked"><%- help %></span>
+        <% // xss-lint: disable=underscore-not-escaped %>
+        <span class="tip tip-stacked"><%= help %></span>
       </div>
       <% if (deprecated) { %>
           <span class="status"><%- gettext("Deprecated") %></span>
diff --git a/common/lib/xmodule/xmodule/course_module.py b/common/lib/xmodule/xmodule/course_module.py
index e595d6bd50bbc76483b15fcc1884ee93594247b3..655a3b67e2c8afb5ef1430866d6504a14ad48c18 100644
--- a/common/lib/xmodule/xmodule/course_module.py
+++ b/common/lib/xmodule/xmodule/course_module.py
@@ -842,25 +842,10 @@ class CourseFields(object):
         display_name=_("Teams Configuration"),
         # Translators: please don't translate "id".
         help=_(
-            'Specify the maximum team size and topics for teams inside the provided set of curly braces. '
-            'Make sure that you enclose all of the sets of topic values within a set of square brackets, '
-            'with a comma after the closing curly brace for each topic, and another comma after the '
-            'closing square brackets. '
-            'For example, to specify that teams should have a maximum of 5 participants and provide a list of '
-            '2 topics, enter the configuration in this format: {example_format}. '
-            'If no max_size is provided, it will default to {default_max}'
-            'In "id" values, the only supported special characters are underscore, hyphen, and period.'
-            # Note that we also support space (" "), which may have been an accident, but it's in
-            # our DB now. Let's not advertise the fact, though.
-        ),
-        help_format_args=dict(
-            # Put the sample JSON into a format variable so that translators
-            # don't muck with it.
-            example_format=(
-                '{"topics": [{"name": "Topic1Name", "description": "Topic1Description", "id": "Topic1ID"}, '
-                '{"name": "Topic2Name", "description": "Topic2Description", "id": "Topic2ID"}], "max_team_size": 5}'
-            ),
-            default_max=str(DEFAULT_COURSE_RUN_MAX_TEAM_SIZE),
+            'Configure team sets, limit team sizes, and set visibility settings using JSON. See '
+            '<a target="&#95;blank" href="https://edx.readthedocs.io/projects/edx-partner-course-staff/en/latest/'
+            'course_features/teams/teams_setup.html#enable-and-configure-teams">teams '
+            'configuration documentation</a> for help and examples.'
         ),
         scope=Scope.settings,
     )