diff --git a/doc/integration/imap_and_smtp.rst b/doc/integration/imap_and_smtp.rst
index 0a6e89a24..521371b0c 100644
--- a/doc/integration/imap_and_smtp.rst
+++ b/doc/integration/imap_and_smtp.rst
@@ -113,7 +113,7 @@ content inside::
     # Path for SQL configuration file, see example-config/dovecot-sql.conf.ext
     args = /etc/dovecot/dovecot-sql.conf.ext
   }
-    
+
   userdb sql {
     driver = sql
     args = /etc/dovecot/dovecot-sql.conf.ext
@@ -151,7 +151,7 @@ PostgreSQL users
 
 ::
 
-  driver = postgresql
+  driver = pgsql
 
   connect = host=<postgres socket> dbname=<database> user=<user> password=<password>
 
@@ -215,7 +215,7 @@ proper permissions::
     unix_listener dict {
       mode = 0600
       user = <user owning mailboxes>
-      #group = 
+      #group =
     }
   }
 
@@ -394,12 +394,12 @@ Finally, configure the ``sieve`` plugin by editing the
 :file:`conf.d/90-sieve.conf` file. Put the follwing caontent inside::
 
   plugin {
-    # Location of the active script. When ManageSieve is used this is actually 
+    # Location of the active script. When ManageSieve is used this is actually
     # a symlink pointing to the active script in the sieve storage directory.
     sieve = ~/.dovecot.sieve
 
     #
-    # The path to the directory where the personal Sieve scripts are stored. For 
+    # The path to the directory where the personal Sieve scripts are stored. For
     # ManageSieve this is where the uploaded scripts are stored.
     sieve_dir = ~/sieve
   }
@@ -442,12 +442,12 @@ Use the following configuration in the :file:`/etc/postfix/main.cf` file
   virtual_transport = dovecot
   dovecot_destination_recipient_limit = 1
 
-  virtual_minimum_uid = <vmail user id> 
+  virtual_minimum_uid = <vmail user id>
   virtual_gid_maps = static:<vmail group id>
   virtual_uid_maps = static:<vmail user id>
   virtual_mailbox_base = /var/vmail
 
-  relay_domains = 
+  relay_domains =
   virtual_mailbox_domains = <driver>:/etc/postfix/sql-domains.cf
   virtual_alias_domains = <driver>:/etc/postfix/sql-domain-aliases.cf
   virtual_mailbox_maps = <driver>:/etc/postfix/sql-mailboxes.cf