From f7f30d8d37e7de092cd72be4bff05c20d8447772 Mon Sep 17 00:00:00 2001
From: Andreas Braun <git@alcaeus.org>
Date: Tue, 5 Feb 2019 19:51:55 +0100
Subject: [PATCH] Move attribute explanations to the top of the file

---
 Resources/doc/configuration.rst | 47 ++++++++++++++++++++++-----------
 1 file changed, 31 insertions(+), 16 deletions(-)

diff --git a/Resources/doc/configuration.rst b/Resources/doc/configuration.rst
index cc7ecf67b..b04064910 100644
--- a/Resources/doc/configuration.rst
+++ b/Resources/doc/configuration.rst
@@ -1003,9 +1003,24 @@ can configure. The following block shows all possible configuration keys:
                 http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
 
             <doctrine:config>
+                <!-- path: SQLite specific -->
+                <!-- memory: SQLite specific -->
+                <!-- multiple-active-result-sets: driver specific -->
+                <!-- pooled: Oracle specific (SERVER=POOLED) -->
+                <!-- protocol: IBM DB2 specific (PROTOCOL) -->
+                <!-- server: SQL Anywhere specific (ServerName) -->
+                <!-- service: Oracle specific (SERVICE_NAME instead of SID) -->
+                <!-- servicename: Oracle specific (SERVICE_NAME) -->
+                <!-- sessionMode: oci8 driver specific (session_mode) -->
+                <!-- default_dbname: PostgreSQL specific (default_dbname) -->
+                <!-- sslmode: PostgreSQL specific (LIBPQ-CONNECT-SSLMODE) -->
+                <!-- sslrootcert: PostgreSQL specific (LIBPQ-CONNECT-SSLROOTCERT) -->
+                <!-- sslcert: PostgreSQL specific (LIBPQ-CONNECT-SSLCERT) -->
+                <!-- sslkey: PostgreSQL specific (LIBPQ-CONNECT-SSLKEY) -->
+                <!-- sslcrl: PostgreSQL specific (LIBPQ-CONNECT-SSLCRL) -->
                 <doctrine:dbal
                     name="default"
-                    url="mysql://user:secret@localhost:1234/otherdatabase" <!-- this would override the values below -->
+                    url="mysql://user:secret@localhost:1234/otherdatabase"
                     dbname="database"
                     host="localhost"
                     port="1234"
@@ -1013,23 +1028,23 @@ can configure. The following block shows all possible configuration keys:
                     password="secret"
                     driver="pdo_mysql"
                     driver-class="MyNamespace\MyDriverImpl"
-                    path="%kernel.project_dir%/var/data.db" <!-- SQLite specific -->
-                    memory="true"                           <!-- SQLite specific -->
+                    path="%kernel.project_dir%/var/data.db"
+                    memory="true"
                     unix-socket="/tmp/mysql.sock"
                     persistent="true"
-                    multiple-active-result-sets="true" <!-- pdo_sqlsrv driver specific -->
-                    pooled="true"                      <!-- Oracle specific (SERVER=POOLED) -->
-                    protocol="TCPIP"                   <!-- IBM DB2 specific (PROTOCOL) -->
-                    server="my_database_server"        <!-- SQL Anywhere specific (ServerName) -->
-                    service="true"                     <!-- Oracle specific (SERVICE_NAME instead of SID) -->
-                    servicename="MyOracleServiceName"  <!-- Oracle specific (SERVICE_NAME) -->
-                    sessionMode"2"                     <!-- oci8 driver specific (session_mode) -->
-                    default_dbname="database"          <!-- PostgreSQL specific (default_dbname) -->
-                    sslmode="require"                  <!-- PostgreSQL specific (LIBPQ-CONNECT-SSLMODE) -->
-                    sslrootcert="postgresql-ca.pem"    <!-- PostgreSQL specific (LIBPQ-CONNECT-SSLROOTCERT) -->
-                    sslcert="postgresql-cert.pem"      <!-- PostgreSQL specific (LIBPQ-CONNECT-SSLCERT) -->
-                    sslkey="postgresql-key.pem"        <!-- PostgreSQL specific (LIBPQ-CONNECT-SSLKEY) -->
-                    sslcrl="postgresql.crl"            <!-- PostgreSQL specific (LIBPQ-CONNECT-SSLCRL) -->
+                    multiple-active-result-sets="true"
+                    pooled="true"
+                    protocol="TCPIP"
+                    server="my_database_server"
+                    service="true"
+                    servicename="MyOracleServiceName"
+                    sessionMode="2"
+                    default_dbname="database"
+                    sslmode="require"
+                    sslrootcert="postgresql-ca.pem"
+                    sslcert="postgresql-cert.pem"
+                    sslkey="postgresql-key.pem"
+                    sslcrl="postgresql.crl"
                     wrapper-class="MyDoctrineDbalConnectionWrapper"
                     charset="UTF8"
                     logging="%kernel.debug%"