Reorganise TC pages

Signed-off-by: Chris Chinchilla <chris.ward@docker.com>

Fix links

Signed-off-by: Chris Chinchilla <chris.ward@docker.com>

Fix image sizes

Signed-off-by: Chris Chinchilla <chris.ward@docker.com>

Remove logos page

Signed-off-by: Chris Chinchilla <chris.ward@docker.com>

Add logo redirect

Signed-off-by: Chris Chinchilla <chris.ward@docker.com>

_data/toc.yaml

@@ -1842,16 +1842,12 @@ manuals:
         title: Manage
   - path: /docker-hub/official_images/
     title: Docker Official images
-  - sectiontitle: Docker Verified Publisher
-    section:
-      - path: /docker-hub/publish/
-        title: Overview
-      - path: /docker-hub/publish/insights-analytics/
-        title: Insights and analytics
-      - path: /docker-hub/publish/repository-logos/
-        title: Repository logos        
+  - path: /docker-hub/dvp-program/
+    title: Docker Verified Publisher Program
   - path: /docker-hub/dsos-program/
     title: Docker-Sponsored Open Source Program
+  - path: /docker-hub/insights-analytics/
+    title: Insights and analytics
   - path: /docker-hub/download-rate-limit/
     title: Download rate limit
   - path: /docker-hub/webhooks/

develop/security-best-practices.md

@@ -24,7 +24,7 @@ Docker Hub has more than 8.3 million repositories. Some of these images are
 [Official Images](../docker-hub/official_images.md), which are published by
 Docker as a curated set of Docker open source and drop-in solution repositories.
 Docker also offers images that are published by
-[Verified Publishers](../docker-hub/publish/index.md). These high-quality images
+[Verified Publishers](../docker-hub/dvp-program.md). These high-quality images
 are published and maintained by the organizations partnering with Docker, with
 Docker verifying the authenticity of the content in their repositories. When you
 pick your base image, look out for the **Official Image** and **Verified Publisher**

docker-hub/dsos-program.md

@@ -12,10 +12,11 @@ Images that are part of this program have a special badge on Docker Hub making i
 
 ## For content publishers
 
-The Docker-Sponsored Open Source Program provides several features and benefits to non-commercial open source developers.
+The Docker-Sponsored Open Source (DSOS) Program provides several features and benefits to non-commercial open source developers.
 
 The program grants the following perks to eligible projects:
 
+- Repository logo
 - Verified Docker-Sponsored Open Source badge
 - Insights and analytics
 - Vulnerability analysis
@@ -24,6 +25,39 @@ The program grants the following perks to eligible projects:
 
 These benefits are valid for one year and publishers can renew annually if the project still meets the program requirements. Program members, and all users pulling public images from the project namespace get access to unlimited pulls and unlimited egress.
 
+### Repository logo
+
+DSOS organizations can upload custom images for individual repositories on Docker Hub.
+This lets you override the default organization-level logo on a per-repository basis.
+
+Only a user with administrative access (owner or team member with administrator permission)
+over the repository can change the repository logo.
+
+#### Image requirements
+
+- The supported filetypes for the logo image are JPEG and PNG.
+- The minimum allowed image size in pixels is 120×120.
+- The maximum allowed image size in pixels is 1000×1000.
+- The maximum allowed image file size is 5MB.
+
+#### Set the repository logo
+
+1. Sign in to Docker Hub.
+2. Go to the page of the repository that you want to change the logo for.
+3. Select the upload logo button, represented by a camera icon
+   (![Camera icon](images/upload_logo_sm.png){: .inline height="22px" })
+   overlaying the current repository logo.
+4. In the dialog that opens, select the PNG image that you want to upload to
+   set it as the logo for the repository.
+
+#### Remove the logo
+
+Remove a logo using the clear button (![Clear button](images/clear_logo_sm.png){: .inline width="20px" }).
+
+Removing the logo makes the repository fallback to using the organization logo, if set, and the default logo if not.
+
+![Default logo which is a 3D grey cube](images/default_logo_sm.png){: width="50px" }
+
 ### Verified Docker-Sponsored Open Source badge
 
 Docker verifies that developers can trust images with this badge on Docker Hub as an active open source project.
@@ -39,7 +73,7 @@ the community uses Docker images, granting insight into user behavior.
 The usage metrics show the number of image pulls by tag or by digest, and breakdowns by
 geolocation, cloud provider, client, and more.
 
-![The insights and analytics tab on the Docker Hub website](./publish/images/insights-and-analytics-tab.png)
+![The insights and analytics tab on the Docker Hub website](images/insights-and-analytics-tab.png)
 
 You can use the view to select the time span you want to view analytics data and export the data in
 either a summary or raw format.
@@ -47,7 +81,7 @@ either a summary or raw format.
 ### Vulnerability analysis
 
 [Docker Scout](/scout/){:
-target="blank" rel="noopener" class=""} provides automatic vulnerability analysis 
+target="blank" rel="noopener" class=""} provides automatic vulnerability analysis
 for DVP images published to Docker Hub.
 Scanning images ensures that the published content is secure, and proves to
 developers that they can trust the image.

docker-hub/dvp-program.md

@@ -17,6 +17,8 @@ redirect_from:
   - /docker-hub/publish/trustchain/
   - /docker-hub/publish/byol/
   - /docker-hub/publish/publisher-center-migration/
+  - /docker-hub/publish/
+  - /docker-hub/publish/repository-logos/
 ---
 
 [The Docker Verified Publisher Program](https://hub.docker.com/search?q=&image_filter=store){:target="_blank" rel="noopener" class="_"} provides high-quality images from commercial publishers verified by Docker.
@@ -32,6 +34,7 @@ Images that are part of this program have a special badge on Docker Hub making i
 The Docker Verified Publisher Program (DVP) provides several features and benefits to Docker
 Hub publishers. The program grants the following perks based on participation tier:
 
+- Repository logo
 - Verified publisher badge
 - Priority search ranking in Docker Hub
 - Insights and analytics
@@ -40,6 +43,39 @@ Hub publishers. The program grants the following perks based on participation ti
 - Removal of rate limiting for developers
 - Co-marketing opportunities
 
+### Repository logo
+
+DVP organizations can upload custom images for individual repositories on Docker Hub.
+This lets you override the default organization-level logo on a per-repository basis.
+
+Only a user with administrative access (owner or team member with administrator permission)
+over the repository can change the repository logo.
+
+#### Image requirements
+
+- The supported filetypes for the logo image are JPEG and PNG.
+- The minimum allowed image size in pixels is 120×120.
+- The maximum allowed image size in pixels is 1000×1000.
+- The maximum allowed image file size is 5MB.
+
+#### Set the repository logo
+
+1. Sign in to Docker Hub.
+2. Go to the page of the repository that you want to change the logo for.
+3. Select the upload logo button, represented by a camera icon
+   (![Camera icon](./images/upload_logo_sm.png){: .inline height="22px" })
+   overlaying the current repository logo.
+4. In the dialog that opens, select the PNG image that you want to upload to
+   set it as the logo for the repository.
+
+#### Remove the logo
+
+Remove a logo using the clear button (![Clear button](images/clear_logo_sm.png){: .inline width="20px" }).
+
+Removing the logo makes the repository fallback to using the organization logo, if set, and the default logo if not.
+
+![Default logo which is a 3D grey cube](images/default_logo_sm.png){: width="50px" }
+
 ### Verified publisher badge
 
 Images that are part of this program have a badge on Docker Hub making it easier for developers
@@ -64,7 +100,7 @@ either a summary or raw format.
 ### Vulnerability analysis
 
 [Docker Scout](/scout/){:
-target="blank" rel="noopener" class=""} provides automatic vulnerability analysis 
+target="blank" rel="noopener" class=""} provides automatic vulnerability analysis
 for DVP images published to Docker Hub.
 Scanning images ensures that the published content is secure, and proves to
 developers that they can trust the image.

docker-hub/index.md

@@ -35,7 +35,7 @@ Docker Hub is also where you can go to [change your Docker account settings and
 * [Repositories](../docker-hub/repos/index.md): Push and pull container images.
 * [Docker Official Images](official_images.md): Pull and use high-quality
 container images provided by Docker.
-* [Docker Verified Publisher Images](publish/index.md): Pull and use high-quality
+* [Docker Verified Publisher Images](dvp-program.md): Pull and use high-quality
 container images provided by external vendors.
 * [Docker-Sponsored Open Source Images](dsos-program.md): Pull and use high-quality
 container images from non-commercial open source projects.

docker-hub/insights-analytics.md

@@ -2,17 +2,23 @@
 title: Insights and analytics
 description: Provides usage statistics of your images on Docker Hub.
 keywords: docker hub, hub, insights, analytics, api, verified publisher
+redirect_from:
+  - /docker-hub/publish/insights-analytics/
 ---
 
 Insights and analytics provides usage analytics for Docker Verified
-Publisher (DVP) images on Docker Hub, providing self-serve access
+Publisher (DVP) and Docker-Sponsored Open Source (DSOS) images on Docker Hub, providing self-serve access
 to metrics as both raw data and summary data for a desired time span. You can
 view the number of image pulls by tag or by digest, and get breakdowns by
 geolocation, cloud provider, client, and more.
 
-Head to the
-[Docker Verified Publisher Program page](https://www.docker.com/partners/programs/){: target="blank" rel="noopener" class="_" }
-to learn more about the benefits of becoming a verified publisher.
+<!-- prettier-ignore -->
+> **Tip**
+>
+> Head to the
+[Docker Verified Publisher Program](https://www.docker.com/partners/programs/){: target="blank" rel="noopener" class="_" } or [Docker-Sponsored Open Source](https://www.docker.com/community/open-source/application/#){: target="blank" rel="noopener" class="_" } pages
+to learn more about the programs.
+{: .tip }
 
 ## View the analytics data
 

docker-hub/publish/repository-logos.md

@@ -1,37 +0,0 @@
----
-title: Repository logos
-description: Override the organization logo on a per-repository basis
-keywords: dvp, verified, publisher, repository, logo, icons
----
-
-Docker Verified Publishers (DVP) and Docker Sponsored Open Source (DSOS)
-organizations can upload custom images for individual repositories on Docker Hub.
-This lets you override the default organization-level logo on a per-repository basis.
-
-Only a user with administrative access (owner or team member with Admin permission)
-over the repository can change the repository logo.
-
-## Image requirements
-
-- The supported filetypes for the logo image are JPEG and PNG.
-- The minimum allowed image size in pixels is 120×120.
-- The maximum allowed image size in pixels is 1000×1000.
-- The maximum allowed image file size is 5MB.
-
-## Set the repository logo
-
-1. Sign in to Docker Hub.
-2. Go to the page of the repository that you want to change the logo for.
-3. Select the upload logo button, represented by a camera icon
-   (![Camera icon](./images/upload_logo_sm.png){: .inline height="22px" })
-   overlaying the current repository logo.
-4. In the dialog that opens, select the PNG image that you want to upload to
-   set it as the logo for the repository.
-
-## Remove the logo
-
-Remove a logo using the clear button (![Clear button](../images/clear_logo_sm.png){: .inline height="22px" }).
-
-Removing the logo makes the repository fallback to using the organization logo, if set, and the default logo if not.
-
-![Default logo which is a 3D grey cube](./images/default_logo_sm.png){: .inline height="22px" }

subscription/faq.md

@@ -19,8 +19,8 @@ Contact the [Docker Sales Team](https://www.docker.com/company/contact){:target=
 ### What ways can I contribute to Docker content?
 
 Docker offers two programs:
-- [Docker-Sponsored Open Source Program (DSOS)](https://www.docker.com/community/open-source/application/)
-- [Docker Verified Publisher (DVP)](../docker-hub/publish/index.md)
+- [Docker-Sponsored Open Source Program (DSOS)](../docker-hub/dsos-program.md)
+- [Docker Verified Publisher (DVP)](../docker-hub/dvp-program.md)
 
 ### Do I need to do anything at the end of my subscription term?