diff --git a/doc/README.md b/doc/README.md
index 5a8cbb42..0ca680ec 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -51,20 +51,100 @@
     * [help](Commands.md#help)
     * [uptime](Commands.md#uptime)
   * [Commands documented elsewhere](Commands.md#commands-documented-elsewhere)
+    * [Administrative commands](Commands.md#administrative-commands)
+      * [Logging in and out of PBot](Commands.md#logging-in-and-out-of-pbot)
+        * [login](Commands.mdAdmin.md#login)
+        * [logout](Commands.mdAdmin.md#logout)
+      * [Admin management commands](Commands.md#admin-management-commands)
+        * [adminadd](Commands.mdAdmin.md#adminadd)
+        * [adminrem](Commands.mdAdmin.md#adminrem)
+        * [adminset](Commands.mdAdmin.md#adminset)
+        * [adminunset](Commands.mdAdmin.md#adminunset)
+        * [list admins](Commands.mdAdmin.md#listing-admins)
+      * [Channel management commands](Commands.md#channel-management-commands)
+        * [join](Commands.mdAdmin.md#join)
+        * [part](Commands.mdAdmin.md#part)
+        * [chanadd](Commands.mdAdmin.md#chanadd)
+        * [chanrem](Commands.mdAdmin.md#chanrem)
+        * [chanset](Commands.mdAdmin.md#chanset)
+        * [chanunset](Commands.mdAdmin.md#chanunset)
+        * [chanlist](Commands.mdAdmin.md#chanlist)
+        * [ignore](Commands.mdAdmin.md#ignore)
+        * [unignore](Commands.mdAdmin.md#unignore)
+        * [whitelist](Commands.mdAdmin.md#whitelist)
+        * [blacklist](Commands.mdAdmin.md#blacklist)
+        * [op](Commands.mdAdmin.md#op)
+        * [deop](Commands.mdAdmin.md#deop)
+        * [voice](Commands.mdAdmin.md#voice)
+        * [devoice](Commands.mdAdmin.md#devoice)
+        * [mode](Commands.mdAdmin.md#mode)
+        * [ban/mute](Commands.mdAdmin.md#banmute)
+        * [unban/unmute](Commands.mdAdmin.md#unbanunmute)
+        * [invite](Commands.mdAdmin.md#invite)
+        * [kick](Commands.mdAdmin.md#kick)
+      * [Module management commands](Commands.md#module-management-commands)
+        * [load](Commands.mdAdmin.md#load)
+        * [unload](Commands.mdAdmin.md#unload)
+        * [list modules](Commands.mdAdmin.md#listing-modules)
+      * [Plugin management commands](Commands.md#plugin-management-commands)
+        * [plug](Commands.mdAdmin.md#plug)
+        * [unplug](Commands.mdAdmin.md#unplug)
+        * [replug](Commands.mdAdmin.md#replug)
+        * [pluglist](Commands.mdAdmin.md#pluglist)
+      * [Command metadata](Commands.md#command-metadata)
+        * [cmdset](Commands.mdAdmin.md#cmdset)
+        * [cmdunset](Commands.mdAdmin.md#cmdunset)
+      * [Registry commands](Commands.md#registry-commands)
+        * [regset](Commands.mdRegistry.md#regset)
+        * [regunset](Commands.mdRegistry.md#regunset)
+        * [regchange](Commands.mdRegistry.md#regchange)
+        * [regshow](Commands.mdRegistry.md#regshow)
+        * [regfind](Commands.mdRegistry.md#regfind)
+        * [regsetmeta](Commands.mdRegistry.md#regsetmeta)
+        * [regunsetmeta](Commands.mdRegistry.md#regunsetmeta)
+      * [Miscellaneous admin commands](Commands.md#miscellaneous-admin-commands)
+        * [export](Commands.mdAdmin.md#export)
+        * [refresh](Commands.mdAdmin.md#refresh])
+        * [reload](Commands.mdAdmin.md#reload])
+        * [sl](Commands.mdAdmin.md#sl)
+        * [die](Commands.mdAdmin.md#die)
+    * [Factoid commands](Commands.md#factoid-commands)
+      * [Adding/removing factoids](Commands.md#addingremoving-factoids)
+        * [factadd](Commands.mdFactoids.md#factadd)
+        * [factrem](Commands.mdFactoids.md#factrem)
+        * [factalias](Commands.mdFactoids.md#factalias)
+      * [Displaying factoids](Commands.md#displaying-factoids)
+        * [fact](Commands.mdFactoids.md#fact)
+        * [factshow](Commands.mdFactoids.md#factshow)
+      * [Editing factoids](Commands.md#editing-factoids)
+        * [factchange](Commands.mdFactoids.md#factchange)
+        * [factmove](Commands.mdFactoids.md#factmove)
+        * [factundo](Commands.mdFactoids.md#factundo)
+        * [factredo](Commands.mdFactoids.md#factredo)
+      * [Factoid metadata](Commands.md#factoid-metadata)
+        * [factset](Commands.mdFactoids.md#factset)
+        * [factunset](Commands.mdFactoids.md#factunset)
+      * [Information about factoids](Commands.md#information-about-factoids)
+        * [factfind](Commands.mdFactoids.md#factfind)
+        * [factinfo](Commands.mdFactoids.md#factinfo)
+        * [factlog](Commands.mdFactoids.md#factlog)
+        * [count](Commands.mdFactoids.md#count)
+        * [histogram](Commands.mdFactoids.md#histogram)
+        * [top20](Commands.mdFactoids.md#top20)
 <!-- md-toc-end -->
 <!-- md-toc-begin -->
 * [Administrative](Admin.md#administrative)
   * [Logging in and out](Admin.md#logging-in-and-out)
     * [login](Admin.md#login)
     * [logout](Admin.md#logout)
-  * [Admin management commands](Admin.md#admin-management-commands)
-    * [adminadd](Admin.md#adminadd)
-    * [adminrem](Admin.md#adminrem)
+  * [User management commands](Admin.md#user-management-commands)
+    * [useradd](Admin.md#useradd)
+    * [userdel](Admin.md#userdel)
       * [Admin levels](Admin.md#admin-levels)
-    * [adminset](Admin.md#adminset)
-    * [adminunset](Admin.md#adminunset)
-      * [Admin metadata list](Admin.md#admin-metadata-list)
-    * [Listing admins](Admin.md#listing-admins)
+    * [userset](Admin.md#userset)
+    * [userunset](Admin.md#userunset)
+      * [User metadata list](Admin.md#user-metadata-list)
+    * [Listing users](Admin.md#listing-users)
   * [Channel management commands](Admin.md#channel-management-commands)
     * [join](Admin.md#join)
     * [part](Admin.md#part)