diff --git a/_data/toc.yaml b/_data/toc.yaml index 72e013f2c5..f552ce0076 100644 --- a/_data/toc.yaml +++ b/_data/toc.yaml @@ -1631,6 +1631,8 @@ manuals: title: Migrate from Boot2Docker to Machine - sectiontitle: Command line reference section: + - path: /machine/reference/ + title: Reference overview - path: /machine/reference/active/ title: active - path: /machine/reference/config/ @@ -1733,26 +1735,6 @@ manuals: title: Control startup order - path: /compose/faq/ title: Frequently Asked Questions -- sectiontitle: Docker Hub - section: - - path: /docker-hub/ - title: Overview of Docker Hub - - path: /docker-hub/accounts/ - title: Use Docker Hub with Docker ID - - path: /docker-hub/orgs/ - title: Teams & Organizations - - path: /docker-hub/repos/ - title: Repositories on Docker Hub - - path: /docker-hub/builds/ - title: Automated Builds - - path: /docker-hub/webhooks/ - title: Webhooks for automated builds - - path: /docker-hub/bitbucket/ - title: Automated Builds with Bitbucket - - path: /docker-hub/github/ - title: Automated Builds from GitHub - - path: /docker-hub/official_repos/ - title: Official Repositories on Docker Hub - sectiontitle: Docker ID section: - path: /docker-id/ @@ -1761,6 +1743,26 @@ manuals: title: API Reference - sectiontitle: Superseded products and tools section: + - sectiontitle: Docker Hub + section: + - path: /docker-hub/ + title: Overview of Docker Hub + - path: /docker-hub/accounts/ + title: Use Docker Hub with Docker ID + - path: /docker-hub/orgs/ + title: Teams & Organizations + - path: /docker-hub/repos/ + title: Repositories on Docker Hub + - path: /docker-hub/builds/ + title: Automated Builds + - path: /docker-hub/webhooks/ + title: Webhooks for automated builds + - path: /docker-hub/bitbucket/ + title: Automated Builds with Bitbucket + - path: /docker-hub/github/ + title: Automated Builds from GitHub + - path: /docker-hub/official_repos/ + title: Official Repositories on Docker Hub - sectiontitle: Docker Swarm section: - path: /swarm/overview/ diff --git a/manuals.md b/manuals.md index d1165101bb..9a43d07c6f 100644 --- a/manuals.md +++ b/manuals.md @@ -9,27 +9,32 @@ can find the documentation for these tools and products here. ## Products +Commercial Docker products that turn your container-based solution into a +production-ready application. + | Product | Description | | ------- | ----------- | | [Docker Cloud](/docker-cloud/overview) | Manages multi-container applications and host resources running on a cloud provider (such as Amazon Web Services) | | [Universal Control Plane (UCP)](/ucp/overview/) | Manages multi-container applications on a custom host installation (on-premise, on a cloud provider) | | [Docker Trusted Registry (DTR)](/docker-trusted-registry/) | Runs a private repository of container images and makes them available to a UCP instance | -| [Docker Hub](/docker-hub/) and [Docker Store](/docker-store/) | Public, Docker-hosted registries that distribute free and paid container images (respectively) | +| [Docker Store](/docker-store/) | Public, Docker-hosted registry that distributes free and paid images from various publishers | | [CS Docker Engine](/cs-engine/install) | The commercially-supported version of Docker that excludes experimental features and includes customer support | ## Tools +Free downloadables that help your device use Docker containers. + | Tool | Description | | ---- | ----------- | | [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 | +| [Docker for Linux](/engine/installation/#on-linux) | Installation guides for running Docker on all supported Linux distros. | | [Docker Compose](/compose/) | Enables you to define, build, and run multi-container applications | | [Docker Notary](/notary/) | Allows the signing of container images to enable Docker Content Trust | | [Docker Registry](/registry/) | The software that powers Docker Hub and Docker Store, Registry stores and distributes container images | -## Superseded tools +## Superseded products and tools -> Note: These tools have had their functionality replaced by recent releases, as noted. - -* [Docker Toolbox](/toolbox/overview/) - Superseded by Docker for Mac/Windows +* [Docker Hub](/docker-hub/) - Superseded by Docker Store and Docker Cloud * [Docker Swarm](/swarm/) - Functionality folded directly into native Docker, no longer a standalone tool +* [Docker Toolbox](/toolbox/overview/) - Superseded by Docker for Mac/Windows diff --git a/reference.md b/reference.md index b10a177f21..879fb3681d 100644 --- a/reference.md +++ b/reference.md @@ -13,15 +13,6 @@ various APIs, CLIs, and file formats. | [Dockerfile](/engine/reference/builder/) | Defines the contents and startup behavior of a single container | | [Compose file](/compose/compose-file/) | Defines a multi-container application | -## Application programming interfaces (APIs) - -| API | Description | -| --- | ----------- | -| [Remote API](/engine/reference/api/docker_remote_api/) | The main API for Docker, provides programmatic access to a [daemon](/glossary/#daemon) | -| [Trusted Registry API](/apidocs/overview/) | Provides programmatic access to -a trusted registry | -| [Cloud API](/apidocs/docker-cloud/) | Enables programmatic management of your Docker application running on a cloud provider | - ## Command-line interfaces (CLIs) @@ -31,4 +22,12 @@ a trusted registry | | [Compose CLI](/compose/reference/overview/) | The CLI for Docker Compose, which allows you to build and run multi-container applications | | [Machine CLI](/machine/reference/) | Manages virtual machines that are pre-configured to run Docker | | [UCP Tool](/ucp/reference/) | Manages a Universal Control Plane instance | -| [Trusted Registry CLI](/docker-trusted-registry/reference/) | Manages a trusted registry +| [Trusted Registry CLI](/docker-trusted-registry/reference/) | Manages a trusted registry | + +## Application programming interfaces (APIs) + +| API | Description | +| --- | ----------- | +| [Remote API](/engine/api/) | The main API for Docker, provides programmatic access to a [daemon](/glossary/#daemon) | +| [Trusted Registry API](/apidocs/overview/) | Provides programmatic access to a trusted registry | +| [Cloud API](/apidocs/docker-cloud/) | Enables programmatic management of your Docker application running on a cloud provider | diff --git a/samples.md b/samples.md index 93512d2ecd..2e26c42e1c 100644 --- a/samples.md +++ b/samples.md @@ -12,7 +12,7 @@ The following samples were developed by Docker and the Docker community. ## Tutorial labs Tutorial labs demonstrate how to develop and ship containerized applications, by -walking through a sample that exhibits canonical practices. These labs are being +walking through a sample that exhibits canonical practices. These labs are from the [Docker Labs repository]({{ labsbase }}). | Sample | Description |