conflicts solved

.github/CODEOWNERS

@@ -2873,6 +2873,7 @@ src/platform/packages/private/shared-ux/page/kibana_no_data/types @elastic/appex
 src/platform/packages/private/shared-ux/prompt/no_data_views/impl @elastic/appex-sharedux
 src/platform/packages/private/shared-ux/prompt/no_data_views/mocks @elastic/appex-sharedux
 src/platform/packages/private/shared-ux/table_persist @elastic/appex-sharedux
+src/platform/packages/shared/chart_expressions/common @elastic/kibana-visualizations
 src/platform/packages/shared/cloud @elastic/kibana-core
 src/platform/packages/shared/content-management/content_editor @elastic/appex-sharedux
 src/platform/packages/shared/content-management/content_insights/content_insights_public @elastic/appex-sharedux
@@ -3055,8 +3056,6 @@ src/platform/packages/shared/shared-ux/prompt/no_data_views/types @elastic/appex
 src/platform/packages/shared/shared-ux/prompt/not_found @elastic/appex-sharedux
 src/platform/packages/shared/shared-ux/router/impl @elastic/appex-sharedux
 src/platform/packages/shared/shared-ux/storybook/mock @elastic/appex-sharedux
-src/platform/packages/shared/Users/gsoldevila/Work/kibana-secondary/Users/gsoldevila/Work/kibana-secondary/src/core @elastic/kibana-core
-src/platform/packages/shared/Users/gsoldevila/Work/kibana-secondary/Users/gsoldevila/Work/kibana-secondary/src/plugins/chart_expressions/common @elastic/kibana-visualizations
 src/platform/plugins/private/advanced_settings @elastic/appex-sharedux @elastic/kibana-management
 src/platform/plugins/private/event_annotation @elastic/kibana-visualizations
 src/platform/plugins/private/event_annotation_listing @elastic/kibana-visualizations

docs/setup/settings.asciidoc

@@ -565,7 +565,9 @@ all http requests to https over the port configured as <<server-port, `server.po
 
 [[server-ssl-supportedProtocols]] `server.ssl.supportedProtocols`::
 An array of supported protocols with versions.
-Valid protocols: `TLSv1`, `TLSv1.1`, `TLSv1.2`, `TLSv1.3`. *Default: TLSv1.1, TLSv1.2, TLSv1.3*
+Valid protocols: `TLSv1`, `TLSv1.1`, `TLSv1.2`, `TLSv1.3`. *Default: TLSv1.2, TLSv1.3*
+Enabling `TLSv1.1` would require both setting the `--tls-min-1.1` option in the `node.options` configuration and adding `TLSv1.1` to `server.ssl.supportedProtocols`.
+`HTTP/2` requires the use of minimum `TLSv1.2` for secure connections.
 
 [[server-uuid]] `server.uuid`::
 The unique identifier for this {kib} instance. It must be a valid UUIDv4. It gets automatically generated on the first startup if not specified and persisted in the `data` path.

docs/spaces/index.asciidoc

@@ -23,7 +23,7 @@ The `kibana_admin` role or equivalent is required to manage **Spaces**.
 === Create a space
 
 [[spaces-control-feature-visibility]]
-You can have up to 100 spaces. 
+You can have up to 1,000 spaces by default. The maximum number of spaces can be configured by the `xpack.spaces.maxSpaces` setting (refer to <<spaces-settings-kb, Spaces settings in {kib}>>).
 
 . Select *Create space* and provide a name, description, and URL identifier.
 +