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 334001e1b541a04d3ba5965e2e0f1f915ba68c2f
Author: danhaywood <d...@haywood-associates.co.uk>
AuthorDate: Mon Feb 10 09:59:09 2020 +0000
ISIS-2062: fixes up redirects from old URLs.
---
antora/playbooks/site-comguide.yml | 4 ----
antora/playbooks/site-conguide.yml | 4 ----
antora/playbooks/site-core.yml | 4 ----
antora/playbooks/site-docs.yml | 4 ----
antora/playbooks/site-extensions.yml | 4 ----
antora/playbooks/site-incubator.yml | 4 ----
antora/playbooks/site-legacy.yml | 4 ----
antora/playbooks/site-mappings.yml | 4 ----
antora/playbooks/site-persistence.yml | 4 ----
antora/playbooks/site-refguide.yml | 4 ----
antora/playbooks/site-relnotes.yml | 4 ----
antora/playbooks/site-security.yml | 5 -----
antora/playbooks/site-setupguide.yml | 4 ----
antora/playbooks/site-subdomains.yml | 4 ----
antora/playbooks/site-testing.yml | 4 ----
antora/playbooks/site-userguide.yml | 4 ----
antora/playbooks/site-valuetypes.yml | 4 ----
antora/playbooks/site-vro.yml | 4 ----
antora/playbooks/site-vw.yml | 4 ----
antora/playbooks/site.yml | 3 ---
antora/redirects/guides/antora.yml | 6 ------
antora/redirects/guides/modules/ROOT/nav.adoc | 1 -
antora/redirects/guides/modules/ROOT/pages/about.adoc | 4 ----
antora/redirects/guides/modules/ugvro/nav.adoc | 3 ---
antora/redirects/guides/modules/ugvro/pages/ugvro.adoc | 4 ----
antora/redirects/guides/modules/ugvw/nav.adoc | 1 -
antora/redirects/guides/modules/ugvw/pages/ugvw.adoc | 3 ---
antora/supplemental-ui/ui.yml | 1 +
28 files changed, 1 insertion(+), 102 deletions(-)
diff --git a/antora/playbooks/site-comguide.yml
b/antora/playbooks/site-comguide.yml
index 8781e5b..b4a0262 100644
--- a/antora/playbooks/site-comguide.yml
+++ b/antora/playbooks/site-comguide.yml
@@ -13,10 +13,6 @@ content:
- url: .
start_path: antora/components/comguide # comguide
branches: HEAD
- - url: .
- start_path: antora/redirects/guides # docs
- branches: HEAD
-
# examples
- url: .
start_path: examples/demo/src/main/adoc # docs
diff --git a/antora/playbooks/site-conguide.yml
b/antora/playbooks/site-conguide.yml
index 9f2d58b..a0b0849 100644
--- a/antora/playbooks/site-conguide.yml
+++ b/antora/playbooks/site-conguide.yml
@@ -13,10 +13,6 @@ content:
- url: .
start_path: antora/components/conguide # conguide
branches: HEAD
- - url: .
- start_path: antora/redirects/guides # docs
- branches: HEAD
-
# examples
- url: .
start_path: examples/demo/src/main/adoc # docs
diff --git a/antora/playbooks/site-core.yml b/antora/playbooks/site-core.yml
index f15fa0c..a4350c2 100644
--- a/antora/playbooks/site-core.yml
+++ b/antora/playbooks/site-core.yml
@@ -10,10 +10,6 @@ content:
- url: .
start_path: antora/components/docs # docs
branches: HEAD
- - url: .
- start_path: antora/redirects/guides # docs
- branches: HEAD
-
# core
- url: .
start_path: core/adoc # core
diff --git a/antora/playbooks/site-docs.yml b/antora/playbooks/site-docs.yml
index 0b6f000..2a68198 100644
--- a/antora/playbooks/site-docs.yml
+++ b/antora/playbooks/site-docs.yml
@@ -10,10 +10,6 @@ content:
- url: .
start_path: antora/components/docs # docs
branches: HEAD
- - url: .
- start_path: antora/redirects/guides # docs
- branches: HEAD
-
# examples
- url: .
start_path: examples/demo/src/main/adoc # docs
diff --git a/antora/playbooks/site-extensions.yml
b/antora/playbooks/site-extensions.yml
index 8a8037c..c764061 100644
--- a/antora/playbooks/site-extensions.yml
+++ b/antora/playbooks/site-extensions.yml
@@ -10,10 +10,6 @@ content:
- url: .
start_path: antora/components/docs # docs
branches: HEAD
- - url: .
- start_path: antora/redirects/guides # docs
- branches: HEAD
-
# examples
- url: .
start_path: examples/demo/src/main/adoc # docs
diff --git a/antora/playbooks/site-incubator.yml
b/antora/playbooks/site-incubator.yml
index 9a1c2b8..7f52021 100644
--- a/antora/playbooks/site-incubator.yml
+++ b/antora/playbooks/site-incubator.yml
@@ -10,10 +10,6 @@ content:
- url: .
start_path: antora/components/docs # docs
branches: HEAD
- - url: .
- start_path: antora/redirects/guides # docs
- branches: HEAD
-
# examples
- url: .
start_path: examples/demo/src/main/adoc # docs
diff --git a/antora/playbooks/site-legacy.yml b/antora/playbooks/site-legacy.yml
index 836d0d1..a6eac9b 100644
--- a/antora/playbooks/site-legacy.yml
+++ b/antora/playbooks/site-legacy.yml
@@ -10,10 +10,6 @@ content:
- url: .
start_path: antora/components/docs # docs
branches: HEAD
- - url: .
- start_path: antora/redirects/guides # docs
- branches: HEAD
-
# examples
- url: .
start_path: examples/demo/src/main/adoc # docs
diff --git a/antora/playbooks/site-mappings.yml
b/antora/playbooks/site-mappings.yml
index f4108e0..f175bdb 100644
--- a/antora/playbooks/site-mappings.yml
+++ b/antora/playbooks/site-mappings.yml
@@ -10,10 +10,6 @@ content:
- url: .
start_path: antora/components/docs # docs
branches: HEAD
- - url: .
- start_path: antora/redirects/guides # docs
- branches: HEAD
-
# examples
- url: .
start_path: examples/demo/src/main/adoc # docs
diff --git a/antora/playbooks/site-persistence.yml
b/antora/playbooks/site-persistence.yml
index c6f2b99..36a7fe5 100644
--- a/antora/playbooks/site-persistence.yml
+++ b/antora/playbooks/site-persistence.yml
@@ -10,10 +10,6 @@ content:
- url: .
start_path: antora/components/docs # docs
branches: HEAD
- - url: .
- start_path: antora/redirects/guides # docs
- branches: HEAD
-
# examples
- url: .
start_path: examples/demo/src/main/adoc # docs
diff --git a/antora/playbooks/site-refguide.yml
b/antora/playbooks/site-refguide.yml
index e2ec26e..6a086ee 100644
--- a/antora/playbooks/site-refguide.yml
+++ b/antora/playbooks/site-refguide.yml
@@ -10,10 +10,6 @@ content:
- url: .
start_path: antora/components/docs # docs
branches: HEAD
- - url: .
- start_path: antora/redirects/guides # docs
- branches: HEAD
-
# api
- url: .
start_path: api/adoc/refguide # refguide
diff --git a/antora/playbooks/site-relnotes.yml
b/antora/playbooks/site-relnotes.yml
index fd56739..fd8dbc4 100644
--- a/antora/playbooks/site-relnotes.yml
+++ b/antora/playbooks/site-relnotes.yml
@@ -13,10 +13,6 @@ content:
- url: .
start_path: antora/components/relnotes # relnotes
branches: HEAD
- - url: .
- start_path: antora/redirects/guides # docs
- branches: HEAD
-
# examples
- url: .
start_path: examples/demo/src/main/adoc # docs
diff --git a/antora/playbooks/site-security.yml
b/antora/playbooks/site-security.yml
index 1a0d0a6..1986336 100644
--- a/antora/playbooks/site-security.yml
+++ b/antora/playbooks/site-security.yml
@@ -10,11 +10,6 @@ content:
- url: .
start_path: antora/components/docs # docs
branches: HEAD
- - url: .
- start_path: antora/redirects/guides # docs
- branches: HEAD
-
-
# core
- url: .
start_path: core/security/src/main/adoc # security
diff --git a/antora/playbooks/site-setupguide.yml
b/antora/playbooks/site-setupguide.yml
index eb46d38..0666b04 100644
--- a/antora/playbooks/site-setupguide.yml
+++ b/antora/playbooks/site-setupguide.yml
@@ -13,10 +13,6 @@ content:
- url: .
start_path: antora/components/setupguide # setupguide
branches: HEAD
- - url: .
- start_path: antora/redirects/guides # docs
- branches: HEAD
-
# examples
- url: .
start_path: examples/demo/src/main/adoc # docs
diff --git a/antora/playbooks/site-subdomains.yml
b/antora/playbooks/site-subdomains.yml
index 6782cdc..813a9f4 100644
--- a/antora/playbooks/site-subdomains.yml
+++ b/antora/playbooks/site-subdomains.yml
@@ -10,10 +10,6 @@ content:
- url: .
start_path: antora/components/docs # docs
branches: HEAD
- - url: .
- start_path: antora/redirects/guides # docs
- branches: HEAD
-
# examples
- url: .
start_path: examples/demo/src/main/adoc # docs
diff --git a/antora/playbooks/site-testing.yml
b/antora/playbooks/site-testing.yml
index d75027a..462b029 100644
--- a/antora/playbooks/site-testing.yml
+++ b/antora/playbooks/site-testing.yml
@@ -10,10 +10,6 @@ content:
- url: .
start_path: antora/components/docs # docs
branches: HEAD
- - url: .
- start_path: antora/redirects/guides # docs
- branches: HEAD
-
# examples
- url: .
start_path: examples/demo/src/main/adoc # docs
diff --git a/antora/playbooks/site-userguide.yml
b/antora/playbooks/site-userguide.yml
index f146d25..7ea398f 100644
--- a/antora/playbooks/site-userguide.yml
+++ b/antora/playbooks/site-userguide.yml
@@ -10,10 +10,6 @@ content:
- url: .
start_path: antora/components/docs # docs
branches: HEAD
- - url: .
- start_path: antora/redirects/guides # docs
- branches: HEAD
-
# api
- url: .
start_path: api/adoc/userguide # userguide
diff --git a/antora/playbooks/site-valuetypes.yml
b/antora/playbooks/site-valuetypes.yml
index 3f2ec03..6e64be6 100644
--- a/antora/playbooks/site-valuetypes.yml
+++ b/antora/playbooks/site-valuetypes.yml
@@ -10,10 +10,6 @@ content:
- url: .
start_path: antora/components/docs # docs
branches: HEAD
- - url: .
- start_path: antora/redirects/guides # docs
- branches: HEAD
-
# examples
- url: .
start_path: examples/demo/src/main/adoc # docs
diff --git a/antora/playbooks/site-vro.yml b/antora/playbooks/site-vro.yml
index 14039df..9ed8e9f 100644
--- a/antora/playbooks/site-vro.yml
+++ b/antora/playbooks/site-vro.yml
@@ -10,10 +10,6 @@ content:
- url: .
start_path: antora/components/docs # docs
branches: HEAD
- - url: .
- start_path: antora/redirects/guides # docs
- branches: HEAD
-
# examples
- url: .
start_path: examples/demo/src/main/adoc # docs
diff --git a/antora/playbooks/site-vw.yml b/antora/playbooks/site-vw.yml
index e685c4d..4a456e0 100644
--- a/antora/playbooks/site-vw.yml
+++ b/antora/playbooks/site-vw.yml
@@ -10,10 +10,6 @@ content:
- url: .
start_path: antora/components/docs # docs
branches: HEAD
- - url: .
- start_path: antora/redirects/guides # docs
- branches: HEAD
-
# examples
- url: .
start_path: examples/demo/src/main/adoc # docs
diff --git a/antora/playbooks/site.yml b/antora/playbooks/site.yml
index 88be3b4..bf8842e 100644
--- a/antora/playbooks/site.yml
+++ b/antora/playbooks/site.yml
@@ -22,9 +22,6 @@ content:
- url: .
start_path: antora/components/setupguide # setupguide
branches: HEAD
-# - url: .
-# start_path: antora/redirects/guides # docs
-# branches: HEAD
# api
diff --git a/antora/redirects/guides/antora.yml
b/antora/redirects/guides/antora.yml
deleted file mode 100644
index 85593c3..0000000
--- a/antora/redirects/guides/antora.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: guides
-title: "Guides (redirecting)"
-version: master
-start_page: ROOT:about.adoc
-nav:
-- modules/ROOT/nav.adoc
diff --git a/antora/redirects/guides/modules/ROOT/nav.adoc
b/antora/redirects/guides/modules/ROOT/nav.adoc
deleted file mode 100644
index 08f35ec..0000000
--- a/antora/redirects/guides/modules/ROOT/nav.adoc
+++ /dev/null
@@ -1 +0,0 @@
-* xref:guides:ROOT:about.adoc[]
diff --git a/antora/redirects/guides/modules/ROOT/pages/about.adoc
b/antora/redirects/guides/modules/ROOT/pages/about.adoc
deleted file mode 100644
index 9508b58..0000000
--- a/antora/redirects/guides/modules/ROOT/pages/about.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-= Redirects
-: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 [...]
-
-
diff --git a/antora/redirects/guides/modules/ugvro/nav.adoc
b/antora/redirects/guides/modules/ugvro/nav.adoc
deleted file mode 100644
index 498244d..0000000
--- a/antora/redirects/guides/modules/ugvro/nav.adoc
+++ /dev/null
@@ -1,3 +0,0 @@
-* xref:guides:ugvro:ugvro.adoc[]
-
-
diff --git a/antora/redirects/guides/modules/ugvro/pages/ugvro.adoc
b/antora/redirects/guides/modules/ugvro/pages/ugvro.adoc
deleted file mode 100644
index 1f1400e..0000000
--- a/antora/redirects/guides/modules/ugvro/pages/ugvro.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-= Restful Objects Viewer
-: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 [...]
-
-
diff --git a/antora/redirects/guides/modules/ugvw/nav.adoc
b/antora/redirects/guides/modules/ugvw/nav.adoc
deleted file mode 100644
index 1538b85..0000000
--- a/antora/redirects/guides/modules/ugvw/nav.adoc
+++ /dev/null
@@ -1 +0,0 @@
-* xref:guides:ugvw:ugvw.adoc[]
diff --git a/antora/redirects/guides/modules/ugvw/pages/ugvw.adoc
b/antora/redirects/guides/modules/ugvw/pages/ugvw.adoc
deleted file mode 100644
index fb5dcfe..0000000
--- a/antora/redirects/guides/modules/ugvw/pages/ugvw.adoc
+++ /dev/null
@@ -1,3 +0,0 @@
-= Wicket Viewer
-: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 [...]
-
diff --git a/antora/supplemental-ui/ui.yml b/antora/supplemental-ui/ui.yml
index 611ea9a..5c1feb1 100644
--- a/antora/supplemental-ui/ui.yml
+++ b/antora/supplemental-ui/ui.yml
@@ -1,5 +1,6 @@
static_files:
- index.html
+- support.html
- _headers
- robots.txt
- doap_isis.rdf
