Merge remote-tracking branch 'origin/pr/1495' into develop

Forward port #1495
zendframework · Jul 21, 2015 · ed8bfdc · ed8bfdc
2 parents bd0c693 + b8343c6
commit ed8bfdc
Showing 1 changed file with 20 additions and 20 deletions.
diff --git a/docs/src/modules/zend.cache.storage.adapter.rst b/docs/src/modules/zend.cache.storage.adapter.rst
@@ -746,26 +746,26 @@ The Redis Adapter
 
 .. table:: Adapter specific options
 
-   +--------------------+----------------------+-------------------------+--------------------------------------------------------------------------------------+
-   |Name                |Data Type             |Default Value            |Description                                                                           |
-   +====================+======================+=========================+======================================================================================+
-   |database            |``integer``           |0                        |Set database identifier                                                               |
-   +--------------------+----------------------+-------------------------+--------------------------------------------------------------------------------------+
-   |lib_option          |``array``             |``[]``                   | Associative array of redis options were the array key is the option name             |
-   +--------------------+----------------------+-------------------------+--------------------------------------------------------------------------------------+
-   |namespace_separator |``string``            |":"                      |A separator for the namespace and prefix                                              |
-   +--------------------+----------------------+-------------------------+--------------------------------------------------------------------------------------+
-   |password            |``string``            |""                       |Set password                                                                          |
-   +--------------------+----------------------+-------------------------+--------------------------------------------------------------------------------------+
-   |persistent_id       |``string``            |````                     |Set persistant id (``RDB``, ``AOF``)                                                  |
-   +--------------------+----------------------+-------------------------+--------------------------------------------------------------------------------------+
-   |resource_manager    |``string``            |````                     |Set the redis resource manager to use                                                 |
-   +--------------------+----------------------+-------------------------+--------------------------------------------------------------------------------------+
-   |server              |                      |                         | Server can be described as follows:                                                  |
-   |                    |                      |                         |  - URI:   /path/to/sock.sock                                                         |
-   |                    |                      |                         |  - Assoc: array('host' => <host>[, 'port' => <port>[, 'timeout' => <timeout>]])      |
-   |                    |                      |                         |  - List:  array(<host>[, <port>, [, <timeout>]])                                     |
-   +--------------------+----------------------+-------------------------+--------------------------------------------------------------------------------------+
+   +--------------------+----------------------+-------------------------+----------------------------------------------------------------------------------------------+
+   |Name                |Data Type             |Default Value            |Description                                                                                   |
+   +====================+======================+=========================+==============================================================================================+
+   |database            |``integer``           |0                        |Set database identifier                                                                       |
+   +--------------------+----------------------+-------------------------+----------------------------------------------------------------------------------------------+
+   |lib_option          |``array``             |``[]``                   | Associative array of redis options were the array key is the option name                     |
+   +--------------------+----------------------+-------------------------+----------------------------------------------------------------------------------------------+
+   |namespace_separator |``string``            |":"                      |A separator for the namespace and prefix                                                      |
+   +--------------------+----------------------+-------------------------+----------------------------------------------------------------------------------------------+
+   |password            |``string``            |""                       |Set password                                                                                  |
+   +--------------------+----------------------+-------------------------+----------------------------------------------------------------------------------------------+
+   |persistent_id       |``string``            |````                     |Set persistent id (*name* of the connection, leave blank to not use a persistent connection)  |
+   +--------------------+----------------------+-------------------------+----------------------------------------------------------------------------------------------+
+   |resource_manager    |``string``            |````                     |Set the redis resource manager to use                                                         |
+   +--------------------+----------------------+-------------------------+----------------------------------------------------------------------------------------------+
+   |server              |                      |                         | Server can be described as follows:                                                          |
+   |                    |                      |                         |  - URI:   /path/to/sock.sock                                                                 |
+   |                    |                      |                         |  - Assoc: array('host' => <host>[, 'port' => <port>[, 'timeout' => <timeout>]])              |
+   |                    |                      |                         |  - List:  array(<host>[, <port>, [, <timeout>]])                                             |
+   +--------------------+----------------------+-------------------------+----------------------------------------------------------------------------------------------+
 
 .. _zend.cache.storage.adapter.memory: