diff --git a/docsrc/imap/download/upgrade.rst b/docsrc/imap/download/upgrade.rst
index 353a0114b80..6f741bd31c1 100644
--- a/docsrc/imap/download/upgrade.rst
+++ b/docsrc/imap/download/upgrade.rst
@@ -162,29 +162,7 @@ Upgrade in place
 ~~~~~~~~~~~~~~~~
 
 If you are upgrading in place, you will need to shut down Cyrus
-entirely while you install the new package.  If your old installation
-was using Berkeley DB format databases, you will need to convert or
-upgrade the databases **before** you upgrade.  Cyrus v3.8 does not
-support Berkeley DB at all.
-
-.. note::
-
-    If you are upgrading from Cyrus version 2.5 or earlier,
-    and your system is configured with the following combination
-    in :cyrusman:`imapd.conf(5)`::
-
-        fulldirhash: yes
-        hashimapspool: either yes or no
-        unixhierarchysep: yes
-
-    then you will not be able to upgrade-in-place.  This is due to
-    a change in how directory hashes are calculated for users whose
-    localpart contains a dot, which was introduced in 3.0.0.  After
-    an in-place upgrade, Cyrus will not be able to find these users'
-    metadata and/or mailboxes.
-
-    If you have this configuration, you will need to upgrade by
-    replicating, not in place.
+entirely while you install the new package.
 
 Do What As Who?
 ###############
@@ -322,51 +300,10 @@ you have provided overrides for in your config files::
 
     cyr_info conf-all -C <path to imapd.conf> -M <path to cyrus.conf>
 
-**Important config** options: ``unixhierarchysep:`` and ``altnamespace:``
-defaults in :cyrusman:`imapd.conf(5)` changed in 3.0, which will affect you
-if you are upgrading to 3.8 from something earlier than 3.0. Implications
-are outlined in the Note in :ref:`imap-admin-namespaces-mode` and
-:ref:`imap-switching-alt-namespace-mode`.  Please also see "Sieve Scripts,"
-below.
-
-* unixhierarchysep: on
-* altnamespace: on
-
-In :cyrusman:`cyrus.conf(5)` move idled from the START section to the
-DAEMON section.
-
 6. Upgrade specific items
 -------------------------
 
-* Special-Use flags
-
-   If your 2.4 :cyrusman:`imapd.conf(5)` made use of the ``xlist-XX``
-   directive(s), you can convert these to per-user special-use annotations
-   in your new install with the :cyrusman:`cvt_xlist_specialuse(8)` tool
-
-.. warning::
-
-    **Berkeley db format no longer supported since 3.0**
-
-    If you have any databases using Berkeley db, they'll need to be
-    converted to skiplist or flat *in your existing installation*. And
-    then optionally converted to whatever final format you'd like in
-    your 3.8 installation.
-
-    Databases potentially affected: mailboxes, annotations, conversations,
-    quotas.
-
-    On old install, prior to migration::
-
-       cvt_cyrusdb /<configdirectory>mailboxes.db berkeley /tmp/new-mailboxes.db skiplist
-
-    If you don't want to use flat or skiplist for 3.5, you can use
-    :cyrusman:`cvt_cyrusdb(8)` to swap to new format::
-
-       cvt_cyrusdb /tmp/new-mailboxes.db skiplist /<configdirectory>/mailboxes.db <new file format>
-
-.. note::
-    The :cyrusman:`cvt_cyrusdb(8)` command does not accept relative paths.
+* None
 
 7. Start new 3.8 Cyrus and verify
 ---------------------------------
@@ -406,7 +343,7 @@ possibly days.
     reconstruct -V max
 
 New configuration: if turning on conversations, you need to create
-conversations.db for each user.  (This is required for JMAP).::
+conversations.db for each user.  This is required for JMAP.::
 
      ctl_conversationsdb -b -r
 
@@ -419,23 +356,6 @@ the user.dav databases need to be reconstructed due to format changes.::
 
     dav_reconstruct -a
 
-If you are upgrading from 3.0, and have the `reverseacls` feature enabled
-in :cyrusman:`imapd.conf(5)`, you may need to regenerate the data it uses
-(which is stored in `mailboxes.db`).  This is automatically regenerated at
-startup by `ctl_cyrusdb -r` if the `reverseacls` setting has changed. So,
-to force a regeneration:
-
-    1. Shut down Cyrus
-    2. Change `reverseacls` to `0` in :cyrusman:`imapd.conf(5)`
-    3. Run :cyrusman:`ctl_cyrusdb(8)` with the `-r` switch (or just start
-       Cyrus, assuming your :cyrusman:`cyrus.conf(5)` contains a
-       `ctl_cyrusdb -r` entry in the START section).  The old RACL entries
-       will be removed
-    4. (If you started Cyrus, shut it down again)
-    5. Change `reverseacls` back to `1`
-    6. Start up Cyrus (or run `ctl_cyrusdb -r`).  The RACL entries will
-       be rebuilt
-
 There were fixes and improvements to caching and search indexing in 3.6.  If
 you are upgrading to 3.8 from something earlier than 3.6, you should consider
 running :cyrusman:`reconstruct(8)` across all mailboxes to rebuild caches, and