From edbcd01895162bfe5db38b6e8affe707ff9a1817 Mon Sep 17 00:00:00 2001 From: David Karlsson <35727626+dvdksn@users.noreply.github.com> Date: Wed, 9 Oct 2024 17:35:36 +0200 Subject: [PATCH 1/4] fix: remove circular alias for /get-started/educational-resources Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> --- content/get-started/resources.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/content/get-started/resources.md b/content/get-started/resources.md index 8fe0d64358af..e0235d675e26 100644 --- a/content/get-started/resources.md +++ b/content/get-started/resources.md @@ -3,8 +3,6 @@ title: Educational resources keywords: get started, setup, orientation, quickstart, intro, concepts, kubernetes, docker desktop description: Get started resources learning docker -aliases: -- /get-started/resources/ --- Docker and the broader community of Docker experts have put together many different ways to get further training and hands-on experience with Docker. Expand your understanding of Docker and Kubernetes with these additional free and paid resources. From 0fb80dc479e2b97f8401341f1b59270141c6405f Mon Sep 17 00:00:00 2001 From: Sarah Sanders Date: Wed, 9 Oct 2024 08:45:17 -0700 Subject: [PATCH 2/4] Update CODEOWNERS Updated code owners for my domains (subscription, admin, accounts, billing) --- .github/CODEOWNERS | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 877694f4b7f6..381061958618 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -21,7 +21,7 @@ /content/manuals/engine/ @dvdksn -/content/manuals/subscription/ @aevesdocker +/content/manuals/subscription/ @sarahsanders-docker /content/manuals/security/ @aevesdocker @@ -31,3 +31,9 @@ /content/manuals/registry/ @dvdksn +/content/manuals/admin/ @sarahsanders-docker + +/content/manuals/billing/ @sarahsanders-docker + +/content/manuals/accounts/ @sarahsanders-docker + From 44b422e6d65115aff0a0a3a7261a51fcef7f45f1 Mon Sep 17 00:00:00 2001 From: sheltongraves <148902861+sheltongraves@users.noreply.github.com> Date: Wed, 9 Oct 2024 14:11:03 -0400 Subject: [PATCH 3/4] Update download-rate-limit.md (#20943) * Update download-rate-limit.md Added Pull Attribution section * Update content/manuals/docker-hub/download-rate-limit.md Co-authored-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> * Update content/manuals/docker-hub/download-rate-limit.md Co-authored-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> * Update content/manuals/docker-hub/download-rate-limit.md Co-authored-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> * Update content/manuals/docker-hub/download-rate-limit.md Co-authored-by: Craig Osterhout <103533812+craig-osterhout@users.noreply.github.com> * Update content/manuals/docker-hub/download-rate-limit.md Co-authored-by: Craig Osterhout <103533812+craig-osterhout@users.noreply.github.com> * Update content/manuals/docker-hub/download-rate-limit.md Co-authored-by: Craig Osterhout <103533812+craig-osterhout@users.noreply.github.com> * Update content/manuals/docker-hub/download-rate-limit.md Co-authored-by: Craig Osterhout <103533812+craig-osterhout@users.noreply.github.com> * Update content/manuals/docker-hub/download-rate-limit.md Co-authored-by: Craig Osterhout <103533812+craig-osterhout@users.noreply.github.com> * Update content/manuals/docker-hub/download-rate-limit.md Co-authored-by: Craig Osterhout <103533812+craig-osterhout@users.noreply.github.com> * Update content/manuals/docker-hub/download-rate-limit.md Co-authored-by: Craig Osterhout <103533812+craig-osterhout@users.noreply.github.com> * Update content/manuals/docker-hub/download-rate-limit.md Co-authored-by: Craig Osterhout <103533812+craig-osterhout@users.noreply.github.com> * Update content/manuals/docker-hub/download-rate-limit.md Co-authored-by: Craig Osterhout <103533812+craig-osterhout@users.noreply.github.com> * Update content/manuals/docker-hub/download-rate-limit.md Co-authored-by: Craig Osterhout <103533812+craig-osterhout@users.noreply.github.com> * Update content/manuals/docker-hub/download-rate-limit.md Co-authored-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> --------- Co-authored-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> Co-authored-by: Craig Osterhout <103533812+craig-osterhout@users.noreply.github.com> --- .../manuals/docker-hub/download-rate-limit.md | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/content/manuals/docker-hub/download-rate-limit.md b/content/manuals/docker-hub/download-rate-limit.md index a7692f308d87..c0bca10b5c85 100644 --- a/content/manuals/docker-hub/download-rate-limit.md +++ b/content/manuals/docker-hub/download-rate-limit.md @@ -98,6 +98,31 @@ both individuals and organizations. - [Enforce sign-in](/security/for-admins/enforce-sign-in/) to ensure that you can monitor the usage of your users and users receive higher usage limits. +## Pull attribution + +Pulls can be attributed to either a personal or organization [namespace](https://docs.docker.com/contribute/style/terminology/#namespace). + +### Private pulls + +Pulls for private repositories are attributed to the repository's namespace owner. + +### Public pulls + +When pulling images from a public repository, attribution is determined based on domain affiliation and organization membership. + +### Verified domain ownership + +When pulling an image from an account linked to a verified domain, the attribution is set to be the owner of that [domain](https://docs.docker.com/security/faqs/single-sign-on/domain-faqs/) + +### Single organization membership + +- If the owner of the verified domain is a company and the user is part of only one organization within that [company](https://docs.docker.com/admin/faqs/company-faqs/#what-features-are-supported-at-the-company-level), the pull is attributed to that specific organization. +- If the user is part of only one organization, the pull is attributed to that specific organization. + +### Multiple organization memberships + +If the user is part of multiple organizations under the company, the pull is attributed to the user's personal namespace. + ## Rate limit A user's rate limit is equal to the highest entitlement of their personal From 47fcaeb6af54c33b3a5bd75c896afa122cb32ff5 Mon Sep 17 00:00:00 2001 From: Sarah Sanders Date: Wed, 9 Oct 2024 11:23:37 -0700 Subject: [PATCH 4/4] Update billing activity logs for new activities (#21091) --- content/manuals/admin/organization/activity-logs.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/content/manuals/admin/organization/activity-logs.md b/content/manuals/admin/organization/activity-logs.md index 11e596bb470b..3409fbf52969 100644 --- a/content/manuals/admin/organization/activity-logs.md +++ b/content/manuals/admin/organization/activity-logs.md @@ -90,3 +90,10 @@ Refer to the following section for a list of events and their descriptions: | Billing Cycle Changed | Occurs when there is a change in the recurring interval that your organization is charged.| | Plan Downgrade Canceled | Occurs when a scheduled plan downgrade for your organization is canceled.| | Seat Removal Canceled | Occurs when a scheduled seat removal for an organization’s billing plan is canceled. | +| Plan Upgrade Requested | Occurs when a user in your organization requests a plan upgrade. | +| Plan Downgrade Requested | Occurs when a user in your organization requests a plan downgrade. | +| Seat Addition Requested | Occurs when a user in your organization requests an increase in the number of seats. | +| Seat Removal Requested | Occurs when a user in your organization requests a decrease in the number of seats. | +| Billing Cycle Change Requested | Occurs when a user in your organization requests a change in the billing cycle. | +| Plan Downgrade Cancellation Requested | Occurs when a user in your organization requests a cancellation of a scheduled plan downgrade. | +| Seat Removal Cancellation Requested | Occurs when a user in your organization requests a cancellation of a scheduled seat removal. | \ No newline at end of file