Merge branch '3.0' into 3.1

neo4j · Jul 1, 2016 · 035c12b · 035c12b
2 parents eb5e986 + e09f6ed
commit 035c12b
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/community/kernel/src/main/java/org/neo4j/procedure/Procedure.java b/community/kernel/src/main/java/org/neo4j/procedure/Procedure.java
@@ -51,7 +51,10 @@
  *     <li>{@link Double} or {@code double}</li>
  *     <li>{@link Number}</li>
  *     <li>{@link Boolean} or {@code boolean}</li>
- *     <li>{@link java.util.Map} with key {@link String} and value {@link Object}</li>
+ *     <li>{@link org.neo4j.graphdb.Node}</li>
+ *     <li>{@link org.neo4j.graphdb.Relationship}</li>
+ *     <li>{@link org.neo4j.graphdb.Path}</li>
+ *     <li>{@link java.util.Map} with key {@link String} and value of any type in this list, including {@link java.util.Map}</li>
  *     <li>{@link java.util.List} with element type of any type in this list, including {@link java.util.List}</li>
  *     <li>{@link Object}, meaning any valid input types</li>
  * </ul>
@@ -72,7 +75,7 @@
  *     <li>{@link org.neo4j.graphdb.Node}</li>
  *     <li>{@link org.neo4j.graphdb.Relationship}</li>
  *     <li>{@link org.neo4j.graphdb.Path}</li>
- *     <li>{@link java.util.Map} with key {@link String} and value {@link Object}</li>
+ *     <li>{@link java.util.Map} with key {@link String} and value of any type in this list, including {@link java.util.Map}</li>
  *     <li>{@link java.util.List} of elements of any valid field type, including {@link java.util.List}</li>
  *     <li>{@link Object}, meaning any of the valid field types</li>
  * </ul>