tinkerpop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From spmalle...@apache.org
Subject [tinkerpop] 01/01: Merge branch 'tp33'
Date Mon, 22 Oct 2018 19:49:48 GMT
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit db429a8054f1eb02dff82cbfe55243b5bb3f3355
Merge: 11f9949 a7ae62c
Author: Stephen Mallette <spmva@genoprime.com>
AuthorDate: Mon Oct 22 13:27:43 2018 -0400

    Merge branch 'tp33'
    
    Conflicts:
    	docs/src/reference/intro.asciidoc

 README.asciidoc                                       |  2 +-
 docs/src/dev/developer/release.asciidoc               | 13 ++++++++++---
 docs/src/dev/future/index.asciidoc                    |  8 ++++----
 docs/src/dev/io/index.asciidoc                        |  2 +-
 docs/src/dev/provider/index.asciidoc                  |  8 ++++----
 docs/src/index.asciidoc                               |  2 +-
 docs/src/recipes/index.asciidoc                       |  2 +-
 docs/src/reference/intro.asciidoc                     | 10 +++++-----
 docs/src/reference/the-traversal.asciidoc             |  2 +-
 docs/src/tutorials/getting-started/index.asciidoc     |  2 +-
 docs/src/tutorials/the-gremlin-console/index.asciidoc |  2 +-
 docs/src/upgrade/index.asciidoc                       |  6 +++---
 12 files changed, 33 insertions(+), 26 deletions(-)

diff --cc docs/src/reference/intro.asciidoc
index e8f54a7,9315fe1..c141f28
--- a/docs/src/reference/intro.asciidoc
+++ b/docs/src/reference/intro.asciidoc
@@@ -44,11 -46,11 +44,11 @@@ link:http://tinkerpop.apache.org/docs/x
  .TinkerPop Modern
  image::tinkerpop-modern.png[width=500]
  
- TinkerPop 3.x is the third incarnation of the TinkerPop graph computing framework. Similar
to computing in general, graph
- computing makes a distinction between *structure* (graph) and *process* (traversal). The
structure of the graph is the
- data model defined by a vertex/edge/property link:http://en.wikipedia.org/wiki/Network_topology[topology].
The process
- of the graph is the means by which the structure is analyzed. The typical form of graph
processing is called a
- link:http://en.wikipedia.org/wiki/Graph_traversal[traversal].
 -TinkerPop3 is the third incarnation of the Apache TinkerPop™ graph computing framework.
Similar to computing in
++TinkerPop 3.x is the third incarnation of the Apache TinkerPop™ graph computing framework.
Similar to computing in
+ general, graph computing makes a distinction between *structure* (graph) and *process* (traversal).
The structure of
+ the graph is the data model defined by a vertex/edge/property link:http://en.wikipedia.org/wiki/Network_topology[topology].
+ The process of the graph is the means by which the structure is analyzed. The typical form
of graph processing is
+ called a link:http://en.wikipedia.org/wiki/Graph_traversal[traversal].
  
  Generally speaking, the structure or "graph" API is meant for link:http://tinkerpop.apache.org/providers.html[graph
providers]
  who are implementing the TinkerPop interfaces and the process or "traversal" API (i.e. Gremlin)
is meant for end-users


Mime
View raw message