Automatic merge of gitlab-org/gitlab-ce master

doc/development/feature_flags.md

@@ -26,8 +26,9 @@ the time, you should execute `/chatops run feature set my_feature_flag 50`.
 
 ## Feature flags for user applications
 
-GitLab does not yet support the use of feature flags in deployed user applications.
-You can follow the progress on that [in the issue on our issue tracker](https://gitlab.com/gitlab-org/gitlab-ee/issues/779).
+This document only covers feature flags used in the development of GitLab 
+itself. Feature flags in deployed user applications can be found at 
+[Feature Flags](https://docs.gitlab.com/ee/user/project/operations/feature_flags.html)
 
 ## Developing with feature flags
 

doc/user/instance_statistics/convdev.md

@@ -2,25 +2,27 @@
 
 > [Introduced][ce-30469] in GitLab 9.3.
 
+NOTE: **NOTE**
+Your GitLab instance's [usage ping][ping] must be activated in order to use this feature.
+
 The Conversational Development Index (ConvDev Index) gives you an overview of your entire
 instance's adoption of [Concurrent DevOps](https://about.gitlab.com/concurrent-devops/)
-from planning to monitoring. It displays the usage of these GitLab features over
+from planning to monitoring.
+
+This displays the usage of these GitLab features over
 the last 30 days, averaged over the number of active users in that time period. It also
 provides a Lead score per feature, which is calculated based on GitLab's analysis
 of top-performing instances based on [usage ping data][ping] that GitLab has
-collected. Your score is compared to the lead score, expressed as a percentage.
-Your overall index score is an average of all your feature score percentages.
+collected. Your score is compared to the lead score of each feature and then expressed as a percentage at the bottom of said feature.
+Your overall index score is an average of all your feature score percentages - this percentage value is presented above all the of features on the page.
 
 ![ConvDev index](img/convdev_index.png)
 
 The page also provides helpful links to articles and GitLab docs, to help you
 improve your scores.
 
-Your GitLab instance's [usage ping][ping] must be activated in order to use this feature.
 Usage ping data is aggregated on GitLab's servers for analysis. Your usage
-information is **not sent** to any other GitLab instances.
-
-If you have just started using GitLab, it may take a few weeks for data to be
+information is **not sent** to any other GitLab instances. If you have just started using GitLab, it may take a few weeks for data to be
 collected before this feature is available.
 
 [ce-30469]: https://gitlab.com/gitlab-org/gitlab-ce/issues/30469

doc/user/project/clusters/runbooks/index.md

@@ -4,6 +4,10 @@ Runbooks are a collection of documented procedures that explain how to
 carry out a particular process, be it starting, stopping, debugging, 
 or troubleshooting a particular system.
 
+Using [Jupyter Notebooks](https://jupyter.org/) and the [Rubix library](https://github.com/Nurtch/rubix),
+users can get started writing their own executable runbooks.
+
+
 ## Overview
 
 Historically, runbooks took the form of a decision tree or a detailed 
@@ -36,7 +40,7 @@ To create an executable runbook, you will need:
     can run the helm CLI in a safe environment.
 1. **Ingress** - Ingress can provide load balancing, SSL termination, and name-based 
     virtual hosting. It acts as a web proxy for your applications.
-1. **JupyterHub** - JupyterHub is a multi-user service for managing notebooks across 
+1. **JupyterHub** - [JupyterHub](https://jupyterhub.readthedocs.io/) is a multi-user service for managing notebooks across 
     a team. Jupyter Notebooks provide a web-based interactive programming environment 
     used for data analysis, visualization, and machine learning.