diff options
| author | Andrey Andreev <narf@devilix.net> | 2017-10-09 09:57:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-09 09:57:57 +0200 |
| commit | ecf0ceab07ceae00c87710c166c5a97a7f9de042 (patch) | |
| tree | b1ca776a8a794fd4c0ade13cf5bcb1b862111101 | |
| parent | 7298a788797ff64edaddb7ca65b21b6816757940 (diff) | |
| parent | a457c20f4183f800d9c14ac779dd440237165cbf (diff) | |
[ci skip] Merge pull request #5292 from ajdunn2/develop
Small spelling fix
| -rw-r--r-- | application/config/database.php | 2 | ||||
| -rw-r--r-- | user_guide_src/source/database/configuration.rst | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/application/config/database.php b/application/config/database.php index b4d8a6a3e..d8566e8c3 100644 --- a/application/config/database.php +++ b/application/config/database.php @@ -47,7 +47,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); | 'ssl_key' - Path to the private key file | 'ssl_cert' - Path to the public key certificate file | 'ssl_ca' - Path to the certificate authority file -| 'ssl_capath' - Path to a directory containing trusted CA certificats in PEM format +| 'ssl_capath' - Path to a directory containing trusted CA certificates in PEM format | 'ssl_cipher' - List of *allowed* ciphers to be used for the encryption, separated by colons (':') | 'ssl_verify' - TRUE/FALSE; Whether verify the server certificate or not ('mysqli' only) | diff --git a/user_guide_src/source/database/configuration.rst b/user_guide_src/source/database/configuration.rst index e231a7d6a..a9bf7dcb6 100644 --- a/user_guide_src/source/database/configuration.rst +++ b/user_guide_src/source/database/configuration.rst @@ -186,7 +186,7 @@ Explanation of Values: - 'ssl_key' - Path to the private key file - 'ssl_cert' - Path to the public key certificate file - 'ssl_ca' - Path to the certificate authority file - - 'ssl_capath' - Path to a directory containing trusted CA certificats in PEM format + - 'ssl_capath' - Path to a directory containing trusted CA certificates in PEM format - 'ssl_cipher' - List of *allowed* ciphers to be used for the encryption, separated by colons (':') - 'ssl_verify' - TRUE/FALSE; Whether to verify the server certificate or not ('mysqli' only) |