[15/22] tinkerpop git commit: Merge branch 'tp33'

[sp...@apache.org]

Merge branch 'tp33'

Conflicts:
	docs/src/reference/the-traversal.asciidoc


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/78d1a62b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/78d1a62b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/78d1a62b

Branch: refs/heads/TINKERPOP-1975
Commit: 78d1a62b2ab96eba657ebc018a926d9be641464c
Parents: 849349a 0496922
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue May 29 16:16:08 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue May 29 16:16:08 2018 -0400

----------------------------------------------------------------------
 docs/src/reference/the-traversal.asciidoc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/78d1a62b/docs/src/reference/the-traversal.asciidoc
----------------------------------------------------------------------
diff --cc docs/src/reference/the-traversal.asciidoc
index d61da37,60357fe..e28090a
--- a/docs/src/reference/the-traversal.asciidoc
+++ b/docs/src/reference/the-traversal.asciidoc
@@@ -2961,8 -2959,7 +2961,7 @@@ g.V().as('a').out('knows').as('b')
  WARNING: The anonymous traversal of `where()` processes the current object "locally". In OLAP, where the atomic unit
  of computing is the vertex and its local "star graph," it is important that the anonymous traversal does not leave
  the confines of the vertex's star graph. In other words, it can not traverse to an adjacent vertex's properties or
- edges. Note that is only a temporary limitation that will be addressed in a future version of TinkerPop (see
- link:https://issues.apache.org/jira/browse/TINKERPOP-693[TINKERPOP-693]).
 -edges. 
++edges.
  
  *Additional References*