Merge branch 'docker:main' into sssc-docker-concepts

Author: sbenhoff007

.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
+

Dockerfile

@@ -1,11 +1,11 @@
-# syntax=docker/dockerfile-upstream:master
+# syntax=docker/dockerfile:1
 # check=skip=InvalidBaseImagePlatform
 
 # ALPINE_VERSION sets the Alpine Linux version for all Alpine stages
 ARG ALPINE_VERSION=3.20
 # GO_VERSION sets the Go version for the base stage
 ARG GO_VERSION=1.23
-# HTML_TEST_VERSION sets the wjdp/htmltest version for HTML testing
+# HTMLTEST_VERSION sets the wjdp/htmltest version for HTML testing
 ARG HTMLTEST_VERSION=0.17.0
 
 # base is the base stage with build dependencies

content/get-started/introduction/develop-with-containers.md

@@ -79,32 +79,25 @@ With this environment up and running, you’re ready to make a few changes to th
 
 The greeting at the top of the page is populated by an API call at `/api/greeting`. Currently, it always returns "Hello world!". You’ll now modify it to return one of three randomized messages (that you'll get to choose).
 
-1. Open the `backend/src/routes/getGreeting.js` file. This file provides the handler for the API endpoint.
+1. Open the `backend/src/routes/getGreeting.js` file in a text editor. This file provides the handler for the API endpoint.
 
-2. Modify the variable at the top to an array of greetings. Feel free to use the following modifications or customize it to your own liking.
+2. Modify the variable at the top to an array of greetings. Feel free to use the following modifications or customize it to your own liking. Also, update the endpoint to send a random greeting from this list.
 
-    ```js {linenos=table,hl_lines=["1-5"],linenostart=1}
+    ```js {linenos=table,hl_lines=["1-5",9],linenostart=1}
     const GREETINGS = [
         "Whalecome!",
         "All hands on deck!",
         "Charting the course ahead!",
     ];
 
-    module.exports = async (req, res) => {
-    ...
-    ```
-
-3. Now, update the endpoint to send a random greeting from this list by making the following change:
-
-    ```js {linenos=table,hl_lines=[3],linenostart=7}
     module.exports = async (req, res) => {
         res.send({
             greeting: GREETINGS[ Math.floor( Math.random() * GREETINGS.length )],
         });
     };
     ```
 
-4. If you haven't done so yet, save the file. If you refresh your browser, you should see a new greeting. If you keep refreshing, you should see all of the messages appear.
+3. If you haven't done so yet, save the file. If you refresh your browser, you should see a new greeting. If you keep refreshing, you should see all of the messages appear.
 
     ![Screenshot of the to-do app with a new greeting](images/develop-app-with-greetings.webp)
 

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.

content/guides/databases.md

@@ -696,4 +696,4 @@ Related information:
 - [Dockerfile reference](/reference/dockerfile/)
 - [Compose file reference](/reference/compose-file/)
 - [CLI reference](/reference/cli/docker/)
-- [Database samples](../../samples/_index.md#databases)
+- [Database samples](../../reference/samples/_index.md#databases)

content/guides/docker-scout/_index.md

@@ -29,24 +29,23 @@ params:
 
 When container images are insecure, significant risks can arise. Around 60% of
 organizations have reported experiencing at least one security breach or
-vulnerability incident within a year, resulting in operational
-disruption.[^CSA] These incidents often result in considerable downtime, with
+vulnerability incident within a year, [resulting in operational
+disruption][CSA]. These incidents often result in considerable downtime, with
 44% of affected companies experiencing over an hour of downtime per event. The
-financial impact is substantial, with the average data breach cost reaching
-$4.45 million.[^IBM] This highlights the critical importance of maintaining
+financial impact is substantial, with [the average data breach cost reaching
+$4.45 million][IBM]. This highlights the critical importance of maintaining
 robust container security measures.
 
 Docker Scout enhances container security by providing automated vulnerability
 detection and remediation, addressing insecure container images, and ensuring
 compliance with security standards.
 
-[^CSA]: https://cloudsecurityalliance.org/blog/2023/09/21/2023-global-cloud-threat-report-cloud-attacks-are-lightning-fast
-
-[^IBM]: https://www.ibm.com/reports/data-breach
+[CSA]: https://cloudsecurityalliance.org/blog/2023/09/21/2023-global-cloud-threat-report-cloud-attacks-are-lightning-fast
+[IBM]: https://www.ibm.com/reports/data-breach
 
 ## What you'll learn
 
-- Define secure software supply chain (SSSC)
+- Define Secure Software Supply Chain (SSSC)
 - Review SBOMs and how to use them
 - Detect and monitor vulnerabilities
 

content/guides/docker-scout/demo.md

@@ -1,6 +1,6 @@
 ---
 title: Docker Scout demo
-description: Learn about Docke rScout's powerful features for enhanced supply chain security.
+description: Learn about Docker Scout's powerful features for enhanced supply chain security.
 weight: 20
 ---
 

content/includes/admin-company-overview.md

@@ -1,4 +1,4 @@
-A company provides a single point of visibility across multiple organizations. This view simplifies the management of Docker organizations and settings. It's available to Docker Business subscribers.
+A company provides a single point of visibility across multiple organizations. This view simplifies the management of Docker organizations and settings. Organization owners with a Docker Business subscription can create a company and then manage it through the [Docker Admin Console](https://app.docker.com/admin).
 
 The following diagram depicts the setup of a company and how it relates to associated organizations.
 

content/includes/admin-early-access.md

@@ -4,5 +4,5 @@
 {{% restricted title="Early Access" %}}
 The Docker Admin Console is an [early access](/release-lifecycle#early-access-ea) product.
 
-It's available to all company owners and organization owners. You can still manage companies and organizations in Docker Hub, but the Admin Console includes enhanced features for company-level management.
+It's available to all company owners and organization owners. You can still manage organizations in Docker Hub, but the Admin Console includes company-level management and enhanced features for organization management.
 {{% /restricted %}}

content/manuals/accounts/deactivate-user-account.md

@@ -7,22 +7,22 @@ keywords: Docker Hub, delete, deactivate, account, account management
 
 You can deactivate an account at any time. This section describes the prerequisites and steps to deactivate a user account. For information on deactivating an organization, see [Deactivating an organization](../admin/deactivate-account.md).
 
->**Warning**
+>[!Warning]
 >
 > All Docker products and services that use your Docker account will be inaccessible after deactivating your account.
 
 ## Prerequisites
 
 Before deactivating your Docker account, ensure that you meet the following requirements:
 
-- You must not be a member of a company or any teams or organizations. You must remove the account from all teams, organizations, or the company.
-
+- For owners, you must leave your organization or company before deactivating your Docker account.
     To do this:
-    1. Navigate to **Organizations** and then select the organization(s) you need to leave.
-    2. Find your username in the **Members** tab.
-    3. Select the **More options** menu and then select **Leave organization**.
+    1. Sign in to the [Docker Admin Console](https://app.docker.com/admin).
+    2. Select the organization you need to leave from the top-left drop-down menu.
+    3. Find your username in the **Members** tab.
+    4. Select the **More options** menu and then select **Leave organization**.
 
-- If you are the sole owner of an organization, either assign another member of the organization the owner role and then remove yourself from the organization, or deactivate the organization. Similarly, if you are the sole owner of a company, either add someone else as a company owner and then remove yourself, or deactivate the company.
+- If you are the sole owner of an organization, you must assign the owner role to another member of the organization and then remove yourself from the organization, or deactivate the organization. Similarly, if you are the sole owner of a company, either add someone else as a company owner and then remove yourself, or deactivate the company.
 
 - If you have an active Docker subscription, [downgrade it to a Docker Personal subscription](../subscription/core-subscription/downgrade.md).
 
@@ -42,8 +42,8 @@ Once you have completed all the previous steps, you can deactivate your account.
 >
 > This cannot be undone. Be sure you've gathered all the data you need from your account before deactivating it.
 
-1. Sign in to your [Docker account](https://app.docker.com/login).
-2. In Docker Home, select your avatar in the top-right corner to open the drop-down.
+1. Sign in to [Docker Home](https://app.docker.com/login).
+2. Select your avatar to open the drop-down menu.
 3. Select **Account settings**.
-4. In the **Account management** section, select **Deactivate account** to open to deactivate account page.
+4. In the **Account management** section, select **Deactivate account**.
 5. To confirm, select **Deactivate account**.