Skip to content

Commit c1518a2

Browse files
committed
docs: move content in table to section below
1 parent fd6d674 commit c1518a2

1 file changed

Lines changed: 21 additions & 13 deletions

File tree

user_guide_src/source/database/configuration.rst

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,9 @@ and decode it in the constructor in the Config class:
136136

137137
.. _database-config-explanation-of-values:
138138

139-
**********************
140-
Explanation of Values:
141-
**********************
139+
*********************
140+
Explanation of Values
141+
*********************
142142

143143
================ ===========================================================================================================
144144
Name Config Description
@@ -164,15 +164,9 @@ Explanation of Values:
164164
applications where you might run manually written queries, and need the prefix to still be
165165
customizable by the end user.
166166
**schema** The database schema, default value varies by driver. (Used by ``Postgre`` and ``SQLSRV``.)
167-
**encrypt** Whether or not to use an encrypted connection.
168-
``SQLSRV`` driver accepts true/false
169-
``MySQLi`` driver accepts an array with the following options:
170-
* ``ssl_key`` - Path to the private key file
171-
* ``ssl_cert`` - Path to the public key certificate file
172-
* ``ssl_ca`` - Path to the certificate authority file
173-
* ``ssl_capath`` - Path to a directory containing trusted CA certificates in PEM format
174-
* ``ssl_cipher`` - List of *allowed* ciphers to be used for the encryption, separated by colons (``:``)
175-
* ``ssl_verify`` - true/false; Whether to verify the server certificate or not (``MySQLi`` only)
167+
**encrypt** Whether or not to use an encrypted connection. (``MySQLi`` and ``SQLSRV`` only).
168+
``SQLSRV`` driver accepts true/false.
169+
See :ref:`MySQLi encrypt <mysqli-encrypt>` for ``MySQLi`` settings.
176170
**compress** Whether or not to use client compression (``MySQLi`` only).
177171
**strictOn** true/false (boolean) - Whether to force "Strict Mode" connections, good for ensuring strict SQL
178172
while developing an application (``MySQLi`` only).
@@ -205,4 +199,18 @@ the ``'hostname'`` setting. CodeIgniter's MySQLi driver will notice this and con
205199
connection properly.
206200

207201
.. literalinclude:: configuration/011.php
208-
:lines: 11-18
202+
:lines: 11-18
203+
204+
.. _mysqli-encrypt:
205+
206+
encrypt
207+
-------
208+
209+
MySQLi driver accepts an array with the following options:
210+
211+
* ``ssl_key`` - Path to the private key file
212+
* ``ssl_cert`` - Path to the public key certificate file
213+
* ``ssl_ca`` - Path to the certificate authority file
214+
* ``ssl_capath`` - Path to a directory containing trusted CA certificates in PEM format
215+
* ``ssl_cipher`` - List of *allowed* ciphers to be used for the encryption, separated by colons (``:``)
216+
* ``ssl_verify`` - true/false; Whether to verify the server certificate or not

0 commit comments

Comments
 (0)