diff --git a/articles/basics/index.html b/articles/basics/index.html index 8ebce547fd..0ef6798fb0 100644 --- a/articles/basics/index.html +++ b/articles/basics/index.html @@ -1398,7 +1398,7 @@ $ docker pull ubuntu

This will find the ubuntu image by name on -Docker Hub +Docker Hub and download it from Docker Hub to a local image cache.

@@ -1564,7 +1564,7 @@ $ docker images

You now have an image state from which you can create new instances.

-

Read more about Share Images via +

Read more about Share Images via Repositories or continue to the complete Command Line

diff --git a/articles/index.xml b/articles/index.xml index 7fcaac9eba..d97bedf381 100644 --- a/articles/index.xml +++ b/articles/index.xml @@ -1140,7 +1140,7 @@ of another container. Of course, if the host system is setup accordingly, containers can interact with each other through their respective network interfaces — just like they can interact with external hosts. When you specify public ports for your containers or use -<a href="http://localhost/articles/articles/userguide/dockerlinks"><em>links</em></a> +<a href="http://localhost/userguide/dockerlinks"><em>links</em></a> then IP traffic is allowed between containers. They can ping each other, send/receive UDP packets, and establish TCP connections, but that can be restricted if necessary. From a network architecture point of view, all @@ -1425,7 +1425,7 @@ $ docker pull ubuntu </code></pre> <p>This will find the <code>ubuntu</code> image by name on -<a href="http://localhost/articles/articles/userguide/dockerrepos/#searching-for-images"><em>Docker Hub</em></a> +<a href="http://localhost/userguide/dockerrepos/#searching-for-images"><em>Docker Hub</em></a> and download it from <a href="https://hub.docker.com">Docker Hub</a> to a local image cache.</p> @@ -1591,7 +1591,7 @@ $ docker images <p>You now have an image state from which you can create new instances.</p> -<p>Read more about <a href="http://localhost/articles/articles/userguide/dockerrepos"><em>Share Images via +<p>Read more about <a href="http://localhost/userguide/dockerrepos"><em>Share Images via Repositories</em></a> or continue to the complete <a href="http://localhost/articles/articles/reference/commandline/cli"><em>Command Line</em></a></p> @@ -1797,7 +1797,7 @@ This document discusses advanced networking configuration and options for Docker. In most cases you won&rsquo;t need this information. If you&rsquo;re looking to get started with a simpler explanation of Docker networking and an introduction to the concept of container linking see -the <a href="http://localhost/articles/articles/userguide/dockerlinks/">Docker User Guide</a>.</p> +the <a href="http://localhost/userguide/dockerlinks/">Docker User Guide</a>.</p> </blockquote> <p>But <code>docker0</code> is no ordinary interface. It is a virtual <em>Ethernet @@ -2139,7 +2139,7 @@ services. If the Docker daemon is running with both <code>--icc=false< <code>ACCEPT</code> rules so that the new container can connect to the ports exposed by the other container — the ports that it mentioned in the <code>EXPOSE</code> lines of its <code>Dockerfile</code>. Docker has more documentation on -this subject — see the <a href="http://localhost/articles/articles/userguide/dockerlinks">linking Docker containers</a> +this subject — see the <a href="http://localhost/userguide/dockerlinks">linking Docker containers</a> page for further details.</p> <blockquote> @@ -2213,7 +2213,7 @@ MASQUERADE all -- 172.17.0.0/16 0.0.0.0/0 <p>But if you want containers to accept incoming connections, you will need to provide special options when invoking <code>docker run</code>. These options -are covered in more detail in the <a href="http://localhost/articles/articles/userguide/dockerlinks">Docker User Guide</a> +are covered in more detail in the <a href="http://localhost/userguide/dockerlinks">Docker User Guide</a> page. There are two approaches.</p> <p>First, you can supply <code>-P</code> or <code>--publish-all=true|false</code> to <code>docker run</code> which @@ -2280,7 +2280,7 @@ connect to a local container exposed port through the commonly used loopback address: this alternative is preferred for performance reason.</p> <p>Again, this topic is covered without all of these low-level networking -details in the <a href="http://localhost/articles/articles/userguide/dockerlinks/">Docker User Guide</a> document if you +details in the <a href="http://localhost/userguide/dockerlinks/">Docker User Guide</a> document if you would like to use that as your port redirection reference instead.</p> <h2 id="ipv6">IPv6</h2> diff --git a/articles/networking/index.html b/articles/networking/index.html index 633e3a1ca1..8f10472ea0 100644 --- a/articles/networking/index.html +++ b/articles/networking/index.html @@ -10,7 +10,7 @@ - +
@@ -80,7 +80,7 @@
- + - +
- - + +
- +
+ + + + Installation from binaries - - - + + +
- - - + + + Kitematic - - - + + + Docker Machine - - - + + + Docker Compose - - - + + + Docker Swarm - - + +
- + - +
- +
- - + + The Docker user guide - - - + + + - - - + + + - - - + + + - - - + + + - - + +
- +
- +
- +
- - + + About Docker - - - + + + Apply custom metadata - - - + + + Understand the architecture - - - + + + - - - + + + - - - + + + - - - + + + + + + + - - - +
+ + + - - - + + + - - + + - +
- +
- +
- - + + - - - + + + - - - + + + - - - + + + Using certificates for repository client verification - - - + + + Run a local registry mirror - - + +
- +
- +
- +
- - + +
- - + + Using the command line - - - - + + + + daemon - - - - + + + + attach - - - - + + + + build - - - - + + + + commit - - - - + + + + cp - - - - + + + + create - - - - + + + + diff - - - - + + + + events - - - - + + + + exec - - - - + + + + export - - - - + + + + history - - - - + + + + images - - - - + + + + import - - - - + + + + info - - - - + + + + inspect - - - - + + + + kill - - - - + + + + load - - - - + + + + login - - - - + + + + logout - - - - + + + + logs - - - - + + + + pause - - - - + + + + port - - - - + + + + ps - - - - + + + + pull - - - - + + + + push - - - - + + + + rename - - - - + + + + restart - - - - + + + + rm - - - - + + + + rmi - - - - + + + + run - - - - + + + + save - - - - + + + + search - - - - + + + + start - - - - + + + + stats - - - - + + + + stop - - - - + + + + tag - - - - + + + + top - - - - + + + + unpause - - - - + + + + version - - - - + + + + wait - - - + + +
- - - + + + Docker run reference - - - + + + Dockerfile reference - - - + + + Remote API client libraries - - - + + + docker.io accounts API - - - + + + - - - + + + - - - + + + - - - + + + Docker Machine Reference - - - + + + - - - + + + - - + +
- +
- +
- +
- - + + Overview of contributing - - - + + + Where to chat or get help - - - + + + - - - + + + - - - + + + Contribute code overview - - - + + + Support the community - - - + + + Organize our issues - - - + + + Organize a Docker Meetup - - - + + + Testing contributions - - - + + + - - - + + + Style guide for Docker documentation - - + +
- +
- +
- + - +
- +
- + - +
- +