Update docu for 2.11.0 release

docs/content/userguide/_index.md

@@ -300,11 +300,16 @@ where you can specify which query params will be forwarded to IDP
 
 This example will allow passing myparam and yourparam with any value to IDP:
 
+<<<<<<< HEAD
 ```bash
+=======
+```
+>>>>>>> 79855c9ed13894f61e656147fb2b9d062a262e94
   --allowed-query-params="myparam=" \
   --allowed-query-params="yourparam="
 ```
 
+<<<<<<< HEAD
 yaml example:
 
 ```yaml
@@ -316,10 +321,16 @@ yaml example:
 This example will allow passing myparam and yourparam only with specified value:
 
 ```bash
+=======
+This example will allow passing myparam and yourparam only with specified value:
+
+```
+>>>>>>> 79855c9ed13894f61e656147fb2b9d062a262e94
   --allowed-query-params="myparam=myvalue" \
   --allowed-query-params="yourparam=yourvalue"
 ```
 
+<<<<<<< HEAD
 yaml example:
 
 yaml example:
@@ -330,6 +341,8 @@ yaml example:
     - yourparam: "yourvalueF"
 ```
 
+=======
+>>>>>>> 79855c9ed13894f61e656147fb2b9d062a262e94
 ## TCP proxy with HTTP CONNECT
 
 You can protect your TCP services with gogatekeeper by adding `CONNECT` HTTP method to list of `custom-http-methods`. On client side you will need to pass of course token in `Authorization` header (righ now there are few clients which could make HTTP connect with `Bearer` token and then forward tcp, e.g. gost proxy - but only in static way, some IDE provide HTTP CONNECT functionality for db connectors but only with `Basic` authentication, we would like to add this functionality to gatekeeper in future). This setup will authenticate connection at start and will create tunnel to your backend service. Please use with care and ensure that it allows connection only to intended services, otherwise it can be missused for various attacks.