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/06/02 16:55:34 UTC
[isis] branch ISIS-2062-antora updated: ISIS-2062: reorg cgcom pages
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
The following commit(s) were added to refs/heads/ISIS-2062-antora by this push:
new 90c0874 ISIS-2062: reorg cgcom pages
90c0874 is described below
commit 90c08745c0a40e9411eeb67febcb5be857175b3f
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Jun 2 17:55:21 2019 +0100
ISIS-2062: reorg cgcom pages
---
antora/components/support/modules/cgcom/nav.adoc | 30 +++++++++++++++++++++-
.../modules/cgcom}/pages/_partials/x.sh | 2 +-
...applying-patches.adoc => applying-patches.adoc} | 0
...cedure.adoc => asciidoc-publish-procedure.adoc} | 0
.../support/modules/cgcom/pages/cgcom.adoc | 24 -----------------
...tting-a-release.adoc => cutting-a-release.adoc} | 0
...com_key-generation.adoc => key-generation.adoc} | 0
...ll-request.adoc => merging-a-pull-request.adoc} | 0
.../_cgcom_pmc-notes.adoc => pmc-notes.adoc} | 0
.../_cgcom_policies.adoc => policies.adoc} | 2 --
.../git-policy.adoc} | 0
.../versioning-policy.adoc} | 0
...uccessful.adoc => post-release-successful.adoc} | 0
...cessful.adoc => post-release-unsuccessful.adoc} | 0
...c => release-process-for-interim-releases.adoc} | 0
...ots.adoc => release-process-for-snapshots.adoc} | 0
...s-prereqs.adoc => release-process-prereqs.adoc} | 0
...fying-releases.adoc => verifying-releases.adoc} | 0
.../components/toc/modules/ROOT/pages/about.adoc | 2 +-
19 files changed, 31 insertions(+), 29 deletions(-)
diff --git a/antora/components/support/modules/cgcom/nav.adoc b/antora/components/support/modules/cgcom/nav.adoc
index 6e2ed3b..c53839c 100644
--- a/antora/components/support/modules/cgcom/nav.adoc
+++ b/antora/components/support/modules/cgcom/nav.adoc
@@ -1,5 +1,33 @@
* Committers' Guide
** xref:about.adoc[About]
-** xref:cgcom.adoc[Guide]
+
+** xref:applying-patches.adoc[Applying Patches]
+
+** xref:merging-a-pull-request.adoc[Merging a Pull Request]
+
+** xref:cutting-a-release.adoc[Cutting a Release]
+
+** xref:verifying-releases.adoc[Verifying Releases]
+
+** xref:post-release-successful.adoc[Post Release (successful)]
+
+** xref:post-release-unsuccessful.adoc[Post Release (unsuccessful)]
+
+** xref:release-process-for-snapshots.adoc[Release Process for Snapshots]
+
+** xref:release-process-for-interim-releases.adoc[Release Process for Interim Releases]
+
+** xref:asciidoc-publish-procedure.adoc[Asciidoc Publish Procedure]
+
+** xref:key-generation.adoc[Key Generation]
+
+** xref:release-process-prereqs.adoc[Release Process Prereqs]
+
+** xref:policies.adoc[Policies]
+*** xref:policies/versioning-policy.adoc[Versioning Policy]
+*** xref:policies/git-policy.adoc[Git Policy]
+
+** xref:pmc-notes.adoc[PMC Notes]
+
diff --git a/antora/components/rg/modules/svc/pages/_partials/x.sh b/antora/components/support/modules/cgcom/pages/_partials/x.sh
similarity index 82%
rename from antora/components/rg/modules/svc/pages/_partials/x.sh
rename to antora/components/support/modules/cgcom/pages/_partials/x.sh
index b641fe9..cfa0bf2 100644
--- a/antora/components/rg/modules/svc/pages/_partials/x.sh
+++ b/antora/components/support/modules/cgcom/pages/_partials/x.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-for a in `ls | grep _rgsvc`
+for a in `ls | grep _cgcom`
do
b=$(echo $a | cut -c8- | sed 's|_|/|g')
d=$(dirname $b)
diff --git a/antora/components/support/modules/cgcom/pages/_partials/_cgcom_applying-patches.adoc b/antora/components/support/modules/cgcom/pages/applying-patches.adoc
similarity index 100%
rename from antora/components/support/modules/cgcom/pages/_partials/_cgcom_applying-patches.adoc
rename to antora/components/support/modules/cgcom/pages/applying-patches.adoc
diff --git a/antora/components/support/modules/cgcom/pages/_partials/_cgcom_asciidoc-publish-procedure.adoc b/antora/components/support/modules/cgcom/pages/asciidoc-publish-procedure.adoc
similarity index 100%
rename from antora/components/support/modules/cgcom/pages/_partials/_cgcom_asciidoc-publish-procedure.adoc
rename to antora/components/support/modules/cgcom/pages/asciidoc-publish-procedure.adoc
diff --git a/antora/components/support/modules/cgcom/pages/cgcom.adoc b/antora/components/support/modules/cgcom/pages/cgcom.adoc
deleted file mode 100644
index 5f23a0e..0000000
--- a/antora/components/support/modules/cgcom/pages/cgcom.adoc
+++ /dev/null
@@ -1,24 +0,0 @@
-= Committers' Guide
-: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[]
-
-
-include::partial$_cgcom_applying-patches.adoc[leveloffset=+1]
-
-include::partial$_cgcom_merging-a-pull-request.adoc[leveloffset=+1]
-include::partial$_cgcom_cutting-a-release.adoc[leveloffset=+1]
-include::partial$_cgcom_verifying-releases.adoc[leveloffset=+1]
-include::partial$_cgcom_post-release-successful.adoc[leveloffset=+1]
-include::partial$_cgcom_post-release-unsuccessful.adoc[leveloffset=+1]
-include::partial$_cgcom_release-process-for-snapshots.adoc[leveloffset=+1]
-include::partial$_cgcom_release-process-for-interim-releases.adoc[leveloffset=+1]
-
-include::partial$_cgcom_asciidoc-publish-procedure.adoc[leveloffset=+1]
-
-include::partial$_cgcom_key-generation.adoc[leveloffset=+1]
-
-include::partial$_cgcom_release-process-prereqs.adoc[leveloffset=+1]
-
-include::partial$_cgcom_policies.adoc[leveloffset=+1]
-include::partial$_cgcom_pmc-notes.adoc[leveloffset=+1]
-
diff --git a/antora/components/support/modules/cgcom/pages/_partials/_cgcom_cutting-a-release.adoc b/antora/components/support/modules/cgcom/pages/cutting-a-release.adoc
similarity index 100%
rename from antora/components/support/modules/cgcom/pages/_partials/_cgcom_cutting-a-release.adoc
rename to antora/components/support/modules/cgcom/pages/cutting-a-release.adoc
diff --git a/antora/components/support/modules/cgcom/pages/_partials/_cgcom_key-generation.adoc b/antora/components/support/modules/cgcom/pages/key-generation.adoc
similarity index 100%
rename from antora/components/support/modules/cgcom/pages/_partials/_cgcom_key-generation.adoc
rename to antora/components/support/modules/cgcom/pages/key-generation.adoc
diff --git a/antora/components/support/modules/cgcom/pages/_partials/_cgcom_merging-a-pull-request.adoc b/antora/components/support/modules/cgcom/pages/merging-a-pull-request.adoc
similarity index 100%
rename from antora/components/support/modules/cgcom/pages/_partials/_cgcom_merging-a-pull-request.adoc
rename to antora/components/support/modules/cgcom/pages/merging-a-pull-request.adoc
diff --git a/antora/components/support/modules/cgcom/pages/_partials/_cgcom_pmc-notes.adoc b/antora/components/support/modules/cgcom/pages/pmc-notes.adoc
similarity index 100%
rename from antora/components/support/modules/cgcom/pages/_partials/_cgcom_pmc-notes.adoc
rename to antora/components/support/modules/cgcom/pages/pmc-notes.adoc
diff --git a/antora/components/support/modules/cgcom/pages/_partials/_cgcom_policies.adoc b/antora/components/support/modules/cgcom/pages/policies.adoc
similarity index 87%
rename from antora/components/support/modules/cgcom/pages/_partials/_cgcom_policies.adoc
rename to antora/components/support/modules/cgcom/pages/policies.adoc
index 22fd0b2..83d8b11 100644
--- a/antora/components/support/modules/cgcom/pages/_partials/_cgcom_policies.adoc
+++ b/antora/components/support/modules/cgcom/pages/policies.adoc
@@ -8,6 +8,4 @@
This chapter pulls together various policy documents relating to the development of Apache Isis'.
-include::_cgcom_policies_versioning-policy.adoc[leveloffset=+1]
-include::_cgcom_policies_git-policy.adoc[leveloffset=+1]
diff --git a/antora/components/support/modules/cgcom/pages/_partials/_cgcom_policies_git-policy.adoc b/antora/components/support/modules/cgcom/pages/policies/git-policy.adoc
similarity index 100%
rename from antora/components/support/modules/cgcom/pages/_partials/_cgcom_policies_git-policy.adoc
rename to antora/components/support/modules/cgcom/pages/policies/git-policy.adoc
diff --git a/antora/components/support/modules/cgcom/pages/_partials/_cgcom_policies_versioning-policy.adoc b/antora/components/support/modules/cgcom/pages/policies/versioning-policy.adoc
similarity index 100%
rename from antora/components/support/modules/cgcom/pages/_partials/_cgcom_policies_versioning-policy.adoc
rename to antora/components/support/modules/cgcom/pages/policies/versioning-policy.adoc
diff --git a/antora/components/support/modules/cgcom/pages/_partials/_cgcom_post-release-successful.adoc b/antora/components/support/modules/cgcom/pages/post-release-successful.adoc
similarity index 100%
rename from antora/components/support/modules/cgcom/pages/_partials/_cgcom_post-release-successful.adoc
rename to antora/components/support/modules/cgcom/pages/post-release-successful.adoc
diff --git a/antora/components/support/modules/cgcom/pages/_partials/_cgcom_post-release-unsuccessful.adoc b/antora/components/support/modules/cgcom/pages/post-release-unsuccessful.adoc
similarity index 100%
rename from antora/components/support/modules/cgcom/pages/_partials/_cgcom_post-release-unsuccessful.adoc
rename to antora/components/support/modules/cgcom/pages/post-release-unsuccessful.adoc
diff --git a/antora/components/support/modules/cgcom/pages/_partials/_cgcom_release-process-for-interim-releases.adoc b/antora/components/support/modules/cgcom/pages/release-process-for-interim-releases.adoc
similarity index 100%
rename from antora/components/support/modules/cgcom/pages/_partials/_cgcom_release-process-for-interim-releases.adoc
rename to antora/components/support/modules/cgcom/pages/release-process-for-interim-releases.adoc
diff --git a/antora/components/support/modules/cgcom/pages/_partials/_cgcom_release-process-for-snapshots.adoc b/antora/components/support/modules/cgcom/pages/release-process-for-snapshots.adoc
similarity index 100%
rename from antora/components/support/modules/cgcom/pages/_partials/_cgcom_release-process-for-snapshots.adoc
rename to antora/components/support/modules/cgcom/pages/release-process-for-snapshots.adoc
diff --git a/antora/components/support/modules/cgcom/pages/_partials/_cgcom_release-process-prereqs.adoc b/antora/components/support/modules/cgcom/pages/release-process-prereqs.adoc
similarity index 100%
rename from antora/components/support/modules/cgcom/pages/_partials/_cgcom_release-process-prereqs.adoc
rename to antora/components/support/modules/cgcom/pages/release-process-prereqs.adoc
diff --git a/antora/components/support/modules/cgcom/pages/_partials/_cgcom_verifying-releases.adoc b/antora/components/support/modules/cgcom/pages/verifying-releases.adoc
similarity index 100%
rename from antora/components/support/modules/cgcom/pages/_partials/_cgcom_verifying-releases.adoc
rename to antora/components/support/modules/cgcom/pages/verifying-releases.adoc
diff --git a/antora/components/toc/modules/ROOT/pages/about.adoc b/antora/components/toc/modules/ROOT/pages/about.adoc
index 06a3cd1..af9362d 100644
--- a/antora/components/toc/modules/ROOT/pages/about.adoc
+++ b/antora/components/toc/modules/ROOT/pages/about.adoc
@@ -55,7 +55,7 @@ include::_attributes.adoc[]
|*Get involved!*
* *xref:support:dg:dg.adoc[Developers' Guide]*
-** xref:support:dg:dg.adoc#intellij[IntelliJ] & xref:dg:dg.adoc#eclipse[Eclipse]
+** xref:support:dg:dg.adoc#developing-using-intellij-idea[IntelliJ] & xref:support:dg:dg.adoc#eclipse[Eclipse]
** xref:support:dg:dg.adoc#contributing[Pull requests]
** xref:support:dg:dg.adoc#asciidoc-syntax[Asciidoc syntax]