Skip to content

Commit 1a88892

Browse files
Merge pull request #22078 from docker/published-update
publish updates from main
2 parents c99a1dc + 8d87ca8 commit 1a88892

File tree

7 files changed

+263
-177
lines changed

7 files changed

+263
-177
lines changed

assets/css/lists.css

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
.prose ol {
2+
list-style-type: decimal;
3+
}
4+
5+
.prose ol ol {
6+
list-style-type: lower-alpha;
7+
}
8+
9+
.prose ol ol ol {
10+
list-style-type: lower-roman;
11+
}
12+

assets/css/styles.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@
1313
@import "/assets/css/syntax-light";
1414
@import "/assets/css/syntax-dark";
1515
@import "/assets/css/icons";
16+
@import "/assets/css/lists";

content/manuals/compose/install/standalone.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ on Microsoft Windows Server](/manuals/engine/install/binaries.md#install-server-
4848
In order to proceed with the installation, select **Yes** when asked if you want this app to make changes to your device.
4949
5050
2. Optional. Ensure TLS1.2 is enabled.
51-
GitHub requires TLS1.2 fore secure connections. If you’re using an older version of Windows Server, for example 2016, or suspect that TLS1.2 is not enabled, run the following command in PowerShell:
51+
GitHub requires TLS1.2 for secure connections. If you’re using an older version of Windows Server, for example 2016, or suspect that TLS1.2 is not enabled, run the following command in PowerShell:
5252
5353
```powershell
5454
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,12 @@ params:
1515

1616
> [!WARNING]
1717
>
18-
> Organization access tokens (OATs) are not intended to be used with Docker Desktop, and are incompatible.
18+
> Organization access tokens (OATs) are not intended to be used with Docker
19+
> Desktop, and are incompatible.
1920
>
2021
> OATs are also currently incompatible with the following services:
2122
>
22-
> - Docker Build Cloud
2323
> - Docker Scout
24-
> - Docker REST APIs
2524
>
2625
> If you use Docker Desktop or one of these services, you must use personal access tokens instead.
2726
@@ -38,8 +37,8 @@ OATs provide the following advantages:
3837
if you find any suspicious activity.
3938
- You can limit what each OAT has access to, which limits the impact if an OAT
4039
is compromised.
41-
- All organization owners can manage OATs. If one owner leaves the organization,
42-
the remaining owners can still manage the OATs.
40+
- All company or organization owners can manage OATs. If one owner leaves the
41+
organization, the remaining owners can still manage the OATs.
4342
- OATs have their own Docker Hub usage limits that don't count towards your
4443
personal account's limits.
4544

@@ -55,18 +54,19 @@ If you have existing [service accounts](/docker-hub/service-accounts/), Docker r
5554
it.
5655
- OATs are not associated with a single user. If a user with access to the
5756
service account leaves your organization, you may lose access to the service
58-
account. OATs can be managed by any organization owner.
57+
account. OATs can be managed by any company or organization owner.
5958

6059
## Create an organization access token
6160

6261
> [!IMPORTANT]
6362
>
64-
> Treat access tokens like a password and keep them secret. Store your tokens securely in a credential manager for example.
63+
> Treat access tokens like a password and keep them secret. Store your tokens
64+
> securely in a credential manager for example.
6565
66-
Organization owners can create up to 10 organization access tokens (OATs) for
67-
organizations with a Team subscription and up to 100 OATs for organizations with
68-
a Business subscription. Expired tokens count towards the total amount of
69-
tokens.
66+
Company or organization owners can create up to 10 organization access tokens
67+
(OATs) for organizations with a Team subscription and up to 100 OATs for
68+
organizations with a Business subscription. Expired tokens count towards the
69+
total amount of tokens.
7070

7171
To create an OAT:
7272

content/manuals/security/for-admins/single-sign-on/troubleshoot.md

Lines changed: 0 additions & 165 deletions
This file was deleted.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
build:
3+
render: never
4+
title: Troubleshoot
5+
weight: 40
6+
---

0 commit comments

Comments
 (0)