--- a/doc/upgrading.txt	Fri May 15 21:11:42 2020 -0400
+++ b/doc/upgrading.txt	Fri May 15 21:22:41 2020 -0400
@@ -1028,6 +1028,8 @@
 current working directory called 'httpd.log' and will rotate
 the log file at 500K and keep two old copies of the file.
 
+.. index:: Upgrading; 1.5.0 to 1.5.1
+
 Migrating from 1.5.0 to 1.5.1
 =============================
 
@@ -1077,6 +1079,8 @@
 The new calls escape the passed string by default and avoid XSS security
 issues.
 
+.. index:: Upgrading; 1.4.20 to 1.4.21
+
 Migrating from 1.4.20 to 1.4.21
 ===============================
 
@@ -1102,6 +1106,9 @@
   data to roundup for other handlers (e.g. REST, SOAP ...)
   in the future.
 
+
+.. index:: upgrading; 1.4.19 to 1.4.20
+
 Migrating from 1.4.19 to 1.4.20
 ===============================
 
@@ -1128,6 +1135,8 @@
 highlighting.
 
 
+.. index:: upgrading; 1.4.17 to 1.4.18
+
 Migrating from 1.4.17 to 1.4.18
 ===============================
 
@@ -1169,6 +1178,8 @@
 
 roundup-admin -i /path/to/your/tracker set issue42 files=5,17,23
 
+.. index:: upgrading; 1.4.x to 1.4.17
+
 Migrating from 1.4.x to 1.4.17
 ==============================
 
@@ -1228,6 +1239,8 @@
             print("        roles may search:", ', '.join(roles))
 
 
+.. index:: upgrading; 1.4.x to 1.4.12
+
 Migrating from 1.4.x to 1.4.12
 ==============================
 
@@ -1276,6 +1289,8 @@
 the differences in to your versions or ignore the changes.
 
 
+.. index:: upgrading; 1.4.x to 1.4.11
+
 Migrating from 1.4.x to 1.4.11
 ==============================
 
@@ -1337,6 +1352,8 @@
 ``share/roundup/templates/classic/html`` to your tracker's ``html`` directory.
 
 
+.. index:: upgrading; 1.4.x to 1.4.9
+
 Migrating from 1.4.x to 1.4.9
 =============================
 
@@ -1394,6 +1411,8 @@
 Make sure the change is done as listed below in this document.
 
 
+.. index:: upgrading; 1.4.x to 1.4.7
+
 Migrating from 1.4.x to 1.4.7
 =============================
 
@@ -1474,6 +1493,8 @@
 
 
 
+.. index:: upgrading; 1.4.2 to 1.4.3
+
 Migrating from 1.4.2 to 1.4.3
 =============================
 
@@ -1486,6 +1507,8 @@
 "_user (__retired, _name)" should become "_user (__retired, _name(255))".
 
 
+.. index:: upgrading; 1.4.x to 1.4.2
+
 Migrating from 1.4.x to 1.4.2
 =============================
 
@@ -1504,6 +1527,8 @@
 habit.
 
 
+.. index:: upgrading; 1.3.3 to 1.4.0
+
 Migrating from 1.3.3 to 1.4.0
 =============================
 
@@ -1531,6 +1556,8 @@
  CREATE INDEX words_by_id ON __words (_textid);
  CREATE UNIQUE INDEX __textids_by_props ON __textids (_class, _itemid, _prop);
 
+.. index:: upgrading; 1.2.x to 1.3.0
+
 Migrating from 1.2.x to 1.3.0
 =============================
 
@@ -1542,6 +1569,8 @@
 them to the HTML files in your tracker and apply any changes.
 
 
+.. index:: upgrading; 1.1.2 to 1.2.0
+
 Migrating from 1.1.2 to 1.2.0
 =============================
 
@@ -1573,6 +1602,8 @@
    changes. See the example in the classic template which makes use of
    ``batch.propchanged``.
 
+.. index:: upgrading; 1.1.0 to 1.1.1
+
 Migrating from 1.1.0 to 1.1.1
 =============================
 
@@ -1603,6 +1634,8 @@
 should change it to the above and it will work much better!
 
 
+.. index:: upgrading; 1.0.x to 1.1.0
+
 Migrating from 1.0.x to 1.1.0
 =============================
 
@@ -1654,6 +1687,8 @@
  </p>
 
 
+.. index:: upgrading; 0.8.x to 1.0
+
 Migrating from 0.8.x to 1.0
 ===========================
 
@@ -1694,6 +1729,8 @@
  for cl in 'issue', 'file', 'msg', 'keyword':
 
 
+.. index:: upgrading; 0.8.0 to 0.8.3
+
 Migrating from 0.8.0 to 0.8.3
 =============================
 
@@ -1709,6 +1746,8 @@
 version, you will need to roll your changes into the new file.
 
 
+.. index:: upgrading; 0.7.1 to 0.8.0
+
 Migrating from 0.7.1 to 0.8.0
 =============================
 
@@ -1865,6 +1904,8 @@
 logging implemented in 0.8.0.
 
 
+.. index:: upgrading; 0.7.2 to 0.7.3
+
 Migrating from 0.7.2 to 0.7.3
 =============================
 
@@ -1878,6 +1919,8 @@
 static files.
 
 
+.. index:: upgrading; 0.7.0 to 0.7.2
+
 Migrating from 0.7.0 to 0.7.2
 =============================
 
@@ -1891,6 +1934,7 @@
     # choose their own in their settings.
     DEFAULT_TIMEZONE = 0            # specify as numeric hour offest
 
+.. index:: upgrading; 0.7.0 to 0.7.1
 
 Migrating from 0.7.0 to 0.7.1
 =============================
@@ -1920,6 +1964,8 @@
 assign to the anonymous user.
 
 
+.. index:: upgrading; versions earlier than 0.7
+
 Migrating from 0.6 to 0.7
 =========================