diff options
| author | Andrey Andreev <narf@devilix.net> | 2017-10-09 09:57:57 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2017-10-09 09:58:31 +0200 |
| commit | 23aa166a7bef428cbbb06b3f6f7a3fa9f0e78524 (patch) | |
| tree | 2558a698cdff2cca20073b56975a3f7ce028a5ce | |
| parent | 4c679b5e7c2363c2c815e310e31e0f982dba3863 (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 bf9857fff..d22321e2a 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) |