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 2018/08/12 17:38:13 UTC

[isis] branch maint-2.0.0-M1 updated: ISIS-1810: upgrades to release notes, migration notes

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

danhaywood pushed a commit to branch maint-2.0.0-M1
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/maint-2.0.0-M1 by this push:
     new b4c64f1  ISIS-1810: upgrades to release notes, migration notes
b4c64f1 is described below

commit b4c64f1630c66af705fef57a6da4b2575dba7aa1
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Aug 12 18:21:47 2018 +0100

    ISIS-1810: upgrades to release notes, migration notes
---
 .../guides/cgcom/_cgcom_asciidoc-publish-procedure.adoc       |  4 ++--
 .../src/main/asciidoc/migration-notes/migration-notes.adoc    |  1 +
 .../src/main/asciidoc/release-notes/release-notes.adoc        | 11 +++++++----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_asciidoc-publish-procedure.adoc b/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_asciidoc-publish-procedure.adoc
index 637fc9a..e2e151f 100644
--- a/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_asciidoc-publish-procedure.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_asciidoc-publish-procedure.adoc
@@ -149,11 +149,11 @@ where `N.N.N` is the release number
 
 Ensure in doing this that the dropdown for the home page correctly references the versions.
 
-When ready, commit and push the changes (in the `isis-site.git` directory, of course):
+When ready, then stage, commit and push the changes (in the `isis-site.git` directory, of course):
 
 [source,bash]
 ----
-git commit -m "ISIS-nnnn: updating docs"
+git commit -am "ISIS-nnnn: updating docs"
 git push
 ----
 
diff --git a/adocs/documentation/src/main/asciidoc/migration-notes/migration-notes.adoc b/adocs/documentation/src/main/asciidoc/migration-notes/migration-notes.adoc
index 1e38b3a..369e487 100644
--- a/adocs/documentation/src/main/asciidoc/migration-notes/migration-notes.adoc
+++ b/adocs/documentation/src/main/asciidoc/migration-notes/migration-notes.adoc
@@ -10,6 +10,7 @@ Consult these notes when migrating to new versions of the framework.
 
 
 
+include::_migration-notes_1.16.0-to-2.0.0-M1.adoc[leveloffset=+1]
 include::_migration-notes_1.15.0-to-1.16.0.adoc[leveloffset=+1]
 include::_migration-notes_1.14.0-to-1.15.0.adoc[leveloffset=+1]
 include::_migration-notes_1.13.0-to-1.14.0.adoc[leveloffset=+1]
diff --git a/adocs/documentation/src/main/asciidoc/release-notes/release-notes.adoc b/adocs/documentation/src/main/asciidoc/release-notes/release-notes.adoc
index 622762e..dbce006 100644
--- a/adocs/documentation/src/main/asciidoc/release-notes/release-notes.adoc
+++ b/adocs/documentation/src/main/asciidoc/release-notes/release-notes.adoc
@@ -24,10 +24,13 @@ This table summarises all releases of Apache Isis to date.
 | xref:release-notes.adoc#_release-notes_2.0.0-M1[2.0.0-M1]
 | 31-07-2018
 | First milestone release for Apache Isis 2.0.0: Java 8 support, DataNucleus 5.1, Wicket 8, meta-annotations, breadcrumbs
-| XXX
-| XXX
-| XXX
-| https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=XXXXXX[Release notes for 2.0.0-M1]
+| 6
+| 55
+
++ 4 tasks
++ 13 sub-tasks
+| 22
+| https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12342392[Release notes for 2.0.0-M1]
 
 | xref:release-notes.adoc#_release-notes_1.16.2[1.16.2]
 | 05-03-2018