Fix docs

Author: Dean-Coakley

deployments/helm-chart/README.md

@@ -54,11 +54,11 @@ This chart deploys the NGINX Ingress controller in your Kubernetes cluster.
 1. Clone the Ingress controller repo:
     ```console
     $ git clone https://github.com/nginxinc/kubernetes-ingress/
-    $ git checkout v1.6.1
     ```
 2. Change your working directory to /deployments/helm-chart:
     ```console
     $ cd kubernetes-ingress/deployments/helm-chart
+    $ git checkout v1.6.2
     ```
 3. To install the chart with the release name my-release (my-release is the name that you choose):
 

docs-web/configuration/ingress-resources/basic-configuration.md

@@ -27,7 +27,7 @@ spec:
 
 Here is a breakdown of what this Ingress resource definition means:
 * The `metadata.name` field defines the name of the resource `cafe‑ingress`.
-* In the `spec.tsl` field we set up SSL/TLS termination:
+* In the `spec.tls` field we set up SSL/TLS termination:
     * In the `secretName`, we reference a secret resource by its name, `cafe‑secret`. This resource contains the SSL/TLS certificate and key and it must be deployed prior to the Ingress resource.
     * In the `hosts` field, we apply the certificate and key to our `cafe.example.com` host.
 * In the `spec.rules` field, we define a host with domain name `cafe.example.com`.

docs-web/installation/building-ingress-controller-image.md

@@ -1,6 +1,6 @@
-# Building Ingress Controller Image
+# Building the Ingress Controller Image
 
-This document explains how to build an Ingress Controller image. Note that for NGINX, we provide the image though [DockerHub](https://hub.docker.com/r/nginx/nginx-ingress-controller/). For NGINX Plus, you need to build the image.
+This document explains how to build an Ingress Controller image. Note that for NGINX, we provide the image though [DockerHub](https://hub.docker.com/r/nginx/nginx-ingress/). For NGINX Plus, you need to build the image.
 
 ## Prerequisites
 
@@ -22,7 +22,8 @@ We build the image using the make utility and the provided `Makefile`. Let’s c
 1. Clone the Ingress controller repo:
     ```
     $ git clone https://github.com/nginxinc/kubernetes-ingress/
-    $ git checkout v1.6.1
+    $ cd kubernetes-ingress
+    $ git checkout v1.6.2
     ```
 
 1. Build the image:
@@ -32,7 +33,7 @@ We build the image using the make utility and the provided `Makefile`. Let’s c
       $ make PREFIX=myregistry.example.com/nginx-ingress
       ```
       `myregistry.example.com/nginx-ingress` defines the repo in your private registry where the image will be pushed. Substitute that value with the repo in your private registry.
-      
+
       As the result, the image **myregistry.example.com/nginx-ingress:1.6.0** is built and pushed to the registry. Note that the tag `1.6.0` comes from the `VERSION` variable, defined in the Makefile.
 
     * For NGINX Plus, first, make sure that the certificate (`nginx-repo.crt`) and the key (`nginx-repo.key`) of your license are located in the root of the project:
@@ -46,7 +47,7 @@ We build the image using the make utility and the provided `Makefile`. Let’s c
       $ make DOCKERFILE=DockerfileForPlus PREFIX=myregistry.example.com/nginx-plus-ingress
       ```
       `myregistry.example.com/nginx-plus-ingress` defines the repo in your private registry where the image will be pushed. Substitute that value with the repo in your private registry.
-      
+
       As the result, the image **myregistry.example.com/nginx-plus-ingress:1.6.0** is built and pushed to the registry. Note that the tag `1.6.0` comes from the `VERSION` variable, defined in the Makefile.
 
 Next you will find the details about available Makefile targets and variables.

docs-web/installation/installation-with-helm.md

@@ -52,11 +52,11 @@ This document describes how to install the NGINX Ingress Controller in your Kube
 1. Clone the Ingress controller repo:
     ```console
     $ git clone https://github.com/nginxinc/kubernetes-ingress/
-    $ git checkout v1.6.1
     ```
 2. Change your working directory to /deployments/helm-chart:
     ```console
     $ cd kubernetes-ingress/deployments/helm-chart
+    $ git checkout v1.6.2
     ```
 3. To install the chart with the release name my-release (my-release is the name that you choose):
 

docs-web/third-party-modules/opentracing.md

@@ -2,18 +2,18 @@
 
 The Ingress Controller supports [OpenTracing](http://opentracing.io/) with the third-party module [opentracing-contrib/nginx-opentracing](https://github.com/opentracing-contrib/nginx-opentracing).
 
-This document explains how to use OpenTracing with the Ingress Controller. Additionally, we have an [example](https://github.com/nginxinc/kubernetes-ingress/blob/v1.6.1/docs/opentracing.md) on how to enable OpenTracing for a simple web application using Jaeger as a tracer.
+This document explains how to use OpenTracing with the Ingress Controller. Additionally, we have an [example](https://github.com/nginxinc/kubernetes-ingress/blob/v1.6.2/examples/opentracing) on how to enable OpenTracing for a simple web application using Jaeger as a tracer.
 
 ## Prerequisites
-1. **Use the Ingress Controller image with OpenTracing.** The default Ingress Controller images don’t include the OpenTracing module. To use OpenTracing, you need to build the image with that module. Follow the build instructions to build the image using `DockerfileWithOpentracing` for NGINX or `DockerfileWithOpentracingForPlus` for NGINX Plus. 
+1. **Use the Ingress Controller image with OpenTracing.** The default Ingress Controller images don’t include the OpenTracing module. To use OpenTracing, you need to build the image with that module. Follow the build instructions to build the image using `DockerfileWithOpentracing` for NGINX or `DockerfileWithOpentracingForPlus` for NGINX Plus.
 By default, the Dockerfiles install Jaeger as a tracer. However, it is possible to replace Jaeger with other supported [tracers](https://github.com/opentracing-contrib/nginx-opentracing#building-from-source). For that, please modify the Dockerfile accordingly:
    1. Change the download line in the tracer-downloader stage of the Dockerfile to download the right tracer.
    1. Edit the COPY line of the final image to copy the previously downloaded tracer to the image
 
 1. **Load the OpenTracing module.** You need to load the module with the configuration for the chosen tracer using the following ConfigMap keys:
    * `opentracing-tracer`: sets the path to the vendor tracer binary plugin. This is the path you used in the COPY line of step *ii* above.
    * `opentracing-tracer-config`: sets the tracer configuration in JSON format.
-    
+
    Below an example on how to use those keys to load the module with Jaeger tracer:
     ```yaml
     opentracing-tracer: "/usr/local/lib/libjaegertracing_plugin.so"
@@ -55,7 +55,7 @@ Consider the following two cases:
         ```
 
 2. OpenTracing is globally enabled:
-   1. To disable OpenTracing for a specific Ingress Resource, use the server snippet annotation:  
+   1. To disable OpenTracing for a specific Ingress Resource, use the server snippet annotation:
         ```yaml
         nginx.org/server-snippets: |
             opentracing off;
@@ -69,9 +69,9 @@ Consider the following two cases:
 
 ## Customize OpenTracing
 
-You can customize OpenTracing though the supported [OpenTracing module directives](https://github.com/opentracing-contrib/nginx-opentracing/blob/v1.6.1/doc/Reference.md). Use the snippets ConfigMap keys or annotations to insert those directives into the http, server or location contexts of the generated NGINX configuration. 
+You can customize OpenTracing though the supported [OpenTracing module directives](https://github.com/opentracing-contrib/nginx-opentracing/blob/v1.6.2/doc/Reference.md). Use the snippets ConfigMap keys or annotations to insert those directives into the http, server or location contexts of the generated NGINX configuration.
 
-For example, to propagate the active span context for upstream requests, it is required to set the `opentracing_propagate_context` directive, which you can add to an Ingress resource using the location snippets annotation: 
+For example, to propagate the active span context for upstream requests, it is required to set the `opentracing_propagate_context` directive, which you can add to an Ingress resource using the location snippets annotation:
 
 ```yaml
 nginx.org/location-snippets: |