Commit 38b1299c authored by Marcel Amirault's avatar Marcel Amirault

Merge branch 'vale-acronym-fix' into 'master'

feat: fix doc warnings by Vale acronym rule

See merge request gitlab-org/gitlab!71106
parents 4cc57b8c 5e9b9937
......@@ -49,6 +49,7 @@ exceptions:
- ECS
- EFS
- EKS
- ELB
- EOL
- EXIF
- FAQ
......@@ -98,6 +99,7 @@ exceptions:
- LESS
- LFS
- LRU
- LTM
- LTS
- MIME
- MIT
......@@ -119,6 +121,7 @@ exceptions:
- PEM
- PEP
- PGP
- PID
- PKCS
- PHP
- PNG
......@@ -129,6 +132,7 @@ exceptions:
- RAM
- RBAC
- RDP
- RDS
- REST
- RFC
- RHEL
......@@ -140,6 +144,7 @@ exceptions:
- RVM
- SAAS
- SAML
- SAN
- SAST
- SATA
- SCIM
......@@ -173,6 +178,7 @@ exceptions:
- TODO
- TOML
- TTL
- UID
- UDP
- UID
- UNIX
......
......@@ -45,7 +45,7 @@ For more information, see the links shown on this page for each external provide
| Capability | SaaS | Self-Managed |
|-------------------------------------------------|-----------------------------------------|------------------------------------|
| **User Provisioning** | SCIM<br>JIT Provisioning | LDAP Sync |
| **User Provisioning** | SCIM<br>Just-In-Time (JIT) Provisioning | LDAP Sync |
| **User Detail Updating** (not group management) | Not Available | LDAP Sync |
| **Authentication** | SAML at top-level group (1 provider) | LDAP (multiple providers)<br>Generic OAuth2<br>SAML (only 1 permitted per unique provider)<br>Kerberos<br>JWT<br>Smartcard<br>OmniAuth Providers (only 1 permitted per unique provider) |
| **Provider-to-GitLab Role Sync** | SAML Group Sync | LDAP Group Sync |
......
......@@ -217,7 +217,7 @@ use the `hard` option, because (from the man page):
> use the soft option only when client responsiveness is more important than data integrity
Other vendors make similar recommendations, including
[SAP](http://wiki.scn.sap.com/wiki/x/PARnFQ) and NetApp's
[System Applications and Products in Data Processing (SAP)](http://wiki.scn.sap.com/wiki/x/PARnFQ) and NetApp's
[knowledge base](https://kb.netapp.com/Advice_and_Troubleshooting/Data_Storage_Software/ONTAP_OS/What_are_the_differences_between_hard_mount_and_soft_mount),
they highlight that if the NFS client driver caches data, `soft` means there is no certainty if
writes by GitLab are actually on disk.
......
......@@ -847,7 +847,7 @@ Investigate further if:
- `reply_time` is not current.
The `lsn` fields relate to which write-ahead-log segments have been replicated.
Run the following on the leader to find out the current LSN:
Run the following on the leader to find out the current Log Sequence Number (LSN):
```shell
echo 'SELECT pg_current_wal_lsn();' | gitlab-psql
......@@ -1248,7 +1248,7 @@ To fix the problem, ensure the loopback interface is included in the CIDR addres
1. [Reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure) for the changes to take effect.
1. Check that [all the replicas are synchronized](#check-replication-status)
### Errors in Patroni logs: the requested start point is ahead of the WAL flush position
### Errors in Patroni logs: the requested start point is ahead of the Write Ahead Log (WAL) flush position
This error indicates that the database is not replicating:
......
......@@ -69,10 +69,10 @@ The key needs to be readable by the GitLab system user (`git` by default).
The key needs to be readable by the GitLab system user (`git` by default).
### How to convert S/MIME PKCS #12 / PFX format to PEM encoding
### How to convert S/MIME PKCS #12 format to PEM encoding
Typically S/MIME certificates are handled in binary PKCS #12 format (`.pfx` or `.p12`
extensions), which contain the following in a single encrypted file:
Typically S/MIME certificates are handled in binary Public Key Cryptography Standards (PKCS) #12 format
(`.pfx` or `.p12` extensions), which contain the following in a single encrypted file:
- Public certificate
- Intermediate certificates (if any)
......
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