Skip to content

Commit d8a738b

Browse files
Merge remote-tracking branch 'origin/main' into opentelemetrybot/semconv-integration-v1.31.0-dev
2 parents 72a8a8a + 79515cb commit d8a738b

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

.github/workflows/auto-update-community-members.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
jobs:
1010
auto-update-versions:
1111
name: Auto-update community members page
12-
runs-on: ubuntu-24.04
12+
runs-on: ubuntu-latest
1313
# Remove the if statement below when testing against a fork
1414
if: github.repository == 'open-telemetry/opentelemetry.io'
1515
steps:

.github/workflows/auto-update-registry.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
jobs:
1010
auto-update-versions:
1111
name: Auto-update registry versions
12-
runs-on: ubuntu-20.04
12+
runs-on: ubuntu-latest
1313
# Remove the if statement below when testing against a fork
1414
if: github.repository == 'open-telemetry/opentelemetry.io'
1515
steps:

.github/workflows/auto-update-versions.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
jobs:
1010
auto-update-versions:
1111
name: Auto-update versions
12-
runs-on: ubuntu-20.04
12+
runs-on: ubuntu-latest
1313
if: github.repository == 'open-telemetry/opentelemetry.io'
1414
env:
1515
DEPTH: --depth 999 # submodule clone depth

content/en/docs/contributing/localization.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ at `HEAD`, then erase the commit hash value in the front matter, and run the
210210
{{% /alert %}}
211211

212212
If you have batch updated all of your localization pages that had drifted, you
213-
can update the commit hash of these files using the `-u` flag followed by a
213+
can update the commit hash of these files using the `-c` flag followed by a
214214
commit hash or 'HEAD' to use `main@HEAD`.
215215

216216
```sh

content/en/docs/platforms/kubernetes/helm/operator.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ generate/configure the required TLS certificate.
4242

4343
- The easiest and default method is to install the
4444
[cert-manager](https://cert-manager.io/docs/) and set
45-
`admissionWebhooks.certManager.create` to `true`. In this way, cert-manager
45+
`admissionWebhooks.certManager.enabled` to `true`. In this way, cert-manager
4646
will generate a self-signed certificate. See
4747
[cert-manager installation](https://cert-manager.io/docs/installation/kubernetes/)
4848
for more details.

0 commit comments

Comments
 (0)