From 41542dae264b3893158a3e42b21fc4257abcf1ae Mon Sep 17 00:00:00 2001
From: "jdc@princeton.edu" <jdc@princeton.edu>
Date: Thu, 12 Apr 2018 23:23:31 -0400
Subject: [PATCH] =?UTF-8?q?=E2=80=A2=20Mechanism=20=20=20docstring:=20=20a?=
 =?UTF-8?q?dded=20explanation=20of=20assignment=20of=20target=20labels=20t?=
 =?UTF-8?q?o=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20output=5Flabels?=
 =?UTF-8?q?=5Fdict=20for=20Mechanism=20that=20projects=20to=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20TARGET=20Mechanism?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/runConfigurations/Make_HTML.xml         |  6 +++---
 psyneulink/components/mechanisms/mechanism.py | 17 ++++++++++++-----
 psyneulink/composition.py                     |  3 ++-
 psyneulink/globals/keywords.py                |  9 +++++----
 4 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/.idea/runConfigurations/Make_HTML.xml b/.idea/runConfigurations/Make_HTML.xml
index 52e2eb9e7aa..7e95a8f2e27 100644
--- a/.idea/runConfigurations/Make_HTML.xml
+++ b/.idea/runConfigurations/Make_HTML.xml
@@ -1,9 +1,9 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" factoryName="Sphinx task" name="Make HTML" singleton="true" type="docs">
-    <module name="" />
+  <configuration default="false" name="Make HTML" type="docs" factoryName="Sphinx task" singleton="true">
+    <module name="PsyNeuLink (Dropbox)" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
-    <option name="SDK_HOME" value="" />
+    <option name="SDK_HOME" value="$USER_HOME$/anaconda/envs/python35/bin/python" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/docs" />
     <option name="IS_MODULE_SDK" value="false" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
diff --git a/psyneulink/components/mechanisms/mechanism.py b/psyneulink/components/mechanisms/mechanism.py
index e773a1f3e51..71a79ab293f 100644
--- a/psyneulink/components/mechanisms/mechanism.py
+++ b/psyneulink/components/mechanisms/mechanism.py
@@ -687,12 +687,19 @@ class `UserList <https://docs.python.org/3.6/library/collections.html?highlight=
 The labels specified in these dictionaries can be used to specify items in the `inputs <Run_Inputs>` and `targets
 <Run_Targets>` arguments of the `run <System.run>` method of a `System`, and to report the values of the InputState(s)
 and OutputState(s) of a Mechanism in a System's `show_graph <System.show_graph>` method (using its **use_values**
-option).  The labels for the current value(s) of the Mechanism's InputState(s) and OutputState(s) are listed in its
-`input_labels <Mechanism_Base.input_labels>` and `output_labels <Mechanism_Base.output_labels>`, respectively.
+option).  If they are used to specify `targets <Run_Targets>`, they must be included in the `output_labels_dict
+<Mechanism_Base.output_labels_dict>` of the Mechanism that projects to the `TARGET` Mechanism (see `TARGET Mechanisms
+<LearningMechanism_Targets>`,  the last one in a `learning sequence <Process_Learning_Sequence>`.
+
+The labels for the current value(s) of the Mechanism's InputState(s) and OutputState(s) are listed in its
+`input_labels <Mechanism_Base.input_labels>` and `output_labels <Mechanism_Base.output_labels>` attributes,
+respectively.
+
+*Specifying label dictionaries*
 
 Label dictionaries can only be specified in a parameters dictionary assigned to the **params** argument of the
-Mechanism's constructor, using the keywords listed above.  A given label dictionary must contain entries *all* of which
-use *only one* of the two following formats for the *key:value* pair of each entry:
+Mechanism's constructor, using the keywords described above.  A given label dictionary must contain entries *all*
+of which use *only one* of the two following formats for the *key:value* pair of each entry:
 
     * *label:value* -- the *label* is a string to be associated with the specified value of the State. If the
       Mechanism has more than one State of the type corresponding to the dictionary, then the label will be used for
@@ -710,7 +717,7 @@ class `UserList <https://docs.python.org/3.6/library/collections.html?highlight=
       `output_states <Mechanism_Base.output_states>`), and the value a subdictionary containing *label:value* entries
       to be used for that State.  For example, if a Mechanism has two InputStates, named *SAMPLE* and *TARGET*, then
       *INPUT_LABELS_DICT* could be assigned two entries, *SAMPLE*:<dict> and *TARGET*:<dict> or, correspondingly,
-      0:<dict> and 1:<dict>, in which each dict contained separate *label:value* entries for each of the two
+      0:<dict> and 1:<dict>, in which each dict contained separate *label:value* entries for the *SAMPLE* and *TARGET*
       InputStates.
       COMMENT:
           ADD EXAMPLE HERE
diff --git a/psyneulink/composition.py b/psyneulink/composition.py
index 2a4d1cec8e6..72908425f57 100644
--- a/psyneulink/composition.py
+++ b/psyneulink/composition.py
@@ -126,7 +126,8 @@ class MechanismRole(Enum):
         `run <ComparatorMechanism.ComparatorMechanism.execute>` method.  It must be associated with the `TERMINAL`
         Mechanism of the Process or System. The `TARGET` Mechanisms of a Process or System are listed in its
         :keyword:`target_mechanisms` attribute, and can be displayed using its :keyword:`show` method.  For additional
-        details, see `TARGET mechanisms <LearningProjection_Targets>` and specifying `target values <Run_Targets>`.
+        details, see `TARGET Mechanisms <LearningMechanism_Targets>`, `learning sequence <Process_Learning_Sequence>`,
+        and specifying `target values <Run_Targets>`.
 
     - RECURRENT_INIT
         .
diff --git a/psyneulink/globals/keywords.py b/psyneulink/globals/keywords.py
index c6c08f041c4..c20f19bebf4 100644
--- a/psyneulink/globals/keywords.py
+++ b/psyneulink/globals/keywords.py
@@ -149,10 +149,11 @@ class MechanismRoles:
     TARGET
         A `ComparatorMechanism` of a `Process` and/or `System` configured for learning that receives a target value
         from its `execute <ComparatorMechanism.ComparatorMechanism.execute>` or
-        `run <ComparatorMechanism.ComparatorMechanism.execute>` method.  It must be associated with the `TERMINAL`
-        Mechanism of the Process or System. The `TARGET` Mechanisms of a Process or System are listed in its
-        :keyword:`target_mechanisms` attribute, and can be displayed using its :keyword:`show` method.  For additional
-        details, see `TARGET Mechanisms <LearningMechanism_Targets>` and specifying `target values <Run_Targets>`.
+        `run <ComparatorMechanism.ComparatorMechanism.execute>` method.  It is usually (but not necessarily)
+        associated with the `TERMINAL` Mechanism of the Process or System. The `TARGET` Mechanisms of a Process or
+        System are listed in its :keyword:`target_mechanisms` attribute, and can be displayed using its
+        :keyword:`show` method.  For additional details, see `TARGET Mechanisms <LearningMechanism_Targets>`,
+        `learning sequence <Process_Learning_Sequence>`, and specifying `target values <Run_Targets>`.
 
 
     """