Automatic merge of gitlab-org/gitlab-ce master

doc/administration/index.md

@@ -187,3 +187,4 @@ Learn how to install, configure, update, and maintain your GitLab instance.
 - [Sidekiq Troubleshooting](troubleshooting/sidekiq.md): Debug when Sidekiq appears hung and is not processing jobs.
 - Useful [diagnostics tools](troubleshooting/diagnostics_tools.md) that are sometimes used by the GitLab
   Support team.
+- [Troubleshooting ElasticSearch](troubleshooting/elasticsearch.md): Tips to troubleshoot ElasticSearch.

doc/user/admin_area/settings/continuous_integration.md

@@ -98,7 +98,10 @@ a group in the **Usage Quotas** page available to the group page settings list.
 
 If you're using GitLab.com, you can purchase additional CI minutes so your
 pipelines will not be blocked after you have used all your CI minutes from your
-main quota.
+main quota. Additional minutes:
+
+- Are only used once the shared quota included in your subscription runs out.
+- Roll over month to month.
 
 In order to purchase additional minutes, you should follow these steps: