Skip to content

Commit 051a788

Browse files
authored
[7.15] [DOCS] Fixes settings (elastic#149728) (elastic#149736)
# Backport This will backport the following commits from `7.16` to `7.15`: - [[DOCS] Fixes settings (elastic#149728)](elastic#149728) <!--- Backport version: 8.9.7 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) <!--BACKPORT [{"author":{"name":"gchaps","email":"[email protected]"},"sourceCommit":{"committedDate":"2023-01-27T18:54:08Z","message":"[DOCS] Fixes settings (elastic#149728)\n\n## Summary\r\n\r\nThis PR updates the text for telemetry settings.","sha":"7074a9b26790ffe0ec6370b6d0ac46a60c02be0f","branchLabelMapping":{"^v8.1.0$":"master","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Team:Docs","backport","release_note:skip","v7.14.0","v7.15.0","v7.16.0"],"number":149728,"url":"https://github.com/elastic/kibana/pull/149728","mergeCommit":{"message":"[DOCS] Fixes settings (elastic#149728)\n\n## Summary\r\n\r\nThis PR updates the text for telemetry settings.","sha":"7074a9b26790ffe0ec6370b6d0ac46a60c02be0f"}},"sourceBranch":"7.16","suggestedTargetBranches":["7.14","7.15"],"targetPullRequestStates":[{"branch":"7.14","label":"v7.14.0","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"7.15","label":"v7.15.0","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"7.16","label":"v7.16.0","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/149728","number":149728,"mergeCommit":{"message":"[DOCS] Fixes settings (elastic#149728)\n\n## Summary\r\n\r\nThis PR updates the text for telemetry settings.","sha":"7074a9b26790ffe0ec6370b6d0ac46a60c02be0f"}}]}] BACKPORT-->
1 parent 4b64490 commit 051a788

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

docs/management/advanced-options.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -566,4 +566,4 @@ only production-ready visualizations are available to users.
566566
[horizontal]
567567
[[telemetry-enabled-advanced-setting]]`telemetry:enabled`::
568568
When enabled, helps improve the Elastic Stack by providing usage statistics for
569-
basic features. This data will not be shared outside of Elastic.
569+
basic features.

docs/settings/telemetry-settings.asciidoc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ See our https://www.elastic.co/legal/privacy-statement[Privacy Statement] to lea
2020

2121
[[telemetry-enabled]] `telemetry.enabled`::
2222
Set to `true` to send cluster statistics to Elastic. Reporting your
23-
cluster statistics helps us improve your user experience. Your data is never
24-
shared with anyone. Set to `false` to disable statistics reporting from any
23+
cluster statistics helps us improve your user experience. Set to `false` to disable statistics reporting from any
2524
browser connected to the {kib} instance. Defaults to `true`.
2625

2726
`telemetry.sendUsageFrom`::

docs/setup/settings.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,7 @@ experimental[] Controls whether the https://developer.mozilla.org/en-US/docs/Web
535535
is used in all responses to the client from the {kib} server, and specifies what value is used. Allowed values are any text value or `null`.
536536
To disable, set to `null`. *Default:* `null`
537537

538-
[[server-securityResponseHeaders-disableEmbedding]]`server.securityResponseHeaders.disableEmbedding`::
538+
[[server-securityResponseHeaders-disableEmbedding]]`server.securityResponseHeaders.disableEmbedding`::
539539
Controls whether the https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy[`Content-Security-Policy`] and
540540
https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Frame-Options[`X-Frame-Options`] headers are configured to disable embedding
541541
{kib} in other webpages using iframes. When set to `true`, secure headers are used to disable embedding, which adds the `frame-ancestors:
@@ -690,7 +690,7 @@ set <<telemetry-allowChangingOptInStatus, `telemetry.allowChangingOptInStatus`>>
690690

691691
`telemetry.enabled`::
692692
Reporting your cluster statistics helps
693-
us improve your user experience. Your data is never shared with anyone. Set to
693+
us improve your user experience. Set to
694694
`false` to disable telemetry capabilities entirely. You can alternatively opt
695695
out through *Advanced Settings*. *Default: `true`*
696696

0 commit comments

Comments
 (0)