[felix-antora-site] 06/06: nav and organizational cleanup

[dj...@apache.org]

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

djencks pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/felix-antora-site.git

commit 4bd429ac673e5e470b4ef654c5ef05424a5c1878
Author: David Jencks <dj...@apache.org>
AuthorDate: Mon Jul 19 16:59:50 2021 -0700

    nav and organizational cleanup
---
 modules/ROOT/nav.adoc                          | 267 +++++++++++++------------
 modules/ROOT/pages/auto-index.adoc             |  64 ------
 modules/ROOT/pages/community.adoc              |   3 -
 modules/ROOT/pages/community/project-info.adoc |   2 +-
 modules/ROOT/pages/development.adoc            |   5 -
 modules/ROOT/pages/documentation.adoc          |   6 +-
 modules/ROOT/pages/getting-started.adoc        |   4 +-
 modules/ROOT/pages/media.adoc                  |   8 -
 modules/ROOT/pages/miscellaneous.adoc          |   1 -
 modules/ROOT/pages/site-map.adoc               |  64 ++++++
 10 files changed, 205 insertions(+), 219 deletions(-)

diff --git a/modules/ROOT/nav.adoc b/modules/ROOT/nav.adoc
index e5642fe..1fe6c0f 100644
--- a/modules/ROOT/nav.adoc
+++ b/modules/ROOT/nav.adoc
@@ -1,148 +1,151 @@
-* xref:auto-index.adoc[]
 //indexList::[relative=*.adoc]
-* xref:license.adoc[]
-* xref:documentation.adoc[]
-* xref:media.adoc[]
-* xref:miscellaneous.adoc[]
-* xref:news.adoc[]
-* xref:index.adoc[]
+//* xref::subprojects.adoc[]
+//* xref::license.adoc[]
+* xref::documentation.adoc[]
+* xref::downloads.adoc[]
+//* xref::faqs.adoc[]
+* xref::getting-started.adoc[]
+* xref::news.adoc[]
+//* xref::tutorials-examples-and-presentations.adoc[]
 
-** Community
-//indexList::[level=3,relative=community/*.adoc]
-*** xref:community/project-info.adoc[]
-*** xref:community/contributing.adoc[]
-*** xref:community/projects-using-felix.adoc[]
+* Community
+//indexList::[level=2,relative=community/*.adoc]
+** xref:community/project-info.adoc[]
+** xref:community/contributing.adoc[]
+** xref:community/projects-using-felix.adoc[]
 
-** Development
-//indexList::[level=3,relative=development/*.adoc]
-*** xref:development/coding-standards.adoc[]
-*** xref:development/dependencies-file-template.adoc[]
-*** xref:development/provisional-osgi-api-policy.adoc[]
-*** xref:development/release-management-nexus.adoc[]
-*** xref:development/site-how-to.adoc[]
-*** xref:development/using-the-osgi-compliance-tests.adoc[]
+* Development
+//indexList::[level=2,relative=development/*.adoc]
+** xref:development/coding-standards.adoc[]
+** xref:development/dependencies-file-template.adoc[]
+** xref:development/provisional-osgi-api-policy.adoc[]
+** xref:development/release-management-nexus.adoc[]
+** xref:development/site-how-to.adoc[]
+** xref:development/using-the-osgi-compliance-tests.adoc[]
 
-** FAQS
-//indexList::[level=3,relative=faqs/*.adoc]
-*** xref:faqs/apache-felix-bundle-plugin-faq.adoc[]
-*** xref:faqs/apache-felix-scr-plugin-faq.adoc[]
+* xref::faqs.adoc[FAQS]
+//indexList::[level=2,relative=faqs/*.adoc]
+** xref:faqs/apache-felix-bundle-plugin-faq.adoc[]
+** xref:faqs/apache-felix-scr-plugin-faq.adoc[]
 
-** Subprojects
-//indexList::[level=3,relative=subprojects/*.adoc]
-*** xref:subprojects/apache-felix-dependency-manager.adoc[]
-*** xref:subprojects/apache-felix-event-admin.adoc[]
-*** xref:subprojects/apache-felix-file-install.adoc[]
-*** xref:subprojects/apache-felix-framework.adoc[]
-*** xref:subprojects/apache-felix-framework-security.adoc[]
-*** xref:subprojects/apache-felix-gogo.adoc[]
-*** xref:subprojects/apache-felix-healthchecks.adoc[]
-*** xref:subprojects/apache-felix-inventory.adoc[]
-*** xref:subprojects/apache-felix-log.adoc[]
-*** xref:subprojects/apache-felix-logback.adoc[]
-*** xref:subprojects/apache-felix-maven-bundle-plugin-bnd.adoc[]
-*** xref:subprojects/apache-felix-metatype-service.adoc[]
-*** xref:subprojects/apache-felix-osgi-bundle-repository.adoc[]
-*** xref:subprojects/apache-felix-preferences-service.adoc[]
-*** xref:subprojects/apache-felix-remote-shell.adoc[]
-*** xref:subprojects/apache-felix-shell.adoc[]
-*** xref:subprojects/apache-felix-shell-tui.adoc[]
-*** xref:subprojects/apache-felix-web-console.adoc[]
+* xref::subprojects.adoc[Subprojects]
+//indexList::[level=2,relative=subprojects/*.adoc]
+** xref:subprojects/apache-felix-dependency-manager.adoc[]
+** xref:subprojects/apache-felix-event-admin.adoc[]
+** xref:subprojects/apache-felix-file-install.adoc[]
+** xref:subprojects/apache-felix-framework.adoc[]
+** xref:subprojects/apache-felix-framework-security.adoc[]
+** xref:subprojects/apache-felix-gogo.adoc[]
+** xref:subprojects/apache-felix-healthchecks.adoc[]
+** xref:subprojects/apache-felix-inventory.adoc[]
+** xref:subprojects/apache-felix-log.adoc[]
+** xref:subprojects/apache-felix-logback.adoc[]
+** xref:subprojects/apache-felix-maven-bundle-plugin-bnd.adoc[]
+** xref:subprojects/apache-felix-metatype-service.adoc[]
+** xref:subprojects/apache-felix-osgi-bundle-repository.adoc[]
+** xref:subprojects/apache-felix-preferences-service.adoc[]
+** xref:subprojects/apache-felix-remote-shell.adoc[]
+** xref:subprojects/apache-felix-shell.adoc[]
+** xref:subprojects/apache-felix-shell-tui.adoc[]
+** xref:subprojects/apache-felix-web-console.adoc[]
 
-*** Dependency Manager
-**** Guides
-//indexList::[level=5,relative=subprojects/apache-felix-dependency-manager/guides/*.adoc]
-***** xref:subprojects/apache-felix-dependency-manager/guides/migrating-from-earlier-versions.adoc[]
-***** xref:subprojects/apache-felix-dependency-manager/guides/annotations.adoc[]
-***** xref:subprojects/apache-felix-dependency-manager/guides/background.adoc[]
-***** xref:subprojects/apache-felix-dependency-manager/guides/bundles-and-dependencies.adoc[]
-***** xref:subprojects/apache-felix-dependency-manager/guides/design-patterns.adoc[]
-***** xref:subprojects/apache-felix-dependency-manager/guides/development.adoc[]
-***** xref:subprojects/apache-felix-dependency-manager/guides/history.adoc[]
-***** xref:subprojects/apache-felix-dependency-manager/guides/javadocs.adoc[]
-***** xref:subprojects/apache-felix-dependency-manager/guides/migrating-from-other-solutions.adoc[]
-***** xref:subprojects/apache-felix-dependency-manager/guides/performance-tuning.adoc[]
-***** xref:subprojects/apache-felix-dependency-manager/guides/resources.adoc[]
-***** xref:subprojects/apache-felix-dependency-manager/guides/whatsnew.adoc[]
-***** xref:subprojects/apache-felix-dependency-manager/guides/dm-lambda.adoc[]
-***** xref:subprojects/apache-felix-dependency-manager/guides/whatsnew-r15.adoc[]
+** Dependency Manager
+*** Guides
+//indexList::[level=4,relative=subprojects/apache-felix-dependency-manager/guides/*.adoc]
+**** xref:subprojects/apache-felix-dependency-manager/guides/migrating-from-earlier-versions.adoc[]
+**** xref:subprojects/apache-felix-dependency-manager/guides/annotations.adoc[]
+**** xref:subprojects/apache-felix-dependency-manager/guides/background.adoc[]
+**** xref:subprojects/apache-felix-dependency-manager/guides/bundles-and-dependencies.adoc[]
+**** xref:subprojects/apache-felix-dependency-manager/guides/design-patterns.adoc[]
+**** xref:subprojects/apache-felix-dependency-manager/guides/development.adoc[]
+**** xref:subprojects/apache-felix-dependency-manager/guides/history.adoc[]
+**** xref:subprojects/apache-felix-dependency-manager/guides/javadocs.adoc[]
+**** xref:subprojects/apache-felix-dependency-manager/guides/migrating-from-other-solutions.adoc[]
+**** xref:subprojects/apache-felix-dependency-manager/guides/performance-tuning.adoc[]
+**** xref:subprojects/apache-felix-dependency-manager/guides/resources.adoc[]
+**** xref:subprojects/apache-felix-dependency-manager/guides/whatsnew.adoc[]
+**** xref:subprojects/apache-felix-dependency-manager/guides/dm-lambda.adoc[]
+**** xref:subprojects/apache-felix-dependency-manager/guides/whatsnew-r15.adoc[]
 
-**** Reference
-//indexList::[level=5,relative=subprojects/apache-felix-dependency-manager/reference/*.adoc]
-***** xref:subprojects/apache-felix-dependency-manager/reference/component-adapter.adoc[]
-***** xref:subprojects/apache-felix-dependency-manager/reference/component-aspect.adoc[]
-***** xref:subprojects/apache-felix-dependency-manager/reference/component-bundle-adapter.adoc[]
-***** xref:subprojects/apache-felix-dependency-manager/reference/dependency-bundle.adoc[]
-***** xref:subprojects/apache-felix-dependency-manager/reference/components.adoc[]
-***** xref:subprojects/apache-felix-dependency-manager/reference/dependency-configuration.adoc[]
-***** xref:subprojects/apache-felix-dependency-manager/reference/dependencies.adoc[]
-***** xref:subprojects/apache-felix-dependency-manager/reference/external-links.adoc[]
-***** xref:subprojects/apache-felix-dependency-manager/reference/component-factory-configuration-adapter.adoc[]
-***** xref:subprojects/apache-felix-dependency-manager/reference/component-resource-adapter.adoc[]
-***** xref:subprojects/apache-felix-dependency-manager/reference/dependency-resource.adoc[]
-***** xref:subprojects/apache-felix-dependency-manager/reference/dependency-service.adoc[]
-***** xref:subprojects/apache-felix-dependency-manager/reference/service-scopes.adoc[]
-***** xref:subprojects/apache-felix-dependency-manager/reference/component-singleton.adoc[]
-***** xref:subprojects/apache-felix-dependency-manager/reference/thread-model.adoc[]
-***** xref:subprojects/apache-felix-dependency-manager/reference/dm-annotations.adoc[]
+*** Reference
+//indexList::[level=4,relative=subprojects/apache-felix-dependency-manager/reference/*.adoc]
+**** xref:subprojects/apache-felix-dependency-manager/reference/component-adapter.adoc[]
+**** xref:subprojects/apache-felix-dependency-manager/reference/component-aspect.adoc[]
+**** xref:subprojects/apache-felix-dependency-manager/reference/component-bundle-adapter.adoc[]
+**** xref:subprojects/apache-felix-dependency-manager/reference/dependency-bundle.adoc[]
+**** xref:subprojects/apache-felix-dependency-manager/reference/components.adoc[]
+**** xref:subprojects/apache-felix-dependency-manager/reference/dependency-configuration.adoc[]
+**** xref:subprojects/apache-felix-dependency-manager/reference/dependencies.adoc[]
+**** xref:subprojects/apache-felix-dependency-manager/reference/external-links.adoc[]
+**** xref:subprojects/apache-felix-dependency-manager/reference/component-factory-configuration-adapter.adoc[]
+**** xref:subprojects/apache-felix-dependency-manager/reference/component-resource-adapter.adoc[]
+**** xref:subprojects/apache-felix-dependency-manager/reference/dependency-resource.adoc[]
+**** xref:subprojects/apache-felix-dependency-manager/reference/dependency-service.adoc[]
+**** xref:subprojects/apache-felix-dependency-manager/reference/service-scopes.adoc[]
+**** xref:subprojects/apache-felix-dependency-manager/reference/component-singleton.adoc[]
+**** xref:subprojects/apache-felix-dependency-manager/reference/thread-model.adoc[]
+**** xref:subprojects/apache-felix-dependency-manager/reference/dm-annotations.adoc[]
 
-**** Tutorials
-//indexList::[level=5,relative=subprojects/apache-felix-dependency-manager/tutorials/*.adoc]
-***** xref:subprojects/apache-felix-dependency-manager/tutorials/working-with-annotations.adoc[]
-***** xref:subprojects/apache-felix-dependency-manager/tutorials/getting-started.adoc[]
-***** xref:subprojects/apache-felix-dependency-manager/tutorials/leveraging-the-shell.adoc[]
-***** xref:subprojects/apache-felix-dependency-manager/tutorials/sample-code.adoc[]
+*** Tutorials
+//indexList::[level=4,relative=subprojects/apache-felix-dependency-manager/tutorials/*.adoc]
+**** xref:subprojects/apache-felix-dependency-manager/tutorials/working-with-annotations.adoc[]
+**** xref:subprojects/apache-felix-dependency-manager/tutorials/getting-started.adoc[]
+**** xref:subprojects/apache-felix-dependency-manager/tutorials/leveraging-the-shell.adoc[]
+**** xref:subprojects/apache-felix-dependency-manager/tutorials/sample-code.adoc[]
 
-*** Framework
-//indexList::[level=4,relative=subprojects/apache-felix-framework/*.adoc]
-**** xref:subprojects/apache-felix-framework/apache-felix-framework-bundle-cache.adoc[]
-**** xref:subprojects/apache-felix-framework/apache-felix-framework-configuration-properties.adoc[]
-**** xref:subprojects/apache-felix-framework/apache-felix-framework-faq.adoc[]
-**** xref:subprojects/apache-felix-framework/apache-felix-framework-launching-and-embedding.adoc[]
-**** xref:subprojects/apache-felix-framework/apache-felix-framework-usage-documentation.adoc[]
+** Framework
+//indexList::[level=3,relative=subprojects/apache-felix-framework/*.adoc]
+*** xref:subprojects/apache-felix-framework/apache-felix-framework-bundle-cache.adoc[]
+*** xref:subprojects/apache-felix-framework/apache-felix-framework-configuration-properties.adoc[]
+*** xref:subprojects/apache-felix-framework/apache-felix-framework-faq.adoc[]
+*** xref:subprojects/apache-felix-framework/apache-felix-framework-launching-and-embedding.adoc[]
+*** xref:subprojects/apache-felix-framework/apache-felix-framework-usage-documentation.adoc[]
 
-*** GoGo Shell
-//indexList::[level=4,relative=subprojects/apache-felix-gogo/*.adoc]
-**** xref:subprojects/apache-felix-gogo/rfc-147-overview.adoc[]
+** GoGo Shell
+//indexList::[level=3,relative=subprojects/apache-felix-gogo/*.adoc]
+*** xref:subprojects/apache-felix-gogo/rfc-147-overview.adoc[]
 
-*** Maven SCR plugin
-//indexList::[level=4,relative=subprojects/apache-felix-maven-scr-plugin/*.adoc]
-**** xref:subprojects/apache-felix-maven-scr-plugin/apache-felix-maven-scr-plugin-use.adoc[]
-**** xref:subprojects/apache-felix-maven-scr-plugin/apache-felix-scr-bndtools-use.adoc[]
-**** xref:subprojects/apache-felix-maven-scr-plugin/apache-felix-scr-ant-task-use.adoc[]
-**** xref:subprojects/apache-felix-maven-scr-plugin/extending-scr-annotations.adoc[]
-**** xref:subprojects/apache-felix-maven-scr-plugin/scr-annotations.adoc[]
-**** xref:subprojects/apache-felix-maven-scr-plugin/scr-javadoc-tags.adoc[]
+** Maven SCR plugin
+//indexList::[level=3,relative=subprojects/apache-felix-maven-scr-plugin/*.adoc]
+*** xref:subprojects/apache-felix-maven-scr-plugin/apache-felix-maven-scr-plugin-use.adoc[]
+*** xref:subprojects/apache-felix-maven-scr-plugin/apache-felix-scr-bndtools-use.adoc[]
+*** xref:subprojects/apache-felix-maven-scr-plugin/apache-felix-scr-ant-task-use.adoc[]
+*** xref:subprojects/apache-felix-maven-scr-plugin/extending-scr-annotations.adoc[]
+*** xref:subprojects/apache-felix-maven-scr-plugin/scr-annotations.adoc[]
+*** xref:subprojects/apache-felix-maven-scr-plugin/scr-javadoc-tags.adoc[]
 
-*** Web Console
-//indexList::[level=4,relative=subprojects/apache-felix-web-console/*.adoc]
-**** xref:subprojects/apache-felix-web-console/extending-the-apache-felix-web-console.adoc[]
-**** xref:subprojects/apache-felix-web-console/web-console-restful-api.adoc[]
-**** xref:subprojects/apache-felix-web-console/web-console-security-provider.adoc[]
+** Web Console
+//indexList::[level=3,relative=subprojects/apache-felix-web-console/*.adoc]
+*** xref:subprojects/apache-felix-web-console/extending-the-apache-felix-web-console.adoc[]
+*** xref:subprojects/apache-felix-web-console/web-console-restful-api.adoc[]
+*** xref:subprojects/apache-felix-web-console/web-console-security-provider.adoc[]
 
-**** Extensions
-//indexList::[level=5,relative=subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/*.adoc]
-***** xref:subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/branding-the-web-console.adoc[]
-***** xref:subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/providing-resources.adoc[]
-***** xref:subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/providing-web-console-plugins.adoc[]
-***** xref:subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/web-console-logging.adoc[]
-***** xref:subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/web-console-output-templating.adoc[]
+*** Extensions
+//indexList::[level=4,relative=subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/*.adoc]
+**** xref:subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/branding-the-web-console.adoc[]
+**** xref:subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/providing-resources.adoc[]
+**** xref:subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/providing-web-console-plugins.adoc[]
+**** xref:subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/web-console-logging.adoc[]
+**** xref:subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/web-console-output-templating.adoc[]
 
-** Tutorials
-//indexList::[level=3,relative=tutorials-examples-and-presentations/*.adoc]
-*** xref:tutorials-examples-and-presentations/apache-felix-application-demonstration.adoc[]
-*** xref:tutorials-examples-and-presentations/apache-felix-osgi-tutorial.adoc[]
-*** xref:tutorials-examples-and-presentations/apache-felix-osgi-faq.adoc[]
+* xref::tutorials-examples-and-presentations.adoc[Tutorials]
+//indexList::[level=2,relative=tutorials-examples-and-presentations/*.adoc]
+** xref:tutorials-examples-and-presentations/apache-felix-application-demonstration.adoc[]
+** xref:tutorials-examples-and-presentations/apache-felix-osgi-tutorial.adoc[]
+** xref:tutorials-examples-and-presentations/apache-felix-osgi-faq.adoc[]
 
-*** OSGI Tutorial
-//indexList::[level=4,relative=tutorials-examples-and-presentations/apache-felix-osgi-tutorial/*.adoc]
-**** xref:tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-1.adoc[]
-**** xref:tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-2.adoc[]
-**** xref:tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-2b.adoc[]
-**** xref:tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-3.adoc[]
-**** xref:tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-4.adoc[]
-**** xref:tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-5.adoc[]
-**** xref:tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-6.adoc[]
-**** xref:tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-7.adoc[]
-**** xref:tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-8.adoc[]
-**** xref:tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-9.adoc[]
+** OSGI Tutorial
+//indexList::[level=3,relative=tutorials-examples-and-presentations/apache-felix-osgi-tutorial/*.adoc]
+*** xref:tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-1.adoc[]
+*** xref:tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-2.adoc[]
+*** xref:tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-2b.adoc[]
+*** xref:tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-3.adoc[]
+*** xref:tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-4.adoc[]
+*** xref:tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-5.adoc[]
+*** xref:tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-6.adoc[]
+*** xref:tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-7.adoc[]
+*** xref:tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-8.adoc[]
+*** xref:tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-9.adoc[]
 
+* xref::license.adoc[]
+* xref:site-map.adoc[]
diff --git a/modules/ROOT/pages/auto-index.adoc b/modules/ROOT/pages/auto-index.adoc
deleted file mode 100644
index 322c944..0000000
--- a/modules/ROOT/pages/auto-index.adoc
+++ /dev/null
@@ -1,64 +0,0 @@
-= Temporary auto-index page
-//uncomment to generate temporary nav file contents on console.
-//:antora-indexer-log-lists:
-
-indexList::[relative=*.adoc]
-
-** Community
-
-indexList::[level=3,relative=community/*.adoc]
-
-** Development
-
-indexList::[level=3,relative=development/*.adoc]
-
-** FAQS
-
-indexList::[level=3,relative=faqs/*.adoc]
-
-** Subprojects
-
-indexList::[level=3,relative=subprojects/*.adoc]
-
-*** Dependency Manager
-**** Guides
-
-indexList::[level=5,relative=subprojects/apache-felix-dependency-manager/guides/*.adoc]
-
-**** Reference
-
-indexList::[level=5,relative=subprojects/apache-felix-dependency-manager/reference/*.adoc]
-
-**** Tutorials
-
-indexList::[level=5,relative=subprojects/apache-felix-dependency-manager/tutorials/*.adoc]
-
-*** Framework
-
-indexList::[level=4,relative=subprojects/apache-felix-framework/*.adoc]
-
-*** GoGo Shell
-
-indexList::[level=4,relative=subprojects/apache-felix-gogo/*.adoc]
-
-*** Maven SCR plugin
-
-indexList::[level=4,relative=subprojects/apache-felix-maven-scr-plugin/*.adoc]
-
-*** Web Console
-
-indexList::[level=4,relative=subprojects/apache-felix-web-console/*.adoc]
-
-**** Extensions
-
-indexList::[level=5,relative=subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/*.adoc]
-
-** Tutorials
-
-indexList::[level=3,relative=tutorials-examples-and-presentations/*.adoc]
-
-*** OSGI Tutorial
-
-indexList::[level=4,relative=tutorials-examples-and-presentations/apache-felix-osgi-tutorial/*.adoc]
-
-//indexList::[]
diff --git a/modules/ROOT/pages/community.adoc b/modules/ROOT/pages/community.adoc
deleted file mode 100644
index aa2e998..0000000
--- a/modules/ROOT/pages/community.adoc
+++ /dev/null
@@ -1,3 +0,0 @@
-= Community Documentation
-
-{% for label, page in children %}* link:{{ page.path }}[{{ page.headers.title }}] {% endfor %}
diff --git a/modules/ROOT/pages/community/project-info.adoc b/modules/ROOT/pages/community/project-info.adoc
index 422c8dc..f64f27f 100644
--- a/modules/ROOT/pages/community/project-info.adoc
+++ b/modules/ROOT/pages/community/project-info.adoc
@@ -3,7 +3,7 @@
 There are different roles with which Felix community members may be associated, these roles are: users, contributors, committers, and Project Management Committee (PMC) members.
 These roles are assigned and assumed based on merit.
 Everyone in the Felix community can participate to whatever level they desire, but participating and the resulting merit gained is directly linked to the role an individual may obtain.
-To further understand how the Felix community operates, refer to the https://www.apache.org/foundation/how-it-works.html[Community Roles and Processes] document and/or join the <<mailing-lists,mailing lists>>.
+To further understand how the Felix community operates, refer to the https://www.apache.org/foundation/how-it-works.html[Community Roles and Processes] document and/or join the <<_mailing_lists,mailing lists>>.
 
 == Committers and Project Management Committee (PMC)
 
diff --git a/modules/ROOT/pages/development.adoc b/modules/ROOT/pages/development.adoc
deleted file mode 100644
index d4242e3..0000000
--- a/modules/ROOT/pages/development.adoc
+++ /dev/null
@@ -1,5 +0,0 @@
-= Development
-
-This page contains links related to Felix project development.
-
-{% for label, page in children %}* link:{{ page.path }}[{{ page.headers.title }}] {% endfor %}
diff --git a/modules/ROOT/pages/documentation.adoc b/modules/ROOT/pages/documentation.adoc
index 9f6384c..8d45a26 100644
--- a/modules/ROOT/pages/documentation.adoc
+++ b/modules/ROOT/pages/documentation.adoc
@@ -4,15 +4,15 @@ In an effort to make it easier to find desired documentation, we have divided ou
 
 * xref:getting-started.adoc[Getting started] - This area captures a few links from the areas below that will help you get started with Felix.
 * xref:faqs.adoc[FAQs] - This area captures all FAQ documentation, which typically varies from subproject to subproject.
-* xref:community.adoc[Community] - This area captures documentation associated with how the Felix community works and how to become involved in it.
-* xref:development.adoc[Development] - This area captures documentation for Felix developers or those interested in becoming Felix developers;
+* Community - This area captures documentation associated with how the Felix community works and how to become involved in it.
+* Development - This area captures documentation for Felix developers or those interested in becoming Felix developers;
 this is not intended for Felix users although some information may be useful.
 * xref:subprojects.adoc[Subprojects] - This area captures user documentation for the various Felix subprojects.
 * xref:tutorials-examples-and-presentations.adoc[Tutorials, examples, and presentations] - This area captures general user documentation that does not necessarily fit into any single subproject.
 
 In addition a xref:auto-index.adoc[site map] is available as a table of contents of the site.
 
-If you are unable to find the documentation you need, please ask on the xref:mailinglists.adoc[mailing lists].
+If you are unable to find the documentation you need, please ask on the xref:community/project-info.adoc#_mailing_lists[mailing lists].
 Also, feedback on improving the documentation and/or organization of this site is welcome.
 
 _The Felix web site and documentation are managed with link:https://antora.org[Antora].
diff --git a/modules/ROOT/pages/getting-started.adoc b/modules/ROOT/pages/getting-started.adoc
index ee61164..0416a2f 100644
--- a/modules/ROOT/pages/getting-started.adoc
+++ b/modules/ROOT/pages/getting-started.adoc
@@ -2,11 +2,11 @@
 
 For first-time users, here are a few links that might get you started more quickly:
 
-* https://felix.apache.org/downloads.cgi[Downloads] - Go to the download page and download and extract the Felix release.
+* xref:documentation.adoc[Downloads] - Go to the download page and download and extract the Felix release.
 * xref:subprojects/apache-felix-framework/apache-felix-framework-usage-documentation.adoc[Launching Felix] - Go to the Felix usage page to learn how to launch the Felix framework.
 * xref:tutorials-examples-and-presentations/apache-felix-osgi-tutorial.adoc[OSGi tutorial] - Go to the tutorial page to learn some OSGi basics.
 * xref:tutorials-examples-and-presentations/apache-felix-osgi-faq.adoc[OSGi FAQ] - Check out the OSGi FAQ for answers to common questions.
 * xref:documentation.adoc[Documentation] - Search the documentation pages for additional examples and presentations or subproject documentation to learn about specific subprojects.
 
-If you are unable to find the documentation you need, please ask on the xref:mailinglists.adoc[mailing lists].
+If you are unable to find the documentation you need, please ask on the xref:community/project-info.adoc#_mailing_lists[mailing lists].
 Also, feedback on improving the documentation and/or organization of this site is welcome.
diff --git a/modules/ROOT/pages/media.adoc b/modules/ROOT/pages/media.adoc
deleted file mode 100644
index 6132b18..0000000
--- a/modules/ROOT/pages/media.adoc
+++ /dev/null
@@ -1,8 +0,0 @@
-= Media
-
-This page holds all media required for the Apache Felix website.
-The media are attachments and can be addressed using the following URL: http://cwiki.apache.org/FELIX/media.data/ (followed by the actual name of the attachment).
-
-Currently, some of these attachments are used by the overall site template (only visible/editable by Confluence administrators).
-
-\{attachments}
diff --git a/modules/ROOT/pages/miscellaneous.adoc b/modules/ROOT/pages/miscellaneous.adoc
deleted file mode 100644
index d65c1d4..0000000
--- a/modules/ROOT/pages/miscellaneous.adoc
+++ /dev/null
@@ -1 +0,0 @@
-= miscellaneous
diff --git a/modules/ROOT/pages/site-map.adoc b/modules/ROOT/pages/site-map.adoc
new file mode 100644
index 0000000..9a87475
--- /dev/null
+++ b/modules/ROOT/pages/site-map.adoc
@@ -0,0 +1,64 @@
+= Site map
+//uncomment to generate temporary nav file contents on console.
+//:antora-indexer-log-lists:
+
+indexList::[relative=*.adoc]
+
+* Community
+
+indexList::[level=2,relative=community/*.adoc]
+
+* Development
+
+indexList::[level=2,relative=development/*.adoc]
+
+* FAQS
+
+indexList::[level=2,relative=faqs/*.adoc]
+
+* Subprojects
+
+indexList::[level=2,relative=subprojects/*.adoc]
+
+** Dependency Manager
+*** Guides
+
+indexList::[level=4,relative=subprojects/apache-felix-dependency-manager/guides/*.adoc]
+
+*** Reference
+
+indexList::[level=4,relative=subprojects/apache-felix-dependency-manager/reference/*.adoc]
+
+*** Tutorials
+
+indexList::[level=4,relative=subprojects/apache-felix-dependency-manager/tutorials/*.adoc]
+
+** Framework
+
+indexList::[level=3,relative=subprojects/apache-felix-framework/*.adoc]
+
+** GoGo Shell
+
+indexList::[level=3,relative=subprojects/apache-felix-gogo/*.adoc]
+
+** Maven SCR plugin
+
+indexList::[level=3,relative=subprojects/apache-felix-maven-scr-plugin/*.adoc]
+
+** Web Console
+
+indexList::[level=3,relative=subprojects/apache-felix-web-console/*.adoc]
+
+*** Extensions
+
+indexList::[level=4,relative=subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/*.adoc]
+
+* Tutorials
+
+indexList::[level=2,relative=tutorials-examples-and-presentations/*.adoc]
+
+** OSGI Tutorial
+
+indexList::[level=3,relative=tutorials-examples-and-presentations/apache-felix-osgi-tutorial/*.adoc]
+
+//indexList::[]