Skip to content

Commit 492842f

Browse files
authored
Merge pull request #21305 from docker/published-update
publish updates from main
2 parents ea6d335 + 80d1892 commit 492842f

File tree

14 files changed

+48
-44
lines changed

14 files changed

+48
-44
lines changed

content/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ grid:
135135
url: "/security/for-admins/single-sign-on/"
136136
- text: "SCIM"
137137
url: "/security/for-admins/provisioning/scim/"
138-
- title: Testcontainers cloud
138+
- title: Testcontainers Cloud
139139
icon: cloud
140140
description: |
141141
Testcontainers Cloud lets you run heavy test workloads remotely.

content/manuals/desktop/previous-versions/edge-releases-windows.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2279,7 +2279,7 @@ This Beta release includes some significant changes:
22792279

22802280
**Upgrades**
22812281

2282-
* docker-compose 1.7.1 (see <a href="https://github.com/docker/compose/releases/tag/1.7.1" target="_blank"> changelog</a>)
2282+
* docker-compose 1.7.1 (see [changelog](https://github.com/docker/compose/releases/tag/1.7.1))
22832283
* Kernel 4.4.9
22842284

22852285
**Bug fixes and minor changes**

content/manuals/engine/daemon/alternative-runtimes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ To add youki as a container runtime:
133133
1. Install youki and its dependencies.
134134

135135
For instructions, refer to the
136-
[official setup guide](https://containers.github.io/youki/user/basic_setup.html).
136+
[official setup guide](https://youki-dev.github.io/youki/user/basic_setup.html).
137137

138138
2. Register youki as a runtime for Docker by editing the Docker daemon
139139
configuration file, located at `/etc/docker/daemon.json` by default.

content/manuals/engine/install/fedora.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,13 @@ download a new file each time you want to upgrade Docker Engine.
191191
$ sudo systemctl start docker
192192
```
193193

194-
4. Verify that the Docker Engine installation is successful by running the
194+
4. Make Docker start automatically after reboot.
195+
196+
```console
197+
$ sudo systemctl enable docker
198+
```
199+
200+
5. Verify that the Docker Engine installation is successful by running the
195201
`hello-world` image.
196202

197203
```console

content/manuals/security/for-developers/2fa/_index.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ code. Each recovery code is unique and specific to your account. You can use
1717
this code to recover your account in case you lose access to your authenticator
1818
app. See [Recover your Docker account](recover-hub-account/).
1919

20-
2120
## Prerequisites
2221

2322
You need a mobile phone with a time-based one-time password (TOTP) authenticator
@@ -27,11 +26,11 @@ Authenticator with a registered YubiKey.
2726
## Enable two-factor authentication
2827

2928
1. Sign in to your [Docker account](https://app.docker.com/login).
30-
2. Select your avatar and then from the drop-down menu, select **Account settings**.
29+
2. Select your avatar and then from the drop-down menu, select **Account settings**.
3130
3. Navigate to the **Security** section, then select **Two-factor authentication**.
3231
4. Enter your account password, then select **Confirm**.
3332
5. Save your recovery code and store it somewhere safe. You can use your recovery code to recover your account in the event you lose access to your authenticator app.
34-
6. Use a TOTP mobile app to scan the QR code or enter the text code.
33+
6. Use a Time-based One-time password (TOTP) mobile app to scan the QR code or enter the text code.
3534
7. Once you've linked your authenticator app, enter the six-digit code in the text-field.
3635
8. Select **Enable 2FA**.
3736

content/manuals/security/for-developers/2fa/disable-2fa.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ keywords: Docker, docker, registry, security, Docker Hub, authentication, two-fa
44
authentication, account security,
55
title: Disable two-factor authentication on your Docker account
66
linkTitle: Disable two-factor authentication
7-
aliases:
7+
aliases:
88
- /docker-hub/2fa/disable-2fa/
99
weight: 30
1010
---

content/manuals/security/for-developers/2fa/new-recovery-code.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ access to your Docker Hub account, you can generate a new recovery code.
1818
5. Select **Generate new code**.
1919

2020
This generates a new code. Select the visibility icon to view the code. Remember to save your recovery code
21-
and store it somewhere safe.
21+
and store it somewhere safe.

content/manuals/security/for-developers/2fa/recover-hub-account.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ If you have lost access to both your two-factor authentication application and y
1212

1313
1. Sign in to your [Docker account](https://app.docker.com/login) with your username and password.
1414
2. Select **I've lost my authentication device** and **I've lost my recovery code**.
15-
3. Complete the [Contact Support form](https://hub.docker.com/support/contact/?category=2fa-lockout).
15+
3. Complete the [Contact Support form](https://hub.docker.com/support/contact/?category=2fa-lockout).
1616
You must enter the primary email address associated with your Docker ID in the **Contact Support** form for recovery instructions.

content/manuals/security/for-developers/access-tokens.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ linkTitle: Access tokens
44
description: Learn how to create and manage your personal Docker access tokens
55
to securely push and pull images programmatically.
66
keywords: docker hub, hub, security, PAT, personal access token
7-
aliases:
7+
aliases:
88
- /docker-hub/access-tokens/
99
---
1010

@@ -13,8 +13,8 @@ You can create a personal access token (PAT) to use as an alternative to your pa
1313
Compared to passwords, PATs provide the following advantages:
1414

1515
- You can investigate when the PAT was last used and then disable or delete it if you find any suspicious activity.
16-
- When using an access token, you can't perform any admin activity on the account, including changing the password. It protects your account if your computer is compromised.
17-
16+
- When using an access token, you can't perform any administrative activity on the account, including changing the password. It protects your account if your computer is compromised.
17+
1818
Access tokens are also valuable for building integrations, as you can issue multiple tokens, one for each integration, and revoke them at
1919
any time.
2020

@@ -33,7 +33,7 @@ any time.
3333
4. Select **Generate new token**.
3434

3535
5. Add a description for your token. Use something that indicates the use case or purpose of the token.
36-
36+
3737
6. Set the access permissions.
3838
The access permissions are scopes that set restrictions in your
3939
repositories. For example, for Read & Write permissions, an automation
@@ -81,4 +81,4 @@ You can rename, activate, deactivate, or delete a token as needed. You can manag
8181

8282
When you sign in to your Docker account with Docker Desktop, Docker Desktop generates an authentication token on your behalf. When you interact with Docker Hub using the Docker CLI, the CLI uses this token for authentication. The token scope has Read, Write, and Delete access. If your Docker Desktop session expires, the token is automatically removed locally.
8383

84-
You can have up to 5 auto-generated tokens associated with your account. These are deleted and created automatically based on usage and creation dates. You can also delete your auto-generated tokens as needed. See [Modify existing tokens](#modify-existing-tokens).
84+
You can have up to 5 auto-generated tokens associated with your account. These are deleted and created automatically based on usage and creation dates. You can also delete your auto-generated tokens as needed. For more information, see [Modify existing tokens](#modify-existing-tokens).

content/reference/api/hub/latest.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ tags:
2323
description: |
2424
The following resources are available to interact with the documented API:
2525
26-
- <a href="https://github.com/docker/hub-tool#readme" target="_blank">Docker Hub CLI tool</a> (currently experimental)
26+
- <a href="https://github.com/docker/hub-tool#readme">Docker Hub CLI tool</a> (currently experimental)
2727
- name: rate-limiting
2828
x-displayName: Rate Limiting
2929
description: |

0 commit comments

Comments
 (0)