diff --git a/admin_manual/configuration_database/linux_database_configuration.rst b/admin_manual/configuration_database/linux_database_configuration.rst
index 90ae631c235..59d197179d9 100644
--- a/admin_manual/configuration_database/linux_database_configuration.rst
+++ b/admin_manual/configuration_database/linux_database_configuration.rst
@@ -51,7 +51,7 @@ If you decide to use a MySQL or MariaDB database, ensure the following:
 
   Verify the **transaction_isolation** and **binlog_format**:
 
-::
+.. code-block:: ini
 
   [mysqld]
   ...
@@ -61,7 +61,7 @@ If you decide to use a MySQL or MariaDB database, ensure the following:
 
 Your :file:`/etc/mysql/my.cnf` could look like this:
 
-::
+.. code-block:: ini
 
   [server]
   skip_name_resolve = 1
@@ -100,30 +100,17 @@ Please refer to the `page in the MySQL manual <https://mariadb.com/kb/en/library
 
 * That you have installed and enabled the pdo_mysql extension in PHP
 
-* That the **mysql.default_socket** points to the correct socket (if the database runs on the same server as Nextcloud).
+* That the **pdo_mysql.default_socket** points to the correct socket (if the database runs on the same server as Nextcloud).
+  This is usually correct without any adjustments. But if PHP fails to find the socket, it can be defined in the PHP configuration in :file:`/etc/php/**/pdo_mysql.ini` like this:
 
-.. note:: MariaDB is backwards compatible with MySQL.  All instructions work for both. You will not need to replace mysql with anything.
+.. code-block:: ini
 
-The PHP configuration in :file:`/etc/php7/conf.d/mysql.ini` could look like this:
-
-::
-
-  # configuration for PHP MySQL module
+  ; configuration for PHP MySQL module
   extension=pdo_mysql.so
 
-  [mysql]
-  mysql.allow_local_infile=On
-  mysql.allow_persistent=On
-  mysql.cache_size=2000
-  mysql.max_persistent=-1
-  mysql.max_links=-1
-  mysql.default_port=
-  mysql.default_socket=/var/lib/mysql/mysql.sock  # Debian squeeze: /var/run/mysqld/mysqld.sock
-  mysql.default_host=
-  mysql.default_user=
-  mysql.default_password=
-  mysql.connect_timeout=60
-  mysql.trace_mode=Off
+  pdo_mysql.default_socket=/run/mysqld/mysqld.sock
+
+.. note:: MariaDB is backwards compatible with MySQL.  All instructions work for both. You will not need to replace mysql with anything.
 
 Now you need to create a database user and the database itself by using the
 MySQL command line interface. The database tables will be created by Nextcloud
@@ -139,7 +126,7 @@ When using MariaDB use::
 
 Then a **mysql>** or **MariaDB [root]>** prompt will appear. Now enter the following lines and confirm them with the enter key:
 
-::
+.. code-block:: sql
 
   CREATE USER 'username'@'localhost' IDENTIFIED BY 'password';
   CREATE DATABASE IF NOT EXISTS nextcloud CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;
@@ -155,7 +142,7 @@ name of the database. The :file:`config/config.php` as created by the
 :doc:`../installation/installation_wizard` would therefore contain entries like
 this:
 
-::
+.. code-block:: php
 
   <?php
 
@@ -177,7 +164,7 @@ Enabling SSL is only necessary if your database does not reside on the same serv
 If you do not connect over localhost and need to allow remote connections then you should enable SSL.
 This just covers the SSL database configuration on the Nextcloud server. First you need to configure your database server accordingly.
 
-::
+.. code-block:: php
 
   'dbdriveroptions' => [
     \PDO::MYSQL_ATTR_SSL_KEY => '/../ssl-key.pem',
@@ -206,12 +193,12 @@ For further services and users, we recommend to create a separate
 database or PostgreSQL instance.
 
 If you decide to use a PostgreSQL database make sure that you have installed
-and enabled the PostgreSQL extension in PHP. The PHP configuration in :file:`/etc/php7/conf.d/pgsql.ini` could look
+and enabled the PostgreSQL extension in PHP. The PHP configuration in :file:`/etc/php/**/pgsql.ini` could look
 like this:
 
-::
+.. code-block:: ini
 
-  # configuration for PHP PostgreSQL module
+  ; configuration for PHP PostgreSQL module
   extension=pdo_pgsql.so
   extension=pgsql.so
 
@@ -230,7 +217,7 @@ To start the postgres command line mode use::
 
 Then a **template1=#** prompt will appear. Now enter the following lines and confirm them with the enter key:
 
-::
+.. code-block:: sql
 
   CREATE USER username CREATEDB;
   CREATE DATABASE nextcloud OWNER username TEMPLATE template0 ENCODING 'UTF8';
@@ -246,7 +233,7 @@ and an empty password to access it, and the name of the database. The :file:`con
 created by the :doc:`../installation/installation_wizard` would therefore contain entries like
 this:
 
-::
+.. code-block:: php
 
   <?php
 
@@ -270,7 +257,7 @@ To start the postgres command line mode use::
 
 Then a **postgres=#** prompt will appear. Now enter the following lines and confirm them with the enter key:
 
-::
+.. code-block:: sql
 
   CREATE USER username WITH PASSWORD 'password' CREATEDB;
   CREATE DATABASE nextcloud TEMPLATE template0 ENCODING 'UTF8';
@@ -288,7 +275,7 @@ the name of the database. The :file:`config/config.php` as created by the
 :doc:`../installation/installation_wizard` would therefore contain entries like
 this:
 
-::
+.. code-block:: php
 
   <?php
 
@@ -306,7 +293,7 @@ As with MySQL, enabling SSL is only necessary if your database does not reside o
 Nextcloud instance. First configure your database server accordingly, then add the ``pgsql_ssl``
 configuration to your :file:`config/config.php`.
 
-::
+.. code-block:: php
 
   'pgsql_ssl' => [
     'mode' => 'verify-full',