Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-09-03 18:08:29 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-09-03 18:08:29 +0300
commit0e13b2c71563d578805fc01fda9a4361f9f9d053 (patch)
tree7f876d131509f05ad62e1aac49be78d172dfc86a /doc
parent40024efc700a2ece0e30402ec5a9c512ed4d9b5b (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
-rw-r--r--doc/development/documentation/styleguide.md4
-rw-r--r--doc/policy/maintenance.md3
2 files changed, 5 insertions, 2 deletions
diff --git a/doc/development/documentation/styleguide.md b/doc/development/documentation/styleguide.md
index 48c1ad0dcca..949b6c19563 100644
--- a/doc/development/documentation/styleguide.md
+++ b/doc/development/documentation/styleguide.md
@@ -983,7 +983,7 @@ Relative linking enables crosslinks to work:
- in Review Apps, local previews, and `/help`.
- when working on the documentation locally, so you can verify that they work as
early as possible in the process.
-- within the GitLab user interace when browsing doc files in their respective
+- within the GitLab user interface when browsing doc files in their respective
repositories. For example, the links displayed at
`https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/README.md`.
@@ -1426,7 +1426,7 @@ interface:
| **{monitor}** Monitoring | View GitLab system information, and information on background jobs, logs, health checks, requests profiles, and audit logs. |
| **{messages}** Messages | Send and manage broadcast messages for your users. |
-Use an icon when you find youself having to describe an interface element. For
+Use an icon when you find yourself having to describe an interface element. For
example:
- Do: Click the Admin Area icon ( **{admin}** ).
diff --git a/doc/policy/maintenance.md b/doc/policy/maintenance.md
index 7f3f75d933d..08ab9fdf7b7 100644
--- a/doc/policy/maintenance.md
+++ b/doc/policy/maintenance.md
@@ -76,6 +76,9 @@ Version specific changes in Omnibus GitLab Linux packages can be found in [the O
NOTE: **Note:**
Instructions are available for downloading an Omnibus GitLab Linux package locally and [manually installing](https://docs.gitlab.com/omnibus/manual_install.html) it.
+NOTE: **Note:**
+A step-by-step guide to [upgrading the Omnibus-bundled PostgreSQL is documented separately](https://docs.gitlab.com/omnibus/settings/database.html#upgrade-packaged-postgresql-server).
+
### Upgrading major versions
Upgrading the *major* version requires more attention.