You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2020/09/05 09:04:05 UTC
[isis] branch master updated: ISIS-2426: adoc: fix broken reference
(model annotation docs)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new e14e2bd ISIS-2426: adoc: fix broken reference (model annotation docs)
e14e2bd is described below
commit e14e2bd68260f59c0d3ff9e182fb3448e82d0027
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sat Sep 5 11:03:46 2020 +0200
ISIS-2426: adoc: fix broken reference (model annotation docs)
---
antora/playbooks/site-extensions.yml | 2 +-
antora/playbooks/site.yml | 2 +-
extensions/adoc/modules/ROOT/partials/component-nav.adoc | 2 +-
extensions/core/model-annotation/{src/main => }/adoc/antora.yml | 2 +-
.../core/model-annotation/{src/main => }/adoc/modules/model/nav.adoc | 0
.../model-annotation/{src/main => }/adoc/modules/model/pages/about.adoc | 0
.../{src/main => }/adoc/modules/model/partials/module-nav.adoc | 0
7 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/antora/playbooks/site-extensions.yml b/antora/playbooks/site-extensions.yml
index 0ec7b3c..173c46a 100644
--- a/antora/playbooks/site-extensions.yml
+++ b/antora/playbooks/site-extensions.yml
@@ -38,7 +38,7 @@ content:
branches: HEAD
- url: .
- start_path: extensions/core/model-annotation/src/main/adoc # extensions
+ start_path: extensions/core/model-annotation/adoc # extensions
branches: HEAD
- url: .
start_path: extensions/core/command-log/adoc # extensions
diff --git a/antora/playbooks/site.yml b/antora/playbooks/site.yml
index dbe0649..c9035d0 100644
--- a/antora/playbooks/site.yml
+++ b/antora/playbooks/site.yml
@@ -103,7 +103,7 @@ content:
branches: HEAD
- url: .
- start_path: extensions/core/model-annotation/src/main/adoc # extensions
+ start_path: extensions/core/model-annotation/adoc # extensions
branches: HEAD
- url: .
start_path: extensions/core/command-log/adoc # extensions
diff --git a/extensions/adoc/modules/ROOT/partials/component-nav.adoc b/extensions/adoc/modules/ROOT/partials/component-nav.adoc
index 1b77a8a..23a5de7 100644
--- a/extensions/adoc/modules/ROOT/partials/component-nav.adoc
+++ b/extensions/adoc/modules/ROOT/partials/component-nav.adoc
@@ -5,7 +5,7 @@ include::extensions:ROOT:partial$module-nav.adoc[]
include::security:session-log:partial$module-nav.adoc[]
include::command-log:partial$module-nav.adoc[]
include::userguide:flyway:partial$module-nav.adoc[]
-include::model-annotation:partial$module-nav.adoc[]
+include::userguide:model:partial$module-nav.adoc[]
* Security
include::security:shiro-realm-ldap:partial$module-nav.adoc[]
diff --git a/extensions/core/model-annotation/src/main/adoc/antora.yml b/extensions/core/model-annotation/adoc/antora.yml
similarity index 98%
rename from extensions/core/model-annotation/src/main/adoc/antora.yml
rename to extensions/core/model-annotation/adoc/antora.yml
index bc87cdc..448d819 100644
--- a/extensions/core/model-annotation/src/main/adoc/antora.yml
+++ b/extensions/core/model-annotation/adoc/antora.yml
@@ -15,5 +15,5 @@
# specific language governing permissions and limitations
# under the License.
-name: incubator
+name: userguide
version: latest
diff --git a/extensions/core/model-annotation/src/main/adoc/modules/model/nav.adoc b/extensions/core/model-annotation/adoc/modules/model/nav.adoc
similarity index 100%
rename from extensions/core/model-annotation/src/main/adoc/modules/model/nav.adoc
rename to extensions/core/model-annotation/adoc/modules/model/nav.adoc
diff --git a/extensions/core/model-annotation/src/main/adoc/modules/model/pages/about.adoc b/extensions/core/model-annotation/adoc/modules/model/pages/about.adoc
similarity index 100%
rename from extensions/core/model-annotation/src/main/adoc/modules/model/pages/about.adoc
rename to extensions/core/model-annotation/adoc/modules/model/pages/about.adoc
diff --git a/extensions/core/model-annotation/src/main/adoc/modules/model/partials/module-nav.adoc b/extensions/core/model-annotation/adoc/modules/model/partials/module-nav.adoc
similarity index 100%
rename from extensions/core/model-annotation/src/main/adoc/modules/model/partials/module-nav.adoc
rename to extensions/core/model-annotation/adoc/modules/model/partials/module-nav.adoc