[isis] 09/09: ISIS-2267: more updates docs

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

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

commit 910c808518af4a0fdb81abf8f60a8c05a6cc2583
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Jan 20 17:47:00 2020 +0000

    ISIS-2267: more updates docs
---
 antora/components/extensions/modules/ROOT/partials/component-nav.adoc | 4 ++--
 antora/components/userguide/modules/ROOT/nav.adoc                     | 1 +
 antora/components/userguide/modules/ROOT/partials/component-nav.adoc  | 2 +-
 extensions/core/flyway/adoc/modules/flyway/pages/about.adoc           | 2 +-
 .../jdo/src/main/adoc/modules/ROOT/partials/component-nav.adoc        | 2 --
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/antora/components/extensions/modules/ROOT/partials/component-nav.adoc b/antora/components/extensions/modules/ROOT/partials/component-nav.adoc
index 0d5cc71..85bf24f 100644
--- a/antora/components/extensions/modules/ROOT/partials/component-nav.adoc
+++ b/antora/components/extensions/modules/ROOT/partials/component-nav.adoc
@@ -1,8 +1,8 @@
 include::extensions:ROOT:partial$module-nav.adoc[]
 
-* JDO Persistence
+* Core
 
-include::pjdo:flywayjdo:partial$module-nav.adoc[]
+include::userguide:flyway:partial$module-nav.adoc[]
 
 * Security
 include::security:shiro-realm-ldap:partial$module-nav.adoc[]
diff --git a/antora/components/userguide/modules/ROOT/nav.adoc b/antora/components/userguide/modules/ROOT/nav.adoc
index 8b13789..e34fb4b 100644
--- a/antora/components/userguide/modules/ROOT/nav.adoc
+++ b/antora/components/userguide/modules/ROOT/nav.adoc
@@ -1 +1,2 @@
+include::userguide:ROOT:partial$component-nav.adoc[]
 
diff --git a/antora/components/userguide/modules/ROOT/partials/component-nav.adoc b/antora/components/userguide/modules/ROOT/partials/component-nav.adoc
index 32bd5e9..f35ad96 100644
--- a/antora/components/userguide/modules/ROOT/partials/component-nav.adoc
+++ b/antora/components/userguide/modules/ROOT/partials/component-nav.adoc
@@ -3,6 +3,6 @@ include::userguide:btb:partial$module-nav.adoc[]
 
 * Extensions
 
-include::refguide:flyway:partial$module-nav.adoc[]
+include::userguide:flyway:partial$module-nav.adoc[]
 
 
diff --git a/extensions/core/flyway/adoc/modules/flyway/pages/about.adoc b/extensions/core/flyway/adoc/modules/flyway/pages/about.adoc
index d1877ec..f905c5d 100644
--- a/extensions/core/flyway/adoc/modules/flyway/pages/about.adoc
+++ b/extensions/core/flyway/adoc/modules/flyway/pages/about.adoc
@@ -60,7 +60,7 @@ In normal circumstances this is most easily peformed using with `autoCreateAll`
 If you want your tests to check your Flyway scripts beforehand, there is nothing to prevent you from using Flyway all the time, even for integration tests.
 
 One point to be aware of though is that the DDL syntax may vary between an in-memory database (such as H2) and a typical production database (such as PostgreSQL or SQL Server).
-Luckily, Spring Boot's Flyway integration allows different variants of scripts for different vendors to be stored, in `db.migration.{vendor}` package (where `{vendor}` is as defined by the https://github.com/spring-projects/spring-boot/blob/v2.2.3.RELEASE/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java[DatabaseDriver] class).
+Luckily, Spring Boot's Flyway integration allows different variants of scripts for different vendors to be stored, in `+db.migration.{vendor}+` package (where `{vendor}` is as defined by the https://github.com/spring-projects/spring-boot/blob/v2.2.3.RELEASE/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java[DatabaseDriver] class).
 The link:https://github.com/apache/isis-app-simpleapp[simpleapp starter app] also provides an example of this.
 
 
diff --git a/persistence/jdo/src/main/adoc/modules/ROOT/partials/component-nav.adoc b/persistence/jdo/src/main/adoc/modules/ROOT/partials/component-nav.adoc
index 6807b58..49c1365 100644
--- a/persistence/jdo/src/main/adoc/modules/ROOT/partials/component-nav.adoc
+++ b/persistence/jdo/src/main/adoc/modules/ROOT/partials/component-nav.adoc
@@ -1,4 +1,2 @@
 include::pjdo:ROOT:partial$module-nav.adoc[]
 
-* Extensions
-include::pjdo:flywayjdo:partial$module-nav.adoc[]