Merge 2.9.3-specific docs from apache#15340 and apache#15818

site2/website/versioned_docs/version-2.10.x/reference-configuration.md

@@ -459,9 +459,13 @@ You can set the log level and configuration in the  [log4j2.yaml](https://github
 |log4j.appender.TRACEFILE.layout| org.apache.log4j.PatternLayout|
 |log4j.appender.TRACEFILE.layout.ConversionPattern| %d{ISO8601} - %-5p [%t:%C{1}@%L][%x] - %m%n|
 
-> Note: 'topic' in log4j2.appender is configurable. 
-> - If you want to append all logs to a single topic, set the same topic name.
-> - If you want to append logs to different topics, you can set different topic names. 
+:::note
+
+'topic' in log4j2.appender is configurable. 
+- If you want to append all logs to a single topic, set the same topic name.
+- If you want to append logs to different topics, you can set different topic names. 
+
+:::
 
 ## Log4j shell
 

site2/website/versioned_docs/version-2.9.x/reference-configuration.md

@@ -360,6 +360,21 @@ brokerServiceCompactionThresholdInBytes|If the estimated backlog size is greater
 | additionalServletDirectory | Location of broker additional servlet NAR directory | ./brokerAdditionalServlet |
 |narExtractionDirectory | The extraction directory of the nar package. <br />Available for Protocol Handler, Additional Servlets, Offloaders, Broker Interceptor. | System.getProperty("java.io.tmpdir") |
 
+#### Configuration override for clients internal to broker
+
+In 2.9.3 and later versions, you can configure some clients by using the appropriate prefix.
+
+|Prefix|Description|
+|---|---|
+|brokerClient_| Configure **all** the broker's Pulsar Clients and Pulsar Admin Clients. These configurations are applied after hard coded configuration and before the above broker client configurations named above.|
+|bookkeeper_| Configure the broker's BookKeeper clients used by managed ledgers and the BookkeeperPackagesStorage bookkeeper client. Takes precedence over most other configuration values.|
+
+:::note
+
+When running the function worker within the broker, these prefixed configurations do not apply to any of those clients. You must configure those clients using the `functions_worker.yml` file.
+
+:::
+
 ## Client
 
 You can use the [`pulsar-client`](reference-cli-tools.md#pulsar-client) CLI tool to publish messages to and consume messages from Pulsar topics. You can use this tool in place of a client library.
@@ -409,9 +424,13 @@ You can set the log level and configuration in the  [log4j2.yaml](https://github
 |log4j.appender.TRACEFILE.layout| org.apache.log4j.PatternLayout|
 |log4j.appender.TRACEFILE.layout.ConversionPattern| %d{ISO8601} - %-5p [%t:%C{1}@%L][%x] - %m%n|
 
-> Note: 'topic' in log4j2.appender is configurable. 
-> - If you want to append all logs to a single topic, set the same topic name.
-> - If you want to append logs to different topics, you can set different topic names. 
+:::note
+
+'topic' in log4j2.appender is configurable. 
+- If you want to append all logs to a single topic, set the same topic name.
+- If you want to append logs to different topics, you can set different topic names. 
+
+:::
 
 ## Log4j shell
 
@@ -685,6 +704,14 @@ You can set the log level and configuration in the  [log4j2.yaml](https://github
 |tlsKeyFilePath |||
 |tlsTrustCertsFilePath|||
 
+#### Configuration Override For Clients Internal to WebSocket
+
+In 2.9.3 and later versions, you can configure some clients by using the appropriate prefix.
+
+|Prefix|Description|
+|---|---|
+|brokerClient_| Configure **all** the broker's Pulsar Clients. These configurations are applied after hard coded configuration and before the above brokerClient configurations named above.|
+
 ## Pulsar proxy
 
 The [Pulsar proxy](concepts-architecture-overview.md#pulsar-proxy) can be configured in the `conf/proxy.conf` file.
@@ -739,6 +766,16 @@ The [Pulsar proxy](concepts-architecture-overview.md#pulsar-proxy) can be config
 |tokenAudienceClaim| The token audience "claim" name, e.g. "aud". It is used to get the audience from token. If it is not set, the audience is not verified. ||
 | tokenAudience | The token audience stands for this broker. The field `tokenAudienceClaim` of a valid token need contains this parameter.| |
 |haProxyProtocolEnabled | Enable or disable the [HAProxy](http://www.haproxy.org/) protocol. |false|
+| numIOThreads | Number of threads used for Netty IO. <br />**Note:** This configuration is only available in 2.9.3 and later versions. | 2 * Runtime.getRuntime().availableProcessors() |
+| numAcceptorThreads | Number of threads used for Netty Acceptor. <br />**Note:** This configuration is only available in 2.9.3 and later versions.| 1 |
+
+#### Configuration Override For Clients Internal to Proxy
+
+In 2.9.3 and later versions, you can configure some clients by using the appropriate prefix.
+
+|Prefix|Description|
+|---|---|
+|brokerClient_| Configure **all** the proxy's Pulsar Clients. These configurations are applied after hard coded configuration and before the above brokerClient configurations named above.|
 
 ## ZooKeeper