Merge branch 'main' into 1.51.0

apollographql · Jul 16, 2024 · 2fc4acc · 2fc4acc
2 parents 972a519 + 8f58805
commit 2fc4acc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/docs/source/configuration/telemetry/exporters/metrics/otlp.mdx b/docs/source/configuration/telemetry/exporters/metrics/otlp.mdx
@@ -152,4 +152,4 @@ telemetry:
 | `endpoint`      |                        | `http://127.0.0.1:4317` for gRPC and `http://127.0.0.1:4318` for HTTP | The endpoint to send spans to.                                         |
 | `grpc`          |                        |                                                                       | Configuration specific to gRPC protocol.                               |
 | `http`          |                        |                                                                       | Configuration specific to HTTP protocol.                               |
-| `temporarility` | `delta`\|`cumulative`  |                                                                       | See the documentation for your APM to see what this should be set to.  |
+| `temporality`   | `delta`\|`cumulative`  |                                                                       | See the documentation for your APM to see what this should be set to.  |
diff --git a/docs/source/configuration/telemetry/exporters/tracing/otlp.mdx b/docs/source/configuration/telemetry/exporters/tracing/otlp.mdx
@@ -144,5 +144,5 @@ telemetry:
 | `endpoint`        |                | `http://127.0.0.1:4317` for gRPC and `http://127.0.0.1:4318` for HTTP | The endpoint to send spans to.                   |
 | `grpc`            |                |                                                                       | Configuration specific to gRPC protocol.         |
 | `http`            |                |                                                                       | Configuration specific to HTTP protocol.         |
-| `temporarility`   |                |                                                                       | This configuration option is unused for tracing. |
+| `temporality`     |                |                                                                       | This configuration option is unused for tracing. |
 | `batch_processor` |                |                                                                       | The batch processor settings.                    |
diff --git a/docs/source/enterprise-features.mdx b/docs/source/enterprise-features.mdx
@@ -82,7 +82,7 @@ With an offline license, a router can either be fully disconnected from GraphOS
 
 <Note>
 
-A router using an offline license cannot use [safelisting with persisted queries](./configuration/persisted-queries). The feature relies on Apollo Uplink to fetch persisted query manifests, so it doesn't work as designed when the router is disconnected from Uplink.
+A router using an offline license requires [the use of local manifests](./configuration/persisted-queries/#experimental_local_manifests) when using [safelisting with persisted queries](./configuration/persisted-queries), otherwise it will not work as designed when the router is disconnected from Uplink.
 
 </Note>
-Original file line number
+Diff line change
@@ Expand Up @@
     <Note>
-    A router using an offline license cannot use [safelisting with persisted queries](./configuration/persisted-queries). The feature relies on Apollo Uplink to fetch persisted query manifests, so it doesn't work as designed when the router is disconnected from Uplink.
+    A router using an offline license requires [the use of local manifests](./configuration/persisted-queries/#experimental_local_manifests) when using [safelisting with persisted queries](./configuration/persisted-queries), otherwise it will not work as designed when the router is disconnected from Uplink.
     </Note>
@@ Expand Down @@