Skip to content

Commit bf13e30

Browse files
Jon GlassmanAshraf Khamis
andcommitted
Merge branch 'docs/fix-trailing-whitespace' into 'master'
Docs maintenance: Fix trailing whitespace See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/6947 Merged-by: Jon Glassman <[email protected]> Approved-by: Jon Glassman <[email protected]> Co-authored-by: Ashraf Khamis <[email protected]>
2 parents cece192 + e8c8151 commit bf13e30

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

doc/architecture/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ are:
4040
### Individual software definitions
4141

4242
Omnibus GitLab follows a batteries-included style of distribution. All of the
43-
software, libraries, and binaries necessary for the proper functioning of
43+
software, libraries, and binaries necessary for the proper functioning of
4444
a GitLab instance is provided as part of the package, in an embedded format.
4545

4646
So another one of the major components of the omnibus architecture is the
@@ -148,7 +148,7 @@ parsed correctly.
148148

149149
### runit
150150

151-
GitLab uses [runit](http://smarden.org/runit/) recipes for
151+
GitLab uses [runit](http://smarden.org/runit/) recipes for
152152
service management and supervision. runit recipes do the job of identifying the
153153
init system used by the OS and performing basic service management tasks like
154154
creating necessary service files for GitLab, service enabling, and service

doc/settings/database.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,10 @@ of your database is `database.example.com`, and your external GitLab hostname
100100
is `gitlab.example.com`. You will either need a wildcard certificate for
101101
`*.example.com` or two different SSL certificates.
102102

103-
The `ssl_cert_file`, `ssl_key_file`, and `ssl_ca_file` files direct PostgreSQL to where
104-
on the filesystem to find the certificate, key, and bundle. These changes are applied to
105-
`postgresql.conf`. The directives `internal_certificate` and `internal_key` are used to
106-
populate the contents of these files. The contents can be added directly or
103+
The `ssl_cert_file`, `ssl_key_file`, and `ssl_ca_file` files direct PostgreSQL to where
104+
on the filesystem to find the certificate, key, and bundle. These changes are applied to
105+
`postgresql.conf`. The directives `internal_certificate` and `internal_key` are used to
106+
populate the contents of these files. The contents can be added directly or
107107
loaded from file as shown in the following example.
108108

109109
After you have these files, enable SSL:

0 commit comments

Comments
 (0)