This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a commit to branch STABLE-4.1
in repository https://gitbox.apache.org/repos/asf/cayenne.git
The following commit(s) were added to refs/heads/STABLE-4.1 by this push:
new 3b7dc8a Docs: fix warnings
3b7dc8a is described below
commit 3b7dc8a10a83b36a5c1fac066bdc9a5a1448ddca
Author: Nikita Timofeev <[email protected]>
AuthorDate: Thu Nov 14 11:31:54 2019 +0300
Docs: fix warnings
---
.../src/docs/asciidoc/_cayenne-guide/part1/modeler.adoc | 6 ++----
.../docs/asciidoc/_cayenne-guide/part2/queries/sqlscripting.adoc | 2 +-
.../src/docs/asciidoc/_cayenne-guide/part5/cayenneRopServer.adoc | 4 ++--
.../src/docs/asciidoc/_cayenne-guide/part5/jCache.adoc | 4 ++--
4 files changed, 7 insertions(+), 9 deletions(-)
diff --git
a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part1/modeler.adoc
b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part1/modeler.adoc
index bb101d4..fb4e3d7 100644
---
a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part1/modeler.adoc
+++
b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part1/modeler.adoc
@@ -59,11 +59,9 @@ Cayenne supports three PK generation strategies:
1. *Cayenne Generated*.
This is default strategy. Cayenne will use special table `AUTO_PK_SUPPORT` for
managing primary keys.
-
-1. *Database Generated*.
+2. *Database Generated*.
Cayenne will delegate PK generation to database (e.g. auto increment fields on
MySQL or `serial` type on PostgreSQL)
-
-1. *Custom Sequence*. In this case Cayenne will use provided sequence to
generate primary keys.
+3. *Custom Sequence*. In this case Cayenne will use provided sequence to
generate primary keys.
Strategy should be set per each `DbEntity` independently.
diff --git
a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/sqlscripting.adoc
b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/sqlscripting.adoc
index f05db89..e8d280d 100644
---
a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/sqlscripting.adoc
+++
b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/queries/sqlscripting.adoc
@@ -278,5 +278,5 @@ Full example:
SELECT #result('ID' 'int'), #result('NAME' 'String'), #result('DATE_OF_BIRTH'
'java.util.Date') FROM ARTIST
----
-NOTE: For advanced features you may look at the <<Apache Velocity extension>>
+NOTE: For advanced features you may look at the <<Apache Velocity Extension>>
diff --git
a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/cayenneRopServer.adoc
b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/cayenneRopServer.adoc
index 69ff34b..3260b43 100644
---
a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/cayenneRopServer.adoc
+++
b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/cayenneRopServer.adoc
@@ -19,7 +19,7 @@ include::../var.adoc[]
Creates services for the server side of an <<rop,ROP>> application.
-===== Maven
+==== Maven
[source, XML,subs="verbatim,attributes"]
----
@@ -30,7 +30,7 @@ Creates services for the server side of an <<rop,ROP>>
application.
</dependency>
----
-===== Gradle
+==== Gradle
[source, Groovy,subs="verbatim,attributes"]
----
diff --git
a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/jCache.adoc
b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/jCache.adoc
index d1882fd..b5eecb1 100644
---
a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/jCache.adoc
+++
b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/jCache.adoc
@@ -63,9 +63,9 @@ ServerRuntime.builder()
NOTE: You can read about using cache in Cayenne in xref:caching[this] chapter.
-You may else be interested in <<Cache invalidation extension>>.
+You may else be interested in <<Cache Invalidation Extension>>.
-===== Ehcache setup example
+==== Ehcache setup example
Here is an example of using `ehcache` as cache manager.
First you need to include `ehcache` dependency:
