This is an automated email from the ASF dual-hosted git repository.
jmclean pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
The following commit(s) were added to refs/heads/develop by this push:
new f30a113 Correcting two typos in contributing.adoc
new 7ec820a Merge pull request #48 from cptblaubaer/develop
f30a113 is described below
commit f30a1133a56be5aa988eeeb9bc218a4ce750d228
Author: Andreas Oswald <[email protected]>
AuthorDate: Tue Mar 19 17:33:31 2019 +0100
Correcting two typos in contributing.adoc
---
src/site/asciidoc/developers/contributing.adoc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/site/asciidoc/developers/contributing.adoc
b/src/site/asciidoc/developers/contributing.adoc
index 6952f0a..cb98241 100644
--- a/src/site/asciidoc/developers/contributing.adoc
+++ b/src/site/asciidoc/developers/contributing.adoc
@@ -89,7 +89,7 @@ In order to get all changes of our upstream-repository, just
execute the followi
git pull upstream
-This will get all changed from upstream and merge them locally. In order to
update your GitHub version, you have to push things back to `origin?`. You can
do this by execunting the follwing command:
+This will get all changed from upstream and merge them locally. In order to
update your GitHub version, you have to push things back to `origin`. You can
do this by execunting the follwing command:
git push
@@ -113,7 +113,7 @@ If you want to be assigned to an issue because you want to
work on it, please re
As our documentation and website are generated as a side-product of our build,
contributing to this technically the same as contributing to the code.
-All our content is written in Asciidoctor and is located in
`src/site/asciidoctor` directories. For a reference of the Asciidoctor snytax
please have a look at the
https://asciidoctor.org/docs/user-manual/#introduction-to-asciidoctor[Asciidoctor
documentation].
+All our content is written in Asciidoctor and is located in
`src/site/asciidoc` directories. For a reference of the Asciidoctor snytax
please have a look at the
https://asciidoctor.org/docs/user-manual/#introduction-to-asciidoctor[Asciidoctor
documentation].
=== Branching model