Merge branch 'master' into release-1.8

2017-08-04 09:17:55 -07:00
parent e8b4d65bbc a29cfd7d0c
commit d6012632b4
14 changed files with 50 additions and 41 deletions
@@ -510,7 +510,7 @@ nginx-deployment-618515232    11        11        11        7m
 ## Pausing and Resuming a Deployment

 You can pause a Deployment before triggering one or more updates and then resume it. This will allow you to
-apply multiple fixes in between pausing and resuming without triggering unnecesarry rollouts.
+apply multiple fixes in between pausing and resuming without triggering unnecessary rollouts.

 For example, with a Deployment that was just created:
 ```shell