From 07041c37d457780ccf6bc5931f92b65e91ba7dc7 Mon Sep 17 00:00:00 2001
From: Jari Matilainen <vague666@users.noreply.github.com>
Date: Mon, 12 Sep 2022 14:15:11 +0200
Subject: [PATCH 1/2] Add -nocap to /connect and /server connect syntax

---
 src/core/chat-commands.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/core/chat-commands.c b/src/core/chat-commands.c
index dd8dbe75..2f5c4b42 100644
--- a/src/core/chat-commands.c
+++ b/src/core/chat-commands.c
@@ -114,8 +114,8 @@ static SERVER_CONNECT_REC *get_server_connect(const char *data, int *plus_addr,
                    [-tls_verify] [-tls_cafile <cafile>] [-tls_capath <capath>]
                    [-tls_ciphers <list>] [-tls_pinned_cert <fingerprint>]
                    [-tls_pinned_pubkey <fingerprint>] [-!] [-noautosendcmd] [-tls | -notls]
-                   [-starttls | -disallow_starttls] [-noproxy] [-network <network>]
-                   [-host <hostname>] [-rawlog <file>]
+                   [-nocap] [-starttls | -disallow_starttls] [-noproxy]
+                   [-network <network>] [-host <hostname>] [-rawlog <file>]
                    <address>|<chatnet> [<port> [<password> [<nick>]]] */
 /* NOTE: -network replaces the old -ircnet flag. */
 static void cmd_connect(const char *data)
@@ -215,7 +215,7 @@ static void cmd_server(const char *data, SERVER_REC *server, WI_ITEM_REC *item)
 		  [-tls_pass <password>] [-tls_verify] [-tls_cafile <cafile>] 
 		  [-tls_capath <capath>]
 		  [-tls_ciphers <list>] [-tls_pinned_cert <fingerprint>] [-tls_pinned_pubkey <fingerprint>]
-		  [-!] [-noautosendcmd]
+		  [-!] [-noautosendcmd] [-nocap]
 		  [-noproxy] [-network <network>] [-host <hostname>]
 		  [-rawlog <file>]
 		  [+]<address>|<chatnet> [<port> [<password> [<nick>]]] */

From de2bf6707f37c17ced26f865de3a5748a933240d Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 13 Sep 2022 09:55:02 +0200
Subject: [PATCH 2/2] fix clang-format

---
 src/core/chat-commands.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/core/chat-commands.c b/src/core/chat-commands.c
index 2f5c4b42..a88a27ab 100644
--- a/src/core/chat-commands.c
+++ b/src/core/chat-commands.c
@@ -211,14 +211,14 @@ static void cmd_server(const char *data, SERVER_REC *server, WI_ITEM_REC *item)
 	command_runsub("server", data, server, item);
 }
 
-/* SYNTAX: SERVER CONNECT [-4 | -6] [-tls] [-tls_cert <cert>] [-tls_pkey <pkey>] 
-		  [-tls_pass <password>] [-tls_verify] [-tls_cafile <cafile>] 
-		  [-tls_capath <capath>]
-		  [-tls_ciphers <list>] [-tls_pinned_cert <fingerprint>] [-tls_pinned_pubkey <fingerprint>]
-		  [-!] [-noautosendcmd] [-nocap]
-		  [-noproxy] [-network <network>] [-host <hostname>]
-		  [-rawlog <file>]
-		  [+]<address>|<chatnet> [<port> [<password> [<nick>]]] */
+/* SYNTAX: SERVER CONNECT [-4 | -6] [-tls] [-tls_cert <cert>] [-tls_pkey <pkey>]
+                  [-tls_pass <password>] [-tls_verify] [-tls_cafile <cafile>]
+                  [-tls_capath <capath>] [-tls_ciphers <list>]
+                  [-tls_pinned_cert <fingerprint>] [-tls_pinned_pubkey <fingerprint>]
+                  [-!] [-noautosendcmd] [-nocap]
+                  [-noproxy] [-network <network>] [-host <hostname>]
+                  [-rawlog <file>]
+                  [+]<address>|<chatnet> [<port> [<password> [<nick>]]] */
 /* NOTE: -network replaces the old -ircnet flag. */
 static void cmd_server_connect(const char *data, SERVER_REC *server)
 {