This is an automated email from the ASF dual-hosted git repository. aadamchik pushed a commit to branch STABLE-4.2 in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit 31b70b85661242f19e016bdf7ff25ad02472b3d4 Merge: 2a9debc1c 9fc3109d9 Author: Andrus Adamchik <and...@objectstyle.com> AuthorDate: Sat Sep 23 10:40:12 2023 -0400 Merge branch '590' into STABLE-4.2 .../asciidoc/_cayenne-guide/part1/mapping.adoc | 2 +- .../asciidoc/_cayenne-guide/part1/modeler.adoc | 2 +- .../asciidoc/_cayenne-guide/part2/customize.adoc | 10 +- .../asciidoc/_cayenne-guide/part2/expressions.adoc | 82 +++++---------- .../asciidoc/_cayenne-guide/part2/lifecycle.adoc | 8 +- .../_cayenne-guide/part2/objectContext.adoc | 113 +++++++-------------- .../asciidoc/_cayenne-guide/part2/starting.adoc | 16 ++- .../docs/asciidoc/_cayenne-guide/part2/tuning.adoc | 4 +- .../asciidoc/_cayenne-guide/part4/filtering.adoc | 2 +- .../_cayenne-guide/part4/introduction.adoc | 2 +- .../_cayenne-guide/part4/revEngineering.adoc | 2 +- .../docs/asciidoc/_cayenne-guide/part5/jCache.adoc | 2 +- 12 files changed, 82 insertions(+), 163 deletions(-)