From a5adc9a9df75681fa7a663b0c2b9cd12680b2bf2 Mon Sep 17 00:00:00 2001
From: Robert Seedorff <Robert.Seedorff@iteratec.com>
Date: Fri, 14 Aug 2020 23:38:24 +0200
Subject: [PATCH 1/5] Updated github ISSUE_Templates.

---
 .github/ISSUE_TEMPLATE/bug_report.md          | 27 +++++++----
 .github/ISSUE_TEMPLATE/documentation_issue.md | 20 ++++++++
 .github/ISSUE_TEMPLATE/feature_request.md     | 17 ++++---
 .github/ISSUE_TEMPLATE/new_hook.md            | 41 ++++++++++++++++
 .../ISSUE_TEMPLATE/new_security_scanner.md    | 48 +++++++++++--------
 .github/ISSUE_TEMPLATE/question.md            | 14 ++++++
 6 files changed, 132 insertions(+), 35 deletions(-)
 create mode 100644 .github/ISSUE_TEMPLATE/documentation_issue.md
 create mode 100644 .github/ISSUE_TEMPLATE/new_hook.md
 create mode 100644 .github/ISSUE_TEMPLATE/question.md

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 732843f8..5544741f 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,31 +1,42 @@
 ---
-name: Bug report
-about: Create a report to help us improve
+name: "🐞 Bug report"
+about: Please create a bug report if you encouter any project specific issue.
+labels: bug
 
 ---
+<!--
+Thanks for reporting an issue in the documentation 🙌 ❤️
+
+Before opening a new issue, please make sure that we do not have any duplicates already open. You can ensure this by searching the issue list for this repository. If there is a duplicate, please close your issue and add a comment to the existing issue instead.
+-->
 
 **Describe the bug**
-A clear and concise description of what the bug is.
+<!-- A clear and concise description of what the bug is. -->
 
 **To Reproduce**
+<!--
 Steps to reproduce the behavior:
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
 4. See error
+-->
 
 **Expected behavior**
-A clear and concise description of what you expected to happen.
+<!-- A clear and concise description of what you expected to happen. -->
 
 
 **System (please complete the following information):**
+<!--
+ - secureCodeBox Version/Release
  - OS: [e.g. iOS]
+ - Kubernetes Version [command: `kubectl version`]
  - Docker Version [command: `docker -v`]
- - Docker Compose Version [command: `docker-compose -v`]
- - Browser [e.g. chrome, safari]
+ - Browser [e.g. chrome, safari, firefox,...]
+-->
 
 **Screenshots / Logs**
-If applicable, add screenshots to help explain your problem.
+<!-- If applicable, add screenshots to help explain your problem. -->
 
 **Additional context**
-Add any other context about the problem here.
+<!-- Add any other context about the problem here. -->
diff --git a/.github/ISSUE_TEMPLATE/documentation_issue.md b/.github/ISSUE_TEMPLATE/documentation_issue.md
new file mode 100644
index 00000000..070e86f7
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/documentation_issue.md
@@ -0,0 +1,20 @@
+---
+name: "📚 Documentation Issue"
+about: "Did you come across parts of our documentation that should be fixed?"
+labels: documentation
+
+---
+<!--
+Thanks for reporting an issue in our documentation 🙌 ❤️
+
+Before opening a new issue, please make sure that we do not have any duplicates already open. You can ensure this by searching the issue list for this repository. If there is a duplicate, please close your issue and add a comment to the existing issue instead.
+-->
+
+## Where to find the issue
+<!-- Be as specific as possible by naming the document, page, and ideally paragraph. -->
+
+## Describe the issue
+<!-- Please let us know what exactly is the issue with that part of the documentation -->
+
+## Suggested change
+<!-- If you have ideas on how to fix this issue, please note them here, or consider creating a Pull Request -->
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 066b2d92..d3f448b6 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,17 +1,22 @@
 ---
-name: Feature request
-about: Suggest an idea for this project
+name: "Feature request"
+about: "Suggest an idea for this project"
 
 ---
+<!--
+Thanks for reporting an issue in our documentation 🙌 ❤️
+
+Before opening a new issue, please make sure that we do not have any duplicates already open. You can ensure this by searching the issue list for this repository. If there is a duplicate, please close your issue and add a comment to the existing issue instead.
+-->
 
 **Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
 
 **Describe the solution you'd like**
-A clear and concise description of what you want to happen.
+<!-- A clear and concise description of what you want to happen. -->
 
 **Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
+<!-- A clear and concise description of any alternative solutions or features you've considered. -->
 
 **Additional context**
-Add any other context or screenshots about the feature request here.
+<!-- Add any other context or screenshots about the feature request here. -->
diff --git a/.github/ISSUE_TEMPLATE/new_hook.md b/.github/ISSUE_TEMPLATE/new_hook.md
new file mode 100644
index 00000000..a3706a44
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/new_hook.md
@@ -0,0 +1,41 @@
+---
+name: '⚓️ New Hook request'
+about: 'Suggest an idea for a new data processing or integration hook in this project.'
+labels: 'hook'
+---
+
+<!--
+Thanks for contributing to the project 🙌 ❤️
+
+Before opening a new issue, please make sure that we do not have any duplicates already open. You can ensure this by searching the issue list for this repository. If there is a duplicate, please close your issue and add a comment to the existing issue instead. Also, please, have a look at our FAQs and existing questions before opening a new question.
+-->
+
+## New Hook implementation request
+
+**Is your feature request related to a problem? Please describe.**
+<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
+
+**Describe the solution you'd like**
+<!-- A clear and concise description of what you want to happen. -->
+
+**Describe alternatives you've considered**
+<!-- A clear and concise description of any alternative solutions or features you've considered. -->
+
+**Additional context**
+<!-- Add any other context or screenshots about the feature request here. -->
+
+## Steps to implement a new Hook
+<!--
+Hint: A general guide how to implement a new scanner is documented [here](https://github.com/secureCodeBox/secureCodeBox-v2/tree/master/docs/developer-guide)
+-->
+
+- [ ] Create a new folder with the name of the [scanner here](https://github.com/secureCodeBox/secureCodeBox-v2/tree/master/scanners), based on the existing template
+- [ ] Add a README.md and give a brief overview of the scanner and its configuration options.
+- [ ] Implement a new scanner specific scan-type.yaml
+- [ ] Implement a new scanner specific parse-definition.yaml
+- [ ] Add (optional) some cascading-rules.yaml
+- [ ] Add (optional) a Dockerfile for the scanner if there is now existing one public available on dockerHub
+- [ ] Use the parserSDK to implement a new findings parser (currently based on NodeJS)
+- [ ] Add unit tests with at minimum 80% test coverage
+- [ ] Add some example scan.yaml and finding.yaml files in the example folder
+- [ ] Implement a new integration test for the scanner [here](https://github.com/secureCodeBox/secureCodeBox-v2/tree/master/tests/integration)
diff --git a/.github/ISSUE_TEMPLATE/new_security_scanner.md b/.github/ISSUE_TEMPLATE/new_security_scanner.md
index 4209c8d8..22604771 100644
--- a/.github/ISSUE_TEMPLATE/new_security_scanner.md
+++ b/.github/ISSUE_TEMPLATE/new_security_scanner.md
@@ -1,35 +1,41 @@
 ---
-name: 'New Security Scanner request'
+name: '🚓 New Security Scanner request'
 about: 'Suggest an idea for a new security scanner to integrate in this project.'
-labels: 'security scanner'
+labels: 'scanner'
 ---
+
+<!--
+Thanks for contributing to the project 🙌 ❤️
+
+Before opening a new issue, please make sure that we do not have any duplicates already open. You can ensure this by searching the issue list for this repository. If there is a duplicate, please close your issue and add a comment to the existing issue instead. Also, please, have a look at our FAQs and existing questions before opening a new question.
+-->
+
 ## New Scanner implementation request
 
 **Is your feature request related to a problem? Please describe.**
-- _A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]_
+<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
 
 **Describe the solution you'd like**
-- _A clear and concise description of what you want to happen._
+<!-- A clear and concise description of what you want to happen. -->
 
 **Describe alternatives you've considered**
-- _A clear and concise description of any alternative solutions or features you've considered._
+<!-- A clear and concise description of any alternative solutions or features you've considered. -->
 
 **Additional context**
-- _Add any other context or screenshots about the feature request here._
+<!-- Add any other context or screenshots about the feature request here. -->
 
 ## Steps to implement a new scanner
-> Hint: A general guide how to implement a new scanner is documented [here]( https://github.com/secureCodeBox/secureCodeBox/blob/master/docs/developer-guide/README.md#developing-own-processes)
-
-### Must have
-- [ ] Create a [new public secureCodeBox repository](https://github.com/organizations/secureCodeBox/repositories/new) for the scanner implementation
-- [ ] Implement a new scanner microservice an reuse some of the existing stuff, if possible
-- [ ] Check if there is a [healthcheck](https://github.com/secureCodeBox/secureCodeBox/blob/master/docs/developer-guide/README.md#healthchecks-for-scanner-microservices) for the microservice implemented
-- [ ] Implement a [new basic security process](https://github.com/secureCodeBox/secureCodeBox/blob/master/docs/developer-guide/README.md#developing-a-process-model) for the scanner
-- [ ] Update the [docker-compose](https://github.com/secureCodeBox/secureCodeBox/blob/master/docker-compose.yml) files and integrate your new scanner there
-- [ ] Update the [user guide](https://github.com/secureCodeBox/secureCodeBox/tree/master/docs/user-guide) and [developer guide](https://github.com/secureCodeBox/secureCodeBox/tree/master/docs/developer-guide)
-- [ ] Implement a integration test for the scanner [here](https://github.com/secureCodeBox/secureCodeBox/tree/master/test)
-
-### Should have
-- [ ] Update the [CLI examples](https://github.com/secureCodeBox/secureCodeBox/tree/master/cli)
-- [ ] Update the [Jenkins Pipeline](https://github.com/secureCodeBox/integration-pipeline-jenkins-examples) examples
-- [ ] Update the [OpenShift Container Setup](https://github.com/secureCodeBox/ansible-role-securecodebox-openshift)
+<!--
+Hint: A general guide how to implement a new scanner is documented [here](https://github.com/secureCodeBox/secureCodeBox-v2/tree/master/docs/developer-guide)
+-->
+
+- [ ] Create a new folder with the name of the [scanner here](https://github.com/secureCodeBox/secureCodeBox-v2/tree/master/scanners), based on the existing template
+- [ ] Add a README.md and give a brief overview of the scanner and its configuration options.
+- [ ] Implement a new scanner specific scan-type.yaml
+- [ ] Implement a new scanner specific parse-definition.yaml
+- [ ] Add (optional) some cascading-rules.yaml
+- [ ] Add (optional) a Dockerfile for the scanner if there is now existing one public available on dockerHub
+- [ ] Use the parserSDK to implement a new findings parser (currently based on NodeJS)
+- [ ] Add unit tests with at minimum 80% test coverage
+- [ ] Add some example scan.yaml and finding.yaml files in the example folder
+- [ ] Implement a new integration test for the scanner [here](https://github.com/secureCodeBox/secureCodeBox-v2/tree/master/tests/integration)
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
new file mode 100644
index 00000000..1f404758
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -0,0 +1,14 @@
+---
+name: "🤨 Question"
+about: "If you have *specific* questions about the project, please post them here."
+labels: question
+
+---
+<!--
+Thanks for contributing to the project 🙌 ❤️
+
+Before opening a new issue, please make sure that we do not have any duplicates already open. You can ensure this by searching the issue list for this repository. If there is a duplicate, please close your issue and add a comment to the existing issue instead. Also, please, have a look at our FAQs and existing questions before opening a new question.
+-->
+
+## Your Question
+<!-- Include details about your question. -->
\ No newline at end of file

From 52c9a71417854fff69e265f6861a8e1e9b7b25ff Mon Sep 17 00:00:00 2001
From: Robert Seedorff <Robert.Seedorff@iteratec.com>
Date: Thu, 10 Sep 2020 17:16:42 +0200
Subject: [PATCH 2/5] Added some readme files to improve documentation.

---
 README.md                            |  4 +++-
 docs/developer-guide/Architecture.md |  0
 docs/developer-guide/CRDs.md         |  0
 docs/developer-guide/Hooks.md        |  0
 docs/developer-guide/Operator.md     |  0
 docs/developer-guide/Scanners.md     |  0
 docs/glossary.md                     | 13 +++++++++++++
 docs/index.md                        | 10 ++++++----
 docs/user-guide/CLI.md               |  0
 docs/user-guide/Hooks.md             |  0
 docs/user-guide/Installation.md      |  0
 docs/user-guide/README.md            |  2 +-
 docs/user-guide/Scanners.md          |  0
 docs/versioning.md                   | 17 +++++++++++++++++
 14 files changed, 40 insertions(+), 6 deletions(-)
 create mode 100644 docs/developer-guide/Architecture.md
 create mode 100644 docs/developer-guide/CRDs.md
 create mode 100644 docs/developer-guide/Hooks.md
 create mode 100644 docs/developer-guide/Operator.md
 create mode 100644 docs/developer-guide/Scanners.md
 create mode 100644 docs/glossary.md
 create mode 100644 docs/user-guide/CLI.md
 create mode 100644 docs/user-guide/Hooks.md
 create mode 100644 docs/user-guide/Installation.md
 create mode 100644 docs/user-guide/Scanners.md
 create mode 100644 docs/versioning.md

diff --git a/README.md b/README.md
index 9f4abab0..f14835a6 100644
--- a/README.md
+++ b/README.md
@@ -65,7 +65,9 @@ The typical way to ensure application security is to hire a security specialist
 
 With the _secureCodeBox_ we provide a toolchain for continuous scanning of applications to find the low-hanging fruit issues early in the development process and free the resources of the penetration tester to concentrate on the major security issues.
 
-The purpose of _secureCodeBox_ **is not** to replace the penetration testers or make them obsolete. We strongly recommend running extensive tests by experienced penetration testers on all your applications.
+![secureCodeBox Architecture](./docs/resources/macbook_kibana.jpg)
+
+The purpose of _secureCodeBox_ **is not** to replace the penetration testers or make them obsolete. We strongly recommend to run extensive tests by experienced penetration testers on all your applications.
 
 **Important note**: The _secureCodeBox_ is no simple one-button-click-solution! You must have a deep understanding of security and how to configure the scanners. Furthermore, an understanding of the scan results and how to interpret them is also necessary.
 
diff --git a/docs/developer-guide/Architecture.md b/docs/developer-guide/Architecture.md
new file mode 100644
index 00000000..e69de29b
diff --git a/docs/developer-guide/CRDs.md b/docs/developer-guide/CRDs.md
new file mode 100644
index 00000000..e69de29b
diff --git a/docs/developer-guide/Hooks.md b/docs/developer-guide/Hooks.md
new file mode 100644
index 00000000..e69de29b
diff --git a/docs/developer-guide/Operator.md b/docs/developer-guide/Operator.md
new file mode 100644
index 00000000..e69de29b
diff --git a/docs/developer-guide/Scanners.md b/docs/developer-guide/Scanners.md
new file mode 100644
index 00000000..e69de29b
diff --git a/docs/glossary.md b/docs/glossary.md
new file mode 100644
index 00000000..ca136a44
--- /dev/null
+++ b/docs/glossary.md
@@ -0,0 +1,13 @@
+# Glossary
+
+This overview provides a description for all acronyms and special terms which are used in this project. If you encounter any missing terms, please [let us know](https://github.com/corona-warn-app/cwa-documentation/issues/new?labels=documentation%2C+bug&template=01_doc_issue.md) or [create a pull request](https://github.com/secureCodeBox/secureCodeBox-v2/pulls).
+
+| Term, acronym... | Description |
+| --- | --- |
+| API | An [Application Programming Interface](https://en.wikipedia.org/wiki/Application_programming_interface) (API) is a computing interface which defines interactions between multiple software intermediaries. |
+| CRD | Acronym for "[Custom Ressource Definition](https://kubernetes.io/docs/concepts/extend-kubernetes/api-extension/custom-resources/)". |
+| GUID | Acronym for "[Globally Unique Identifier](https://en.wikipedia.org/wiki/Universally_unique_identifier)". |
+| K8S | Acronym for "[Kubernetes](https://kubernetes.io/docs/home/)". |
+| SCB | Acronym for "[secureCodeBox (This Project)](https://www.secureCodeBox.io)". |
+
+
diff --git a/docs/index.md b/docs/index.md
index abb1ab06..646b7123 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -7,14 +7,16 @@
 ## Documentation Overview
 
 <!-- toc -->
-- [Project Readme and Quickstart][scb-github]
-- [User Guide](user-guide/README.md)
-- [Developer Guide](developer-guide/README.md)
+- [Project Readme and Quickstart][scb-github] Start here if you want to get a brief overview and installation quickstart
+- [User Guide](user-guide/README.md) If you want to configure security automation in your environment, please take a look into our user guide.
+- [Developer Guide](developer-guide/README.md) If you want to extend the project an add your own compents or bugfix something, please take a look into our developer guide.
+- [Glossary](glossary.md) This overview provides a description for all acronyms and special terms which are used in this project.
+- [Versioning](versioning.md) This describes how we use versioning in tags and releases.
 
 <!-- tocstop -->
 
 ## Need a human?
-- [Join Slack][scb-slack]
+- [Join us -> Slack][scb-slack] 💬
 
 ## License
 Code of secureCodeBox is licensed under the [Apache License 2.0][scb-license].
diff --git a/docs/user-guide/CLI.md b/docs/user-guide/CLI.md
new file mode 100644
index 00000000..e69de29b
diff --git a/docs/user-guide/Hooks.md b/docs/user-guide/Hooks.md
new file mode 100644
index 00000000..e69de29b
diff --git a/docs/user-guide/Installation.md b/docs/user-guide/Installation.md
new file mode 100644
index 00000000..e69de29b
diff --git a/docs/user-guide/README.md b/docs/user-guide/README.md
index c0b3a4c0..af3821b6 100644
--- a/docs/user-guide/README.md
+++ b/docs/user-guide/README.md
@@ -135,4 +135,4 @@ pop3s-tls-scan   sslyze         non-invasive   light
 smtps-tls-scan   sslyze         non-invasive   light
 ssh-scan         ssh-scan       non-invasive   light
 zap-http         zap-baseline   non-invasive   medium
-```
\ No newline at end of file
+```
diff --git a/docs/user-guide/Scanners.md b/docs/user-guide/Scanners.md
new file mode 100644
index 00000000..e69de29b
diff --git a/docs/versioning.md b/docs/versioning.md
new file mode 100644
index 00000000..0bfe605b
--- /dev/null
+++ b/docs/versioning.md
@@ -0,0 +1,17 @@
+# Versioning
+
+All components of the secureCodeBox use [Semantic versioning](https://semver.org/).
+
+Given a version number MAJOR.MINOR.PATCH, we increment the:
+
+- MAJOR version when we make incompatible API changes,
+- MINOR version when we add functionality in a backwards compatible manner, and
+- PATCH version when we make backwards compatible bug fixes.
+
+## Maintaining compatible versions
+
+Backend components will always remain compatible due to ongoing the availability of old API versions.
+
+## Changelogs
+
+Changelogs can be found the in release notes attached to git tags, e.g. (https://github.com/secureCodeBox/secureCodeBox-v2/releases).
\ No newline at end of file

From e9857f99874943ae2e095abdc9c4de80f34edc5f Mon Sep 17 00:00:00 2001
From: Robert Seedorff <Robert.Seedorff@iteratec.com>
Date: Wed, 30 Sep 2020 08:42:33 +0200
Subject: [PATCH 3/5] Reverted docs changes due to a complete new documentation
 repo instead.

---
 docs/_config.yml                     | 1 -
 docs/developer-guide/Architecture.md | 0
 docs/developer-guide/CRDs.md         | 0
 docs/developer-guide/Hooks.md        | 0
 docs/developer-guide/Operator.md     | 0
 docs/developer-guide/Scanners.md     | 0
 docs/user-guide/CLI.md               | 0
 docs/user-guide/Hooks.md             | 0
 docs/user-guide/Installation.md      | 0
 docs/user-guide/Scanners.md          | 0
 10 files changed, 1 deletion(-)
 delete mode 100644 docs/_config.yml
 delete mode 100644 docs/developer-guide/Architecture.md
 delete mode 100644 docs/developer-guide/CRDs.md
 delete mode 100644 docs/developer-guide/Hooks.md
 delete mode 100644 docs/developer-guide/Operator.md
 delete mode 100644 docs/developer-guide/Scanners.md
 delete mode 100644 docs/user-guide/CLI.md
 delete mode 100644 docs/user-guide/Hooks.md
 delete mode 100644 docs/user-guide/Installation.md
 delete mode 100644 docs/user-guide/Scanners.md

diff --git a/docs/_config.yml b/docs/_config.yml
deleted file mode 100644
index 2f7efbea..00000000
--- a/docs/_config.yml
+++ /dev/null
@@ -1 +0,0 @@
-theme: jekyll-theme-minimal
\ No newline at end of file
diff --git a/docs/developer-guide/Architecture.md b/docs/developer-guide/Architecture.md
deleted file mode 100644
index e69de29b..00000000
diff --git a/docs/developer-guide/CRDs.md b/docs/developer-guide/CRDs.md
deleted file mode 100644
index e69de29b..00000000
diff --git a/docs/developer-guide/Hooks.md b/docs/developer-guide/Hooks.md
deleted file mode 100644
index e69de29b..00000000
diff --git a/docs/developer-guide/Operator.md b/docs/developer-guide/Operator.md
deleted file mode 100644
index e69de29b..00000000
diff --git a/docs/developer-guide/Scanners.md b/docs/developer-guide/Scanners.md
deleted file mode 100644
index e69de29b..00000000
diff --git a/docs/user-guide/CLI.md b/docs/user-guide/CLI.md
deleted file mode 100644
index e69de29b..00000000
diff --git a/docs/user-guide/Hooks.md b/docs/user-guide/Hooks.md
deleted file mode 100644
index e69de29b..00000000
diff --git a/docs/user-guide/Installation.md b/docs/user-guide/Installation.md
deleted file mode 100644
index e69de29b..00000000
diff --git a/docs/user-guide/Scanners.md b/docs/user-guide/Scanners.md
deleted file mode 100644
index e69de29b..00000000

From be0408573e400ed31c1cd688dacc30c9bad67ef6 Mon Sep 17 00:00:00 2001
From: Robert Seedorff <Robert.Seedorff@iteratec.com>
Date: Wed, 30 Sep 2020 10:23:44 +0200
Subject: [PATCH 4/5] Added a PR template and updated the ISSUE templates.

---
 .github/ISSUE_TEMPLATE/bug_report.md          |  2 +-
 .github/ISSUE_TEMPLATE/documentation_issue.md |  2 +-
 .github/ISSUE_TEMPLATE/feature_request.md     |  4 ++--
 .github/ISSUE_TEMPLATE/new_hook.md            |  6 +++---
 .../ISSUE_TEMPLATE/new_security_scanner.md    |  2 +-
 .github/ISSUE_TEMPLATE/question.md            |  2 +-
 .github/pull_request_template.md              | 20 +++++++++++++++++++
 7 files changed, 29 insertions(+), 9 deletions(-)
 create mode 100644 .github/pull_request_template.md

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 5544741f..b267132c 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -5,7 +5,7 @@ labels: bug
 
 ---
 <!--
-Thanks for reporting an issue in the documentation 🙌 ❤️
+Thank you for reporting an issue in our project 🙌
 
 Before opening a new issue, please make sure that we do not have any duplicates already open. You can ensure this by searching the issue list for this repository. If there is a duplicate, please close your issue and add a comment to the existing issue instead.
 -->
diff --git a/.github/ISSUE_TEMPLATE/documentation_issue.md b/.github/ISSUE_TEMPLATE/documentation_issue.md
index 070e86f7..dbdca92c 100644
--- a/.github/ISSUE_TEMPLATE/documentation_issue.md
+++ b/.github/ISSUE_TEMPLATE/documentation_issue.md
@@ -5,7 +5,7 @@ labels: documentation
 
 ---
 <!--
-Thanks for reporting an issue in our documentation 🙌 ❤️
+Thank you for reporting an issue in our documentation 🙌
 
 Before opening a new issue, please make sure that we do not have any duplicates already open. You can ensure this by searching the issue list for this repository. If there is a duplicate, please close your issue and add a comment to the existing issue instead.
 -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index d3f448b6..a893c739 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,10 +1,10 @@
 ---
-name: "Feature request"
+name: "➹ Feature request"
 about: "Suggest an idea for this project"
 
 ---
 <!--
-Thanks for reporting an issue in our documentation 🙌 ❤️
+Thank you for reporting an issue in our documentation 🙌
 
 Before opening a new issue, please make sure that we do not have any duplicates already open. You can ensure this by searching the issue list for this repository. If there is a duplicate, please close your issue and add a comment to the existing issue instead.
 -->
diff --git a/.github/ISSUE_TEMPLATE/new_hook.md b/.github/ISSUE_TEMPLATE/new_hook.md
index a3706a44..c12c644d 100644
--- a/.github/ISSUE_TEMPLATE/new_hook.md
+++ b/.github/ISSUE_TEMPLATE/new_hook.md
@@ -5,7 +5,7 @@ labels: 'hook'
 ---
 
 <!--
-Thanks for contributing to the project 🙌 ❤️
+Thank you for contributing to our project 🙌
 
 Before opening a new issue, please make sure that we do not have any duplicates already open. You can ensure this by searching the issue list for this repository. If there is a duplicate, please close your issue and add a comment to the existing issue instead. Also, please, have a look at our FAQs and existing questions before opening a new question.
 -->
@@ -29,7 +29,7 @@ Before opening a new issue, please make sure that we do not have any duplicates
 Hint: A general guide how to implement a new scanner is documented [here](https://github.com/secureCodeBox/secureCodeBox-v2/tree/master/docs/developer-guide)
 -->
 
-- [ ] Create a new folder with the name of the [scanner here](https://github.com/secureCodeBox/secureCodeBox-v2/tree/master/scanners), based on the existing template
+- [ ] Create a new folder with the name of the [hook here](https://github.com/secureCodeBox/secureCodeBox-v2/tree/master/scanners), based on the existing template
 - [ ] Add a README.md and give a brief overview of the scanner and its configuration options.
 - [ ] Implement a new scanner specific scan-type.yaml
 - [ ] Implement a new scanner specific parse-definition.yaml
@@ -38,4 +38,4 @@ Hint: A general guide how to implement a new scanner is documented [here](https:
 - [ ] Use the parserSDK to implement a new findings parser (currently based on NodeJS)
 - [ ] Add unit tests with at minimum 80% test coverage
 - [ ] Add some example scan.yaml and finding.yaml files in the example folder
-- [ ] Implement a new integration test for the scanner [here](https://github.com/secureCodeBox/secureCodeBox-v2/tree/master/tests/integration)
+- [ ] Implement a new integration test for the hook [here](https://github.com/secureCodeBox/secureCodeBox-v2/tree/master/tests/integration)
diff --git a/.github/ISSUE_TEMPLATE/new_security_scanner.md b/.github/ISSUE_TEMPLATE/new_security_scanner.md
index 22604771..c942e537 100644
--- a/.github/ISSUE_TEMPLATE/new_security_scanner.md
+++ b/.github/ISSUE_TEMPLATE/new_security_scanner.md
@@ -5,7 +5,7 @@ labels: 'scanner'
 ---
 
 <!--
-Thanks for contributing to the project 🙌 ❤️
+Thank you for contributing to our project 🙌
 
 Before opening a new issue, please make sure that we do not have any duplicates already open. You can ensure this by searching the issue list for this repository. If there is a duplicate, please close your issue and add a comment to the existing issue instead. Also, please, have a look at our FAQs and existing questions before opening a new question.
 -->
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
index 1f404758..aeafc6e6 100644
--- a/.github/ISSUE_TEMPLATE/question.md
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -5,7 +5,7 @@ labels: question
 
 ---
 <!--
-Thanks for contributing to the project 🙌 ❤️
+Thank you for supporting our project 🙌
 
 Before opening a new issue, please make sure that we do not have any duplicates already open. You can ensure this by searching the issue list for this repository. If there is a duplicate, please close your issue and add a comment to the existing issue instead. Also, please, have a look at our FAQs and existing questions before opening a new question.
 -->
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 00000000..75373f85
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,20 @@
+<!-- 
+Thank you for your contribution to our Project 🙌 
+
+Before submitting your Pull Request, please take the time to check the points below and provide some descriptive information.
+* [ ] If this PR comes from a fork, please [Allow edits from maintainers](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork)
+* [ ] Set a meaningful title. Format: {task_name} (closes #{issue_number}). For example: Use logger (closes #41)
+* [ ] [Link your Pull Request to an issue](https://help.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue) (if applicable)
+* [ ] Create Draft pull requests if you need clarification or an explicit review before you can continue your work item.
+* [ ] Make sure that your PR is not introducing _unncessary_ reformatting (e.g., introduced by on-save hooks in your IDE)
+* [ ] Make sure each new source file you add has a correct license header.
+-->
+
+## Checklist
+
+* [ ] Test your changes as thoroughly as possible before you commit them. Preferably, automate your test by unit/integration tests.
+* [ ] Make sure `npm test` runs for the whole project.
+
+## Description
+
+<!-- Please be brief in describing which issue is solved by your PR or which enhancement it brings -->
\ No newline at end of file

From 02314cfd950be6f97c89572cfe2b10c32e9ac4a2 Mon Sep 17 00:00:00 2001
From: Robert Seedorff <Robert.Seedorff@iteratec.com>
Date: Wed, 30 Sep 2020 17:24:31 +0200
Subject: [PATCH 5/5] Bugfixing typos and c/p errors.

---
 .github/ISSUE_TEMPLATE/new_hook.md             | 11 ++++-------
 .github/ISSUE_TEMPLATE/new_security_scanner.md |  8 +++-----
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/new_hook.md b/.github/ISSUE_TEMPLATE/new_hook.md
index c12c644d..af32549e 100644
--- a/.github/ISSUE_TEMPLATE/new_hook.md
+++ b/.github/ISSUE_TEMPLATE/new_hook.md
@@ -29,13 +29,10 @@ Before opening a new issue, please make sure that we do not have any duplicates
 Hint: A general guide how to implement a new scanner is documented [here](https://github.com/secureCodeBox/secureCodeBox-v2/tree/master/docs/developer-guide)
 -->
 
-- [ ] Create a new folder with the name of the [hook here](https://github.com/secureCodeBox/secureCodeBox-v2/tree/master/scanners), based on the existing template
-- [ ] Add a README.md and give a brief overview of the scanner and its configuration options.
-- [ ] Implement a new scanner specific scan-type.yaml
-- [ ] Implement a new scanner specific parse-definition.yaml
-- [ ] Add (optional) some cascading-rules.yaml
-- [ ] Add (optional) a Dockerfile for the scanner if there is now existing one public available on dockerHub
-- [ ] Use the parserSDK to implement a new findings parser (currently based on NodeJS)
+- [ ] Create a new folder with the name of the [hook here](https://github.com/secureCodeBox/secureCodeBox-v2/tree/master/hooks)
+- [ ] Add a README and give a brief overview of the scanner and its configuration options.
+- [ ] Add (optional) a Dockerfile for the scanner if there is no existing one publicly available on dockerHub
+- [ ] Use the [Hook-SDK](https://github.com/secureCodeBox/secureCodeBox-v2/tree/master/hook-sdk) to implement a new hook (currently based on NodeJS)
 - [ ] Add unit tests with at minimum 80% test coverage
 - [ ] Add some example scan.yaml and finding.yaml files in the example folder
 - [ ] Implement a new integration test for the hook [here](https://github.com/secureCodeBox/secureCodeBox-v2/tree/master/tests/integration)
diff --git a/.github/ISSUE_TEMPLATE/new_security_scanner.md b/.github/ISSUE_TEMPLATE/new_security_scanner.md
index c942e537..c86a2968 100644
--- a/.github/ISSUE_TEMPLATE/new_security_scanner.md
+++ b/.github/ISSUE_TEMPLATE/new_security_scanner.md
@@ -29,13 +29,11 @@ Before opening a new issue, please make sure that we do not have any duplicates
 Hint: A general guide how to implement a new scanner is documented [here](https://github.com/secureCodeBox/secureCodeBox-v2/tree/master/docs/developer-guide)
 -->
 
-- [ ] Create a new folder with the name of the [scanner here](https://github.com/secureCodeBox/secureCodeBox-v2/tree/master/scanners), based on the existing template
+- [ ] Create a new folder with the name of the [scanner here](https://github.com/secureCodeBox/secureCodeBox-v2/tree/master/scanners)
 - [ ] Add a README.md and give a brief overview of the scanner and its configuration options.
 - [ ] Implement a new scanner specific scan-type.yaml
 - [ ] Implement a new scanner specific parse-definition.yaml
 - [ ] Add (optional) some cascading-rules.yaml
-- [ ] Add (optional) a Dockerfile for the scanner if there is now existing one public available on dockerHub
-- [ ] Use the parserSDK to implement a new findings parser (currently based on NodeJS)
+- [ ] Add (optional) a Dockerfile for the scanner if there is no existing one publicly available on dockerHub
+- [ ] Use the [parser-SDK](https://github.com/secureCodeBox/secureCodeBox-v2/tree/master/parser-sdk) to implement a new findings parser (currently based on NodeJS)
 - [ ] Add unit tests with at minimum 80% test coverage
-- [ ] Add some example scan.yaml and finding.yaml files in the example folder
-- [ ] Implement a new integration test for the scanner [here](https://github.com/secureCodeBox/secureCodeBox-v2/tree/master/tests/integration)