update comment and clean up docs test

botocore/args.py

@@ -642,10 +642,10 @@ def _build_endpoint_resolver(
             client_endpoint_url=endpoint_url,
             legacy_endpoint_url=endpoint.host,
         )
-        # Certain client context params for S3 conflict with the
-        # available settings in the `s3` parameter on the `Config`
-        # object. The s3 config will always take precedence over
-        # the client context params.
+        # Certain client context params for S3 conflict with the available
+        # settings in the `s3` parameter on the `Config` object. The s3 config
+        # will always take precedence over the client context params for s3
+        # and s3control if set.
         if self._is_s3_service(service_name_raw) and s3_config_raw:
             client_context = s3_config_raw
         elif client_config is not None:

tests/functional/docs/test_s3.py

@@ -84,14 +84,11 @@ def test_client_context_params_omitted(self):
             's3', self._session, self.root_services_path
         ).document_service()
         context_params_content = self.get_client_context_params_block(contents)
-        'Accelerate', 'ForcePathStyle'
         self.assert_not_contains_line(
-            '* ``accelerate`` (boolean) - '
-            'Enables this client to use S3 Transfer Acceleration endpoints.',
+            '``accelerate`` (boolean)',
             context_params_content,
         )
         self.assert_not_contains_line(
-            '* ``force_path_style`` (boolean) - '
-            'Forces this client to use path-style addressing for buckets.',
+            '``force_path_style`` (boolean)',
             context_params_content,
         )