Automatic merge of gitlab-org/gitlab-ce master

doc/development/fe_guide/vuex.md

@@ -13,7 +13,7 @@ _Note:_ The action itself will not update the state, only a mutation should upda
 
 ## File structure
 
-When using Vuex at GitLab, separate this concerns into different files to improve readability:
+When using Vuex at GitLab, separate these concerns into different files to improve readability:
 
 ```
 └── store

doc/user/project/canary_deployments.md

@@ -2,7 +2,7 @@
 
 > [Introduced][ee-1659] in [GitLab Premium][eep] 9.1.
 
-A popular [Continuous Integration](https://en.wikipedia.org/wiki/Continuous_integration)
+A popular [Continuous Deployment](https://en.wikipedia.org/wiki/Continuous_deployment)
 strategy, where a small portion of the fleet is updated to the new version of
 your application.