Automatic merge of gitlab-org/gitlab-ce master

doc/administration/high_availability/README.md

@@ -64,8 +64,8 @@ larger one.
 
 - 1 PostgreSQL node
 - 1 Redis node
-- 2 or more GitLab application nodes (Unicorn, Workhorse, Sidekiq)
 - 1 NFS/Gitaly storage server
+- 2 or more GitLab application nodes (Unicorn, Workhorse, Sidekiq)
 
 #### Installation Instructions
 
@@ -88,9 +88,9 @@ in size, indicating that there is contention or not enough resources.
 
 - 1 PostgreSQL node
 - 1 Redis node
-- 2 or more GitLab application nodes (Unicorn, Workhorse)
-- 2 or more Sidekiq nodes
 - 2 or more NFS/Gitaly storage servers
+- 2 or more Sidekiq nodes
+- 2 or more GitLab application nodes (Unicorn, Workhorse)
 
 ## High Availability Architecture Examples
 

doc/ci/caching/index.md

@@ -100,7 +100,7 @@ From the perspective of the Runner, in order for cache to work effectively, one
 of the following must be true:
 
 - Use a single Runner for all your jobs.
-- Use multiple Runners (in autoscale mode or not) that use.
+- Use multiple Runners (in autoscale mode or not) that use
   [distributed caching](https://docs.gitlab.com/runner/configuration/autoscale.html#distributed-runners-caching),
   where the cache is stored in S3 buckets (like shared Runners on GitLab.com).
 - Use multiple Runners (not in autoscale mode) of the same architecture that