Commit b64ace02 authored by Amy Qualls's avatar Amy Qualls

Merge branch 'Clean-Up-Substitution-warning-(administration)-3' into 'master'

Clean up substitution warning (administration)-MR3

See merge request gitlab-org/gitlab!71031
parents 977f4a8c c8f641f2
......@@ -67,7 +67,7 @@ message is logged to:
- `log/file_hook.log` in a source installation.
NOTE:
Before 14.0 release, the file name was `plugin.log`
Before 14.0 release, the filename was `plugin.log`
## Creating file hooks
......
......@@ -41,7 +41,7 @@ Learn how to install, configure, update, and maintain your GitLab instance.
### Configuring GitLab
- [Adjust your instance's timezone](timezone.md): Customize the default time zone of GitLab.
- [Adjust your instance's time zone](timezone.md): Customize the default time zone of GitLab.
- [System hooks](../system_hooks/system_hooks.md): Notifications when users, projects and keys are changed.
- [Security](../security/index.md): Learn what you can do to further secure your GitLab instance.
- [Usage statistics, version check, and Service Ping](../user/admin_area/settings/usage_statistics.md): Enable or disable information about your instance to be sent to GitLab, Inc.
......
......@@ -146,9 +146,9 @@ a background job archives the job log. The log is moved to `/var/opt/gitlab/gitl
by default, or to object storage if configured.
In a [scaled-out architecture](reference_architectures/index.md) with Rails and Sidekiq running on more than one
server, these two locations on the filesystem have to be shared using NFS.
server, these two locations on the file system have to be shared using NFS.
To eliminate both filesystem requirements:
To eliminate both file system requirements:
- [Enable the incremental logging feature](#enable-or-disable-incremental-logging), which uses Redis instead of disk space for temporary caching of job logs.
- Configure [object storage](job_artifacts.md#object-storage-settings) for storing archived job logs.
......
......@@ -60,7 +60,7 @@ We should aim to not remove sensitive configuration in the *next major* release
See the table below for some examples:
| Config. type | Deprecation announced | Final minor release | Remove |
| Configuration type | Deprecation announced | Final minor release | Remove |
| -------- | -------- | -------- | -------- |
| Sensitive | 10.1.0 | 10.9.0 | 11.0.0 |
| Sensitive | 10.7.0 | 10.9.0 | 12.0.0 |
......@@ -90,6 +90,6 @@ the feature will continue working the same way as if you had `gitlab_rails['bett
However, setting the old version of configuration will print out a deprecation
notice at the end of installation/upgrade/reconfigure run.
With GitLab 11, `gitlab_rails['configuration'] = true` will no longer work and you will have to manually change the configuration in `/etc/gitlab/gitlab.rb` to the new valid config.
With GitLab 11, `gitlab_rails['configuration'] = true` will no longer work and you will have to manually change the configuration in `/etc/gitlab/gitlab.rb` to the new valid configuration.
**Note** If this configuration option is sensitive and can put integrity of the installation or
data in danger, installation/upgrade will be aborted.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment