From 8233bb57310edb40904f9c51a1d0939d902d5d65 Mon Sep 17 00:00:00 2001
From: cfi-gb <34644702+cfi-gb@users.noreply.github.com>
Date: Fri, 11 Jun 2021 09:52:02 +0200
Subject: [PATCH 1/3] Updated function description of nasl_ssh_shell_open().

(cherry picked from commit e49ca3c0bdfa549543334ae9ad9cf83db51d6035)
---
 nasl/nasl_ssh.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/nasl/nasl_ssh.c b/nasl/nasl_ssh.c
index 41ee614ba..02a1c37c5 100644
--- a/nasl/nasl_ssh.c
+++ b/nasl/nasl_ssh.c
@@ -1686,8 +1686,10 @@ request_ssh_shell (ssh_channel channel, int pty)
  * @nasluparam
  *
  * - An ssh session id.
- * - Named param 'pty' to enable/disable the interactive shell. Default is 1
- *   interactive.
+ *
+ * @naslnparam
+ *
+ * - @a pty To enable/disable the interactive shell. Default is 1 (interactive).
  *
  * @naslret An int on success or NULL on error.
  *

From 52302d93b755ed30b760ea467bbb965cc39f0d31 Mon Sep 17 00:00:00 2001
From: cfi-gb <34644702+cfi-gb@users.noreply.github.com>
Date: Fri, 11 Jun 2021 09:57:46 +0200
Subject: [PATCH 2/3] Update CHANGELOG.md

(cherry picked from commit b9fa337052cef33742f3fde9046e674ae478703b)

# Conflicts:
#	CHANGELOG.md
---
 CHANGELOG.md | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index de132b6ac..f4d83244e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,33 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+<<<<<<< HEAD
+=======
+## [21.10] (unreleased)
+
+### Added
+- Add support for volatile keys. [#682](https://github.com/greenbone/openvas/pull/682)
+- Extend nasl lint to check Syntax for Arguments for script_xref() function. [#714](https://github.com/greenbone/openvas/pull/714)
+- Recheck alive status of host with specified amount of NVT timeouts. [#729](https://github.com/greenbone/openvas/pull/729)
+- Add json-glib support for creating JSON result strings.
+  [#739](https://github.com/greenbone/openvas/pull/739)
+  [#754](https://github.com/greenbone/openvas/pull/754)
+- Integrate sentry for debugging purposes [#742](https://github.com/greenbone/openvas/pull/742)
+- Add support for non-interactive shell to nasl_ssh_shell_open().
+  [#744](https://github.com/greenbone/openvas/pull/744)
+  [#757](https://github.com/greenbone/openvas/pull/757)
+
+### Changed
+- function script_bugtraq_id getting skipped, linter warns. [#724](https://github.com/greenbone/openvas/pull/724)
+
+### Fixed
+
+### Removed
+- Remove handling of source_iface related preferences. [#730](https://github.com/greenbone/openvas/pull/730)
+
+[21.10]: https://github.com/greenbone/openvas-scanner/compare/openvas-21.04...master
+
+>>>>>>> b9fa3370 (Update CHANGELOG.md)
 ## [21.04.1] (unreleased)
 
 ### Added

From aab05e0bff34ffa489ee6ed8a01c7cbd8735bf2f Mon Sep 17 00:00:00 2001
From: ArnoStiefvater <arno.stiefvater@greenbone.net>
Date: Tue, 22 Jun 2021 11:43:11 +0200
Subject: [PATCH 3/3] Fix mergify changelog

---
 CHANGELOG.md | 27 ---------------------------
 1 file changed, 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f4d83244e..de132b6ac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,33 +4,6 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
-<<<<<<< HEAD
-=======
-## [21.10] (unreleased)
-
-### Added
-- Add support for volatile keys. [#682](https://github.com/greenbone/openvas/pull/682)
-- Extend nasl lint to check Syntax for Arguments for script_xref() function. [#714](https://github.com/greenbone/openvas/pull/714)
-- Recheck alive status of host with specified amount of NVT timeouts. [#729](https://github.com/greenbone/openvas/pull/729)
-- Add json-glib support for creating JSON result strings.
-  [#739](https://github.com/greenbone/openvas/pull/739)
-  [#754](https://github.com/greenbone/openvas/pull/754)
-- Integrate sentry for debugging purposes [#742](https://github.com/greenbone/openvas/pull/742)
-- Add support for non-interactive shell to nasl_ssh_shell_open().
-  [#744](https://github.com/greenbone/openvas/pull/744)
-  [#757](https://github.com/greenbone/openvas/pull/757)
-
-### Changed
-- function script_bugtraq_id getting skipped, linter warns. [#724](https://github.com/greenbone/openvas/pull/724)
-
-### Fixed
-
-### Removed
-- Remove handling of source_iface related preferences. [#730](https://github.com/greenbone/openvas/pull/730)
-
-[21.10]: https://github.com/greenbone/openvas-scanner/compare/openvas-21.04...master
-
->>>>>>> b9fa3370 (Update CHANGELOG.md)
 ## [21.04.1] (unreleased)
 
 ### Added