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
commit 4aeeefcbd2b726ea26bd27484cfc96706d95e1f6 Merge: a045501 80fdfae Author: danhaywood <d...@haywood-associates.co.uk> AuthorDate: Sun Aug 12 16:43:30 2018 +0100 ISIS-1810: merges documentation commits from master (nb: reverted an API polishing commit that relates to 2.0.0-M2) # Conflicts: # adocs/documentation/pom.xml # adocs/documentation/src/main/asciidoc/index.html # todo-deprecation-list.txt adocs/documentation/pom.xml | 2 +- .../src/main/asciidoc/documentation.adoc | 76 +++++++--------------- .../guides/cgcom/_cgcom_key-generation.adoc | 2 +- 3 files changed, 27 insertions(+), 53 deletions(-) diff --cc adocs/documentation/pom.xml index ef23534,d0de46a..fa4418b --- a/adocs/documentation/pom.xml +++ b/adocs/documentation/pom.xml @@@ -52,11 -52,10 +52,11 @@@ <build.dir>${project.basedir}/target/site</build.dir> - <!-- expected isis-site to be checked out to /c/ASF/isis/isis-site, vs /c/github/apache/isis --> - <!-- expects 'isis-site' to be checked out to the same parent directory as 'isis-master' --> - <isis-site-latest.dir>../../../isis-site/latest</isis-site-latest.dir> - <isis-site-content.dir>../../../isis-site/content</isis-site-content.dir> - <isis-site-search.dir>../../../isis-site/search</isis-site-search.dir> ++ <!-- expects isis-site to be checked out to /c/ASF/isis/isis-site, vs /c/github/apache/isis --> + <isis-site.dir>../../../../../ASF/isis/isis-site</isis-site.dir> + <isis-site-latest.dir>${isis-site.dir}/latest</isis-site-latest.dir> + <isis-site-content.dir>${isis-site.dir}/content</isis-site-content.dir> + <isis-site-search.dir>${isis-site.dir}/search</isis-site-search.dir> <message>updating content (built from adocs/documentation in isis.git repo)</message> </properties>