diff --git a/docs/en/reference/configuration.rst b/docs/en/reference/configuration.rst index 88f0069506a..f8eb141ba4c 100644 --- a/docs/en/reference/configuration.rst +++ b/docs/en/reference/configuration.rst @@ -126,19 +126,19 @@ interfaces to use. It can be configured in one of three ways: - ``driver``: The built-in driver implementation to use. The following drivers are currently available: - - ``pdo_mysql``: A MySQL driver that uses the pdo\_mysql PDO + - ``pdo_mysql``: A MySQL driver that uses the pdo_mysql PDO extension. - - ``drizzle_pdo_mysql``: A Drizzle driver that uses pdo\_mysql PDO + - ``drizzle_pdo_mysql``: A Drizzle driver that uses pdo_mysql PDO extension. - ``mysqli``: A MySQL driver that uses the mysqli extension. - - ``pdo_sqlite``: An SQLite driver that uses the pdo\_sqlite PDO + - ``pdo_sqlite``: An SQLite driver that uses the pdo_sqlite PDO extension. - - ``pdo_pgsql``: A PostgreSQL driver that uses the pdo\_pgsql PDO + - ``pdo_pgsql``: A PostgreSQL driver that uses the pdo_pgsql PDO extension. - - ``pdo_oci``: An Oracle driver that uses the pdo\_oci PDO + - ``pdo_oci``: An Oracle driver that uses the pdo_oci PDO extension. **Note that this driver caused problems in our tests. Prefer the oci8 driver if possible.** - - ``pdo_sqlsrv``: A Microsoft SQL Server driver that uses pdo\_sqlsrv PDO + - ``pdo_sqlsrv``: A Microsoft SQL Server driver that uses pdo_sqlsrv PDO **Note that this driver caused problems in our tests. Prefer the sqlsrv driver if possible.** - ``sqlsrv``: A Microsoft SQL Server driver that uses the sqlsrv PHP extension. - ``oci8``: An Oracle driver that uses the oci8 PHP extension. @@ -170,8 +170,8 @@ options recognized by each built-in driver. When using an existing PDO instance through the ``pdo`` option, specifying connection details is obviously not necessary. -pdo\_sqlite -^^^^^^^^^^^ +pdo_sqlite +^^^^^^^^^^ - ``user`` (string): Username to use when connecting to the database. @@ -183,8 +183,8 @@ pdo\_sqlite in-memory (non-persistent). Mutually exclusive with ``path``. ``path`` takes precedence. -pdo\_mysql -^^^^^^^^^^ +pdo_mysql +^^^^^^^^^ - ``user`` (string): Username to use when connecting to the database. @@ -198,8 +198,8 @@ pdo\_mysql - ``charset`` (string): The charset used when connecting to the database. -drizzle\_pdo\_mysql -^^^^^^^^^^^^^^^^^^^ +drizzle_pdo_mysql +^^^^^^^^^^^^^^^^^ **Requires** drizzle plugin ``mysql_protocol`` or ``mysql_unix_socket_protocol`` to be enabled. On Ubuntu this can be done by editing ``/etc/drizzle/conf.d/mysql-protocol.cnf`` @@ -236,8 +236,8 @@ mysqli - ``ssl_cipher`` (string): A list of allowable ciphers to use for SSL encryption. - ``driverOptions`` Any supported flags for mysqli found on `http://www.php.net/manual/en/mysqli.real-connect.php` -pdo\_pgsql -^^^^^^^^^^ +pdo_pgsql +^^^^^^^^^ - ``user`` (string): Username to use when connecting to the database. @@ -275,8 +275,8 @@ PostgreSQL behaves differently with regard to booleans when you use and ``'false'`` as strings you can change to integers by using: ``$conn->getDatabasePlatform()->setUseBooleanTrueFalseStrings($flag)``. -pdo\_oci / oci8 -^^^^^^^^^^^^^^^ +pdo_oci / oci8 +^^^^^^^^^^^^^^ - ``user`` (string): Username to use when connecting to the database. @@ -307,8 +307,8 @@ pdo\_oci / oci8 and ``getPort`` methods from ``Doctrine\DBAL\Connection`` will no longer function as expected. - ``persistent`` (boolean): Whether to establish a persistent connection. -pdo\_sqlsrv / sqlsrv -^^^^^^^^^^^^^^^^^^^^ +pdo_sqlsrv / sqlsrv +^^^^^^^^^^^^^^^^^^^ - ``user`` (string): Username to use when connecting to the database. diff --git a/docs/en/reference/sharding.rst b/docs/en/reference/sharding.rst index 0bade11ccbd..dcdd7d8f660 100644 --- a/docs/en/reference/sharding.rst +++ b/docs/en/reference/sharding.rst @@ -84,8 +84,7 @@ Use GUID/UUIDs The most simple ID-generation mechanism for sharding are universally unique identifiers. These are 16-byte (128-bit) numbers that are guaranteed to be unique across different servers. -You can `read up on UUIDs on Wikipedia -`_. +You can `read up on UUIDs on Wikipedia `_. The drawback of UUIDs is the segmentation they cause on indexes. Because UUIDs are not sequentially generated, they can have negative impact on index access @@ -128,8 +127,7 @@ In your application you should hide this details in Id-Generation services: } A good starting point to read up on GUIDs (vs numerical ids) is this blog post -`Coding Horror: Primary Keys: IDs vs GUIDs -`_. +`Coding Horror: Primary Keys: IDs vs GUIDs `_. Table Generator ~~~~~~~~~~~~~~~ diff --git a/docs/en/reference/sharding_azure_tutorial.rst b/docs/en/reference/sharding_azure_tutorial.rst index 761ed401cbb..71a4fab5594 100644 --- a/docs/en/reference/sharding_azure_tutorial.rst +++ b/docs/en/reference/sharding_azure_tutorial.rst @@ -6,8 +6,7 @@ SQLAzure Sharding Tutorial The sharding extension is currently in transition from a separate Project into DBAL. Class names may differ. -This tutorial builds upon the `Brian Swans tutorial -`_ +This tutorial builds upon the `Brian Swans tutorial `_ on SQLAzure Sharding and turns all the examples into examples using the Doctrine Sharding support. It introduces SQL Azure Sharding, which is an abstraction layer in SQL Azure to