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 1d8a5c825f6c7c16f4c73ec06a335296943802dd
Merge: b9afe89d0e a080dfa6d5
Author: Stephen Mallette <[email protected]>
AuthorDate: Wed Aug 26 15:48:36 2026 +0000

    Merge branch '3.8-dev'
    
    Resolved docs conflicts from the Sample Data book merge; fixed a dangling 
grateful-dead xref in the-traversal.asciidoc left by master's match() rewrite.
    
    Assisted-by: Claude Code:claude-opus-4-8

 docs/src/data/grateful-dead.asciidoc               | 124 +++++++++++++++++++++
 docs/src/data/index.asciidoc                       |  59 ++++++++++
 docs/src/data/modern.asciidoc                      | 106 ++++++++++++++++++
 docs/src/data/the-crew.asciidoc                    | 122 ++++++++++++++++++++
 docs/src/dev/io/graphml.asciidoc                   |   3 +-
 docs/src/dev/io/graphson.asciidoc                  |   3 +-
 docs/src/index.asciidoc                            |   3 +
 docs/src/recipes/centrality.asciidoc               |   4 +-
 docs/src/reference/intro.asciidoc                  |   5 +-
 docs/src/reference/the-graph.asciidoc              |   2 +
 docs/src/reference/the-traversal.asciidoc          |   3 +-
 docs/src/tutorials/getting-started/index.asciidoc  |   3 +
 .../tutorials/the-gremlin-console/index.asciidoc   |  12 +-
 pom.xml                                            |  55 +++++++++
 14 files changed, 493 insertions(+), 11 deletions(-)

diff --cc docs/src/dev/io/graphson.asciidoc
index e8effbecba,c0092a97fb..44ee2c396a
--- a/docs/src/dev/io/graphson.asciidoc
+++ b/docs/src/dev/io/graphson.asciidoc
@@@ -69,7 -64,8 +69,8 @@@ writer.writeObject(os, graph)
  Generalized object serialization will be discussed later in this section, so 
for now the focus will be on the "graph"
  format. Unlike GraphML, GraphSON does not use an edge list format. It uses an 
adjacency list. In the adjacency list,
  each vertex is essentially a line in the file and the vertex line contains a 
list of all the edges associated with
- that vertex. The GraphSON 4.0 representation looks like this for the Modern 
toy graph:
 -that vertex. The GraphSON 3.0 representation looks like this for the
++that vertex. The GraphSON 4.0 representation looks like this for the
+ link:https://tinkerpop.apache.org/docs/x.y.z/data/#modern[Modern toy graph]:
  
  [source,json]
  ----
diff --cc docs/src/reference/the-traversal.asciidoc
index 39ba7074e3,1475bafb2f..20f4888d7b
--- a/docs/src/reference/the-traversal.asciidoc
+++ b/docs/src/reference/the-traversal.asciidoc
@@@ -1051,7 -914,7 +1051,8 @@@ g.V().sideEffect{println "first: ${it}"
  The theory behind a "bulking optimization" is simple. If there are one 
million traversers at vertex 1, then there is
  no need to calculate one million `both()`-computations. Instead, represent 
those one million traversers as a single
  traverser with a `Traverser.bulk()` equal to one million and execute `both()` 
once. A bulking optimization example is
--made more salient on a larger graph. Therefore, the example below leverages 
the <<grateful-dead,Grateful Dead graph>>.
++made more salient on a larger graph. Therefore, the example below leverages 
the
++link:https://tinkerpop.apache.org/docs/x.y.z/data/#grateful-dead[Grateful 
Dead graph].
  
  [gremlin-groovy]
  ----
diff --cc docs/src/tutorials/the-gremlin-console/index.asciidoc
index aaaae7c44b,211e19b6bb..feda5e1af3
--- a/docs/src/tutorials/the-gremlin-console/index.asciidoc
+++ b/docs/src/tutorials/the-gremlin-console/index.asciidoc
@@@ -110,13 -111,12 +111,15 @@@ documented in the link:https://tinkerpo
  * `createClassic()` - The original TinkerPop 2.x toy graph 
(link:https://tinkerpop.apache.org/docs/x.y.z/images/tinkerpop-classic.png[diagram]).
  * `createModern()` - The TinkerPop 3.x representation of the "classic" graph, 
where the main difference is that vertex
  labels are defined and the "weight" edge property is a `double` rather than a 
`float`
- 
(link:https://tinkerpop.apache.org/docs/x.y.z/images/tinkerpop-modern.png[diagram]).
+ 
(link:https://tinkerpop.apache.org/docs/x.y.z/images/tinkerpop-modern.png[diagram],
+ link:https://tinkerpop.apache.org/docs/x.y.z/data/#modern[reference]).
  * `createTheCrew()` - A graph that demonstrates usage of the new structural 
features of TinkerPop 3.x such as
  
link:https://tinkerpop.apache.org/docs/x.y.z/reference/#vertex-properties[vertex
 meta-properties and multi-properties]
- 
(link:https://tinkerpop.apache.org/docs/x.y.z/images/the-crew-graph.png[diagram]).
+ 
(link:https://tinkerpop.apache.org/docs/x.y.z/images/the-crew-graph.png[diagram],
+ link:https://tinkerpop.apache.org/docs/x.y.z/data/#the-crew[reference]).
 +* `createTheZoo()` - A graph that demonstrates usage of TinkerPop 4.x
 
+link:https://tinkerpop.apache.org/docs/x.y.z/reference/#vertex-labels[multi-label
 vertices] alongside a variety of
 +property types 
(link:https://tinkerpop.apache.org/docs/x.y.z/images/the-zoo-graph.png[diagram]).
  
  [gremlin-groovy]
  ----

Reply via email to