You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2019/05/31 07:29:25 UTC
[isis] 02/02: ISIS-2062: fixing bad links
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2062-antora
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 1c064dddc371af077ae9442f9d8197fb89a5d84b
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri May 31 08:29:04 2019 +0100
ISIS-2062: fixing bad links
---
antora/README.adoc | 1 -
antora/components/demoapp/antora.yml | 5 ++---
.../modules/cfg/pages/_partials/_rgcfg_configuring-core.adoc | 1 -
.../_partials/_rgcms_classes_AppManifest-bootstrapping.adoc | 1 -
antora/components/toc/antora.yml | 2 +-
antora/components/toc/modules/ROOT/nav.adoc | 2 +-
.../toc/modules/ROOT/pages/{documentation.adoc => about.adoc} | 0
.../_ugfun_getting-started_helloworld-archetype.adoc | 2 +-
.../_partials/_ugfun_getting-started_simpleapp-archetype.adoc | 2 +-
antora/components/ug/modules/fun/pages/ugfun.adoc | 11 -----------
migration-notes.adoc | 2 --
site.yml | 2 +-
12 files changed, 7 insertions(+), 24 deletions(-)
diff --git a/antora/README.adoc b/antora/README.adoc
index 349606c..933c68b 100644
--- a/antora/README.adoc
+++ b/antora/README.adoc
@@ -1,5 +1,4 @@
= Antora Template
-:toc:
The documentation for this template is published on http://docserver/ReleaseEngineering/AntoraTemplate[docserver]
It includes a checklist on how to use this template in your own repositories.
diff --git a/antora/components/demoapp/antora.yml b/antora/components/demoapp/antora.yml
index 1372ddf..5768159 100644
--- a/antora/components/demoapp/antora.yml
+++ b/antora/components/demoapp/antora.yml
@@ -1,7 +1,6 @@
-name: apps
-title: Applications
+name: demoapp
+title: Demo App
version: master
start_page: ROOT:about.adoc
nav:
- modules/ROOT/nav.adoc
-- modules/demoapp/nav.adoc
diff --git a/antora/components/rg/modules/cfg/pages/_partials/_rgcfg_configuring-core.adoc b/antora/components/rg/modules/cfg/pages/_partials/_rgcfg_configuring-core.adoc
index 3d7d672..4653165 100644
--- a/antora/components/rg/modules/cfg/pages/_partials/_rgcfg_configuring-core.adoc
+++ b/antora/components/rg/modules/cfg/pages/_partials/_rgcfg_configuring-core.adoc
@@ -1,4 +1,3 @@
-:toc:
= Configuring Core
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
include::_attributes.adoc[]
diff --git a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_AppManifest-bootstrapping.adoc b/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_AppManifest-bootstrapping.adoc
index a3d882e..7bf7c6d 100644
--- a/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_AppManifest-bootstrapping.adoc
+++ b/antora/components/rg/modules/cms/pages/_partials/_rgcms_classes_AppManifest-bootstrapping.adoc
@@ -1,5 +1,4 @@
= `AppManifest` (bootstrapping)
-:toc:
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
include::_attributes.adoc[]
diff --git a/antora/components/toc/antora.yml b/antora/components/toc/antora.yml
index 163f43f..5cfc106 100644
--- a/antora/components/toc/antora.yml
+++ b/antora/components/toc/antora.yml
@@ -1,7 +1,7 @@
name: toc
title: Table of Contents
version: master
-start_page: ROOT:documentation.adoc
+start_page: ROOT:about.adoc
nav:
- modules/ROOT/nav.adoc
- modules/how-tos/nav.adoc
diff --git a/antora/components/toc/modules/ROOT/nav.adoc b/antora/components/toc/modules/ROOT/nav.adoc
index ba1184c..69d8d52 100644
--- a/antora/components/toc/modules/ROOT/nav.adoc
+++ b/antora/components/toc/modules/ROOT/nav.adoc
@@ -1,2 +1,2 @@
-* xref:documentation.adoc[Table of Contents]
+* xref:about.adoc[Table of Contents]
diff --git a/antora/components/toc/modules/ROOT/pages/documentation.adoc b/antora/components/toc/modules/ROOT/pages/about.adoc
similarity index 100%
rename from antora/components/toc/modules/ROOT/pages/documentation.adoc
rename to antora/components/toc/modules/ROOT/pages/about.adoc
diff --git a/antora/components/ug/modules/fun/pages/_partials/_ugfun_getting-started_helloworld-archetype.adoc b/antora/components/ug/modules/fun/pages/_partials/_ugfun_getting-started_helloworld-archetype.adoc
index 9811572..00b7332 100644
--- a/antora/components/ug/modules/fun/pages/_partials/_ugfun_getting-started_helloworld-archetype.adoc
+++ b/antora/components/ug/modules/fun/pages/_partials/_ugfun_getting-started_helloworld-archetype.adoc
@@ -497,7 +497,7 @@ The REST API implemented by Apache Isis is specified in the link:http://www.rest
== Experimenting with the App
Once you are familiar with the generated app, try modifying it.
-There is plenty more guidance on this site; start with this guide (fundamentals) and then look at the other guides available the main xref:toc:ROOT:documentation.adoc#[documentation] page.
+There is plenty more guidance on this site; start with this guide (fundamentals) and then look at the other guides linked to from the top-level menu or from the main xref:toc:ROOT:about.adoc[table of contents].
If you use IntelliJ IDEA or Eclipse, do also install the xref:support:dg:dg.adoc#__dg_ide_intellij_live-templates[live templates (for IntelliJ)] / xref:support:dg:dg.adoc#editor-templates[editor templates (for Eclipse)]; these will help you follow the Apache Isis naming conventions.
diff --git a/antora/components/ug/modules/fun/pages/_partials/_ugfun_getting-started_simpleapp-archetype.adoc b/antora/components/ug/modules/fun/pages/_partials/_ugfun_getting-started_simpleapp-archetype.adoc
index 6721091..e92eb98 100644
--- a/antora/components/ug/modules/fun/pages/_partials/_ugfun_getting-started_simpleapp-archetype.adoc
+++ b/antora/components/ug/modules/fun/pages/_partials/_ugfun_getting-started_simpleapp-archetype.adoc
@@ -729,7 +729,7 @@ docker run -p 8080:8080 -d danhaywood/simpleapp:20180315.0935.master.4521215
== Modifying the App
Once you are familiar with the generated app, you'll want to start modifying it.
-There is plenty of guidance on this site; start with this guide (fundamentals) and then look at the other guides available the main xref:toc:ROOT:documentation.adoc[documentation] page.
+There is plenty of guidance on this site; start with this guide (fundamentals) and then look at the other guides linked to from the top-level menu or from the main xref:toc:ROOT:about.adoc[table of contents].
If you use IntelliJ IDEA or Eclipse, do also install the xref:support:dg:dg.adoc#__dg_ide_intellij_live-templates[live templates (for IntelliJ)] / xref:support:dg:dg.adoc#editor-templates[editor templates (for Eclipse)]; these will help you follow the Apache Isis naming conventions.
diff --git a/antora/components/ug/modules/fun/pages/ugfun.adoc b/antora/components/ug/modules/fun/pages/ugfun.adoc
index b6d3bd3..319e087 100644
--- a/antora/components/ug/modules/fun/pages/ugfun.adoc
+++ b/antora/components/ug/modules/fun/pages/ugfun.adoc
@@ -1,29 +1,18 @@
= Fundamentals
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
include::_attributes.adoc[]
-:numbered:
-:generate_pdf:
-:toc:
include::partial$_ugfun_core-concepts.adoc[leveloffset=+1]
-
include::partial$_ugfun_building-blocks.adoc[leveloffset=+1]
-
include::partial$_ugfun_getting-started_helloworld-archetype.adoc[leveloffset=+1]
-
include::partial$_ugfun_getting-started_simpleapp-archetype.adoc[leveloffset=+1]
-
include::partial$_ugfun_programming-model.adoc[leveloffset=+1]
include::partial$_ugfun_ui-hints.adoc[leveloffset=+1]
-
include::partial$_ugfun_crud.adoc[leveloffset=+1]
-
include::partial$_ugfun_business-rules.adoc[leveloffset=+1]
-
include::partial$_ugfun_drop-downs-and-defaults.adoc[leveloffset=+1]
-
include::partial$_ugfun_available-domain-services.adoc[leveloffset=+1]
diff --git a/migration-notes.adoc b/migration-notes.adoc
index b8919e1..a48093e 100644
--- a/migration-notes.adoc
+++ b/migration-notes.adoc
@@ -1,7 +1,5 @@
= Migration Notes
-:toc:
-
Search also for: "TODO: v2: " in the .adoc documentation.
== 2.0.0-M2 to 2.0.0-M3
diff --git a/site.yml b/site.yml
index a33cbc4..8bd2164 100644
--- a/site.yml
+++ b/site.yml
@@ -2,7 +2,7 @@ site:
title: Apache Isis
url: https://isis.apache.org/
start_page: ug:fun:about.adoc
-# start_page: toc:ROOT:documentation.adoc
+# start_page: toc:ROOT:about.adoc
content:
sources: