Merge remote-tracking branch 'upstream/master'

hfxsd · Aug 14, 2024 · 6189a2e · 6189a2e
2 parents 6a7a656 + 1cef35f
commit 6189a2e
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/tiproxy/tiproxy-configuration.md b/tiproxy/tiproxy-configuration.md
@@ -85,10 +85,10 @@ Configuration for SQL port.
 
 #### `proxy-protocol`
 
-+ Default value: ``
++ Default value: `""`
 + Support hot-reload: yes, but only for new connections
-+ Possible values: ``, `v2`
-+ Enable the [PROXY protocol](https://www.haproxy.org/download/1.8/doc/proxy-protocol.txt) on the port. By enabling the PROXY protocol, TiProxy can pass the real client IP address to TiDB. `v2` indicates using the PROXY protocol version 2, and `` indicates disabling the PROXY protocol. If the PROXY protocol is enabled on TiProxy, you need to also enable the [PROXY protocol](/tidb-configuration-file.md#proxy-protocol) on the TiDB server.
++ Possible values: `""`, `"v2"`
++ Enable the [PROXY protocol](https://www.haproxy.org/download/1.8/doc/proxy-protocol.txt) on the port. By enabling the PROXY protocol, TiProxy can pass the real client IP address to TiDB. `"v2"` indicates using the PROXY protocol version 2, and `""` indicates disabling the PROXY protocol. If the PROXY protocol is enabled on TiProxy, you need to also enable the [PROXY protocol](/tidb-configuration-file.md#proxy-protocol) on the TiDB server.
 
 ### api
 
@@ -102,10 +102,10 @@ Configurations for HTTP gateway.
 
 #### `proxy-protocol`
 
-+ Default value: ``
++ Default value: `""`
 + Support hot-reload: no
-+ Possible values: ``, `v2`
-+ Enable the [PROXY protocol](https://www.haproxy.org/download/1.8/doc/proxy-protocol.txt) on the port. `v2` indicates using the PROXY protocol version 2, and `` indicates disabling the PROXY protocol.
++ Possible values: `""`, `"v2"`
++ Enable the [PROXY protocol](https://www.haproxy.org/download/1.8/doc/proxy-protocol.txt) on the port. `"v2"` indicates using the PROXY protocol version 2, and `""` indicates disabling the PROXY protocol.
 
 ### balance
 
@@ -146,7 +146,7 @@ Configurations for the load balancing policy of TiProxy.
 
 #### `filename`
 
-+ Default value: ``
++ Default value: `""`
 + Support hot-reload: yes
 + Log file path. Non empty value will enable logging to file. When TiProxy is deployed with TiUP, the filename is set automatically.