Add latest changes from gitlab-org/gitlab@master

5 files changed, 36 insertions, 3 deletions

diff --git a/doc/administration/pages/index.md b/doc/administration/pages/index.md
index b1c19ef7526..fd5642b2c4b 100644
--- a/doc/administration/pages/index.md
+++ b/doc/administration/pages/index.md
@@ -1122,6 +1122,35 @@ to define the explicit address that the GitLab Pages daemon should listen on:
 gitlab_pages['listen_proxy'] = '127.0.0.1:8090'
 ```
 
+### Intermittent 502 errors or after a few days
+
+If you run Pages on a system that uses `systemd` and
+[`tmpfiles.d`](https://www.freedesktop.org/software/systemd/man/tmpfiles.d.html),
+you may encounter intermittent 502 errors trying to serve Pages with an error similar to:
+
+```plaintext
+dial tcp: lookup gitlab.example.com on [::1]:53: dial udp [::1]:53: connect: no route to host"
+```
+
+GitLab Pages creates a [bind mount](https://man7.org/linux/man-pages/man8/mount.8.html)
+inside `/tmp/gitlab-pages-*` that includes files like `/etc/hosts`.
+However, `systemd` may clean the `/tmp/` directory on a regular basis so the DNS
+configuration may be lost.
+
+To stop `systemd` from cleaning the Pages related content:
+
+1. Tell `tmpfiles.d` to not remove the Pages `/tmp` directory:
+
+   ```shell
+   echo 'x /tmp/gitlab-pages-*' >> /etc/tmpfiles.d/gitlab-pages-jail.conf
+   ```
+
+1. Restart GitLab Pages:
+
+   ```shell
+   sudo gitlab-ctl restart gitlab-pages
+   ```
+
 ### 404 error after transferring the project to a different group or user, or changing project path
 
 If you encounter a `404 Not Found` error a Pages site after transferring a project to
diff --git a/doc/ci/environments/index.md b/doc/ci/environments/index.md
index dae38d0aea1..a9ab03c3213 100644
--- a/doc/ci/environments/index.md
+++ b/doc/ci/environments/index.md
@@ -676,7 +676,7 @@ fetch = +refs/environments/*:refs/remotes/origin/environments/*
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/2112) in [GitLab Premium](https://about.gitlab.com/pricing/) 9.4.
 > - [Environment scoping for CI/CD variables was moved to all tiers](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/30779) in GitLab 12.2.
-> - [Environment scoping for Group CI/CD variables](https://gitlab.com/gitlab-org/gitlab/-/issues/2874) added to GitLab Premium in 13.11
+> - [Environment scoping for Group CI/CD variables](https://gitlab.com/gitlab-org/gitlab/-/issues/2874) added to GitLab Premium in 13.11.
 
 You can limit the environment scope of a CI/CD variable by
 defining which environments it can be available for.
diff --git a/doc/ci/variables/README.md b/doc/ci/variables/README.md
index 9abd21c4d15..5796a5c6b7d 100644
--- a/doc/ci/variables/README.md
+++ b/doc/ci/variables/README.md
@@ -181,7 +181,7 @@ To add a group variable:
    - **Key**: Must be one line, with no spaces, using only letters, numbers, or `_`.
    - **Value**: No limitations.
    - **Type**: [`File` or `Variable`](#cicd-variable-types).
-   - **Environment scope** (optional): `All`, or specific [environments](#limit-the-environment-scope-of-a-cicd-variable). **PREMIUM**
+   - **Environment scope** (optional): `All`, or specific [environments](#limit-the-environment-scope-of-a-cicd-variable). **(PREMIUM)**
    - **Protect variable** (Optional): If selected, the variable is only available
      in pipelines that run on protected branches or tags.
    - **Mask variable** (Optional): If selected, the variable's **Value** is masked
diff --git a/doc/development/migration_style_guide.md b/doc/development/migration_style_guide.md
index 40457dbb533..491f65bd88a 100644
--- a/doc/development/migration_style_guide.md
+++ b/doc/development/migration_style_guide.md
@@ -33,7 +33,7 @@ compatible.
 
 For GitLab.com, please take into consideration that regular migrations (under `db/migrate`)
 are run before [Canary is deployed](https://gitlab.com/gitlab-com/gl-infra/readiness/-/tree/master/library/canary/#configuration-and-deployment),
-and post-deployment migrations (`db/post_migrate`) are run after the deployment to production has finished.
+and [post-deployment migrations](post_deployment_migrations.md) (`db/post_migrate`) are run after the deployment to production has finished.
 
 ## Schema Changes
 
diff --git a/doc/user/project/pages/introduction.md b/doc/user/project/pages/introduction.md
index 80b0c3b1f29..da2e2e8dcc2 100644
--- a/doc/user/project/pages/introduction.md
+++ b/doc/user/project/pages/introduction.md
@@ -273,6 +273,10 @@ Sure. All you need to do is download the artifacts archive from the job page.
 Yes. GitLab Pages doesn't care whether you set your project's visibility level
 to private, internal or public.
 
+### Can I create a personal or a group website
+
+Yes. See the documentation about [GitLab Pages domain names, URLs, and base URLs](getting_started_part_one.md).
+
 ### Do I need to create a user/group website before creating a project website?
 
 No, you don't. You can create your project first and access it under