diff --git a/_data/glossary.yaml b/_data/glossary.yaml index e9eff619e7..24a3a2516d 100644 --- a/_data/glossary.yaml +++ b/_data/glossary.yaml @@ -189,8 +189,7 @@ a namespace can only interact with resources or processes that are part of the same namespace. Namespaces are an important part of Docker's isolation model. Namespaces exist for each type of resource, including `net` (networking), `mnt` (storage), `pid` (processes), `uts` (hostname control), - and `user` (UID mapping). For more information about namespaces, see [Docker run reference](/engine/reference/run/) - and [Introduction to user namespaces](https://success.docker.com/KBase/Introduction_to_User_Namespaces_in_Docker_Engine). + and `user` (UID mapping). For more information about namespaces, see [Docker run reference](/engine/reference/run/) and [Isolate containers with a user namespace](/engine/security/userns-remap/). node: | A [node](/engine/swarm/how-swarm-mode-works/nodes/) is a physical or virtual machine running an instance of the Docker Engine in [swarm mode](#swarm_mode). diff --git a/_includes/body-landing.html b/_includes/body-landing.html index 2cd9555ec8..4bdb37d648 100644 --- a/_includes/body-landing.html +++ b/_includes/body-landing.html @@ -599,18 +599,6 @@ Docker Security best practices

-

- - Docker Reference architecture: Docker logging design and best - practices - -

-

- - Docker Swarm reference architecture: Exploring scalable, - portable container networks - -

Develop with Docker

@@ -709,11 +697,6 @@ Troubleshoot volumes or bind mount errors

-

- - Troubleshoot container networking errors - -

Docker Desktop logs and troubleshooting diff --git a/network/index.md b/network/index.md index d87d7eac4f..3b706cf1b4 100644 --- a/network/index.md +++ b/network/index.md @@ -29,10 +29,7 @@ This topic does **not** go into OS-specific details about how Docker networks work, so you will not find information about how Docker manipulates `iptables` rules on Linux or how it manipulates routing rules on Windows servers, and you will not find detailed information about how Docker forms and encapsulates -packets or handles encryption. See [Docker and iptables](iptables.md) -and -[Docker Reference Architecture: Designing Scalable, Portable Docker Container Networks](http://success.docker.com/article/networking) -for a much greater depth of technical detail. +packets or handles encryption. See [Docker and iptables](iptables.md). In addition, this topic does not provide any tutorials for how to create, manage, and use Docker networks. Each section includes links to relevant diff --git a/network/iptables.md b/network/iptables.md index 29d2d6e128..cfb7b175e8 100644 --- a/network/iptables.md +++ b/network/iptables.md @@ -93,7 +93,3 @@ any address on the host. If you want to change that behavior to only expose ports on an internal IP address, you can use the `--ip` option to specify a different IP address. However, setting `--ip` only changes the _default_, it does not _restrict_ services to that IP. - -## Next steps - -- Read [Docker Reference Architecture: Designing Scalable, Portable Docker Container Networks](https://success.docker.com/Architecture/Docker_Reference_Architecture%3A_Designing_Scalable%2C_Portable_Docker_Container_Networks)