diff --git a/_data/toc.yaml b/_data/toc.yaml index d9705038a2..4938fcb92a 100644 --- a/_data/toc.yaml +++ b/_data/toc.yaml @@ -480,23 +480,23 @@ toc: - sectiontitle: API Reference section: - path: /engine/reference/api/docker_remote_api/ - title: Remote API + title: Engine API - path: /engine/reference/api/docker_remote_api_v1.24/ - title: Remote API v1.24 + title: Engine API v1.24 - path: /engine/reference/api/docker_remote_api_v1.23/ - title: Remote API v1.23 + title: Engine API v1.23 - path: /engine/reference/api/docker_remote_api_v1.22/ - title: Remote API v1.22 + title: Engine API v1.22 - path: /engine/reference/api/docker_remote_api_v1.21/ - title: Remote API v1.21 + title: Engine API v1.21 - path: /engine/reference/api/docker_remote_api_v1.20/ - title: Remote API v1.20 + title: Engine API v1.20 - path: /engine/reference/api/docker_remote_api_v1.19/ - title: Remote API v1.19 + title: Engine API v1.19 - path: /engine/reference/api/docker_remote_api_v1.18/ - title: Remote API v1.18 + title: Engine API v1.18 - path: /engine/reference/api/remote_api_client_libraries/ - title: Remote API client libraries + title: Engine API client libraries - path: /engine/migration/ title: Migrate to Engine 1.10 - path: /engine/breaking_changes/ diff --git a/datacenter/ucp/1.1/install-sandbox-2.md b/datacenter/ucp/1.1/install-sandbox-2.md index b2f901c0b7..c4da8242d1 100644 --- a/datacenter/ucp/1.1/install-sandbox-2.md +++ b/datacenter/ucp/1.1/install-sandbox-2.md @@ -169,7 +169,7 @@ UCP allows you to deploy and manage "Dockerized" applications in production. An application is built using Docker objects, such as images and containers, and Docker resources, such as volumes and networks. -UCP deploys and manages these objects and resources using remote API calls to +UCP deploys and manages these objects and resources using Engine API calls to the Engine daemons running on the nodes. For example, the `run` action may deploy an image in a Docker container. That image might define a service such as an Nginx web server or a database like Postgres. diff --git a/docker-for-mac/faqs.md b/docker-for-mac/faqs.md index 3e5eb42eff..811f64b06e 100644 --- a/docker-for-mac/faqs.md +++ b/docker-for-mac/faqs.md @@ -84,11 +84,11 @@ experiment a multi-node swarm. Check out the tutorial at [Get started with swarm ### How do I connect to the remote Docker Engine API? -You might need to provide the location of the remote API for Docker clients and development tools. +You might need to provide the location of the Engine API for Docker clients and development tools. On Docker for Mac, clients can connect to the Docker Engine through a Unix socket: `unix:///var/run/docker.sock`. -See also [Docker Remote API](/engine/reference/api/docker_remote_api.md) and Docker for Mac forums topic [Using pycharm Docker plugin..](https://forums.docker.com/t/using-pycharm-docker-plugin-with-docker-beta/8617). +See also [Docker Engine API](/engine/reference/api/docker_remote_api.md) and Docker for Mac forums topic [Using pycharm Docker plugin..](https://forums.docker.com/t/using-pycharm-docker-plugin-with-docker-beta/8617). If you are working with applications like [Apache Maven](https://maven.apache.org/) that expect settings for `DOCKER_HOST` and `DOCKER_CERT_PATH` environment variables, specify these to connect to Docker instances through Unix sockets. For example: diff --git a/docker-for-windows/faqs.md b/docker-for-windows/faqs.md index cc7684af6c..44073e9100 100644 --- a/docker-for-windows/faqs.md +++ b/docker-for-windows/faqs.md @@ -103,13 +103,13 @@ swarm mode](/engine/swarm/swarm-tutorial/index.md). ### How do I connect to the remote Docker Engine API? -You might need to provide the location of the remote API for Docker clients and development tools. +You might need to provide the location of the Engine API for Docker clients and development tools. On Docker for Windows, clients can connect to the Docker Engine through a **named pipe**: `npipe:////./pipe/docker_engine`, or **TCP socket** at this URL: `http://localhost:2375`. This sets `DOCKER_HOST` and `DOCKER_CERT_PATH` environment variables to the given values (for the named pipe or TCP socket, whichever you use). -See also [Docker Remote API](/engine/reference/api/docker_remote_api.md) and the Docker for Windows forums topic [How to find the remote API](https://forums.docker.com/t/how-to-find-the-remote-api/20988). +See also [Docker Engine API](/engine/reference/api/) and the Docker for Windows forums topic [How to find the remote API](https://forums.docker.com/t/how-to-find-the-remote-api/20988). ### Why doesn't `nodemon` pick up file changes in a container mounted on a shared drive? diff --git a/kitematic/faq.md b/kitematic/faq.md index 830d926c5b..51b448f43a 100644 --- a/kitematic/faq.md +++ b/kitematic/faq.md @@ -19,7 +19,7 @@ best way to start contributing to Kitematic is to review our doc on s"` to specify the interval, in seconds, between heartbeats the manager sends to the primary manager. These heartbeats indicate that the manager is healthy and reachable. By default, the interval is 60 seconds. -### `--api-enable-cors`, `--cors` — Enable CORS headers in the remote API +### `--api-enable-cors`, `--cors` — Enable CORS headers in the Engine API -Use `--api-enable-cors` or `--cors` to enable cross-origin resource sharing (CORS) headers in the remote API. +Use `--api-enable-cors` or `--cors` to enable cross-origin resource sharing (CORS) headers in the Engine API. ### `--cluster-driver`, `-c` — Cluster driver to use @@ -198,4 +198,4 @@ Use `--discovery-opt ` to discovery options, such as paths to the TLS fil --discovery-opt kv.certfile=/path/to/mycert.pem \ --discovery-opt kv.keyfile=/path/to/mykey.pem \ -For more information, see [Use TLS with distributed key/value discovery](../discovery.md) \ No newline at end of file +For more information, see [Use TLS with distributed key/value discovery](../discovery.md) diff --git a/swarm/secure-swarm-tls.md b/swarm/secure-swarm-tls.md index e17fdce982..18f6f57d2d 100644 --- a/swarm/secure-swarm-tls.md +++ b/swarm/secure-swarm-tls.md @@ -94,11 +94,11 @@ the Docker Engine daemon automatically trusts any certificates signed by the CA. certificate is in order (the certificate has not expired or been revoked etc.) the Docker Engine daemon accepts commands from this trusted Docker Engine CLI. -The Docker Engine CLI is simply a client that uses the Docker Engine Remote API to -communicate with the Docker Engine daemon. Any client that uses this Docker Engine Remote API can use +The Docker Engine CLI is simply a client that uses the Docker Engine API to +communicate with the Docker Engine daemon. Any client that uses this Docker Engine API can use TLS. For example, Docker Engine clients such as 'Docker Universal Control Plane' (UCP) have TLS support built-in. Other, third party products, that use Docker Engine -Remote API, can also be configured this way. +API, can also be configured this way. ## TLS modes with Docker and Swarm diff --git a/swarm/swarm-api.md b/swarm/swarm-api.md index 9c94e677b3..f44cf5d230 100644 --- a/swarm/swarm-api.md +++ b/swarm/swarm-api.md @@ -12,7 +12,7 @@ title: Docker Swarm API The Docker Swarm API is mostly compatible with the [Docker Remote API](/engine/reference/api/docker_remote_api/). This document is an overview of the differences between the Swarm API and the Docker -Remote API. +Engine API. ## Missing endpoints