Add latest changes from gitlab-org/gitlab@master

2 files changed, 7 insertions, 11 deletions

diff --git a/doc/ci/docker/using_docker_build.md b/doc/ci/docker/using_docker_build.md
index 78fde2767de..8e5ce2fb359 100644
--- a/doc/ci/docker/using_docker_build.md
+++ b/doc/ci/docker/using_docker_build.md
@@ -629,7 +629,7 @@ Then every job that the runner picks up will be authenticated already. If you
 are using the official `docker:19.03.13` image, the home directory is
 under `/root`.
 
-If you mount the config file, any `docker` command
+If you mount the configuration file, any `docker` command
 that modifies the `~/.docker/config.json` (for example, `docker login`)
 fails, because the file is mounted as read-only. Do not change it from
 read-only, because other problems will occur.
@@ -703,7 +703,7 @@ There are multiple ways to define this. For example:
 
 - Inside
   [`pre_build_script`](https://docs.gitlab.com/runner/configuration/advanced-configuration.html#the-runners-section)
-  inside of the runner config file.
+  inside of the runner configuration file.
 - Inside [`before_script`](../yaml/README.md#before_script).
 - Inside of [`script`](../yaml/README.md#script).
 
diff --git a/doc/ci/docker/using_kaniko.md b/doc/ci/docker/using_kaniko.md
index 2a99693b2fb..13d3c607f8a 100644
--- a/doc/ci/docker/using_kaniko.md
+++ b/doc/ci/docker/using_kaniko.md
@@ -106,14 +106,10 @@ Guided Exploration project pipeline. It was tested on:
 The example can be copied to your own group or instance for testing. More details
 on what other GitLab CI patterns are demonstrated are available at the project page.
 
-<!-- ## Troubleshooting
+## Troubleshooting
 
-Include any troubleshooting steps that you can foresee. If you know beforehand what issues
-one might have when setting this up, or when something is changed, or on upgrading, it's
-important to describe those, too. Think of things that may go wrong and include them here.
-This is important to minimize requests for support, and to avoid doc comments with
-questions that you know someone might ask.
+### 403 error: "error checking push permissions"
 
-Each scenario can be a third-level heading, e.g. `### Getting error message X`.
-If you have none to add when creating a doc, leave this section in place
-but commented out to help encourage others to add to it in the future. -->
+If you receive this error, it might be due to an outside proxy. Setting the `http_proxy`
+and `https_proxy` [environment variables](../../administration/packages/container_registry.md#running-the-docker-daemon-with-a-proxy)
+can fix the problem.