This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new ad0bf8e62b ISIS-3243: fix typos and formatting in simpleapp and
contribute docs
new 30368f0fa3 Merge pull request #1136 from
HeVictor/ISIS-3243-fix-doc-typos-and-formatting
ad0bf8e62b is described below
commit ad0bf8e62b56bf6d072a7a73fd22bd58e3dcfbe5
Author: Victor He <[email protected]>
AuthorDate: Tue Oct 11 21:43:05 2022 +1100
ISIS-3243: fix typos and formatting in simpleapp and contribute docs
---
.../conguide/modules/ROOT/pages/contributing.adoc | 2 +-
starters/adoc/modules/starters/pages/simpleapp.adoc | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/antora/components/conguide/modules/ROOT/pages/contributing.adoc
b/antora/components/conguide/modules/ROOT/pages/contributing.adoc
index 92b941fe47..3681eb0b4d 100644
--- a/antora/components/conguide/modules/ROOT/pages/contributing.adoc
+++ b/antora/components/conguide/modules/ROOT/pages/contributing.adoc
@@ -199,7 +199,7 @@ The process to raise the pull request, broadly speaking:
== If your pull request is accepted
-To double check that your pull request is accepted, update your `master`
branch from the `upstream` remote:
+To double-check that your pull request is accepted, update your `master`
branch from the `upstream` remote:
You can then use `gitk --all` (or `git log` if you prefer the command line) to
check your contribution has been added.
diff --git a/starters/adoc/modules/starters/pages/simpleapp.adoc
b/starters/adoc/modules/starters/pages/simpleapp.adoc
index d1079bdd8b..2a8b6ab428 100644
--- a/starters/adoc/modules/starters/pages/simpleapp.adoc
+++ b/starters/adoc/modules/starters/pages/simpleapp.adoc
@@ -399,7 +399,7 @@ Change as required.
<.> The `dom` subpackage holds the "domain object model" for this module.
Modules may have other subpackages, common ones include ``types`` and
``fixture``s (as below), also ``api``s, ``contribution``s, ``spi``s
-<.> Holds classes for the `so` ("simple object") entity/aggregate, consisting
of the entity definition itself (`SimpleObject`) and a corresponding domin
services (`SimpleObjects` and `SimpleObjectRepository`).
+<.> Holds classes for the `so` ("simple object") entity/aggregate, consisting
of the entity definition itself (`SimpleObject`) and a corresponding domain
services (`SimpleObjects` and `SimpleObjectRepository`).
The associated `.layout.xml` and `.png` are optional but provide
metadata/resources for rendering (Maven is configured to also treat
`src/main/java` as a resource location).
<.> For the `jpa` branch only, uses Spring Data JPA to automatically provide
the query implementation.
@@ -584,11 +584,14 @@ public abstract class SimpleModuleIntegTestAbstract
<.> The `TestApp` (defined as a nested static class below) lists the modules
needed to bootstrap the integration test.
-<.> Actives the "test" profile, which reads in additional configuratoin in
`application-test.yml"
+<.> Activates the "test" profile, which reads in additional configuration in
`application-test.yml"
+
+<.> Tests typically inherit from `IsisIntegrationTestAbstract`, which provides
some convenience methods to inherit from.
+In this case, the test inherits from the
`IsisIntegrationTestAbstractWithFixtures` subclass which also adds in support
for running fixtures.
<.> Specifies the modules that make up Apache Isis framework itself.
-These include core, security set to the bypass implementation (effecively is
ignored) and JDO/DataNucleus for persistence.
-Note that there no viewers are bootstrapped because the tests are run through
Spring's integration testing framework, rather than (say) as Selenium tests.
+These include core, security set to the bypass implementation (effectively is
ignored) and JDO/DataNucleus for persistence.
+Note that no viewers are bootstrapped because the tests are run through
Spring's integration testing framework, rather than (say) as Selenium tests.
<.> Disables security checks.
@@ -610,9 +613,6 @@ This may be required because the application might
otherwise be configured to us
<.> Sets up logging to use the configuration defined in the `log4j2-test.xml`
file
-<.> Tests typically inherit from `IsisIntegrationTestAbstract`, which provides
some convenience methods to inherit from.
-In this case, the test inherits from the
`IsisIntegrationTestAbstractWithFixtures` subclass which also adds in support
for running fixtures.
-
=== webapp's src/main/java
