Skip to content

Commit 048c078

Browse files
johndmulhausenMisty Stanley-Jones
authored andcommitted
Improvements
1 parent b76c058 commit 048c078

File tree

4 files changed

+42
-36
lines changed

4 files changed

+42
-36
lines changed

_data/toc.yaml

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1631,6 +1631,8 @@ manuals:
16311631
title: Migrate from Boot2Docker to Machine
16321632
- sectiontitle: Command line reference
16331633
section:
1634+
- path: /machine/reference/
1635+
title: Reference overview
16341636
- path: /machine/reference/active/
16351637
title: active
16361638
- path: /machine/reference/config/
@@ -1733,26 +1735,6 @@ manuals:
17331735
title: Control startup order
17341736
- path: /compose/faq/
17351737
title: Frequently Asked Questions
1736-
- sectiontitle: Docker Hub
1737-
section:
1738-
- path: /docker-hub/
1739-
title: Overview of Docker Hub
1740-
- path: /docker-hub/accounts/
1741-
title: Use Docker Hub with Docker ID
1742-
- path: /docker-hub/orgs/
1743-
title: Teams & Organizations
1744-
- path: /docker-hub/repos/
1745-
title: Repositories on Docker Hub
1746-
- path: /docker-hub/builds/
1747-
title: Automated Builds
1748-
- path: /docker-hub/webhooks/
1749-
title: Webhooks for automated builds
1750-
- path: /docker-hub/bitbucket/
1751-
title: Automated Builds with Bitbucket
1752-
- path: /docker-hub/github/
1753-
title: Automated Builds from GitHub
1754-
- path: /docker-hub/official_repos/
1755-
title: Official Repositories on Docker Hub
17561738
- sectiontitle: Docker ID
17571739
section:
17581740
- path: /docker-id/
@@ -1761,6 +1743,26 @@ manuals:
17611743
title: API Reference
17621744
- sectiontitle: Superseded products and tools
17631745
section:
1746+
- sectiontitle: Docker Hub
1747+
section:
1748+
- path: /docker-hub/
1749+
title: Overview of Docker Hub
1750+
- path: /docker-hub/accounts/
1751+
title: Use Docker Hub with Docker ID
1752+
- path: /docker-hub/orgs/
1753+
title: Teams & Organizations
1754+
- path: /docker-hub/repos/
1755+
title: Repositories on Docker Hub
1756+
- path: /docker-hub/builds/
1757+
title: Automated Builds
1758+
- path: /docker-hub/webhooks/
1759+
title: Webhooks for automated builds
1760+
- path: /docker-hub/bitbucket/
1761+
title: Automated Builds with Bitbucket
1762+
- path: /docker-hub/github/
1763+
title: Automated Builds from GitHub
1764+
- path: /docker-hub/official_repos/
1765+
title: Official Repositories on Docker Hub
17641766
- sectiontitle: Docker Swarm
17651767
section:
17661768
- path: /swarm/overview/

manuals.md

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,32 @@ can find the documentation for these tools and products here.
99

1010
## Products
1111

12+
Commercial Docker products that turn your container-based solution into a
13+
production-ready application.
14+
1215
| Product | Description |
1316
| ------- | ----------- |
1417
| [Docker Cloud](/docker-cloud/overview) | Manages multi-container applications and host resources running on a cloud provider (such as Amazon Web Services) |
1518
| [Universal Control Plane (UCP)](/ucp/overview/) | Manages multi-container applications on a custom host installation (on-premise, on a cloud provider) |
1619
| [Docker Trusted Registry (DTR)](/docker-trusted-registry/) | Runs a private repository of container images and makes them available to a UCP instance |
17-
| [Docker Hub](/docker-hub/) and [Docker Store](/docker-store/) | Public, Docker-hosted registries that distribute free and paid container images (respectively) |
20+
| [Docker Store](/docker-store/) | Public, Docker-hosted registry that distributes free and paid images from various publishers |
1821
| [CS Docker Engine](/cs-engine/install) | The commercially-supported version of Docker that excludes experimental features and includes customer support |
1922

2023
## Tools
2124

25+
Free downloadables that help your device use Docker containers.
26+
2227
| Tool | Description |
2328
| ---- | ----------- |
2429
| [Docker for Mac](/docker-for-mac/) and [Docker for Windows](/docker-for-windows) | Desktop installation packages that include everything a developer needs to create and test applications |
30+
| [Docker for Linux](/engine/installation/#on-linux) | Installation guides for running Docker on all supported Linux distros. |
2531
| [Docker Compose](/compose/) | Enables you to define, build, and run multi-container applications |
2632
| [Docker Notary](/notary/) | Allows the signing of container images to enable Docker Content Trust |
2733
| [Docker Registry](/registry/) | The software that powers Docker Hub and Docker Store, Registry stores and distributes container images |
2834

2935

30-
## Superseded tools
31-
32-
> Note: These tools have had their functionality replaced by recent releases, as noted.
36+
## Superseded products and tools
3337

34-
* [Docker Toolbox](/toolbox/overview/) - Superseded by Docker for Mac/Windows
38+
* [Docker Hub](/docker-hub/) - Superseded by Docker Store and Docker Cloud
3539
* [Docker Swarm](/swarm/) - Functionality folded directly into native Docker, no longer a standalone tool
40+
* [Docker Toolbox](/toolbox/overview/) - Superseded by Docker for Mac/Windows

reference.md

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,6 @@ various APIs, CLIs, and file formats.
1313
| [Dockerfile](/engine/reference/builder/) | Defines the contents and startup behavior of a single container |
1414
| [Compose file](/compose/compose-file/) | Defines a multi-container application |
1515

16-
## Application programming interfaces (APIs)
17-
18-
| API | Description |
19-
| --- | ----------- |
20-
| [Remote API](/engine/reference/api/docker_remote_api/) | The main API for Docker, provides programmatic access to a [daemon](/glossary/#daemon) |
21-
| [Trusted Registry API](/apidocs/overview/) | Provides programmatic access to
22-
a trusted registry |
23-
| [Cloud API](/apidocs/docker-cloud/) | Enables programmatic management of your Docker application running on a cloud provider |
24-
2516

2617
## Command-line interfaces (CLIs)
2718

@@ -31,4 +22,12 @@ a trusted registry |
3122
| [Compose CLI](/compose/reference/overview/) | The CLI for Docker Compose, which allows you to build and run multi-container applications |
3223
| [Machine CLI](/machine/reference/) | Manages virtual machines that are pre-configured to run Docker |
3324
| [UCP Tool](/ucp/reference/) | Manages a Universal Control Plane instance |
34-
| [Trusted Registry CLI](/docker-trusted-registry/reference/) | Manages a trusted registry
25+
| [Trusted Registry CLI](/docker-trusted-registry/reference/) | Manages a trusted registry |
26+
27+
## Application programming interfaces (APIs)
28+
29+
| API | Description |
30+
| --- | ----------- |
31+
| [Remote API](/engine/api/) | The main API for Docker, provides programmatic access to a [daemon](/glossary/#daemon) |
32+
| [Trusted Registry API](/apidocs/overview/) | Provides programmatic access to a trusted registry |
33+
| [Cloud API](/apidocs/docker-cloud/) | Enables programmatic management of your Docker application running on a cloud provider |

samples.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ The following samples were developed by Docker and the Docker community.
1212
## Tutorial labs
1313

1414
Tutorial labs demonstrate how to develop and ship containerized applications, by
15-
walking through a sample that exhibits canonical practices. These labs are being
15+
walking through a sample that exhibits canonical practices. These labs are
1616
from the [Docker Labs repository]({{ labsbase }}).
1717

1818
| Sample | Description |

0 commit comments

Comments
 (0)