From df877ff5af53281b7db6099864f856a685b08722 Mon Sep 17 00:00:00 2001
From: Alex W <embezzle.dev@proton.me>
Date: Tue, 16 Apr 2024 17:15:12 +0100
Subject: T6242: reverse-proxy: Document new backend option ssl no-verify

(cherry picked from commit 6703aeb43338c901f794e6e28affe5bdee3e4a1e)

# Conflicts:
#	docs/configuration/loadbalancing/reverse-proxy.rst
---
 docs/configuration/loadbalancing/reverse-proxy.rst | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'docs/configuration/loadbalancing')

diff --git a/docs/configuration/loadbalancing/reverse-proxy.rst b/docs/configuration/loadbalancing/reverse-proxy.rst
index 04b612f5..7a9f90ae 100644
--- a/docs/configuration/loadbalancing/reverse-proxy.rst
+++ b/docs/configuration/loadbalancing/reverse-proxy.rst
@@ -146,7 +146,16 @@ Backend
 
 
 
+<<<<<<< HEAD
 Gloabal
+=======
+.. cfgcmd:: set load-balancing reverse-proxy backend <name> ssl no-verify
+
+  Configure requests to the backend server to use SSL encryption without
+  validating server certificate
+
+Global
+>>>>>>> 6703aeb4 (T6242: reverse-proxy: Document new backend option ssl no-verify)
 -------
 
 Global parameters
-- 
cgit v1.2.3