Automatic merge of gitlab-org/gitlab-ce master

doc/ci/yaml/README.md

@@ -268,15 +268,9 @@ There are also two edge cases worth mentioning:
 
 ### `stage`
 
-NOTE: **Note:**
-By default, when using your own Runners, the GitLab Runner installation is set up to run only one job at a time (see  the `concurrent` flag in [Runner global settings](https://docs.gitlab.com/runner/configuration/advanced-configuration.html#the-global-section) for more information).
-Jobs will run in parallel only if:
- - Run on different Runners
- - The Runner's `concurrent` config has been changed.
-
 `stage` is defined per-job and relies on [`stages`](#stages) which is defined
 globally. It allows to group jobs into different stages, and jobs of the same
-`stage` are executed in `parallel`. For example:
+`stage` are executed in parallel (subject to [certain conditions](#using-your-own-runners)). For example:
 
 ```yaml
 stages:
@@ -301,6 +295,17 @@ job 4:
   script: make deploy
 ```
 
+#### Using your own Runners
+
+When using your own Runners, GitLab Runner runs only one job at a time by default (see the
+`concurrent` flag in [Runner global settings](https://docs.gitlab.com/runner/configuration/advanced-configuration.html#the-global-section)
+for more information).
+
+Jobs will run on your own Runners in parallel only if:
+
+- Run on different Runners.
+- The Runner's `concurrent` setting has been changed.
+
 ### `only`/`except` (basic)
 
 `only` and `except` are two parameters that set a job policy to limit when

doc/development/architecture.md

@@ -158,6 +158,18 @@ TODO
 
 TODO
 
+### Registry
+
+The registry is what users use to store their own Docker images. The bundled
+registry uses nginx as a load balancer and GitLab as an authentication manager.
+Whenever a client requests to pull or push an image from the registry, it will
+return a `401` response along with a header detailing where to get an
+authentication token, in this case the GitLab instance. The client will then
+request a pull or push auth token from GitLab and retry the original request
+to the registry. Learn more about [token authentication](https://docs.docker.com/registry/spec/auth/token/).
+
+An external registry can also be configured to use GitLab as an auth endpoint.
+
 ## GitLab by Request Type
 
 GitLab provides two "interfaces" for end users to access the service: