diff --git a/docs/en_us/course_authors/source/change_log.rst b/docs/en_us/course_authors/source/change_log.rst
index d74ae2edb8..d3cae484d7 100644
--- a/docs/en_us/course_authors/source/change_log.rst
+++ b/docs/en_us/course_authors/source/change_log.rst
@@ -13,6 +13,8 @@ October, 2014
 
    * - Date
      - Change
+   * - 10/23/14
+     - Added note about limited support of annotation problem type to :ref:`Annotation`.
    * - 10/16/14
      - Updated :ref:`Set Important Dates for Your Course` to reflect change
        that course dates now use UTC.
diff --git a/docs/en_us/course_authors/source/exercises_tools/annotation.rst b/docs/en_us/course_authors/source/exercises_tools/annotation.rst
index 6a0f4d781f..7ef992836d 100644
--- a/docs/en_us/course_authors/source/exercises_tools/annotation.rst
+++ b/docs/en_us/course_authors/source/exercises_tools/annotation.rst
@@ -4,6 +4,8 @@
 Annotation Problem
 ###################
 
+.. note:: This version of the annotation problem type is a provisional feature. Support for this feature is limited.
+
 In an annotation problem, the instructor highlights specific text inside a larger text block and then asks questions about that text. The questions appear when students hover the mouse over the highlighted text. The questions also appear in a section below the text block, along with space for students' responses.
 
 Annotation problems ask students to respond to questions about a specific block of text. The question appears above the text when the student hovers the mouse over the highlighted text so that students can think about the question as they read.
diff --git a/docs/en_us/course_authors/source/exercises_tools/create_exercises_and_tools.rst b/docs/en_us/course_authors/source/exercises_tools/create_exercises_and_tools.rst
index a8e451182e..1c06abf1d9 100644
--- a/docs/en_us/course_authors/source/exercises_tools/create_exercises_and_tools.rst
+++ b/docs/en_us/course_authors/source/exercises_tools/create_exercises_and_tools.rst
@@ -25,7 +25,7 @@ General Exercises and Tools
           :width: 100
           :alt: Example annotation problem
      - :ref:`Annotation`
-     - Annotation problems ask students to respond to questions about a specific block of text. The question appears above the text when the student hovers the mouse over the highlighted text so that students can think about the question as they read.
+     - Annotation problems ask students to respond to questions about a specific block of text. The question appears above the text when the student hovers the mouse over the highlighted text so that students can think about the question as they read. Note that this problem type is not fully supported.
    * - .. image:: /Images/PollExample.png
           :width: 100
           :alt: Example poll