Merge pull request #10400 from SvenDowideit/post-1.4.1-docs-update-2adocs-1.4

Post 1.4.1 docs update 2a

8 files changed, 25 insertions, 21 deletions

diff --git a/docs/man/docker-build.1.md b/docs/man/docker-build.1.md
index a310df52bc..081be958b1 100644
--- a/docs/man/docker-build.1.md
+++ b/docs/man/docker-build.1.md
@@ -54,7 +54,7 @@ as context.
 
 # EXAMPLES
 
-## Building an image using a Dockefile located inside the current directory
+## Building an image using a Dockerfile located inside the current directory
 
 Docker images can be built using the build command and a Dockerfile:
 
diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml
index 6a57ed21d4..17f67a4aca 100644
--- a/docs/mkdocs.yml
+++ b/docs/mkdocs.yml
@@ -86,6 +86,7 @@ pages:
 - ['articles/networking.md', 'Articles', 'Advanced networking']
 - ['articles/security.md', 'Articles', 'Security']
 - ['articles/https.md', 'Articles', 'Running Docker with HTTPS']
+- ['articles/registry_mirror.md', 'Articles', 'Run a local registry mirror']
 - ['articles/host_integration.md', 'Articles', 'Automatically starting containers']
 - ['articles/baseimages.md', 'Articles', 'Creating a base image']
 - ['articles/dockerfile_best-practices.md', 'Articles', 'Best practices for writing Dockerfiles']
diff --git a/docs/sources/articles.md b/docs/sources/articles.md
deleted file mode 100644
index 37f2cd80f1..0000000000
--- a/docs/sources/articles.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Articles
-
- - [Docker Basics](basics/)
- - [Docker Security](security/)
- - [Running the Docker daemon with HTTPS](https/)
- - [Configure Networking](networking/)
- - [Using Supervisor with Docker](using_supervisord/)
- - [Process Management with CFEngine](cfengine_process_management/)
- - [Using Puppet](puppet/)
- - [Create a Base Image](baseimages/)
- - [Runtime Metrics](runmetrics/)
- - [Automatically Start Containers](host_integration/)
- - [Link via an Ambassador Container](ambassador_pattern_linking/)
- - [Increase a Boot2Docker Volume](b2d_volume_resize/)
- - [Run a Local Registry Mirror](registry_mirror/)
diff --git a/docs/sources/articles/networking.md b/docs/sources/articles/networking.md
index 07c70566cb..c1be570a4d 100644
--- a/docs/sources/articles/networking.md
+++ b/docs/sources/articles/networking.md
@@ -463,6 +463,7 @@ stopping the service and removing the interface:
     $ sudo service docker stop
     $ sudo ip link set dev docker0 down
     $ sudo brctl delbr docker0
+    $ sudo iptables -t nat -F POSTROUTING
 
 Then, before starting the Docker service, create your own bridge and
 give it whatever configuration you want.  Here we will create a simple
@@ -489,6 +490,15 @@ illustrate the technique.
     $ echo 'DOCKER_OPTS="-b=bridge0"' >> /etc/default/docker
     $ sudo service docker start
 
+    # Confirming new outgoing NAT masquerade is set up
+
+    $ sudo iptables -t nat -L -n
+    ...
+    Chain POSTROUTING (policy ACCEPT)
+    target     prot opt source               destination
+    MASQUERADE  all  --  192.168.5.0/24      0.0.0.0/0
+
+
 The result should be that the Docker server starts successfully and is
 now prepared to bind containers to the new bridge.  After pausing to
 verify the bridge's configuration, try creating a container — you will
diff --git a/docs/sources/docker-hub/builds.md b/docs/sources/docker-hub/builds.md
index 5d73e4aae9..8b914fa10c 100644
--- a/docs/sources/docker-hub/builds.md
+++ b/docs/sources/docker-hub/builds.md
@@ -278,6 +278,10 @@ Webhooks are available under the Settings menu of each Repository.
 > **Note:** If you want to test your webhook out we recommend using
 > a tool like [requestb.in](http://requestb.in/).
 
+> **Note**: The Docker Hub servers are currently in the IP range
+> `162.242.195.64 - 162.242.195.127`, so you can restrict your webhooks to
+> accept webhook requests from that set of IP addresses.
+
 ### Webhook chains
 
 Webhook chains allow you to chain calls to multiple services. For example,
diff --git a/docs/sources/docker-hub/repos.md b/docs/sources/docker-hub/repos.md
index 0749c0814c..2bb75f0b73 100644
--- a/docs/sources/docker-hub/repos.md
+++ b/docs/sources/docker-hub/repos.md
@@ -105,9 +105,6 @@ Settings page. A webhook is called only after a successful `push` is
 made. The webhook calls are HTTP POST requests with a JSON payload
 similar to the example shown below.
 
-> **Note:** For testing, you can try an HTTP request tool like
-> [requestb.in](http://requestb.in/).
-
 *Example webhook JSON payload:*
 
 ```
@@ -141,6 +138,13 @@ new updates to your images and repositories. To get started adding webhooks,
 go to the desired repo in the Hub, and click "Webhooks" under the "Settings"
 box.
 
+> **Note:** For testing, you can try an HTTP request tool like
+> [requestb.in](http://requestb.in/).
+
+> **Note**: The Docker Hub servers are currently in the IP range
+> `162.242.195.64 - 162.242.195.127`, so you can restrict your webhooks to
+> accept webhook requests from that set of IP addresses.
+
 ### Webhook chains
 
 Webhook chains allow you to chain calls to multiple services. For example,
diff --git a/docs/sources/reference/api/docker_remote_api_v1.15.md b/docs/sources/reference/api/docker_remote_api_v1.15.md
index 229a05b1b4..47fe21e92e 100644
--- a/docs/sources/reference/api/docker_remote_api_v1.15.md
+++ b/docs/sources/reference/api/docker_remote_api_v1.15.md
@@ -222,7 +222,7 @@ Json Parameters:
   -   **Dns** - A list of dns servers for the container to use.
   -   **DnsSearch** - A list of DNS search domains
   -   **ExtraHosts** - A list of hostnames/IP mappings to be added to the
-      container's `/etc/host` file. Specified in the form `["hostname:IP"]`.
+      container's `/etc/hosts` file. Specified in the form `["hostname:IP"]`.
   -   **VolumesFrom** - A list of volumes to inherit from another container.
         Specified in the form `<container name>[:<ro|rw>]`
   -   **CapAdd** - A list of kernel capabilties to add to the container.
diff --git a/docs/sources/reference/api/docker_remote_api_v1.16.md b/docs/sources/reference/api/docker_remote_api_v1.16.md
index c701a58bf0..9934ab7716 100644
--- a/docs/sources/reference/api/docker_remote_api_v1.16.md
+++ b/docs/sources/reference/api/docker_remote_api_v1.16.md
@@ -222,7 +222,7 @@ Json Parameters:
   -   **Dns** - A list of dns servers for the container to use.
   -   **DnsSearch** - A list of DNS search domains
   -   **ExtraHosts** - A list of hostnames/IP mappings to be added to the
-      container's `/etc/host` file. Specified in the form `["hostname:IP"]`.
+      container's `/etc/hosts` file. Specified in the form `["hostname:IP"]`.
   -   **VolumesFrom** - A list of volumes to inherit from another container.
         Specified in the form `<container name>[:<ro|rw>]`
   -   **CapAdd** - A list of kernel capabilties to add to the container.