diff --git a/deploy/upgrade/index.html b/deploy/upgrade/index.html
index 6000a4568..714ec8a55 100644
--- a/deploy/upgrade/index.html
+++ b/deploy/upgrade/index.html
@@ -1145,7 +1145,7 @@ in the controller Deployment.</p>
 <p>simply change the <code class="codehilite">0.9.0</code> tag to the version you wish to upgrade to.
 The easiest way to do this is e.g. (do note you may need to change the name parameter according to your installation):</p>
 <div class="codehilite"><pre><span></span>kubectl set image deployment/nginx-ingress-controller \
-  nginx-ingress-controller=nginx:quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.16.1
+  nginx-ingress-controller=nginx:quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.16.2
 </pre></div>
 
 
diff --git a/examples/static-ip/nginx-ingress-controller.yaml b/examples/static-ip/nginx-ingress-controller.yaml
index add5e3b2a..037b461c7 100644
--- a/examples/static-ip/nginx-ingress-controller.yaml
+++ b/examples/static-ip/nginx-ingress-controller.yaml
@@ -21,7 +21,7 @@ spec:
       # hostNetwork: true
       terminationGracePeriodSeconds: 60
       containers:
-      - image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.16.1
+      - image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.16.2
         name: nginx-ingress-controller
         readinessProbe:
           httpGet:
@@ -53,5 +53,3 @@ spec:
         - /nginx-ingress-controller
         - --default-backend-service=$(POD_NAMESPACE)/default-http-backend
         - --publish-service=$(POD_NAMESPACE)/nginx-ingress-lb
-        securityContext:
-          runAsNonRoot: false
diff --git a/search/search_index.json b/search/search_index.json
index eec490382..465e8d7a5 100644
--- a/search/search_index.json
+++ b/search/search_index.json
@@ -142,7 +142,7 @@
         },
         {
             "location": "/deploy/upgrade/",
-            "text": "Upgrading\n\u00b6\n\n\n\n\nImportant\n\n\nNo matter the method you use for upgrading, \nif you use template overrides,\nmake sure your templates are compatible with the new version of ingress-nginx\n.\n\n\n\n\nWithout Helm\n\u00b6\n\n\nTo upgrade your ingress-nginx installation, it should be enough to change the version of the image\nin the controller Deployment.\n\n\nI.e. if your deployment resource looks like (partial example):\n\n\nkind\n:\n \nDeployment\n\n\nmetadata\n:\n\n  \nname\n:\n \nnginx-ingress-controller\n\n  \nnamespace\n:\n \ningress-nginx\n\n\nspec\n:\n\n  \nreplicas\n:\n \n1\n\n  \nselector\n:\n \n...\n\n  \ntemplate\n:\n\n    \nmetadata\n:\n \n...\n\n    \nspec\n:\n\n      \ncontainers\n:\n\n        \n-\n \nname\n:\n \nnginx-ingress-controller\n\n          \nimage\n:\n \nquay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.9.0\n\n          \nargs\n:\n \n...\n\n\n\n\n\n\nsimply change the \n0.9.0\n tag to the version you wish to upgrade to.\nThe easiest way to do this is e.g. (do note you may need to change the name parameter according to your installation):\n\n\nkubectl set image deployment/nginx-ingress-controller \\\n  nginx-ingress-controller=nginx:quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.16.1\n\n\n\n\n\nFor interactive editing, use \nkubectl edit deployment nginx-ingress-controller\n.\n\n\nWith Helm\n\u00b6\n\n\nIf you installed ingress-nginx using the Helm command in the deployment docs so its name is \nngx-ingress\n,\nyou should be able to upgrade using\n\n\nhelm upgrade --reuse-values ngx-ingress stable/nginx-ingress",
+            "text": "Upgrading\n\u00b6\n\n\n\n\nImportant\n\n\nNo matter the method you use for upgrading, \nif you use template overrides,\nmake sure your templates are compatible with the new version of ingress-nginx\n.\n\n\n\n\nWithout Helm\n\u00b6\n\n\nTo upgrade your ingress-nginx installation, it should be enough to change the version of the image\nin the controller Deployment.\n\n\nI.e. if your deployment resource looks like (partial example):\n\n\nkind\n:\n \nDeployment\n\n\nmetadata\n:\n\n  \nname\n:\n \nnginx-ingress-controller\n\n  \nnamespace\n:\n \ningress-nginx\n\n\nspec\n:\n\n  \nreplicas\n:\n \n1\n\n  \nselector\n:\n \n...\n\n  \ntemplate\n:\n\n    \nmetadata\n:\n \n...\n\n    \nspec\n:\n\n      \ncontainers\n:\n\n        \n-\n \nname\n:\n \nnginx-ingress-controller\n\n          \nimage\n:\n \nquay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.9.0\n\n          \nargs\n:\n \n...\n\n\n\n\n\n\nsimply change the \n0.9.0\n tag to the version you wish to upgrade to.\nThe easiest way to do this is e.g. (do note you may need to change the name parameter according to your installation):\n\n\nkubectl set image deployment/nginx-ingress-controller \\\n  nginx-ingress-controller=nginx:quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.16.2\n\n\n\n\n\nFor interactive editing, use \nkubectl edit deployment nginx-ingress-controller\n.\n\n\nWith Helm\n\u00b6\n\n\nIf you installed ingress-nginx using the Helm command in the deployment docs so its name is \nngx-ingress\n,\nyou should be able to upgrade using\n\n\nhelm upgrade --reuse-values ngx-ingress stable/nginx-ingress",
             "title": "Upgrading"
         },
         {
@@ -152,7 +152,7 @@
         },
         {
             "location": "/deploy/upgrade/#without-helm",
-            "text": "To upgrade your ingress-nginx installation, it should be enough to change the version of the image\nin the controller Deployment.  I.e. if your deployment resource looks like (partial example):  kind :   Deployment  metadata : \n   name :   nginx-ingress-controller \n   namespace :   ingress-nginx  spec : \n   replicas :   1 \n   selector :   ... \n   template : \n     metadata :   ... \n     spec : \n       containers : \n         -   name :   nginx-ingress-controller \n           image :   quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.9.0 \n           args :   ...   simply change the  0.9.0  tag to the version you wish to upgrade to.\nThe easiest way to do this is e.g. (do note you may need to change the name parameter according to your installation):  kubectl set image deployment/nginx-ingress-controller \\\n  nginx-ingress-controller=nginx:quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.16.1  For interactive editing, use  kubectl edit deployment nginx-ingress-controller .",
+            "text": "To upgrade your ingress-nginx installation, it should be enough to change the version of the image\nin the controller Deployment.  I.e. if your deployment resource looks like (partial example):  kind :   Deployment  metadata : \n   name :   nginx-ingress-controller \n   namespace :   ingress-nginx  spec : \n   replicas :   1 \n   selector :   ... \n   template : \n     metadata :   ... \n     spec : \n       containers : \n         -   name :   nginx-ingress-controller \n           image :   quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.9.0 \n           args :   ...   simply change the  0.9.0  tag to the version you wish to upgrade to.\nThe easiest way to do this is e.g. (do note you may need to change the name parameter according to your installation):  kubectl set image deployment/nginx-ingress-controller \\\n  nginx-ingress-controller=nginx:quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.16.2  For interactive editing, use  kubectl edit deployment nginx-ingress-controller .",
             "title": "Without Helm"
         },
         {
@@ -947,12 +947,12 @@
         },
         {
             "location": "/user-guide/cli-arguments/",
-            "text": "Command line arguments\n\u00b6\n\n\nThe following command line arguments are accepted by the Ingress controller executable.\n\n\nThey are set in the container spec of the \nnginx-ingress-controller\n Deployment manifest (see \ndeploy/with-rbac.yaml\n or \ndeploy/without-rbac.yaml\n).\n\n\n\n\n\n\n\n\nArgument\n\n\nDescription\n\n\n\n\n\n\n\n\n\n\n--alsologtostderr\n\n\nlog to standard error as well as files\n\n\n\n\n\n\n--annotations-prefix string\n\n\nPrefix of the Ingress annotations specific to the NGINX controller. (default \"nginx.ingress.kubernetes.io\")\n\n\n\n\n\n\n--apiserver-host string\n\n\nAddress of the Kubernetes API server. Takes the form \"protocol://address:port\". If not specified, it is assumed the program runs inside a Kubernetes cluster and local discovery is attempted.\n\n\n\n\n\n\n--configmap string\n\n\nName of the ConfigMap containing custom global configurations for the controller.\n\n\n\n\n\n\n--default-backend-service string\n\n\nService used to serve HTTP requests not matching any known server name (catch-all). Takes the form \"namespace/name\". The controller configures NGINX to forward requests to the first port of this Service.\n\n\n\n\n\n\n--default-server-port int\n\n\nPort to use for exposing the default server (catch-all). (default 8181)\n\n\n\n\n\n\n--default-ssl-certificate string\n\n\nSecret containing a SSL certificate to be used by the default HTTPS server (catch-all). Takes the form \"namespace/name\".\n\n\n\n\n\n\n--election-id string\n\n\nElection id to use for Ingress status updates. (default \"ingress-controller-leader\")\n\n\n\n\n\n\n--enable-dynamic-configuration\n\n\nDynamically refresh backends on topology changes instead of reloading NGINX. Feature backed by OpenResty Lua libraries.\n\n\n\n\n\n\n--enable-ssl-chain-completion\n\n\nAutocomplete SSL certificate chains with missing intermediate CA certificates. A valid certificate chain is required to enable OCSP stapling. Certificates uploaded to Kubernetes must have the \"Authority Information Access\" X.509 v3 extension for this to succeed. (default true)\n\n\n\n\n\n\n--enable-ssl-passthrough\n\n\nEnable SSL Passthrough.\n\n\n\n\n\n\n--force-namespace-isolation\n\n\nForce namespace isolation. Prevents Ingress objects from referencing Secrets and ConfigMaps located in a different namespace than their own. May be used together with watch-namespace.\n\n\n\n\n\n\n--health-check-path string\n\n\nURL path of the health check endpoint. Configured inside the NGINX status server. All requests received on the port defined by the healthz-port parameter are forwarded internally to this path. (default \"/healthz\")\n\n\n\n\n\n\n--healthz-port int\n\n\nPort to use for the healthz endpoint. (default 10254)\n\n\n\n\n\n\n--http-port int\n\n\nPort to use for servicing HTTP traffic. (default 80)\n\n\n\n\n\n\n--https-port int\n\n\nPort to use for servicing HTTPS traffic. (default 443)\n\n\n\n\n\n\n--ingress-class string\n\n\nName of the ingress class this controller satisfies. The class of an Ingress object is set using the annotation \"kubernetes.io/ingress.class\". All ingress classes are satisfied if this parameter is left empty.\n\n\n\n\n\n\n--kubeconfig string\n\n\nPath to a kubeconfig file containing authorization and API server information.\n\n\n\n\n\n\n--log_backtrace_at traceLocation\n\n\nwhen logging hits line file:N, emit a stack trace (default :0)\n\n\n\n\n\n\n--log_dir string\n\n\nIf non-empty, write log files in this directory\n\n\n\n\n\n\n--logtostderr\n\n\nlog to standard error instead of files (default true)\n\n\n\n\n\n\n--profiling\n\n\nEnable profiling via web interface host:port/debug/pprof/ (default true)\n\n\n\n\n\n\n--publish-service string\n\n\nService fronting the Ingress controller. Takes the form \"namespace/name\". When used together with update-status, the controller mirrors the address of this service's endpoints to the load-balancer status of all Ingress objects it satisfies.\n\n\n\n\n\n\n--publish-status-address string\n\n\nCustomized address to set as the load-balancer status of Ingress objects this controller satisfies. Requires the update-status parameter.\n\n\n\n\n\n\n--report-node-internal-ip-address\n\n\nSet the load-balancer status of Ingress objects to internal Node addresses instead of external. Requires the update-status parameter.\n\n\n\n\n\n\n--sort-backends\n\n\nSort servers inside NGINX upstreams.\n\n\n\n\n\n\n--ssl-passtrough-proxy-port int\n\n\nPort to use internally for SSL Passthgough. (default 442)\n\n\n\n\n\n\n--status-port int\n\n\nPort to use for exposing NGINX status pages. (default 18080)\n\n\n\n\n\n\n--stderrthreshold severity\n\n\nlogs at or above this threshold go to stderr (default 2)\n\n\n\n\n\n\n--sync-period duration\n\n\nPeriod at which the controller forces the repopulation of its local object stores. (default 10m0s)\n\n\n\n\n\n\n--sync-rate-limit float32\n\n\nDefine the sync frequency upper limit (default 0.3)\n\n\n\n\n\n\n--tcp-services-configmap string\n\n\nName of the ConfigMap containing the definition of the TCP services to expose. The key in the map indicates the external port to be used. The value is a reference to a Service in the form \"namespace/name:port\", where \"port\" can either be a port number or name. TCP ports 80 and 443 are reserved by the controller for servicing HTTP traffic.\n\n\n\n\n\n\n--udp-services-configmap string\n\n\nName of the ConfigMap containing the definition of the UDP services to expose. The key in the map indicates the external port to be used. The value is a reference to a Service in the form \"namespace/name:port\", where \"port\" can either be a port name or number.\n\n\n\n\n\n\n--update-status\n\n\nUpdate the load-balancer status of Ingress objects this controller satisfies. Requires setting the publish-service parameter to a valid Service reference. (default true)\n\n\n\n\n\n\n--update-status-on-shutdown\n\n\nUpdate the load-balancer status of Ingress objects when the controller shuts down. Requires the update-status parameter. (default true)\n\n\n\n\n\n\n--v Level\n\n\nlog level for V logs\n\n\n\n\n\n\n--version\n\n\nShow release information about the NGINX Ingress controller and exit.\n\n\n\n\n\n\n--vmodule moduleSpec\n\n\ncomma-separated list of pattern=N settings for file-filtered logging\n\n\n\n\n\n\n--watch-namespace string\n\n\nNamespace the controller watches for updates to Kubernetes objects. This includes Ingresses, Services and all configuration resources. All namespaces are watched if this parameter is left empty.",
+            "text": "Command line arguments\n\u00b6\n\n\nThe following command line arguments are accepted by the Ingress controller executable.\n\n\nThey are set in the container spec of the \nnginx-ingress-controller\n Deployment manifest (see \ndeploy/with-rbac.yaml\n or \ndeploy/without-rbac.yaml\n).\n\n\n\n\n\n\n\n\nArgument\n\n\nDescription\n\n\n\n\n\n\n\n\n\n\n--alsologtostderr\n\n\nlog to standard error as well as files\n\n\n\n\n\n\n--annotations-prefix string\n\n\nPrefix of the Ingress annotations specific to the NGINX controller. (default \"nginx.ingress.kubernetes.io\")\n\n\n\n\n\n\n--apiserver-host string\n\n\nAddress of the Kubernetes API server. Takes the form \"protocol://address:port\". If not specified, it is assumed the program runs inside a Kubernetes cluster and local discovery is attempted.\n\n\n\n\n\n\n--configmap string\n\n\nName of the ConfigMap containing custom global configurations for the controller.\n\n\n\n\n\n\n--default-backend-service string\n\n\nService used to serve HTTP requests not matching any known server name (catch-all). Takes the form \"namespace/name\". The controller configures NGINX to forward requests to the first port of this Service.\n\n\n\n\n\n\n--default-server-port int\n\n\nPort to use for exposing the default server (catch-all). (default 8181)\n\n\n\n\n\n\n--default-ssl-certificate string\n\n\nSecret containing a SSL certificate to be used by the default HTTPS server (catch-all). Takes the form \"namespace/name\".\n\n\n\n\n\n\n--election-id string\n\n\nElection id to use for Ingress status updates. (default \"ingress-controller-leader\")\n\n\n\n\n\n\n--enable-dynamic-configuration\n\n\nDynamically refresh backends on topology changes instead of reloading NGINX. Feature backed by OpenResty Lua libraries.\n\n\n\n\n\n\n--enable-ssl-chain-completion\n\n\nAutocomplete SSL certificate chains with missing intermediate CA certificates. A valid certificate chain is required to enable OCSP stapling. Certificates uploaded to Kubernetes must have the \"Authority Information Access\" X.509 v3 extension for this to succeed. (default true)\n\n\n\n\n\n\n--enable-ssl-passthrough\n\n\nEnable SSL Passthrough.\n\n\n\n\n\n\n--force-namespace-isolation\n\n\nForce namespace isolation. Prevents Ingress objects from referencing Secrets and ConfigMaps located in a different namespace than their own. May be used together with watch-namespace.\n\n\n\n\n\n\n--health-check-path string\n\n\nURL path of the health check endpoint. Configured inside the NGINX status server. All requests received on the port defined by the healthz-port parameter are forwarded internally to this path. (default \"/healthz\")\n\n\n\n\n\n\n--healthz-port int\n\n\nPort to use for the healthz endpoint. (default 10254)\n\n\n\n\n\n\n--http-port int\n\n\nPort to use for servicing HTTP traffic. (default 80)\n\n\n\n\n\n\n--https-port int\n\n\nPort to use for servicing HTTPS traffic. (default 443)\n\n\n\n\n\n\n--ingress-class string\n\n\nName of the ingress class this controller satisfies. The class of an Ingress object is set using the annotation \"kubernetes.io/ingress.class\". All ingress classes are satisfied if this parameter is left empty.\n\n\n\n\n\n\n--kubeconfig string\n\n\nPath to a kubeconfig file containing authorization and API server information.\n\n\n\n\n\n\n--log_backtrace_at traceLocation\n\n\nwhen logging hits line file:N, emit a stack trace (default :0)\n\n\n\n\n\n\n--log_dir string\n\n\nIf non-empty, write log files in this directory\n\n\n\n\n\n\n--logtostderr\n\n\nlog to standard error instead of files (default true)\n\n\n\n\n\n\n--profiling\n\n\nEnable profiling via web interface host:port/debug/pprof/ (default true)\n\n\n\n\n\n\n--publish-service string\n\n\nService fronting the Ingress controller. Takes the form \"namespace/name\". When used together with update-status, the controller mirrors the address of this service's endpoints to the load-balancer status of all Ingress objects it satisfies.\n\n\n\n\n\n\n--publish-status-address string\n\n\nCustomized address to set as the load-balancer status of Ingress objects this controller satisfies. Requires the update-status parameter.\n\n\n\n\n\n\n--report-node-internal-ip-address\n\n\nSet the load-balancer status of Ingress objects to internal Node addresses instead of external. Requires the update-status parameter.\n\n\n\n\n\n\n--sort-backends\n\n\nSort servers inside NGINX upstreams.\n\n\n\n\n\n\n--ssl-passthrough-proxy-port int\n\n\nPort to use internally for SSL Passthrough. (default 442)\n\n\n\n\n\n\n--status-port int\n\n\nPort to use for exposing NGINX status pages. (default 18080)\n\n\n\n\n\n\n--stderrthreshold severity\n\n\nlogs at or above this threshold go to stderr (default 2)\n\n\n\n\n\n\n--sync-period duration\n\n\nPeriod at which the controller forces the repopulation of its local object stores. (default 10m0s)\n\n\n\n\n\n\n--sync-rate-limit float32\n\n\nDefine the sync frequency upper limit (default 0.3)\n\n\n\n\n\n\n--tcp-services-configmap string\n\n\nName of the ConfigMap containing the definition of the TCP services to expose. The key in the map indicates the external port to be used. The value is a reference to a Service in the form \"namespace/name:port\", where \"port\" can either be a port number or name. TCP ports 80 and 443 are reserved by the controller for servicing HTTP traffic.\n\n\n\n\n\n\n--udp-services-configmap string\n\n\nName of the ConfigMap containing the definition of the UDP services to expose. The key in the map indicates the external port to be used. The value is a reference to a Service in the form \"namespace/name:port\", where \"port\" can either be a port name or number.\n\n\n\n\n\n\n--update-status\n\n\nUpdate the load-balancer status of Ingress objects this controller satisfies. Requires setting the publish-service parameter to a valid Service reference. (default true)\n\n\n\n\n\n\n--update-status-on-shutdown\n\n\nUpdate the load-balancer status of Ingress objects when the controller shuts down. Requires the update-status parameter. (default true)\n\n\n\n\n\n\n--v Level\n\n\nlog level for V logs\n\n\n\n\n\n\n--version\n\n\nShow release information about the NGINX Ingress controller and exit.\n\n\n\n\n\n\n--vmodule moduleSpec\n\n\ncomma-separated list of pattern=N settings for file-filtered logging\n\n\n\n\n\n\n--watch-namespace string\n\n\nNamespace the controller watches for updates to Kubernetes objects. This includes Ingresses, Services and all configuration resources. All namespaces are watched if this parameter is left empty.",
             "title": "Command line arguments"
         },
         {
             "location": "/user-guide/cli-arguments/#command-line-arguments",
-            "text": "The following command line arguments are accepted by the Ingress controller executable.  They are set in the container spec of the  nginx-ingress-controller  Deployment manifest (see  deploy/with-rbac.yaml  or  deploy/without-rbac.yaml ).     Argument  Description      --alsologtostderr  log to standard error as well as files    --annotations-prefix string  Prefix of the Ingress annotations specific to the NGINX controller. (default \"nginx.ingress.kubernetes.io\")    --apiserver-host string  Address of the Kubernetes API server. Takes the form \"protocol://address:port\". If not specified, it is assumed the program runs inside a Kubernetes cluster and local discovery is attempted.    --configmap string  Name of the ConfigMap containing custom global configurations for the controller.    --default-backend-service string  Service used to serve HTTP requests not matching any known server name (catch-all). Takes the form \"namespace/name\". The controller configures NGINX to forward requests to the first port of this Service.    --default-server-port int  Port to use for exposing the default server (catch-all). (default 8181)    --default-ssl-certificate string  Secret containing a SSL certificate to be used by the default HTTPS server (catch-all). Takes the form \"namespace/name\".    --election-id string  Election id to use for Ingress status updates. (default \"ingress-controller-leader\")    --enable-dynamic-configuration  Dynamically refresh backends on topology changes instead of reloading NGINX. Feature backed by OpenResty Lua libraries.    --enable-ssl-chain-completion  Autocomplete SSL certificate chains with missing intermediate CA certificates. A valid certificate chain is required to enable OCSP stapling. Certificates uploaded to Kubernetes must have the \"Authority Information Access\" X.509 v3 extension for this to succeed. (default true)    --enable-ssl-passthrough  Enable SSL Passthrough.    --force-namespace-isolation  Force namespace isolation. Prevents Ingress objects from referencing Secrets and ConfigMaps located in a different namespace than their own. May be used together with watch-namespace.    --health-check-path string  URL path of the health check endpoint. Configured inside the NGINX status server. All requests received on the port defined by the healthz-port parameter are forwarded internally to this path. (default \"/healthz\")    --healthz-port int  Port to use for the healthz endpoint. (default 10254)    --http-port int  Port to use for servicing HTTP traffic. (default 80)    --https-port int  Port to use for servicing HTTPS traffic. (default 443)    --ingress-class string  Name of the ingress class this controller satisfies. The class of an Ingress object is set using the annotation \"kubernetes.io/ingress.class\". All ingress classes are satisfied if this parameter is left empty.    --kubeconfig string  Path to a kubeconfig file containing authorization and API server information.    --log_backtrace_at traceLocation  when logging hits line file:N, emit a stack trace (default :0)    --log_dir string  If non-empty, write log files in this directory    --logtostderr  log to standard error instead of files (default true)    --profiling  Enable profiling via web interface host:port/debug/pprof/ (default true)    --publish-service string  Service fronting the Ingress controller. Takes the form \"namespace/name\". When used together with update-status, the controller mirrors the address of this service's endpoints to the load-balancer status of all Ingress objects it satisfies.    --publish-status-address string  Customized address to set as the load-balancer status of Ingress objects this controller satisfies. Requires the update-status parameter.    --report-node-internal-ip-address  Set the load-balancer status of Ingress objects to internal Node addresses instead of external. Requires the update-status parameter.    --sort-backends  Sort servers inside NGINX upstreams.    --ssl-passtrough-proxy-port int  Port to use internally for SSL Passthgough. (default 442)    --status-port int  Port to use for exposing NGINX status pages. (default 18080)    --stderrthreshold severity  logs at or above this threshold go to stderr (default 2)    --sync-period duration  Period at which the controller forces the repopulation of its local object stores. (default 10m0s)    --sync-rate-limit float32  Define the sync frequency upper limit (default 0.3)    --tcp-services-configmap string  Name of the ConfigMap containing the definition of the TCP services to expose. The key in the map indicates the external port to be used. The value is a reference to a Service in the form \"namespace/name:port\", where \"port\" can either be a port number or name. TCP ports 80 and 443 are reserved by the controller for servicing HTTP traffic.    --udp-services-configmap string  Name of the ConfigMap containing the definition of the UDP services to expose. The key in the map indicates the external port to be used. The value is a reference to a Service in the form \"namespace/name:port\", where \"port\" can either be a port name or number.    --update-status  Update the load-balancer status of Ingress objects this controller satisfies. Requires setting the publish-service parameter to a valid Service reference. (default true)    --update-status-on-shutdown  Update the load-balancer status of Ingress objects when the controller shuts down. Requires the update-status parameter. (default true)    --v Level  log level for V logs    --version  Show release information about the NGINX Ingress controller and exit.    --vmodule moduleSpec  comma-separated list of pattern=N settings for file-filtered logging    --watch-namespace string  Namespace the controller watches for updates to Kubernetes objects. This includes Ingresses, Services and all configuration resources. All namespaces are watched if this parameter is left empty.",
+            "text": "The following command line arguments are accepted by the Ingress controller executable.  They are set in the container spec of the  nginx-ingress-controller  Deployment manifest (see  deploy/with-rbac.yaml  or  deploy/without-rbac.yaml ).     Argument  Description      --alsologtostderr  log to standard error as well as files    --annotations-prefix string  Prefix of the Ingress annotations specific to the NGINX controller. (default \"nginx.ingress.kubernetes.io\")    --apiserver-host string  Address of the Kubernetes API server. Takes the form \"protocol://address:port\". If not specified, it is assumed the program runs inside a Kubernetes cluster and local discovery is attempted.    --configmap string  Name of the ConfigMap containing custom global configurations for the controller.    --default-backend-service string  Service used to serve HTTP requests not matching any known server name (catch-all). Takes the form \"namespace/name\". The controller configures NGINX to forward requests to the first port of this Service.    --default-server-port int  Port to use for exposing the default server (catch-all). (default 8181)    --default-ssl-certificate string  Secret containing a SSL certificate to be used by the default HTTPS server (catch-all). Takes the form \"namespace/name\".    --election-id string  Election id to use for Ingress status updates. (default \"ingress-controller-leader\")    --enable-dynamic-configuration  Dynamically refresh backends on topology changes instead of reloading NGINX. Feature backed by OpenResty Lua libraries.    --enable-ssl-chain-completion  Autocomplete SSL certificate chains with missing intermediate CA certificates. A valid certificate chain is required to enable OCSP stapling. Certificates uploaded to Kubernetes must have the \"Authority Information Access\" X.509 v3 extension for this to succeed. (default true)    --enable-ssl-passthrough  Enable SSL Passthrough.    --force-namespace-isolation  Force namespace isolation. Prevents Ingress objects from referencing Secrets and ConfigMaps located in a different namespace than their own. May be used together with watch-namespace.    --health-check-path string  URL path of the health check endpoint. Configured inside the NGINX status server. All requests received on the port defined by the healthz-port parameter are forwarded internally to this path. (default \"/healthz\")    --healthz-port int  Port to use for the healthz endpoint. (default 10254)    --http-port int  Port to use for servicing HTTP traffic. (default 80)    --https-port int  Port to use for servicing HTTPS traffic. (default 443)    --ingress-class string  Name of the ingress class this controller satisfies. The class of an Ingress object is set using the annotation \"kubernetes.io/ingress.class\". All ingress classes are satisfied if this parameter is left empty.    --kubeconfig string  Path to a kubeconfig file containing authorization and API server information.    --log_backtrace_at traceLocation  when logging hits line file:N, emit a stack trace (default :0)    --log_dir string  If non-empty, write log files in this directory    --logtostderr  log to standard error instead of files (default true)    --profiling  Enable profiling via web interface host:port/debug/pprof/ (default true)    --publish-service string  Service fronting the Ingress controller. Takes the form \"namespace/name\". When used together with update-status, the controller mirrors the address of this service's endpoints to the load-balancer status of all Ingress objects it satisfies.    --publish-status-address string  Customized address to set as the load-balancer status of Ingress objects this controller satisfies. Requires the update-status parameter.    --report-node-internal-ip-address  Set the load-balancer status of Ingress objects to internal Node addresses instead of external. Requires the update-status parameter.    --sort-backends  Sort servers inside NGINX upstreams.    --ssl-passthrough-proxy-port int  Port to use internally for SSL Passthrough. (default 442)    --status-port int  Port to use for exposing NGINX status pages. (default 18080)    --stderrthreshold severity  logs at or above this threshold go to stderr (default 2)    --sync-period duration  Period at which the controller forces the repopulation of its local object stores. (default 10m0s)    --sync-rate-limit float32  Define the sync frequency upper limit (default 0.3)    --tcp-services-configmap string  Name of the ConfigMap containing the definition of the TCP services to expose. The key in the map indicates the external port to be used. The value is a reference to a Service in the form \"namespace/name:port\", where \"port\" can either be a port number or name. TCP ports 80 and 443 are reserved by the controller for servicing HTTP traffic.    --udp-services-configmap string  Name of the ConfigMap containing the definition of the UDP services to expose. The key in the map indicates the external port to be used. The value is a reference to a Service in the form \"namespace/name:port\", where \"port\" can either be a port name or number.    --update-status  Update the load-balancer status of Ingress objects this controller satisfies. Requires setting the publish-service parameter to a valid Service reference. (default true)    --update-status-on-shutdown  Update the load-balancer status of Ingress objects when the controller shuts down. Requires the update-status parameter. (default true)    --v Level  log level for V logs    --version  Show release information about the NGINX Ingress controller and exit.    --vmodule moduleSpec  comma-separated list of pattern=N settings for file-filtered logging    --watch-namespace string  Namespace the controller watches for updates to Kubernetes objects. This includes Ingresses, Services and all configuration resources. All namespaces are watched if this parameter is left empty.",
             "title": "Command line arguments"
         },
         {
diff --git a/sitemap.xml b/sitemap.xml
index 72be9b3be..e1acee1c0 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -4,7 +4,7 @@
     
     <url>
      <loc>/</loc>
-     <lastmod>2018-06-24</lastmod>
+     <lastmod>2018-06-25</lastmod>
      <changefreq>daily</changefreq>
     </url>
     
@@ -13,19 +13,19 @@
         
     <url>
      <loc>/deploy/</loc>
-     <lastmod>2018-06-24</lastmod>
+     <lastmod>2018-06-25</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>/deploy/rbac/</loc>
-     <lastmod>2018-06-24</lastmod>
+     <lastmod>2018-06-25</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>/deploy/upgrade/</loc>
-     <lastmod>2018-06-24</lastmod>
+     <lastmod>2018-06-25</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
@@ -41,55 +41,55 @@
         
     <url>
      <loc>/user-guide/cli-arguments/</loc>
-     <lastmod>2018-06-24</lastmod>
+     <lastmod>2018-06-25</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>/user-guide/custom-errors/</loc>
-     <lastmod>2018-06-24</lastmod>
+     <lastmod>2018-06-25</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>/user-guide/default-backend/</loc>
-     <lastmod>2018-06-24</lastmod>
+     <lastmod>2018-06-25</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>/user-guide/exposing-tcp-udp-services/</loc>
-     <lastmod>2018-06-24</lastmod>
+     <lastmod>2018-06-25</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>/user-guide/external-articles/</loc>
-     <lastmod>2018-06-24</lastmod>
+     <lastmod>2018-06-25</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>/user-guide/miscellaneous/</loc>
-     <lastmod>2018-06-24</lastmod>
+     <lastmod>2018-06-25</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>/user-guide/multiple-ingress/</loc>
-     <lastmod>2018-06-24</lastmod>
+     <lastmod>2018-06-25</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>/user-guide/nginx-status-page/</loc>
-     <lastmod>2018-06-24</lastmod>
+     <lastmod>2018-06-25</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>/user-guide/tls/</loc>
-     <lastmod>2018-06-24</lastmod>
+     <lastmod>2018-06-25</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
@@ -105,19 +105,19 @@
         
     <url>
      <loc>/examples/</loc>
-     <lastmod>2018-06-24</lastmod>
+     <lastmod>2018-06-25</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>/examples/PREREQUISITES/</loc>
-     <lastmod>2018-06-24</lastmod>
+     <lastmod>2018-06-25</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>/examples/affinity/cookie/README/</loc>
-     <lastmod>2018-06-24</lastmod>
+     <lastmod>2018-06-25</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
@@ -135,37 +135,37 @@
         
     <url>
      <loc>/examples/docker-registry/README/</loc>
-     <lastmod>2018-06-24</lastmod>
+     <lastmod>2018-06-25</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>/examples/grpc/README/</loc>
-     <lastmod>2018-06-24</lastmod>
+     <lastmod>2018-06-25</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>/examples/multi-tls/README/</loc>
-     <lastmod>2018-06-24</lastmod>
+     <lastmod>2018-06-25</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>/examples/rewrite/README/</loc>
-     <lastmod>2018-06-24</lastmod>
+     <lastmod>2018-06-25</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>/examples/static-ip/README/</loc>
-     <lastmod>2018-06-24</lastmod>
+     <lastmod>2018-06-25</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
     <url>
      <loc>/examples/tls-termination/README/</loc>
-     <lastmod>2018-06-24</lastmod>
+     <lastmod>2018-06-25</lastmod>
      <changefreq>daily</changefreq>
     </url>
         
@@ -174,7 +174,7 @@
     
     <url>
      <loc>/development/</loc>
-     <lastmod>2018-06-24</lastmod>
+     <lastmod>2018-06-25</lastmod>
      <changefreq>daily</changefreq>
     </url>
     
@@ -182,7 +182,7 @@
     
     <url>
      <loc>/how-it-works/</loc>
-     <lastmod>2018-06-24</lastmod>
+     <lastmod>2018-06-25</lastmod>
      <changefreq>daily</changefreq>
     </url>
     
@@ -190,7 +190,7 @@
     
     <url>
      <loc>/ingress-controller-catalog/</loc>
-     <lastmod>2018-06-24</lastmod>
+     <lastmod>2018-06-25</lastmod>
      <changefreq>daily</changefreq>
     </url>
     
@@ -198,7 +198,7 @@
     
     <url>
      <loc>/troubleshooting/</loc>
-     <lastmod>2018-06-24</lastmod>
+     <lastmod>2018-06-25</lastmod>
      <changefreq>daily</changefreq>
     </url>
     
diff --git a/user-guide/cli-arguments/index.html b/user-guide/cli-arguments/index.html
index 7748928d4..106b4d85f 100644
--- a/user-guide/cli-arguments/index.html
+++ b/user-guide/cli-arguments/index.html
@@ -1172,8 +1172,8 @@
 <td>Sort servers inside NGINX upstreams.</td>
 </tr>
 <tr>
-<td>--ssl-passtrough-proxy-port int</td>
-<td>Port to use internally for SSL Passthgough. (default 442)</td>
+<td>--ssl-passthrough-proxy-port int</td>
+<td>Port to use internally for SSL Passthrough. (default 442)</td>
 </tr>
 <tr>
 <td>--status-port int</td>