From 524465eaa5af72e07c1bd8560aff1bdfc410ea47 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Fri, 15 Aug 2025 18:37:58 +0200
Subject: [PATCH] Apply md changes after sphinx version update

---
 .../Beginner-Tutorial-Overview.md             | 16 +++++------
 docs/source/api/evennia.accounts.accounts.md  |  2 +-
 docs/source/api/evennia.accounts.bots.md      |  2 +-
 docs/source/api/evennia.accounts.manager.md   |  2 +-
 docs/source/api/evennia.accounts.md           |  5 ++--
 docs/source/api/evennia.accounts.models.md    |  2 +-
 .../source/api/evennia.commands.cmdhandler.md |  2 +-
 docs/source/api/evennia.commands.cmdparser.md |  2 +-
 docs/source/api/evennia.commands.cmdset.md    |  2 +-
 .../api/evennia.commands.cmdsethandler.md     |  2 +-
 docs/source/api/evennia.commands.command.md   |  2 +-
 .../api/evennia.commands.default.account.md   |  2 +-
 .../api/evennia.commands.default.admin.md     |  2 +-
 .../evennia.commands.default.batchprocess.md  |  2 +-
 .../api/evennia.commands.default.building.md  |  2 +-
 ...evennia.commands.default.cmdset_account.md |  2 +-
 ...ennia.commands.default.cmdset_character.md |  2 +-
 ...evennia.commands.default.cmdset_session.md |  2 +-
 ...nnia.commands.default.cmdset_unloggedin.md |  2 +-
 .../api/evennia.commands.default.comms.md     |  2 +-
 .../api/evennia.commands.default.general.md   |  2 +-
 .../api/evennia.commands.default.help.md      |  2 +-
 docs/source/api/evennia.commands.default.md   |  5 ++--
 .../evennia.commands.default.muxcommand.md    |  2 +-
 .../evennia.commands.default.syscommands.md   |  2 +-
 .../api/evennia.commands.default.system.md    |  2 +-
 .../api/evennia.commands.default.tests.md     |  2 +-
 .../evennia.commands.default.unloggedin.md    |  2 +-
 docs/source/api/evennia.commands.md           | 17 +++++-------
 docs/source/api/evennia.comms.comms.md        |  2 +-
 docs/source/api/evennia.comms.managers.md     |  2 +-
 docs/source/api/evennia.comms.md              |  5 ++--
 docs/source/api/evennia.comms.models.md       |  2 +-
 ...trib.base_systems.awsstorage.aws_s3_cdn.md |  2 +-
 ...evennia.contrib.base_systems.awsstorage.md |  5 ++--
 ...a.contrib.base_systems.awsstorage.tests.md |  2 +-
 ...ase_systems.building_menu.building_menu.md |  2 +-
 ...nnia.contrib.base_systems.building_menu.md |  5 ++--
 ...ontrib.base_systems.building_menu.tests.md |  2 +-
 ...ase_systems.color_markups.color_markups.md |  2 +-
 ...nnia.contrib.base_systems.color_markups.md |  5 ++--
 ...ontrib.base_systems.color_markups.tests.md |  2 +-
 ...ntrib.base_systems.components.component.md |  2 +-
 ...contrib.base_systems.components.dbfield.md |  2 +-
 ...trib.base_systems.components.exceptions.md |  2 +-
 ....contrib.base_systems.components.holder.md |  2 +-
 ...contrib.base_systems.components.listing.md |  2 +-
 ...evennia.contrib.base_systems.components.md |  5 ++--
 ...contrib.base_systems.components.signals.md |  2 +-
 ...a.contrib.base_systems.components.tests.md |  2 +-
 ...systems.custom_gametime.custom_gametime.md |  2 +-
 ...ia.contrib.base_systems.custom_gametime.md |  5 ++--
 ...trib.base_systems.custom_gametime.tests.md |  2 +-
 ..._systems.email_login.connection_screens.md |  2 +-
 ...ib.base_systems.email_login.email_login.md |  2 +-
 ...vennia.contrib.base_systems.email_login.md |  5 ++--
 ....contrib.base_systems.email_login.tests.md |  2 +-
 ...nia.contrib.base_systems.godotwebsocket.md |  5 ++--
 ...systems.godotwebsocket.test_text2bbcode.md |  2 +-
 ...e_systems.godotwebsocket.test_webclient.md |  2 +-
 ...base_systems.godotwebsocket.text2bbcode.md |  2 +-
 ...b.base_systems.godotwebsocket.webclient.md |  2 +-
 ...e_systems.ingame_python.callbackhandler.md |  2 +-
 ...rib.base_systems.ingame_python.commands.md |  2 +-
 ...b.base_systems.ingame_python.eventfuncs.md |  2 +-
 ...nnia.contrib.base_systems.ingame_python.md |  5 ++--
 ...trib.base_systems.ingame_python.scripts.md |  2 +-
 ...ontrib.base_systems.ingame_python.tests.md |  2 +-
 ....base_systems.ingame_python.typeclasses.md |  2 +-
 ...ontrib.base_systems.ingame_python.utils.md |  2 +-
 ...nia.contrib.base_systems.ingame_reports.md |  5 ++--
 ...ontrib.base_systems.ingame_reports.menu.md |  2 +-
 ...rib.base_systems.ingame_reports.reports.md |  2 +-
 ...ntrib.base_systems.ingame_reports.tests.md |  2 +-
 .../api/evennia.contrib.base_systems.md       |  4 +--
 ...e_systems.menu_login.connection_screens.md |  2 +-
 ...evennia.contrib.base_systems.menu_login.md |  5 ++--
 ...trib.base_systems.menu_login.menu_login.md |  2 +-
 ...a.contrib.base_systems.menu_login.tests.md |  2 +-
 ...nia.contrib.base_systems.mux_comms_cmds.md |  5 ++--
 ...e_systems.mux_comms_cmds.mux_comms_cmds.md |  2 +-
 ...ntrib.base_systems.mux_comms_cmds.tests.md |  2 +-
 ...vennia.contrib.base_systems.unixcommand.md |  5 ++--
 ....contrib.base_systems.unixcommand.tests.md |  2 +-
 ...ib.base_systems.unixcommand.unixcommand.md |  2 +-
 ...ntrib.full_systems.evscaperoom.commands.md |  2 +-
 ...vennia.contrib.full_systems.evscaperoom.md |  5 ++--
 ...a.contrib.full_systems.evscaperoom.menu.md |  2 +-
 ...ontrib.full_systems.evscaperoom.objects.md |  2 +-
 ...a.contrib.full_systems.evscaperoom.room.md |  2 +-
 ...ontrib.full_systems.evscaperoom.scripts.md |  2 +-
 ....contrib.full_systems.evscaperoom.state.md |  2 +-
 ....contrib.full_systems.evscaperoom.tests.md |  2 +-
 ....contrib.full_systems.evscaperoom.utils.md |  2 +-
 .../api/evennia.contrib.full_systems.md       |  4 +--
 ....game_systems.achievements.achievements.md |  2 +-
 ...ennia.contrib.game_systems.achievements.md |  5 ++--
 ...contrib.game_systems.achievements.tests.md |  2 +-
 ...nnia.contrib.game_systems.barter.barter.md |  2 +-
 .../evennia.contrib.game_systems.barter.md    |  5 ++--
 ...ennia.contrib.game_systems.barter.tests.md |  2 +-
 ....contrib.game_systems.clothing.clothing.md |  2 +-
 .../evennia.contrib.game_systems.clothing.md  |  5 ++--
 ...nia.contrib.game_systems.clothing.tests.md |  2 +-
 ...trib.game_systems.containers.containers.md |  2 +-
 ...evennia.contrib.game_systems.containers.md |  5 ++--
 ...a.contrib.game_systems.containers.tests.md |  2 +-
 ...ontrib.game_systems.cooldowns.cooldowns.md |  2 +-
 .../evennia.contrib.game_systems.cooldowns.md |  5 ++--
 ...ia.contrib.game_systems.cooldowns.tests.md |  2 +-
 ....contrib.game_systems.crafting.crafting.md |  2 +-
 ...b.game_systems.crafting.example_recipes.md |  2 +-
 .../evennia.contrib.game_systems.crafting.md  |  5 ++--
 ...nia.contrib.game_systems.crafting.tests.md |  2 +-
 ...ontrib.game_systems.gendersub.gendersub.md |  2 +-
 .../evennia.contrib.game_systems.gendersub.md |  5 ++--
 ...ia.contrib.game_systems.gendersub.tests.md |  2 +-
 .../evennia.contrib.game_systems.mail.mail.md |  2 +-
 .../api/evennia.contrib.game_systems.mail.md  |  5 ++--
 ...evennia.contrib.game_systems.mail.tests.md |  2 +-
 .../api/evennia.contrib.game_systems.md       |  4 +--
 ...vennia.contrib.game_systems.multidescer.md |  5 ++--
 ...ib.game_systems.multidescer.multidescer.md |  2 +-
 ....contrib.game_systems.multidescer.tests.md |  2 +-
 .../evennia.contrib.game_systems.puzzles.md   |  5 ++--
 ...ia.contrib.game_systems.puzzles.puzzles.md |  2 +-
 ...nnia.contrib.game_systems.puzzles.tests.md |  2 +-
 .../evennia.contrib.game_systems.storage.md   |  5 ++--
 ...ia.contrib.game_systems.storage.storage.md |  2 +-
 ...nnia.contrib.game_systems.storage.tests.md |  2 +-
 ...evennia.contrib.game_systems.turnbattle.md |  5 ++--
 ...ontrib.game_systems.turnbattle.tb_basic.md |  2 +-
 ...ontrib.game_systems.turnbattle.tb_equip.md |  2 +-
 ...ontrib.game_systems.turnbattle.tb_items.md |  2 +-
 ...ontrib.game_systems.turnbattle.tb_magic.md |  2 +-
 ...ontrib.game_systems.turnbattle.tb_range.md |  2 +-
 ...a.contrib.game_systems.turnbattle.tests.md |  2 +-
 ...ontrib.grid.extended_room.extended_room.md |  2 +-
 .../api/evennia.contrib.grid.extended_room.md |  5 ++--
 ...vennia.contrib.grid.extended_room.tests.md |  2 +-
 ...d.ingame_map_display.ingame_map_display.md |  2 +-
 ...evennia.contrib.grid.ingame_map_display.md |  5 ++--
 ...a.contrib.grid.ingame_map_display.tests.md |  2 +-
 ...nnia.contrib.grid.mapbuilder.mapbuilder.md |  2 +-
 .../api/evennia.contrib.grid.mapbuilder.md    |  5 ++--
 .../evennia.contrib.grid.mapbuilder.tests.md  |  2 +-
 docs/source/api/evennia.contrib.grid.md       |  4 +--
 .../api/evennia.contrib.grid.simpledoor.md    |  5 ++--
 ...nnia.contrib.grid.simpledoor.simpledoor.md |  2 +-
 .../evennia.contrib.grid.simpledoor.tests.md  |  2 +-
 .../api/evennia.contrib.grid.slow_exit.md     |  5 ++--
 ...vennia.contrib.grid.slow_exit.slow_exit.md |  2 +-
 .../evennia.contrib.grid.slow_exit.tests.md   |  2 +-
 .../api/evennia.contrib.grid.wilderness.md    |  5 ++--
 .../evennia.contrib.grid.wilderness.tests.md  |  2 +-
 ...nnia.contrib.grid.wilderness.wilderness.md |  2 +-
 .../evennia.contrib.grid.xyzgrid.commands.md  |  2 +-
 .../evennia.contrib.grid.xyzgrid.example.md   |  2 +-
 .../evennia.contrib.grid.xyzgrid.launchcmd.md |  2 +-
 .../api/evennia.contrib.grid.xyzgrid.md       |  5 ++--
 ...evennia.contrib.grid.xyzgrid.prototypes.md |  2 +-
 .../api/evennia.contrib.grid.xyzgrid.tests.md |  2 +-
 .../api/evennia.contrib.grid.xyzgrid.utils.md |  2 +-
 .../api/evennia.contrib.grid.xyzgrid.xymap.md |  2 +-
 ...ennia.contrib.grid.xyzgrid.xymap_legend.md |  2 +-
 .../evennia.contrib.grid.xyzgrid.xyzgrid.md   |  2 +-
 .../evennia.contrib.grid.xyzgrid.xyzroom.md   |  2 +-
 docs/source/api/evennia.contrib.md            |  4 +--
 .../api/evennia.contrib.rpg.buffs.buff.md     |  2 +-
 docs/source/api/evennia.contrib.rpg.buffs.md  |  5 ++--
 .../evennia.contrib.rpg.buffs.samplebuffs.md  |  2 +-
 .../api/evennia.contrib.rpg.buffs.tests.md    |  2 +-
 ...rpg.character_creator.character_creator.md |  2 +-
 ...trib.rpg.character_creator.example_menu.md |  2 +-
 .../evennia.contrib.rpg.character_creator.md  |  5 ++--
 ...nia.contrib.rpg.character_creator.tests.md |  2 +-
 .../api/evennia.contrib.rpg.dice.dice.md      |  2 +-
 docs/source/api/evennia.contrib.rpg.dice.md   |  5 ++--
 .../api/evennia.contrib.rpg.dice.tests.md     |  2 +-
 ...ennia.contrib.rpg.health_bar.health_bar.md |  2 +-
 .../api/evennia.contrib.rpg.health_bar.md     |  5 ++--
 .../evennia.contrib.rpg.health_bar.tests.md   |  2 +-
 .../api/evennia.contrib.rpg.llm.llm_client.md |  2 +-
 .../api/evennia.contrib.rpg.llm.llm_npc.md    |  2 +-
 docs/source/api/evennia.contrib.rpg.llm.md    |  5 ++--
 .../api/evennia.contrib.rpg.llm.tests.md      |  2 +-
 docs/source/api/evennia.contrib.rpg.md        |  4 +--
 .../api/evennia.contrib.rpg.rpsystem.md       |  5 ++--
 ...evennia.contrib.rpg.rpsystem.rplanguage.md |  2 +-
 .../evennia.contrib.rpg.rpsystem.rpsystem.md  |  2 +-
 .../api/evennia.contrib.rpg.rpsystem.tests.md |  2 +-
 docs/source/api/evennia.contrib.rpg.traits.md |  5 ++--
 .../api/evennia.contrib.rpg.traits.tests.md   |  2 +-
 .../api/evennia.contrib.rpg.traits.traits.md  |  2 +-
 ...rials.batchprocessor.example_batch_code.md |  2 +-
 ...vennia.contrib.tutorials.batchprocessor.md |  5 ++--
 ...b.tutorials.bodyfunctions.bodyfunctions.md |  2 +-
 ...evennia.contrib.tutorials.bodyfunctions.md |  5 ++--
 ...a.contrib.tutorials.bodyfunctions.tests.md |  2 +-
 ...vennia.contrib.tutorials.evadventure.ai.md |  2 +-
 ...trib.tutorials.evadventure.batchscripts.md |  5 ++--
 ...ture.batchscripts.turnbased_combat_demo.md |  2 +-
 ...ib.tutorials.evadventure.build_techdemo.md |  2 +-
 ...ntrib.tutorials.evadventure.build_world.md |  2 +-
 ...ontrib.tutorials.evadventure.characters.md |  2 +-
 ...a.contrib.tutorials.evadventure.chargen.md |  2 +-
 ...ntrib.tutorials.evadventure.combat_base.md |  2 +-
 ....tutorials.evadventure.combat_turnbased.md |  2 +-
 ...rib.tutorials.evadventure.combat_twitch.md |  2 +-
 ....contrib.tutorials.evadventure.commands.md |  2 +-
 ...a.contrib.tutorials.evadventure.dungeon.md |  2 +-
 ...nia.contrib.tutorials.evadventure.enums.md |  2 +-
 ...contrib.tutorials.evadventure.equipment.md |  2 +-
 .../evennia.contrib.tutorials.evadventure.md  | 19 ++++++-------
 ...nnia.contrib.tutorials.evadventure.npcs.md |  2 +-
 ...a.contrib.tutorials.evadventure.objects.md |  2 +-
 ...ia.contrib.tutorials.evadventure.quests.md |  2 +-
 ...rib.tutorials.evadventure.random_tables.md |  2 +-
 ...nia.contrib.tutorials.evadventure.rooms.md |  2 +-
 ...nia.contrib.tutorials.evadventure.rules.md |  2 +-
 ...nia.contrib.tutorials.evadventure.shops.md |  2 +-
 ...nia.contrib.tutorials.evadventure.tests.md |  5 ++--
 ...trib.tutorials.evadventure.tests.mixins.md |  2 +-
 ...rib.tutorials.evadventure.tests.test_ai.md |  2 +-
 ...rials.evadventure.tests.test_characters.md |  2 +-
 ...utorials.evadventure.tests.test_chargen.md |  2 +-
 ...tutorials.evadventure.tests.test_combat.md |  2 +-
 ...torials.evadventure.tests.test_commands.md |  2 +-
 ...utorials.evadventure.tests.test_dungeon.md |  2 +-
 ...orials.evadventure.tests.test_equipment.md |  2 +-
 ...b.tutorials.evadventure.tests.test_npcs.md |  2 +-
 ...tutorials.evadventure.tests.test_quests.md |  2 +-
 ....tutorials.evadventure.tests.test_rooms.md |  2 +-
 ....tutorials.evadventure.tests.test_rules.md |  2 +-
 ....tutorials.evadventure.tests.test_utils.md |  2 +-
 ...nia.contrib.tutorials.evadventure.utils.md |  2 +-
 docs/source/api/evennia.contrib.tutorials.md  |  4 +--
 .../api/evennia.contrib.tutorials.mirror.md   |  5 ++--
 ...evennia.contrib.tutorials.mirror.mirror.md |  2 +-
 .../evennia.contrib.tutorials.red_button.md   |  5 ++--
 ...contrib.tutorials.red_button.red_button.md |  2 +-
 .../evennia.contrib.tutorials.talking_npc.md  |  5 ++--
 ...ntrib.tutorials.talking_npc.talking_npc.md |  2 +-
 ...nia.contrib.tutorials.talking_npc.tests.md |  2 +-
 ...rib.tutorials.tutorial_world.intro_menu.md |  2 +-
 ...vennia.contrib.tutorials.tutorial_world.md |  5 ++--
 ...ia.contrib.tutorials.tutorial_world.mob.md |  2 +-
 ...ontrib.tutorials.tutorial_world.objects.md |  2 +-
 ....contrib.tutorials.tutorial_world.rooms.md |  2 +-
 ....contrib.tutorials.tutorial_world.tests.md |  2 +-
 .../api/evennia.contrib.utils.auditing.md     |  5 ++--
 .../evennia.contrib.utils.auditing.outputs.md |  2 +-
 .../evennia.contrib.utils.auditing.server.md  |  2 +-
 .../evennia.contrib.utils.auditing.tests.md   |  2 +-
 .../api/evennia.contrib.utils.debugpy.cmd.md  |  2 +-
 .../api/evennia.contrib.utils.debugpy.md      |  5 ++--
 ...ennia.contrib.utils.fieldfill.fieldfill.md |  2 +-
 .../api/evennia.contrib.utils.fieldfill.md    |  5 ++--
 ...b.utils.git_integration.git_integration.md |  2 +-
 .../evennia.contrib.utils.git_integration.md  |  5 ++--
 ...nia.contrib.utils.git_integration.tests.md |  2 +-
 docs/source/api/evennia.contrib.utils.md      |  4 +--
 .../evennia.contrib.utils.name_generator.md   |  5 ++--
 ...ia.contrib.utils.name_generator.namegen.md |  2 +-
 ...nnia.contrib.utils.name_generator.tests.md |  2 +-
 ...a.contrib.utils.random_string_generator.md |  5 ++--
 ...tring_generator.random_string_generator.md |  2 +-
 ...rib.utils.random_string_generator.tests.md |  2 +-
 .../api/evennia.contrib.utils.tree_select.md  |  5 ++--
 ...evennia.contrib.utils.tree_select.tests.md |  2 +-
 ...a.contrib.utils.tree_select.tree_select.md |  2 +-
 docs/source/api/evennia.help.filehelp.md      |  2 +-
 docs/source/api/evennia.help.manager.md       |  2 +-
 docs/source/api/evennia.help.md               |  5 ++--
 docs/source/api/evennia.help.models.md        |  2 +-
 docs/source/api/evennia.help.utils.md         |  2 +-
 docs/source/api/evennia.locks.lockfuncs.md    |  2 +-
 docs/source/api/evennia.locks.lockhandler.md  |  2 +-
 docs/source/api/evennia.locks.md              |  5 ++--
 docs/source/api/evennia.md                    | 19 ++++++-------
 docs/source/api/evennia.objects.manager.md    |  2 +-
 docs/source/api/evennia.objects.md            |  5 ++--
 docs/source/api/evennia.objects.models.md     |  2 +-
 docs/source/api/evennia.objects.objects.md    |  2 +-
 docs/source/api/evennia.prototypes.md         |  5 ++--
 docs/source/api/evennia.prototypes.menus.md   |  2 +-
 .../api/evennia.prototypes.protfuncs.md       |  2 +-
 .../api/evennia.prototypes.prototypes.md      |  2 +-
 docs/source/api/evennia.prototypes.spawner.md |  2 +-
 docs/source/api/evennia.scripts.manager.md    |  2 +-
 docs/source/api/evennia.scripts.md            |  5 ++--
 docs/source/api/evennia.scripts.models.md     |  2 +-
 .../api/evennia.scripts.monitorhandler.md     |  2 +-
 .../api/evennia.scripts.ondemandhandler.md    |  2 +-
 .../api/evennia.scripts.scripthandler.md      |  2 +-
 docs/source/api/evennia.scripts.scripts.md    |  2 +-
 .../source/api/evennia.scripts.taskhandler.md |  2 +-
 .../api/evennia.scripts.tickerhandler.md      |  2 +-
 docs/source/api/evennia.server.amp_client.md  |  2 +-
 .../api/evennia.server.connection_wizard.md   |  2 +-
 .../source/api/evennia.server.deprecations.md |  2 +-
 .../api/evennia.server.evennia_launcher.md    |  2 +-
 ...evennia.server.game_index_client.client.md |  2 +-
 .../api/evennia.server.game_index_client.md   |  5 ++--
 ...vennia.server.game_index_client.service.md |  2 +-
 .../api/evennia.server.initial_setup.md       |  2 +-
 docs/source/api/evennia.server.inputfuncs.md  |  2 +-
 docs/source/api/evennia.server.manager.md     |  2 +-
 docs/source/api/evennia.server.md             | 21 +++++++--------
 docs/source/api/evennia.server.models.md      |  2 +-
 docs/source/api/evennia.server.portal.amp.md  |  2 +-
 .../api/evennia.server.portal.amp_server.md   |  2 +-
 .../api/evennia.server.portal.discord.md      |  2 +-
 .../api/evennia.server.portal.grapevine.md    |  2 +-
 docs/source/api/evennia.server.portal.irc.md  |  2 +-
 docs/source/api/evennia.server.portal.mccp.md |  2 +-
 docs/source/api/evennia.server.portal.md      |  5 ++--
 docs/source/api/evennia.server.portal.mssp.md |  2 +-
 docs/source/api/evennia.server.portal.mxp.md  |  2 +-
 docs/source/api/evennia.server.portal.naws.md |  2 +-
 .../api/evennia.server.portal.portal.md       |  2 +-
 ...nnia.server.portal.portalsessionhandler.md |  2 +-
 docs/source/api/evennia.server.portal.rss.md  |  2 +-
 .../api/evennia.server.portal.service.md      |  2 +-
 docs/source/api/evennia.server.portal.ssh.md  |  2 +-
 docs/source/api/evennia.server.portal.ssl.md  |  2 +-
 .../api/evennia.server.portal.suppress_ga.md  |  2 +-
 .../api/evennia.server.portal.telnet.md       |  2 +-
 .../api/evennia.server.portal.telnet_oob.md   |  2 +-
 .../api/evennia.server.portal.telnet_ssl.md   |  2 +-
 .../source/api/evennia.server.portal.tests.md |  2 +-
 .../source/api/evennia.server.portal.ttype.md |  2 +-
 .../api/evennia.server.portal.webclient.md    |  2 +-
 .../evennia.server.portal.webclient_ajax.md   |  2 +-
 .../evennia.server.profiling.dummyrunner.md   |  2 +-
 ...a.server.profiling.dummyrunner_settings.md |  2 +-
 docs/source/api/evennia.server.profiling.md   |  5 ++--
 .../api/evennia.server.profiling.memplot.md   |  2 +-
 ...evennia.server.profiling.settings_mixin.md |  2 +-
 .../evennia.server.profiling.test_queries.md  |  2 +-
 .../api/evennia.server.profiling.tests.md     |  2 +-
 .../api/evennia.server.profiling.timetrace.md |  2 +-
 docs/source/api/evennia.server.server.md      |  2 +-
 .../api/evennia.server.serversession.md       |  2 +-
 docs/source/api/evennia.server.service.md     |  2 +-
 docs/source/api/evennia.server.session.md     |  2 +-
 .../api/evennia.server.sessionhandler.md      |  2 +-
 docs/source/api/evennia.server.signals.md     |  2 +-
 docs/source/api/evennia.server.throttle.md    |  2 +-
 docs/source/api/evennia.server.validators.md  |  2 +-
 docs/source/api/evennia.server.webserver.md   |  2 +-
 docs/source/api/evennia.settings_default.md   |  2 +-
 .../api/evennia.typeclasses.attributes.md     |  2 +-
 .../api/evennia.typeclasses.managers.md       |  2 +-
 docs/source/api/evennia.typeclasses.md        |  5 ++--
 docs/source/api/evennia.typeclasses.models.md |  2 +-
 docs/source/api/evennia.typeclasses.tags.md   |  2 +-
 docs/source/api/evennia.utils.ansi.md         |  2 +-
 .../api/evennia.utils.batchprocessors.md      |  2 +-
 docs/source/api/evennia.utils.containers.md   |  2 +-
 docs/source/api/evennia.utils.create.md       |  2 +-
 docs/source/api/evennia.utils.dbserialize.md  |  2 +-
 docs/source/api/evennia.utils.eveditor.md     |  2 +-
 docs/source/api/evennia.utils.evform.md       |  2 +-
 docs/source/api/evennia.utils.evmenu.md       |  2 +-
 docs/source/api/evennia.utils.evmore.md       |  2 +-
 docs/source/api/evennia.utils.evtable.md      |  2 +-
 docs/source/api/evennia.utils.funcparser.md   |  2 +-
 docs/source/api/evennia.utils.gametime.md     |  2 +-
 docs/source/api/evennia.utils.hex_colors.md   |  2 +-
 .../api/evennia.utils.idmapper.manager.md     |  2 +-
 docs/source/api/evennia.utils.idmapper.md     |  5 ++--
 .../api/evennia.utils.idmapper.models.md      |  2 +-
 .../api/evennia.utils.idmapper.tests.md       |  2 +-
 docs/source/api/evennia.utils.logger.md       |  2 +-
 docs/source/api/evennia.utils.md              | 19 ++++++-------
 .../source/api/evennia.utils.optionclasses.md |  2 +-
 .../source/api/evennia.utils.optionhandler.md |  2 +-
 docs/source/api/evennia.utils.picklefield.md  |  2 +-
 docs/source/api/evennia.utils.search.md       |  2 +-
 .../api/evennia.utils.test_resources.md       |  2 +-
 docs/source/api/evennia.utils.text2html.md    |  2 +-
 docs/source/api/evennia.utils.utils.md        |  2 +-
 .../api/evennia.utils.validatorfuncs.md       |  2 +-
 ...vennia.utils.verb_conjugation.conjugate.md |  2 +-
 .../api/evennia.utils.verb_conjugation.md     |  5 ++--
 ...evennia.utils.verb_conjugation.pronouns.md |  2 +-
 .../evennia.utils.verb_conjugation.tests.md   |  2 +-
 docs/source/api/evennia.web.admin.accounts.md |  2 +-
 .../api/evennia.web.admin.attributes.md       |  2 +-
 docs/source/api/evennia.web.admin.comms.md    |  2 +-
 .../source/api/evennia.web.admin.frontpage.md |  2 +-
 docs/source/api/evennia.web.admin.help.md     |  2 +-
 docs/source/api/evennia.web.admin.md          |  5 ++--
 docs/source/api/evennia.web.admin.objects.md  |  2 +-
 docs/source/api/evennia.web.admin.scripts.md  |  2 +-
 docs/source/api/evennia.web.admin.server.md   |  2 +-
 docs/source/api/evennia.web.admin.tags.md     |  2 +-
 docs/source/api/evennia.web.admin.urls.md     |  2 +-
 docs/source/api/evennia.web.admin.utils.md    |  2 +-
 docs/source/api/evennia.web.api.filters.md    |  2 +-
 docs/source/api/evennia.web.api.md            |  5 ++--
 .../source/api/evennia.web.api.permissions.md |  2 +-
 docs/source/api/evennia.web.api.root.md       |  2 +-
 .../source/api/evennia.web.api.serializers.md |  2 +-
 docs/source/api/evennia.web.api.tests.md      |  2 +-
 docs/source/api/evennia.web.api.urls.md       |  2 +-
 docs/source/api/evennia.web.api.views.md      |  2 +-
 docs/source/api/evennia.web.md                | 19 ++++++-------
 .../api/evennia.web.templatetags.addclass.md  |  2 +-
 docs/source/api/evennia.web.templatetags.md   |  5 ++--
 docs/source/api/evennia.web.urls.md           |  2 +-
 .../source/api/evennia.web.utils.adminsite.md |  2 +-
 docs/source/api/evennia.web.utils.backends.md |  2 +-
 .../api/evennia.web.utils.general_context.md  |  2 +-
 docs/source/api/evennia.web.utils.md          |  5 ++--
 .../api/evennia.web.utils.middleware.md       |  2 +-
 docs/source/api/evennia.web.utils.tests.md    |  2 +-
 docs/source/api/evennia.web.webclient.md      |  5 ++--
 docs/source/api/evennia.web.webclient.urls.md |  2 +-
 .../source/api/evennia.web.webclient.views.md |  2 +-
 docs/source/api/evennia.web.website.forms.md  |  2 +-
 docs/source/api/evennia.web.website.md        | 17 +++++-------
 docs/source/api/evennia.web.website.tests.md  |  2 +-
 docs/source/api/evennia.web.website.urls.md   |  2 +-
 .../api/evennia.web.website.views.accounts.md |  2 +-
 .../api/evennia.web.website.views.channels.md |  2 +-
 .../evennia.web.website.views.characters.md   |  2 +-
 .../api/evennia.web.website.views.errors.md   |  2 +-
 .../api/evennia.web.website.views.help.md     |  2 +-
 .../api/evennia.web.website.views.index.md    |  2 +-
 docs/source/api/evennia.web.website.views.md  |  5 ++--
 .../api/evennia.web.website.views.mixins.md   |  2 +-
 .../api/evennia.web.website.views.objects.md  |  2 +-
 docs/source/conf.py                           | 27 ++++++-------------
 435 files changed, 571 insertions(+), 693 deletions(-)

diff --git a/docs/source/Howtos/Beginner-Tutorial/Beginner-Tutorial-Overview.md b/docs/source/Howtos/Beginner-Tutorial/Beginner-Tutorial-Overview.md
index fa9ec23a1..2b5e29187 100644
--- a/docs/source/Howtos/Beginner-Tutorial/Beginner-Tutorial-Overview.md
+++ b/docs/source/Howtos/Beginner-Tutorial/Beginner-Tutorial-Overview.md
@@ -15,15 +15,15 @@
 <br>Taking our new game online and letting players try it out.
 ```
 
-Welcome to Evennia! This multi-part Beginner Tutorial will help get you off the ground and running. 
+Welcome to Evennia! This multi-part Beginner Tutorial will help get you off the ground and running.
 
 You may choose topics that seem interesting but, if you follow this tutorial through to the end, you will have created your own small online game to play and share with others!
 
-Use the menu on the right to navigate the index of each of the tutorial's parts. Use the [next](Part1/Beginner-Tutorial-Part1-Overview.md) and [previous](../Howtos-Overview.md) links at the top/bottom right of each page to jump between lessons. 
+Use the menu on the right to navigate the index of each of the tutorial's parts. Use the [next](Part1/Beginner-Tutorial-Part1-Overview.md) and [previous](../Howtos-Overview.md) links at the top/bottom right of each page to jump between lessons.
 
 ## Things You Need
 
-- A command line interface 
+- A command line interface
 - A MUD client (or web browser)
 - A text-editor/IDE
 - Evennia installed and a game-dir initialized
@@ -38,9 +38,9 @@ You need to know how to find the terminal/console in your OS. The Evennia server
 
 ### A Fresh Game-Dir?
 
-You should make sure that you have successfully [installed Evennia](../../Setup/Installation.md). If you followed the instructions, you will have already created a game-dir. The documentation will continue to refer to this game-dir as `mygame`, so you may want to re-use it or make a new one specific to this tutorial only -- it's up to you. 
+You should make sure that you have successfully [installed Evennia](../../Setup/Installation.md). If you followed the instructions, you will have already created a game-dir. The documentation will continue to refer to this game-dir as `mygame`, so you may want to re-use it or make a new one specific to this tutorial only -- it's up to you.
 
-If you already have a game-dir and want a new one specific to this tutorial, use the `evennia stop` command to halt the running server. Then, [initialize a new game-dir](../../Setup/Installation.md#initialize-a-new-game) somewhere else (_not_ inside the previous game-dir!). 
+If you already have a game-dir and want a new one specific to this tutorial, use the `evennia stop` command to halt the running server. Then, [initialize a new game-dir](../../Setup/Installation.md#initialize-a-new-game) somewhere else (_not_ inside the previous game-dir!).
 
 ### A MUD Client
 
@@ -56,7 +56,7 @@ You need a text editor application to edit Python source files. Most anything th
 
 - [Here's a blog post summing up a variety of text editor options](https://www.elegantthemes.com/blog/resources/best-code-editors) - these things don't change much from year to year. Popular choices for Python are PyCharm, VSCode, Atom, Sublime Text, and Notepad++. Evennia is -- to a very large degree -- coded in VIM, but it is not suitable for beginners.
 
-```{important} Use Spaces, Not Tabs< br/>
+```{important} Use Spaces, Not Tabs
 Make sure to configure your text editor so that pressing the 'Tab' key inserts _4 spaces_ rather than a tab-character. Because Python is whitespace-aware, this simple practice will make your life much easier.
 ```
 
@@ -64,7 +64,7 @@ Make sure to configure your text editor so that pressing the 'Tab' key inserts _
 
 This tutorial will primarily assume you are experimenting with Python through your game client, using the in-game `py` command. But you can also explore Python instructions outside of the game. Run the following from your game dir folder:
 
-    $ evennia shell 
+    $ evennia shell
 
 ```{sidebar}
 The `evennia shell` console is convenient for experimenting with Python. But note that if you manipulate database objects from `evennia shell`, those changes will not be visible from inside the game until you reload the server. Similarly changes in-game may not visible to the `evennia shell` console until restarting it. As a guideline, use `evennia shell` for testing things out. Don't use it to change the state of a running game. The beginner tutorial uses the in-game `py` command to avoid confusion.
@@ -73,7 +73,7 @@ This will open an Evennia/Django aware python shell. You should use this instead
 
      $ pip install ipython3
 
-The `evennia shell` command will use `ipython` automatically if installed. 
+The `evennia shell` command will use `ipython` automatically if installed.
 
 ---
 
diff --git a/docs/source/api/evennia.accounts.accounts.md b/docs/source/api/evennia.accounts.accounts.md
index 6d01608a5..0f4b8f560 100644
--- a/docs/source/api/evennia.accounts.accounts.md
+++ b/docs/source/api/evennia.accounts.accounts.md
@@ -4,7 +4,7 @@ evennia.accounts.accounts
 
 .. automodule:: evennia.accounts.accounts
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.accounts.bots.md b/docs/source/api/evennia.accounts.bots.md
index bb1288c6e..3433d0453 100644
--- a/docs/source/api/evennia.accounts.bots.md
+++ b/docs/source/api/evennia.accounts.bots.md
@@ -4,7 +4,7 @@ evennia.accounts.bots
 
 .. automodule:: evennia.accounts.bots
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.accounts.manager.md b/docs/source/api/evennia.accounts.manager.md
index 5769f087e..8af138c37 100644
--- a/docs/source/api/evennia.accounts.manager.md
+++ b/docs/source/api/evennia.accounts.manager.md
@@ -4,7 +4,7 @@ evennia.accounts.manager
 
 .. automodule:: evennia.accounts.manager
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.accounts.md b/docs/source/api/evennia.accounts.md
index 0d74bea73..7dc3fe57b 100644
--- a/docs/source/api/evennia.accounts.md
+++ b/docs/source/api/evennia.accounts.md
@@ -4,11 +4,10 @@ evennia.accounts
 
 .. automodule:: evennia.accounts
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.accounts.models.md b/docs/source/api/evennia.accounts.models.md
index 186fa0224..251967bbb 100644
--- a/docs/source/api/evennia.accounts.models.md
+++ b/docs/source/api/evennia.accounts.models.md
@@ -4,7 +4,7 @@ evennia.accounts.models
 
 .. automodule:: evennia.accounts.models
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.commands.cmdhandler.md b/docs/source/api/evennia.commands.cmdhandler.md
index b0bbb99df..a348da6b0 100644
--- a/docs/source/api/evennia.commands.cmdhandler.md
+++ b/docs/source/api/evennia.commands.cmdhandler.md
@@ -4,7 +4,7 @@ evennia.commands.cmdhandler
 
 .. automodule:: evennia.commands.cmdhandler
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.commands.cmdparser.md b/docs/source/api/evennia.commands.cmdparser.md
index 5cdbdf119..17bdcf3e8 100644
--- a/docs/source/api/evennia.commands.cmdparser.md
+++ b/docs/source/api/evennia.commands.cmdparser.md
@@ -4,7 +4,7 @@ evennia.commands.cmdparser
 
 .. automodule:: evennia.commands.cmdparser
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.commands.cmdset.md b/docs/source/api/evennia.commands.cmdset.md
index 5b5da1bfb..67b90798d 100644
--- a/docs/source/api/evennia.commands.cmdset.md
+++ b/docs/source/api/evennia.commands.cmdset.md
@@ -4,7 +4,7 @@ evennia.commands.cmdset
 
 .. automodule:: evennia.commands.cmdset
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.commands.cmdsethandler.md b/docs/source/api/evennia.commands.cmdsethandler.md
index 55ce0d287..e7ef87e77 100644
--- a/docs/source/api/evennia.commands.cmdsethandler.md
+++ b/docs/source/api/evennia.commands.cmdsethandler.md
@@ -4,7 +4,7 @@ evennia.commands.cmdsethandler
 
 .. automodule:: evennia.commands.cmdsethandler
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.commands.command.md b/docs/source/api/evennia.commands.command.md
index 04c5d2b16..5ec541d71 100644
--- a/docs/source/api/evennia.commands.command.md
+++ b/docs/source/api/evennia.commands.command.md
@@ -4,7 +4,7 @@ evennia.commands.command
 
 .. automodule:: evennia.commands.command
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.commands.default.account.md b/docs/source/api/evennia.commands.default.account.md
index 9504dca8c..a2647f234 100644
--- a/docs/source/api/evennia.commands.default.account.md
+++ b/docs/source/api/evennia.commands.default.account.md
@@ -4,7 +4,7 @@ evennia.commands.default.account
 
 .. automodule:: evennia.commands.default.account
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.commands.default.admin.md b/docs/source/api/evennia.commands.default.admin.md
index 7b756a1d7..9e044ebb1 100644
--- a/docs/source/api/evennia.commands.default.admin.md
+++ b/docs/source/api/evennia.commands.default.admin.md
@@ -4,7 +4,7 @@ evennia.commands.default.admin
 
 .. automodule:: evennia.commands.default.admin
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.commands.default.batchprocess.md b/docs/source/api/evennia.commands.default.batchprocess.md
index 30fd693bc..ffe8535a0 100644
--- a/docs/source/api/evennia.commands.default.batchprocess.md
+++ b/docs/source/api/evennia.commands.default.batchprocess.md
@@ -4,7 +4,7 @@ evennia.commands.default.batchprocess
 
 .. automodule:: evennia.commands.default.batchprocess
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.commands.default.building.md b/docs/source/api/evennia.commands.default.building.md
index e8de25927..fe147f9cc 100644
--- a/docs/source/api/evennia.commands.default.building.md
+++ b/docs/source/api/evennia.commands.default.building.md
@@ -4,7 +4,7 @@ evennia.commands.default.building
 
 .. automodule:: evennia.commands.default.building
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.commands.default.cmdset_account.md b/docs/source/api/evennia.commands.default.cmdset_account.md
index db0b9a045..271ffc09c 100644
--- a/docs/source/api/evennia.commands.default.cmdset_account.md
+++ b/docs/source/api/evennia.commands.default.cmdset_account.md
@@ -4,7 +4,7 @@ evennia.commands.default.cmdset\_account
 
 .. automodule:: evennia.commands.default.cmdset_account
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.commands.default.cmdset_character.md b/docs/source/api/evennia.commands.default.cmdset_character.md
index c96181d18..3d891efab 100644
--- a/docs/source/api/evennia.commands.default.cmdset_character.md
+++ b/docs/source/api/evennia.commands.default.cmdset_character.md
@@ -4,7 +4,7 @@ evennia.commands.default.cmdset\_character
 
 .. automodule:: evennia.commands.default.cmdset_character
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.commands.default.cmdset_session.md b/docs/source/api/evennia.commands.default.cmdset_session.md
index 6e707db17..fca2d2b7e 100644
--- a/docs/source/api/evennia.commands.default.cmdset_session.md
+++ b/docs/source/api/evennia.commands.default.cmdset_session.md
@@ -4,7 +4,7 @@ evennia.commands.default.cmdset\_session
 
 .. automodule:: evennia.commands.default.cmdset_session
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.commands.default.cmdset_unloggedin.md b/docs/source/api/evennia.commands.default.cmdset_unloggedin.md
index 078138554..acac1016f 100644
--- a/docs/source/api/evennia.commands.default.cmdset_unloggedin.md
+++ b/docs/source/api/evennia.commands.default.cmdset_unloggedin.md
@@ -4,7 +4,7 @@ evennia.commands.default.cmdset\_unloggedin
 
 .. automodule:: evennia.commands.default.cmdset_unloggedin
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.commands.default.comms.md b/docs/source/api/evennia.commands.default.comms.md
index 0a0878c51..7b69f7301 100644
--- a/docs/source/api/evennia.commands.default.comms.md
+++ b/docs/source/api/evennia.commands.default.comms.md
@@ -4,7 +4,7 @@ evennia.commands.default.comms
 
 .. automodule:: evennia.commands.default.comms
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.commands.default.general.md b/docs/source/api/evennia.commands.default.general.md
index 7c6045028..a2a2f2fec 100644
--- a/docs/source/api/evennia.commands.default.general.md
+++ b/docs/source/api/evennia.commands.default.general.md
@@ -4,7 +4,7 @@ evennia.commands.default.general
 
 .. automodule:: evennia.commands.default.general
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.commands.default.help.md b/docs/source/api/evennia.commands.default.help.md
index 46975ce29..d0aa250f1 100644
--- a/docs/source/api/evennia.commands.default.help.md
+++ b/docs/source/api/evennia.commands.default.help.md
@@ -4,7 +4,7 @@ evennia.commands.default.help
 
 .. automodule:: evennia.commands.default.help
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.commands.default.md b/docs/source/api/evennia.commands.default.md
index 33e9862d4..653ef0e2e 100644
--- a/docs/source/api/evennia.commands.default.md
+++ b/docs/source/api/evennia.commands.default.md
@@ -4,11 +4,10 @@ evennia.commands.default
 
 .. automodule:: evennia.commands.default
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.commands.default.muxcommand.md b/docs/source/api/evennia.commands.default.muxcommand.md
index 6b58cb6a4..162a59610 100644
--- a/docs/source/api/evennia.commands.default.muxcommand.md
+++ b/docs/source/api/evennia.commands.default.muxcommand.md
@@ -4,7 +4,7 @@ evennia.commands.default.muxcommand
 
 .. automodule:: evennia.commands.default.muxcommand
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.commands.default.syscommands.md b/docs/source/api/evennia.commands.default.syscommands.md
index c6eb24d4c..44b9277a6 100644
--- a/docs/source/api/evennia.commands.default.syscommands.md
+++ b/docs/source/api/evennia.commands.default.syscommands.md
@@ -4,7 +4,7 @@ evennia.commands.default.syscommands
 
 .. automodule:: evennia.commands.default.syscommands
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.commands.default.system.md b/docs/source/api/evennia.commands.default.system.md
index a8a4d64ca..57315764b 100644
--- a/docs/source/api/evennia.commands.default.system.md
+++ b/docs/source/api/evennia.commands.default.system.md
@@ -4,7 +4,7 @@ evennia.commands.default.system
 
 .. automodule:: evennia.commands.default.system
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.commands.default.tests.md b/docs/source/api/evennia.commands.default.tests.md
index cd23bcc6f..629d87f20 100644
--- a/docs/source/api/evennia.commands.default.tests.md
+++ b/docs/source/api/evennia.commands.default.tests.md
@@ -4,7 +4,7 @@ evennia.commands.default.tests
 
 .. automodule:: evennia.commands.default.tests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.commands.default.unloggedin.md b/docs/source/api/evennia.commands.default.unloggedin.md
index 5818459d9..9df8a53c5 100644
--- a/docs/source/api/evennia.commands.default.unloggedin.md
+++ b/docs/source/api/evennia.commands.default.unloggedin.md
@@ -4,7 +4,7 @@ evennia.commands.default.unloggedin
 
 .. automodule:: evennia.commands.default.unloggedin
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.commands.md b/docs/source/api/evennia.commands.md
index 4d1732af6..d6460ea75 100644
--- a/docs/source/api/evennia.commands.md
+++ b/docs/source/api/evennia.commands.md
@@ -4,19 +4,10 @@ evennia.commands
 
 .. automodule:: evennia.commands
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
-Subpackages
------------
 
-.. toctree::
-   :maxdepth: 6
-
-   evennia.commands.default
-
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
@@ -27,4 +18,10 @@ Submodules
    evennia.commands.cmdsethandler
    evennia.commands.command
 
+
+.. toctree::
+   :maxdepth: 6
+
+   evennia.commands.default
+
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.comms.comms.md b/docs/source/api/evennia.comms.comms.md
index 7058f8dbc..5ae2a648f 100644
--- a/docs/source/api/evennia.comms.comms.md
+++ b/docs/source/api/evennia.comms.comms.md
@@ -4,7 +4,7 @@ evennia.comms.comms
 
 .. automodule:: evennia.comms.comms
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.comms.managers.md b/docs/source/api/evennia.comms.managers.md
index a67a3145a..d08ea4afc 100644
--- a/docs/source/api/evennia.comms.managers.md
+++ b/docs/source/api/evennia.comms.managers.md
@@ -4,7 +4,7 @@ evennia.comms.managers
 
 .. automodule:: evennia.comms.managers
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.comms.md b/docs/source/api/evennia.comms.md
index dfbb8a1b3..08a5e66f3 100644
--- a/docs/source/api/evennia.comms.md
+++ b/docs/source/api/evennia.comms.md
@@ -4,11 +4,10 @@ evennia.comms
 
 .. automodule:: evennia.comms
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.comms.models.md b/docs/source/api/evennia.comms.models.md
index 9fbd23853..c497fa0cf 100644
--- a/docs/source/api/evennia.comms.models.md
+++ b/docs/source/api/evennia.comms.models.md
@@ -4,7 +4,7 @@ evennia.comms.models
 
 .. automodule:: evennia.comms.models
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.base_systems.awsstorage.aws_s3_cdn.md b/docs/source/api/evennia.contrib.base_systems.awsstorage.aws_s3_cdn.md
index 6b43c668d..84bcbd22b 100644
--- a/docs/source/api/evennia.contrib.base_systems.awsstorage.aws_s3_cdn.md
+++ b/docs/source/api/evennia.contrib.base_systems.awsstorage.aws_s3_cdn.md
@@ -4,7 +4,7 @@ evennia.contrib.base\_systems.awsstorage.aws\_s3\_cdn
 
 .. automodule:: evennia.contrib.base_systems.awsstorage.aws_s3_cdn
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.base_systems.awsstorage.md b/docs/source/api/evennia.contrib.base_systems.awsstorage.md
index d3a7f0b86..efa866295 100644
--- a/docs/source/api/evennia.contrib.base_systems.awsstorage.md
+++ b/docs/source/api/evennia.contrib.base_systems.awsstorage.md
@@ -4,11 +4,10 @@ evennia.contrib.base\_systems.awsstorage
 
 .. automodule:: evennia.contrib.base_systems.awsstorage
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.base_systems.awsstorage.tests.md b/docs/source/api/evennia.contrib.base_systems.awsstorage.tests.md
index 87c7cbb38..3633d2621 100644
--- a/docs/source/api/evennia.contrib.base_systems.awsstorage.tests.md
+++ b/docs/source/api/evennia.contrib.base_systems.awsstorage.tests.md
@@ -4,7 +4,7 @@ evennia.contrib.base\_systems.awsstorage.tests
 
 .. automodule:: evennia.contrib.base_systems.awsstorage.tests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.base_systems.building_menu.building_menu.md b/docs/source/api/evennia.contrib.base_systems.building_menu.building_menu.md
index 8a52b2ef1..f6ed74373 100644
--- a/docs/source/api/evennia.contrib.base_systems.building_menu.building_menu.md
+++ b/docs/source/api/evennia.contrib.base_systems.building_menu.building_menu.md
@@ -4,7 +4,7 @@ evennia.contrib.base\_systems.building\_menu.building\_menu
 
 .. automodule:: evennia.contrib.base_systems.building_menu.building_menu
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.base_systems.building_menu.md b/docs/source/api/evennia.contrib.base_systems.building_menu.md
index e5ea3e874..bdb5a83a0 100644
--- a/docs/source/api/evennia.contrib.base_systems.building_menu.md
+++ b/docs/source/api/evennia.contrib.base_systems.building_menu.md
@@ -4,11 +4,10 @@ evennia.contrib.base\_systems.building\_menu
 
 .. automodule:: evennia.contrib.base_systems.building_menu
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.base_systems.building_menu.tests.md b/docs/source/api/evennia.contrib.base_systems.building_menu.tests.md
index a3d4d1738..50767763d 100644
--- a/docs/source/api/evennia.contrib.base_systems.building_menu.tests.md
+++ b/docs/source/api/evennia.contrib.base_systems.building_menu.tests.md
@@ -4,7 +4,7 @@ evennia.contrib.base\_systems.building\_menu.tests
 
 .. automodule:: evennia.contrib.base_systems.building_menu.tests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.base_systems.color_markups.color_markups.md b/docs/source/api/evennia.contrib.base_systems.color_markups.color_markups.md
index f049b591d..f2dcd919b 100644
--- a/docs/source/api/evennia.contrib.base_systems.color_markups.color_markups.md
+++ b/docs/source/api/evennia.contrib.base_systems.color_markups.color_markups.md
@@ -4,7 +4,7 @@ evennia.contrib.base\_systems.color\_markups.color\_markups
 
 .. automodule:: evennia.contrib.base_systems.color_markups.color_markups
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.base_systems.color_markups.md b/docs/source/api/evennia.contrib.base_systems.color_markups.md
index dbb374042..c83cc796d 100644
--- a/docs/source/api/evennia.contrib.base_systems.color_markups.md
+++ b/docs/source/api/evennia.contrib.base_systems.color_markups.md
@@ -4,11 +4,10 @@ evennia.contrib.base\_systems.color\_markups
 
 .. automodule:: evennia.contrib.base_systems.color_markups
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.base_systems.color_markups.tests.md b/docs/source/api/evennia.contrib.base_systems.color_markups.tests.md
index d196f83ab..846acf8d7 100644
--- a/docs/source/api/evennia.contrib.base_systems.color_markups.tests.md
+++ b/docs/source/api/evennia.contrib.base_systems.color_markups.tests.md
@@ -4,7 +4,7 @@ evennia.contrib.base\_systems.color\_markups.tests
 
 .. automodule:: evennia.contrib.base_systems.color_markups.tests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.base_systems.components.component.md b/docs/source/api/evennia.contrib.base_systems.components.component.md
index c2666e69a..6a7f0366f 100644
--- a/docs/source/api/evennia.contrib.base_systems.components.component.md
+++ b/docs/source/api/evennia.contrib.base_systems.components.component.md
@@ -4,7 +4,7 @@ evennia.contrib.base\_systems.components.component
 
 .. automodule:: evennia.contrib.base_systems.components.component
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.base_systems.components.dbfield.md b/docs/source/api/evennia.contrib.base_systems.components.dbfield.md
index 6069eb28b..90942147f 100644
--- a/docs/source/api/evennia.contrib.base_systems.components.dbfield.md
+++ b/docs/source/api/evennia.contrib.base_systems.components.dbfield.md
@@ -4,7 +4,7 @@ evennia.contrib.base\_systems.components.dbfield
 
 .. automodule:: evennia.contrib.base_systems.components.dbfield
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.base_systems.components.exceptions.md b/docs/source/api/evennia.contrib.base_systems.components.exceptions.md
index e24972319..d1ce75584 100644
--- a/docs/source/api/evennia.contrib.base_systems.components.exceptions.md
+++ b/docs/source/api/evennia.contrib.base_systems.components.exceptions.md
@@ -4,7 +4,7 @@ evennia.contrib.base\_systems.components.exceptions
 
 .. automodule:: evennia.contrib.base_systems.components.exceptions
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.base_systems.components.holder.md b/docs/source/api/evennia.contrib.base_systems.components.holder.md
index d5c545293..d2bb08be6 100644
--- a/docs/source/api/evennia.contrib.base_systems.components.holder.md
+++ b/docs/source/api/evennia.contrib.base_systems.components.holder.md
@@ -4,7 +4,7 @@ evennia.contrib.base\_systems.components.holder
 
 .. automodule:: evennia.contrib.base_systems.components.holder
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.base_systems.components.listing.md b/docs/source/api/evennia.contrib.base_systems.components.listing.md
index 1c7d77f5e..8fd404834 100644
--- a/docs/source/api/evennia.contrib.base_systems.components.listing.md
+++ b/docs/source/api/evennia.contrib.base_systems.components.listing.md
@@ -4,7 +4,7 @@ evennia.contrib.base\_systems.components.listing
 
 .. automodule:: evennia.contrib.base_systems.components.listing
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.base_systems.components.md b/docs/source/api/evennia.contrib.base_systems.components.md
index 700dd6bfe..c893d60cc 100644
--- a/docs/source/api/evennia.contrib.base_systems.components.md
+++ b/docs/source/api/evennia.contrib.base_systems.components.md
@@ -4,11 +4,10 @@ evennia.contrib.base\_systems.components
 
 .. automodule:: evennia.contrib.base_systems.components
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.base_systems.components.signals.md b/docs/source/api/evennia.contrib.base_systems.components.signals.md
index 64260b780..433392af1 100644
--- a/docs/source/api/evennia.contrib.base_systems.components.signals.md
+++ b/docs/source/api/evennia.contrib.base_systems.components.signals.md
@@ -4,7 +4,7 @@ evennia.contrib.base\_systems.components.signals
 
 .. automodule:: evennia.contrib.base_systems.components.signals
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.base_systems.components.tests.md b/docs/source/api/evennia.contrib.base_systems.components.tests.md
index 699b208fb..17870b583 100644
--- a/docs/source/api/evennia.contrib.base_systems.components.tests.md
+++ b/docs/source/api/evennia.contrib.base_systems.components.tests.md
@@ -4,7 +4,7 @@ evennia.contrib.base\_systems.components.tests
 
 .. automodule:: evennia.contrib.base_systems.components.tests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.base_systems.custom_gametime.custom_gametime.md b/docs/source/api/evennia.contrib.base_systems.custom_gametime.custom_gametime.md
index 0dd0b36f5..53eca7825 100644
--- a/docs/source/api/evennia.contrib.base_systems.custom_gametime.custom_gametime.md
+++ b/docs/source/api/evennia.contrib.base_systems.custom_gametime.custom_gametime.md
@@ -4,7 +4,7 @@ evennia.contrib.base\_systems.custom\_gametime.custom\_gametime
 
 .. automodule:: evennia.contrib.base_systems.custom_gametime.custom_gametime
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.base_systems.custom_gametime.md b/docs/source/api/evennia.contrib.base_systems.custom_gametime.md
index eeb09aa1d..cf53efe47 100644
--- a/docs/source/api/evennia.contrib.base_systems.custom_gametime.md
+++ b/docs/source/api/evennia.contrib.base_systems.custom_gametime.md
@@ -4,11 +4,10 @@ evennia.contrib.base\_systems.custom\_gametime
 
 .. automodule:: evennia.contrib.base_systems.custom_gametime
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.base_systems.custom_gametime.tests.md b/docs/source/api/evennia.contrib.base_systems.custom_gametime.tests.md
index ee5078381..af1a846a0 100644
--- a/docs/source/api/evennia.contrib.base_systems.custom_gametime.tests.md
+++ b/docs/source/api/evennia.contrib.base_systems.custom_gametime.tests.md
@@ -4,7 +4,7 @@ evennia.contrib.base\_systems.custom\_gametime.tests
 
 .. automodule:: evennia.contrib.base_systems.custom_gametime.tests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.base_systems.email_login.connection_screens.md b/docs/source/api/evennia.contrib.base_systems.email_login.connection_screens.md
index d4acbcd9c..18f7ba27f 100644
--- a/docs/source/api/evennia.contrib.base_systems.email_login.connection_screens.md
+++ b/docs/source/api/evennia.contrib.base_systems.email_login.connection_screens.md
@@ -4,7 +4,7 @@ evennia.contrib.base\_systems.email\_login.connection\_screens
 
 .. automodule:: evennia.contrib.base_systems.email_login.connection_screens
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.base_systems.email_login.email_login.md b/docs/source/api/evennia.contrib.base_systems.email_login.email_login.md
index 3c1b93b39..4fb41b995 100644
--- a/docs/source/api/evennia.contrib.base_systems.email_login.email_login.md
+++ b/docs/source/api/evennia.contrib.base_systems.email_login.email_login.md
@@ -4,7 +4,7 @@ evennia.contrib.base\_systems.email\_login.email\_login
 
 .. automodule:: evennia.contrib.base_systems.email_login.email_login
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.base_systems.email_login.md b/docs/source/api/evennia.contrib.base_systems.email_login.md
index c3e334698..6c38fee63 100644
--- a/docs/source/api/evennia.contrib.base_systems.email_login.md
+++ b/docs/source/api/evennia.contrib.base_systems.email_login.md
@@ -4,11 +4,10 @@ evennia.contrib.base\_systems.email\_login
 
 .. automodule:: evennia.contrib.base_systems.email_login
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.base_systems.email_login.tests.md b/docs/source/api/evennia.contrib.base_systems.email_login.tests.md
index 64a409431..9965b342b 100644
--- a/docs/source/api/evennia.contrib.base_systems.email_login.tests.md
+++ b/docs/source/api/evennia.contrib.base_systems.email_login.tests.md
@@ -4,7 +4,7 @@ evennia.contrib.base\_systems.email\_login.tests
 
 .. automodule:: evennia.contrib.base_systems.email_login.tests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.base_systems.godotwebsocket.md b/docs/source/api/evennia.contrib.base_systems.godotwebsocket.md
index 46f44447b..5ec12b400 100644
--- a/docs/source/api/evennia.contrib.base_systems.godotwebsocket.md
+++ b/docs/source/api/evennia.contrib.base_systems.godotwebsocket.md
@@ -4,11 +4,10 @@ evennia.contrib.base\_systems.godotwebsocket
 
 .. automodule:: evennia.contrib.base_systems.godotwebsocket
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.base_systems.godotwebsocket.test_text2bbcode.md b/docs/source/api/evennia.contrib.base_systems.godotwebsocket.test_text2bbcode.md
index e280b67eb..15d1ed17b 100644
--- a/docs/source/api/evennia.contrib.base_systems.godotwebsocket.test_text2bbcode.md
+++ b/docs/source/api/evennia.contrib.base_systems.godotwebsocket.test_text2bbcode.md
@@ -4,7 +4,7 @@ evennia.contrib.base\_systems.godotwebsocket.test\_text2bbcode
 
 .. automodule:: evennia.contrib.base_systems.godotwebsocket.test_text2bbcode
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.base_systems.godotwebsocket.test_webclient.md b/docs/source/api/evennia.contrib.base_systems.godotwebsocket.test_webclient.md
index 9199e7b46..10f3d3f57 100644
--- a/docs/source/api/evennia.contrib.base_systems.godotwebsocket.test_webclient.md
+++ b/docs/source/api/evennia.contrib.base_systems.godotwebsocket.test_webclient.md
@@ -4,7 +4,7 @@ evennia.contrib.base\_systems.godotwebsocket.test\_webclient
 
 .. automodule:: evennia.contrib.base_systems.godotwebsocket.test_webclient
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.base_systems.godotwebsocket.text2bbcode.md b/docs/source/api/evennia.contrib.base_systems.godotwebsocket.text2bbcode.md
index d1c101202..18716e3fd 100644
--- a/docs/source/api/evennia.contrib.base_systems.godotwebsocket.text2bbcode.md
+++ b/docs/source/api/evennia.contrib.base_systems.godotwebsocket.text2bbcode.md
@@ -4,7 +4,7 @@ evennia.contrib.base\_systems.godotwebsocket.text2bbcode
 
 .. automodule:: evennia.contrib.base_systems.godotwebsocket.text2bbcode
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.base_systems.godotwebsocket.webclient.md b/docs/source/api/evennia.contrib.base_systems.godotwebsocket.webclient.md
index 1e13774a6..4b86b6fd6 100644
--- a/docs/source/api/evennia.contrib.base_systems.godotwebsocket.webclient.md
+++ b/docs/source/api/evennia.contrib.base_systems.godotwebsocket.webclient.md
@@ -4,7 +4,7 @@ evennia.contrib.base\_systems.godotwebsocket.webclient
 
 .. automodule:: evennia.contrib.base_systems.godotwebsocket.webclient
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.base_systems.ingame_python.callbackhandler.md b/docs/source/api/evennia.contrib.base_systems.ingame_python.callbackhandler.md
index fc9c7bf04..721b151ae 100644
--- a/docs/source/api/evennia.contrib.base_systems.ingame_python.callbackhandler.md
+++ b/docs/source/api/evennia.contrib.base_systems.ingame_python.callbackhandler.md
@@ -4,7 +4,7 @@ evennia.contrib.base\_systems.ingame\_python.callbackhandler
 
 .. automodule:: evennia.contrib.base_systems.ingame_python.callbackhandler
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.base_systems.ingame_python.commands.md b/docs/source/api/evennia.contrib.base_systems.ingame_python.commands.md
index 6f163372f..9cac047ab 100644
--- a/docs/source/api/evennia.contrib.base_systems.ingame_python.commands.md
+++ b/docs/source/api/evennia.contrib.base_systems.ingame_python.commands.md
@@ -4,7 +4,7 @@ evennia.contrib.base\_systems.ingame\_python.commands
 
 .. automodule:: evennia.contrib.base_systems.ingame_python.commands
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.base_systems.ingame_python.eventfuncs.md b/docs/source/api/evennia.contrib.base_systems.ingame_python.eventfuncs.md
index 51597da8f..3359e0638 100644
--- a/docs/source/api/evennia.contrib.base_systems.ingame_python.eventfuncs.md
+++ b/docs/source/api/evennia.contrib.base_systems.ingame_python.eventfuncs.md
@@ -4,7 +4,7 @@ evennia.contrib.base\_systems.ingame\_python.eventfuncs
 
 .. automodule:: evennia.contrib.base_systems.ingame_python.eventfuncs
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.base_systems.ingame_python.md b/docs/source/api/evennia.contrib.base_systems.ingame_python.md
index 241b88352..3924721e5 100644
--- a/docs/source/api/evennia.contrib.base_systems.ingame_python.md
+++ b/docs/source/api/evennia.contrib.base_systems.ingame_python.md
@@ -4,11 +4,10 @@ evennia.contrib.base\_systems.ingame\_python
 
 .. automodule:: evennia.contrib.base_systems.ingame_python
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.base_systems.ingame_python.scripts.md b/docs/source/api/evennia.contrib.base_systems.ingame_python.scripts.md
index 5b1bd4c5c..259f4fc30 100644
--- a/docs/source/api/evennia.contrib.base_systems.ingame_python.scripts.md
+++ b/docs/source/api/evennia.contrib.base_systems.ingame_python.scripts.md
@@ -4,7 +4,7 @@ evennia.contrib.base\_systems.ingame\_python.scripts
 
 .. automodule:: evennia.contrib.base_systems.ingame_python.scripts
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.base_systems.ingame_python.tests.md b/docs/source/api/evennia.contrib.base_systems.ingame_python.tests.md
index d2e3ca5a6..29c8b7ce9 100644
--- a/docs/source/api/evennia.contrib.base_systems.ingame_python.tests.md
+++ b/docs/source/api/evennia.contrib.base_systems.ingame_python.tests.md
@@ -4,7 +4,7 @@ evennia.contrib.base\_systems.ingame\_python.tests
 
 .. automodule:: evennia.contrib.base_systems.ingame_python.tests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.base_systems.ingame_python.typeclasses.md b/docs/source/api/evennia.contrib.base_systems.ingame_python.typeclasses.md
index 8ca0ae4df..00283b77a 100644
--- a/docs/source/api/evennia.contrib.base_systems.ingame_python.typeclasses.md
+++ b/docs/source/api/evennia.contrib.base_systems.ingame_python.typeclasses.md
@@ -4,7 +4,7 @@ evennia.contrib.base\_systems.ingame\_python.typeclasses
 
 .. automodule:: evennia.contrib.base_systems.ingame_python.typeclasses
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.base_systems.ingame_python.utils.md b/docs/source/api/evennia.contrib.base_systems.ingame_python.utils.md
index f322ad72b..7655b1319 100644
--- a/docs/source/api/evennia.contrib.base_systems.ingame_python.utils.md
+++ b/docs/source/api/evennia.contrib.base_systems.ingame_python.utils.md
@@ -4,7 +4,7 @@ evennia.contrib.base\_systems.ingame\_python.utils
 
 .. automodule:: evennia.contrib.base_systems.ingame_python.utils
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.base_systems.ingame_reports.md b/docs/source/api/evennia.contrib.base_systems.ingame_reports.md
index 356f990a0..53cb2e3e9 100644
--- a/docs/source/api/evennia.contrib.base_systems.ingame_reports.md
+++ b/docs/source/api/evennia.contrib.base_systems.ingame_reports.md
@@ -4,11 +4,10 @@ evennia.contrib.base\_systems.ingame\_reports
 
 .. automodule:: evennia.contrib.base_systems.ingame_reports
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.base_systems.ingame_reports.menu.md b/docs/source/api/evennia.contrib.base_systems.ingame_reports.menu.md
index e253b05d6..55e047e18 100644
--- a/docs/source/api/evennia.contrib.base_systems.ingame_reports.menu.md
+++ b/docs/source/api/evennia.contrib.base_systems.ingame_reports.menu.md
@@ -4,7 +4,7 @@ evennia.contrib.base\_systems.ingame\_reports.menu
 
 .. automodule:: evennia.contrib.base_systems.ingame_reports.menu
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.base_systems.ingame_reports.reports.md b/docs/source/api/evennia.contrib.base_systems.ingame_reports.reports.md
index acdcee38f..0bc51bf79 100644
--- a/docs/source/api/evennia.contrib.base_systems.ingame_reports.reports.md
+++ b/docs/source/api/evennia.contrib.base_systems.ingame_reports.reports.md
@@ -4,7 +4,7 @@ evennia.contrib.base\_systems.ingame\_reports.reports
 
 .. automodule:: evennia.contrib.base_systems.ingame_reports.reports
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.base_systems.ingame_reports.tests.md b/docs/source/api/evennia.contrib.base_systems.ingame_reports.tests.md
index 3cb42bee8..cc3bac554 100644
--- a/docs/source/api/evennia.contrib.base_systems.ingame_reports.tests.md
+++ b/docs/source/api/evennia.contrib.base_systems.ingame_reports.tests.md
@@ -4,7 +4,7 @@ evennia.contrib.base\_systems.ingame\_reports.tests
 
 .. automodule:: evennia.contrib.base_systems.ingame_reports.tests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.base_systems.md b/docs/source/api/evennia.contrib.base_systems.md
index 459078700..6c91a0d83 100644
--- a/docs/source/api/evennia.contrib.base_systems.md
+++ b/docs/source/api/evennia.contrib.base_systems.md
@@ -4,11 +4,9 @@ evennia.contrib.base\_systems
 
 .. automodule:: evennia.contrib.base_systems
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
-Subpackages
------------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.base_systems.menu_login.connection_screens.md b/docs/source/api/evennia.contrib.base_systems.menu_login.connection_screens.md
index 1cd39cb4d..4482aea1d 100644
--- a/docs/source/api/evennia.contrib.base_systems.menu_login.connection_screens.md
+++ b/docs/source/api/evennia.contrib.base_systems.menu_login.connection_screens.md
@@ -4,7 +4,7 @@ evennia.contrib.base\_systems.menu\_login.connection\_screens
 
 .. automodule:: evennia.contrib.base_systems.menu_login.connection_screens
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.base_systems.menu_login.md b/docs/source/api/evennia.contrib.base_systems.menu_login.md
index dedc8f5ad..fbe0dd841 100644
--- a/docs/source/api/evennia.contrib.base_systems.menu_login.md
+++ b/docs/source/api/evennia.contrib.base_systems.menu_login.md
@@ -4,11 +4,10 @@ evennia.contrib.base\_systems.menu\_login
 
 .. automodule:: evennia.contrib.base_systems.menu_login
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.base_systems.menu_login.menu_login.md b/docs/source/api/evennia.contrib.base_systems.menu_login.menu_login.md
index 60e16c7fb..922d1d5d7 100644
--- a/docs/source/api/evennia.contrib.base_systems.menu_login.menu_login.md
+++ b/docs/source/api/evennia.contrib.base_systems.menu_login.menu_login.md
@@ -4,7 +4,7 @@ evennia.contrib.base\_systems.menu\_login.menu\_login
 
 .. automodule:: evennia.contrib.base_systems.menu_login.menu_login
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.base_systems.menu_login.tests.md b/docs/source/api/evennia.contrib.base_systems.menu_login.tests.md
index c485eee4d..413c45318 100644
--- a/docs/source/api/evennia.contrib.base_systems.menu_login.tests.md
+++ b/docs/source/api/evennia.contrib.base_systems.menu_login.tests.md
@@ -4,7 +4,7 @@ evennia.contrib.base\_systems.menu\_login.tests
 
 .. automodule:: evennia.contrib.base_systems.menu_login.tests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.base_systems.mux_comms_cmds.md b/docs/source/api/evennia.contrib.base_systems.mux_comms_cmds.md
index e33956ee7..5a0b25ece 100644
--- a/docs/source/api/evennia.contrib.base_systems.mux_comms_cmds.md
+++ b/docs/source/api/evennia.contrib.base_systems.mux_comms_cmds.md
@@ -4,11 +4,10 @@ evennia.contrib.base\_systems.mux\_comms\_cmds
 
 .. automodule:: evennia.contrib.base_systems.mux_comms_cmds
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.base_systems.mux_comms_cmds.mux_comms_cmds.md b/docs/source/api/evennia.contrib.base_systems.mux_comms_cmds.mux_comms_cmds.md
index afbc3865d..ec525f3ec 100644
--- a/docs/source/api/evennia.contrib.base_systems.mux_comms_cmds.mux_comms_cmds.md
+++ b/docs/source/api/evennia.contrib.base_systems.mux_comms_cmds.mux_comms_cmds.md
@@ -4,7 +4,7 @@ evennia.contrib.base\_systems.mux\_comms\_cmds.mux\_comms\_cmds
 
 .. automodule:: evennia.contrib.base_systems.mux_comms_cmds.mux_comms_cmds
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.base_systems.mux_comms_cmds.tests.md b/docs/source/api/evennia.contrib.base_systems.mux_comms_cmds.tests.md
index d89b5423f..66f6e6730 100644
--- a/docs/source/api/evennia.contrib.base_systems.mux_comms_cmds.tests.md
+++ b/docs/source/api/evennia.contrib.base_systems.mux_comms_cmds.tests.md
@@ -4,7 +4,7 @@ evennia.contrib.base\_systems.mux\_comms\_cmds.tests
 
 .. automodule:: evennia.contrib.base_systems.mux_comms_cmds.tests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.base_systems.unixcommand.md b/docs/source/api/evennia.contrib.base_systems.unixcommand.md
index 71d2a1f36..788394517 100644
--- a/docs/source/api/evennia.contrib.base_systems.unixcommand.md
+++ b/docs/source/api/evennia.contrib.base_systems.unixcommand.md
@@ -4,11 +4,10 @@ evennia.contrib.base\_systems.unixcommand
 
 .. automodule:: evennia.contrib.base_systems.unixcommand
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.base_systems.unixcommand.tests.md b/docs/source/api/evennia.contrib.base_systems.unixcommand.tests.md
index d09fba9c3..667d646fa 100644
--- a/docs/source/api/evennia.contrib.base_systems.unixcommand.tests.md
+++ b/docs/source/api/evennia.contrib.base_systems.unixcommand.tests.md
@@ -4,7 +4,7 @@ evennia.contrib.base\_systems.unixcommand.tests
 
 .. automodule:: evennia.contrib.base_systems.unixcommand.tests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.base_systems.unixcommand.unixcommand.md b/docs/source/api/evennia.contrib.base_systems.unixcommand.unixcommand.md
index b4d3374fe..f0cad02b3 100644
--- a/docs/source/api/evennia.contrib.base_systems.unixcommand.unixcommand.md
+++ b/docs/source/api/evennia.contrib.base_systems.unixcommand.unixcommand.md
@@ -4,7 +4,7 @@ evennia.contrib.base\_systems.unixcommand.unixcommand
 
 .. automodule:: evennia.contrib.base_systems.unixcommand.unixcommand
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.full_systems.evscaperoom.commands.md b/docs/source/api/evennia.contrib.full_systems.evscaperoom.commands.md
index 3a56b629d..932fed18c 100644
--- a/docs/source/api/evennia.contrib.full_systems.evscaperoom.commands.md
+++ b/docs/source/api/evennia.contrib.full_systems.evscaperoom.commands.md
@@ -4,7 +4,7 @@ evennia.contrib.full\_systems.evscaperoom.commands
 
 .. automodule:: evennia.contrib.full_systems.evscaperoom.commands
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.full_systems.evscaperoom.md b/docs/source/api/evennia.contrib.full_systems.evscaperoom.md
index 7bbb00bf2..3d5187546 100644
--- a/docs/source/api/evennia.contrib.full_systems.evscaperoom.md
+++ b/docs/source/api/evennia.contrib.full_systems.evscaperoom.md
@@ -4,11 +4,10 @@ evennia.contrib.full\_systems.evscaperoom
 
 .. automodule:: evennia.contrib.full_systems.evscaperoom
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.full_systems.evscaperoom.menu.md b/docs/source/api/evennia.contrib.full_systems.evscaperoom.menu.md
index db9c3f2cb..864ebc1f7 100644
--- a/docs/source/api/evennia.contrib.full_systems.evscaperoom.menu.md
+++ b/docs/source/api/evennia.contrib.full_systems.evscaperoom.menu.md
@@ -4,7 +4,7 @@ evennia.contrib.full\_systems.evscaperoom.menu
 
 .. automodule:: evennia.contrib.full_systems.evscaperoom.menu
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.full_systems.evscaperoom.objects.md b/docs/source/api/evennia.contrib.full_systems.evscaperoom.objects.md
index 434595928..334430328 100644
--- a/docs/source/api/evennia.contrib.full_systems.evscaperoom.objects.md
+++ b/docs/source/api/evennia.contrib.full_systems.evscaperoom.objects.md
@@ -4,7 +4,7 @@ evennia.contrib.full\_systems.evscaperoom.objects
 
 .. automodule:: evennia.contrib.full_systems.evscaperoom.objects
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.full_systems.evscaperoom.room.md b/docs/source/api/evennia.contrib.full_systems.evscaperoom.room.md
index 1c82f2ee1..ddc01b1f7 100644
--- a/docs/source/api/evennia.contrib.full_systems.evscaperoom.room.md
+++ b/docs/source/api/evennia.contrib.full_systems.evscaperoom.room.md
@@ -4,7 +4,7 @@ evennia.contrib.full\_systems.evscaperoom.room
 
 .. automodule:: evennia.contrib.full_systems.evscaperoom.room
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.full_systems.evscaperoom.scripts.md b/docs/source/api/evennia.contrib.full_systems.evscaperoom.scripts.md
index 4c0b70ffa..fca6386e2 100644
--- a/docs/source/api/evennia.contrib.full_systems.evscaperoom.scripts.md
+++ b/docs/source/api/evennia.contrib.full_systems.evscaperoom.scripts.md
@@ -4,7 +4,7 @@ evennia.contrib.full\_systems.evscaperoom.scripts
 
 .. automodule:: evennia.contrib.full_systems.evscaperoom.scripts
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.full_systems.evscaperoom.state.md b/docs/source/api/evennia.contrib.full_systems.evscaperoom.state.md
index d665b6cb6..48535fbd7 100644
--- a/docs/source/api/evennia.contrib.full_systems.evscaperoom.state.md
+++ b/docs/source/api/evennia.contrib.full_systems.evscaperoom.state.md
@@ -4,7 +4,7 @@ evennia.contrib.full\_systems.evscaperoom.state
 
 .. automodule:: evennia.contrib.full_systems.evscaperoom.state
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.full_systems.evscaperoom.tests.md b/docs/source/api/evennia.contrib.full_systems.evscaperoom.tests.md
index 63c00551b..24b4c5d03 100644
--- a/docs/source/api/evennia.contrib.full_systems.evscaperoom.tests.md
+++ b/docs/source/api/evennia.contrib.full_systems.evscaperoom.tests.md
@@ -4,7 +4,7 @@ evennia.contrib.full\_systems.evscaperoom.tests
 
 .. automodule:: evennia.contrib.full_systems.evscaperoom.tests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.full_systems.evscaperoom.utils.md b/docs/source/api/evennia.contrib.full_systems.evscaperoom.utils.md
index 0d4eacbde..d8ed955a0 100644
--- a/docs/source/api/evennia.contrib.full_systems.evscaperoom.utils.md
+++ b/docs/source/api/evennia.contrib.full_systems.evscaperoom.utils.md
@@ -4,7 +4,7 @@ evennia.contrib.full\_systems.evscaperoom.utils
 
 .. automodule:: evennia.contrib.full_systems.evscaperoom.utils
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.full_systems.md b/docs/source/api/evennia.contrib.full_systems.md
index f20fd79d0..1ad1358df 100644
--- a/docs/source/api/evennia.contrib.full_systems.md
+++ b/docs/source/api/evennia.contrib.full_systems.md
@@ -4,11 +4,9 @@ evennia.contrib.full\_systems
 
 .. automodule:: evennia.contrib.full_systems
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
-Subpackages
------------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.game_systems.achievements.achievements.md b/docs/source/api/evennia.contrib.game_systems.achievements.achievements.md
index f0ac45795..044cf701c 100644
--- a/docs/source/api/evennia.contrib.game_systems.achievements.achievements.md
+++ b/docs/source/api/evennia.contrib.game_systems.achievements.achievements.md
@@ -4,7 +4,7 @@ evennia.contrib.game\_systems.achievements.achievements
 
 .. automodule:: evennia.contrib.game_systems.achievements.achievements
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.game_systems.achievements.md b/docs/source/api/evennia.contrib.game_systems.achievements.md
index e40a18aa7..adf1c0dc7 100644
--- a/docs/source/api/evennia.contrib.game_systems.achievements.md
+++ b/docs/source/api/evennia.contrib.game_systems.achievements.md
@@ -4,11 +4,10 @@ evennia.contrib.game\_systems.achievements
 
 .. automodule:: evennia.contrib.game_systems.achievements
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.game_systems.achievements.tests.md b/docs/source/api/evennia.contrib.game_systems.achievements.tests.md
index f883c8ee8..67576718d 100644
--- a/docs/source/api/evennia.contrib.game_systems.achievements.tests.md
+++ b/docs/source/api/evennia.contrib.game_systems.achievements.tests.md
@@ -4,7 +4,7 @@ evennia.contrib.game\_systems.achievements.tests
 
 .. automodule:: evennia.contrib.game_systems.achievements.tests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.game_systems.barter.barter.md b/docs/source/api/evennia.contrib.game_systems.barter.barter.md
index 3581712b1..4a5cc58e5 100644
--- a/docs/source/api/evennia.contrib.game_systems.barter.barter.md
+++ b/docs/source/api/evennia.contrib.game_systems.barter.barter.md
@@ -4,7 +4,7 @@ evennia.contrib.game\_systems.barter.barter
 
 .. automodule:: evennia.contrib.game_systems.barter.barter
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.game_systems.barter.md b/docs/source/api/evennia.contrib.game_systems.barter.md
index 162a1d7c5..c9821411f 100644
--- a/docs/source/api/evennia.contrib.game_systems.barter.md
+++ b/docs/source/api/evennia.contrib.game_systems.barter.md
@@ -4,11 +4,10 @@ evennia.contrib.game\_systems.barter
 
 .. automodule:: evennia.contrib.game_systems.barter
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.game_systems.barter.tests.md b/docs/source/api/evennia.contrib.game_systems.barter.tests.md
index 2d2e0b440..f8bddc230 100644
--- a/docs/source/api/evennia.contrib.game_systems.barter.tests.md
+++ b/docs/source/api/evennia.contrib.game_systems.barter.tests.md
@@ -4,7 +4,7 @@ evennia.contrib.game\_systems.barter.tests
 
 .. automodule:: evennia.contrib.game_systems.barter.tests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.game_systems.clothing.clothing.md b/docs/source/api/evennia.contrib.game_systems.clothing.clothing.md
index 314dcd473..1286dae45 100644
--- a/docs/source/api/evennia.contrib.game_systems.clothing.clothing.md
+++ b/docs/source/api/evennia.contrib.game_systems.clothing.clothing.md
@@ -4,7 +4,7 @@ evennia.contrib.game\_systems.clothing.clothing
 
 .. automodule:: evennia.contrib.game_systems.clothing.clothing
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.game_systems.clothing.md b/docs/source/api/evennia.contrib.game_systems.clothing.md
index b4f391078..912769b9a 100644
--- a/docs/source/api/evennia.contrib.game_systems.clothing.md
+++ b/docs/source/api/evennia.contrib.game_systems.clothing.md
@@ -4,11 +4,10 @@ evennia.contrib.game\_systems.clothing
 
 .. automodule:: evennia.contrib.game_systems.clothing
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.game_systems.clothing.tests.md b/docs/source/api/evennia.contrib.game_systems.clothing.tests.md
index dfcfffebe..1bd4d5a43 100644
--- a/docs/source/api/evennia.contrib.game_systems.clothing.tests.md
+++ b/docs/source/api/evennia.contrib.game_systems.clothing.tests.md
@@ -4,7 +4,7 @@ evennia.contrib.game\_systems.clothing.tests
 
 .. automodule:: evennia.contrib.game_systems.clothing.tests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.game_systems.containers.containers.md b/docs/source/api/evennia.contrib.game_systems.containers.containers.md
index b4cdcfd0a..e304ed58d 100644
--- a/docs/source/api/evennia.contrib.game_systems.containers.containers.md
+++ b/docs/source/api/evennia.contrib.game_systems.containers.containers.md
@@ -4,7 +4,7 @@ evennia.contrib.game\_systems.containers.containers
 
 .. automodule:: evennia.contrib.game_systems.containers.containers
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.game_systems.containers.md b/docs/source/api/evennia.contrib.game_systems.containers.md
index 2b7af16ab..7dc87c4e8 100644
--- a/docs/source/api/evennia.contrib.game_systems.containers.md
+++ b/docs/source/api/evennia.contrib.game_systems.containers.md
@@ -4,11 +4,10 @@ evennia.contrib.game\_systems.containers
 
 .. automodule:: evennia.contrib.game_systems.containers
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.game_systems.containers.tests.md b/docs/source/api/evennia.contrib.game_systems.containers.tests.md
index 318a3d966..f71266739 100644
--- a/docs/source/api/evennia.contrib.game_systems.containers.tests.md
+++ b/docs/source/api/evennia.contrib.game_systems.containers.tests.md
@@ -4,7 +4,7 @@ evennia.contrib.game\_systems.containers.tests
 
 .. automodule:: evennia.contrib.game_systems.containers.tests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.game_systems.cooldowns.cooldowns.md b/docs/source/api/evennia.contrib.game_systems.cooldowns.cooldowns.md
index 49a16396f..7b55986fb 100644
--- a/docs/source/api/evennia.contrib.game_systems.cooldowns.cooldowns.md
+++ b/docs/source/api/evennia.contrib.game_systems.cooldowns.cooldowns.md
@@ -4,7 +4,7 @@ evennia.contrib.game\_systems.cooldowns.cooldowns
 
 .. automodule:: evennia.contrib.game_systems.cooldowns.cooldowns
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.game_systems.cooldowns.md b/docs/source/api/evennia.contrib.game_systems.cooldowns.md
index 336b1a32c..71ea82cd7 100644
--- a/docs/source/api/evennia.contrib.game_systems.cooldowns.md
+++ b/docs/source/api/evennia.contrib.game_systems.cooldowns.md
@@ -4,11 +4,10 @@ evennia.contrib.game\_systems.cooldowns
 
 .. automodule:: evennia.contrib.game_systems.cooldowns
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.game_systems.cooldowns.tests.md b/docs/source/api/evennia.contrib.game_systems.cooldowns.tests.md
index fb6bea9a1..ac47b9373 100644
--- a/docs/source/api/evennia.contrib.game_systems.cooldowns.tests.md
+++ b/docs/source/api/evennia.contrib.game_systems.cooldowns.tests.md
@@ -4,7 +4,7 @@ evennia.contrib.game\_systems.cooldowns.tests
 
 .. automodule:: evennia.contrib.game_systems.cooldowns.tests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.game_systems.crafting.crafting.md b/docs/source/api/evennia.contrib.game_systems.crafting.crafting.md
index ac26805ed..7d32c5d3c 100644
--- a/docs/source/api/evennia.contrib.game_systems.crafting.crafting.md
+++ b/docs/source/api/evennia.contrib.game_systems.crafting.crafting.md
@@ -4,7 +4,7 @@ evennia.contrib.game\_systems.crafting.crafting
 
 .. automodule:: evennia.contrib.game_systems.crafting.crafting
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.game_systems.crafting.example_recipes.md b/docs/source/api/evennia.contrib.game_systems.crafting.example_recipes.md
index 6c17b90c2..fd492a3b8 100644
--- a/docs/source/api/evennia.contrib.game_systems.crafting.example_recipes.md
+++ b/docs/source/api/evennia.contrib.game_systems.crafting.example_recipes.md
@@ -4,7 +4,7 @@ evennia.contrib.game\_systems.crafting.example\_recipes
 
 .. automodule:: evennia.contrib.game_systems.crafting.example_recipes
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.game_systems.crafting.md b/docs/source/api/evennia.contrib.game_systems.crafting.md
index c362f325b..3f172ede8 100644
--- a/docs/source/api/evennia.contrib.game_systems.crafting.md
+++ b/docs/source/api/evennia.contrib.game_systems.crafting.md
@@ -4,11 +4,10 @@ evennia.contrib.game\_systems.crafting
 
 .. automodule:: evennia.contrib.game_systems.crafting
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.game_systems.crafting.tests.md b/docs/source/api/evennia.contrib.game_systems.crafting.tests.md
index ee979eb1e..9d1760448 100644
--- a/docs/source/api/evennia.contrib.game_systems.crafting.tests.md
+++ b/docs/source/api/evennia.contrib.game_systems.crafting.tests.md
@@ -4,7 +4,7 @@ evennia.contrib.game\_systems.crafting.tests
 
 .. automodule:: evennia.contrib.game_systems.crafting.tests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.game_systems.gendersub.gendersub.md b/docs/source/api/evennia.contrib.game_systems.gendersub.gendersub.md
index 6b3e550a9..2cfb9b7ff 100644
--- a/docs/source/api/evennia.contrib.game_systems.gendersub.gendersub.md
+++ b/docs/source/api/evennia.contrib.game_systems.gendersub.gendersub.md
@@ -4,7 +4,7 @@ evennia.contrib.game\_systems.gendersub.gendersub
 
 .. automodule:: evennia.contrib.game_systems.gendersub.gendersub
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.game_systems.gendersub.md b/docs/source/api/evennia.contrib.game_systems.gendersub.md
index f18866646..ffcd6a74a 100644
--- a/docs/source/api/evennia.contrib.game_systems.gendersub.md
+++ b/docs/source/api/evennia.contrib.game_systems.gendersub.md
@@ -4,11 +4,10 @@ evennia.contrib.game\_systems.gendersub
 
 .. automodule:: evennia.contrib.game_systems.gendersub
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.game_systems.gendersub.tests.md b/docs/source/api/evennia.contrib.game_systems.gendersub.tests.md
index 41a1d7afd..bfeb47ae5 100644
--- a/docs/source/api/evennia.contrib.game_systems.gendersub.tests.md
+++ b/docs/source/api/evennia.contrib.game_systems.gendersub.tests.md
@@ -4,7 +4,7 @@ evennia.contrib.game\_systems.gendersub.tests
 
 .. automodule:: evennia.contrib.game_systems.gendersub.tests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.game_systems.mail.mail.md b/docs/source/api/evennia.contrib.game_systems.mail.mail.md
index 05f856044..d08557212 100644
--- a/docs/source/api/evennia.contrib.game_systems.mail.mail.md
+++ b/docs/source/api/evennia.contrib.game_systems.mail.mail.md
@@ -4,7 +4,7 @@ evennia.contrib.game\_systems.mail.mail
 
 .. automodule:: evennia.contrib.game_systems.mail.mail
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.game_systems.mail.md b/docs/source/api/evennia.contrib.game_systems.mail.md
index b9d824f3d..43b85f4b0 100644
--- a/docs/source/api/evennia.contrib.game_systems.mail.md
+++ b/docs/source/api/evennia.contrib.game_systems.mail.md
@@ -4,11 +4,10 @@ evennia.contrib.game\_systems.mail
 
 .. automodule:: evennia.contrib.game_systems.mail
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.game_systems.mail.tests.md b/docs/source/api/evennia.contrib.game_systems.mail.tests.md
index 0c6a5e965..035335522 100644
--- a/docs/source/api/evennia.contrib.game_systems.mail.tests.md
+++ b/docs/source/api/evennia.contrib.game_systems.mail.tests.md
@@ -4,7 +4,7 @@ evennia.contrib.game\_systems.mail.tests
 
 .. automodule:: evennia.contrib.game_systems.mail.tests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.game_systems.md b/docs/source/api/evennia.contrib.game_systems.md
index 46d771dc6..7f469b3a0 100644
--- a/docs/source/api/evennia.contrib.game_systems.md
+++ b/docs/source/api/evennia.contrib.game_systems.md
@@ -4,11 +4,9 @@ evennia.contrib.game\_systems
 
 .. automodule:: evennia.contrib.game_systems
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
-Subpackages
------------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.game_systems.multidescer.md b/docs/source/api/evennia.contrib.game_systems.multidescer.md
index 8a11eedbd..4a3a2cedd 100644
--- a/docs/source/api/evennia.contrib.game_systems.multidescer.md
+++ b/docs/source/api/evennia.contrib.game_systems.multidescer.md
@@ -4,11 +4,10 @@ evennia.contrib.game\_systems.multidescer
 
 .. automodule:: evennia.contrib.game_systems.multidescer
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.game_systems.multidescer.multidescer.md b/docs/source/api/evennia.contrib.game_systems.multidescer.multidescer.md
index 37562e89d..01a4892bd 100644
--- a/docs/source/api/evennia.contrib.game_systems.multidescer.multidescer.md
+++ b/docs/source/api/evennia.contrib.game_systems.multidescer.multidescer.md
@@ -4,7 +4,7 @@ evennia.contrib.game\_systems.multidescer.multidescer
 
 .. automodule:: evennia.contrib.game_systems.multidescer.multidescer
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.game_systems.multidescer.tests.md b/docs/source/api/evennia.contrib.game_systems.multidescer.tests.md
index 45c900571..a86b03502 100644
--- a/docs/source/api/evennia.contrib.game_systems.multidescer.tests.md
+++ b/docs/source/api/evennia.contrib.game_systems.multidescer.tests.md
@@ -4,7 +4,7 @@ evennia.contrib.game\_systems.multidescer.tests
 
 .. automodule:: evennia.contrib.game_systems.multidescer.tests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.game_systems.puzzles.md b/docs/source/api/evennia.contrib.game_systems.puzzles.md
index cb76d7f1f..a2748c90a 100644
--- a/docs/source/api/evennia.contrib.game_systems.puzzles.md
+++ b/docs/source/api/evennia.contrib.game_systems.puzzles.md
@@ -4,11 +4,10 @@ evennia.contrib.game\_systems.puzzles
 
 .. automodule:: evennia.contrib.game_systems.puzzles
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.game_systems.puzzles.puzzles.md b/docs/source/api/evennia.contrib.game_systems.puzzles.puzzles.md
index 47b27e65f..17abd54b1 100644
--- a/docs/source/api/evennia.contrib.game_systems.puzzles.puzzles.md
+++ b/docs/source/api/evennia.contrib.game_systems.puzzles.puzzles.md
@@ -4,7 +4,7 @@ evennia.contrib.game\_systems.puzzles.puzzles
 
 .. automodule:: evennia.contrib.game_systems.puzzles.puzzles
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.game_systems.puzzles.tests.md b/docs/source/api/evennia.contrib.game_systems.puzzles.tests.md
index 507fed2dd..17c2d3686 100644
--- a/docs/source/api/evennia.contrib.game_systems.puzzles.tests.md
+++ b/docs/source/api/evennia.contrib.game_systems.puzzles.tests.md
@@ -4,7 +4,7 @@ evennia.contrib.game\_systems.puzzles.tests
 
 .. automodule:: evennia.contrib.game_systems.puzzles.tests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.game_systems.storage.md b/docs/source/api/evennia.contrib.game_systems.storage.md
index c859aa805..d38633637 100644
--- a/docs/source/api/evennia.contrib.game_systems.storage.md
+++ b/docs/source/api/evennia.contrib.game_systems.storage.md
@@ -4,11 +4,10 @@ evennia.contrib.game\_systems.storage
 
 .. automodule:: evennia.contrib.game_systems.storage
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.game_systems.storage.storage.md b/docs/source/api/evennia.contrib.game_systems.storage.storage.md
index 882eaf698..437fca5bb 100644
--- a/docs/source/api/evennia.contrib.game_systems.storage.storage.md
+++ b/docs/source/api/evennia.contrib.game_systems.storage.storage.md
@@ -4,7 +4,7 @@ evennia.contrib.game\_systems.storage.storage
 
 .. automodule:: evennia.contrib.game_systems.storage.storage
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.game_systems.storage.tests.md b/docs/source/api/evennia.contrib.game_systems.storage.tests.md
index fccdd5fe5..cf0244501 100644
--- a/docs/source/api/evennia.contrib.game_systems.storage.tests.md
+++ b/docs/source/api/evennia.contrib.game_systems.storage.tests.md
@@ -4,7 +4,7 @@ evennia.contrib.game\_systems.storage.tests
 
 .. automodule:: evennia.contrib.game_systems.storage.tests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.game_systems.turnbattle.md b/docs/source/api/evennia.contrib.game_systems.turnbattle.md
index 23abcf07e..49a29a1be 100644
--- a/docs/source/api/evennia.contrib.game_systems.turnbattle.md
+++ b/docs/source/api/evennia.contrib.game_systems.turnbattle.md
@@ -4,11 +4,10 @@ evennia.contrib.game\_systems.turnbattle
 
 .. automodule:: evennia.contrib.game_systems.turnbattle
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.game_systems.turnbattle.tb_basic.md b/docs/source/api/evennia.contrib.game_systems.turnbattle.tb_basic.md
index 84dcd9bed..e033f63e4 100644
--- a/docs/source/api/evennia.contrib.game_systems.turnbattle.tb_basic.md
+++ b/docs/source/api/evennia.contrib.game_systems.turnbattle.tb_basic.md
@@ -4,7 +4,7 @@ evennia.contrib.game\_systems.turnbattle.tb\_basic
 
 .. automodule:: evennia.contrib.game_systems.turnbattle.tb_basic
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.game_systems.turnbattle.tb_equip.md b/docs/source/api/evennia.contrib.game_systems.turnbattle.tb_equip.md
index 77af0c59f..a7ace5e11 100644
--- a/docs/source/api/evennia.contrib.game_systems.turnbattle.tb_equip.md
+++ b/docs/source/api/evennia.contrib.game_systems.turnbattle.tb_equip.md
@@ -4,7 +4,7 @@ evennia.contrib.game\_systems.turnbattle.tb\_equip
 
 .. automodule:: evennia.contrib.game_systems.turnbattle.tb_equip
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.game_systems.turnbattle.tb_items.md b/docs/source/api/evennia.contrib.game_systems.turnbattle.tb_items.md
index 48c82ed70..3e2ea83c4 100644
--- a/docs/source/api/evennia.contrib.game_systems.turnbattle.tb_items.md
+++ b/docs/source/api/evennia.contrib.game_systems.turnbattle.tb_items.md
@@ -4,7 +4,7 @@ evennia.contrib.game\_systems.turnbattle.tb\_items
 
 .. automodule:: evennia.contrib.game_systems.turnbattle.tb_items
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.game_systems.turnbattle.tb_magic.md b/docs/source/api/evennia.contrib.game_systems.turnbattle.tb_magic.md
index a2326b44c..9ac98b6ca 100644
--- a/docs/source/api/evennia.contrib.game_systems.turnbattle.tb_magic.md
+++ b/docs/source/api/evennia.contrib.game_systems.turnbattle.tb_magic.md
@@ -4,7 +4,7 @@ evennia.contrib.game\_systems.turnbattle.tb\_magic
 
 .. automodule:: evennia.contrib.game_systems.turnbattle.tb_magic
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.game_systems.turnbattle.tb_range.md b/docs/source/api/evennia.contrib.game_systems.turnbattle.tb_range.md
index 4c8ce513f..c05126ef7 100644
--- a/docs/source/api/evennia.contrib.game_systems.turnbattle.tb_range.md
+++ b/docs/source/api/evennia.contrib.game_systems.turnbattle.tb_range.md
@@ -4,7 +4,7 @@ evennia.contrib.game\_systems.turnbattle.tb\_range
 
 .. automodule:: evennia.contrib.game_systems.turnbattle.tb_range
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.game_systems.turnbattle.tests.md b/docs/source/api/evennia.contrib.game_systems.turnbattle.tests.md
index 81f21bbcf..38b9aea6d 100644
--- a/docs/source/api/evennia.contrib.game_systems.turnbattle.tests.md
+++ b/docs/source/api/evennia.contrib.game_systems.turnbattle.tests.md
@@ -4,7 +4,7 @@ evennia.contrib.game\_systems.turnbattle.tests
 
 .. automodule:: evennia.contrib.game_systems.turnbattle.tests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.grid.extended_room.extended_room.md b/docs/source/api/evennia.contrib.grid.extended_room.extended_room.md
index c36822314..7bd780bdf 100644
--- a/docs/source/api/evennia.contrib.grid.extended_room.extended_room.md
+++ b/docs/source/api/evennia.contrib.grid.extended_room.extended_room.md
@@ -4,7 +4,7 @@ evennia.contrib.grid.extended\_room.extended\_room
 
 .. automodule:: evennia.contrib.grid.extended_room.extended_room
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.grid.extended_room.md b/docs/source/api/evennia.contrib.grid.extended_room.md
index fcf1ee9e7..7dc1f0f6d 100644
--- a/docs/source/api/evennia.contrib.grid.extended_room.md
+++ b/docs/source/api/evennia.contrib.grid.extended_room.md
@@ -4,11 +4,10 @@ evennia.contrib.grid.extended\_room
 
 .. automodule:: evennia.contrib.grid.extended_room
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.grid.extended_room.tests.md b/docs/source/api/evennia.contrib.grid.extended_room.tests.md
index 64b2e2ece..310bdaa39 100644
--- a/docs/source/api/evennia.contrib.grid.extended_room.tests.md
+++ b/docs/source/api/evennia.contrib.grid.extended_room.tests.md
@@ -4,7 +4,7 @@ evennia.contrib.grid.extended\_room.tests
 
 .. automodule:: evennia.contrib.grid.extended_room.tests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.grid.ingame_map_display.ingame_map_display.md b/docs/source/api/evennia.contrib.grid.ingame_map_display.ingame_map_display.md
index 24af76bca..69a0e5049 100644
--- a/docs/source/api/evennia.contrib.grid.ingame_map_display.ingame_map_display.md
+++ b/docs/source/api/evennia.contrib.grid.ingame_map_display.ingame_map_display.md
@@ -4,7 +4,7 @@ evennia.contrib.grid.ingame\_map\_display.ingame\_map\_display
 
 .. automodule:: evennia.contrib.grid.ingame_map_display.ingame_map_display
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.grid.ingame_map_display.md b/docs/source/api/evennia.contrib.grid.ingame_map_display.md
index a0e0d3da1..9b36efe0e 100644
--- a/docs/source/api/evennia.contrib.grid.ingame_map_display.md
+++ b/docs/source/api/evennia.contrib.grid.ingame_map_display.md
@@ -4,11 +4,10 @@ evennia.contrib.grid.ingame\_map\_display
 
 .. automodule:: evennia.contrib.grid.ingame_map_display
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.grid.ingame_map_display.tests.md b/docs/source/api/evennia.contrib.grid.ingame_map_display.tests.md
index f301581fc..24788bbce 100644
--- a/docs/source/api/evennia.contrib.grid.ingame_map_display.tests.md
+++ b/docs/source/api/evennia.contrib.grid.ingame_map_display.tests.md
@@ -4,7 +4,7 @@ evennia.contrib.grid.ingame\_map\_display.tests
 
 .. automodule:: evennia.contrib.grid.ingame_map_display.tests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.grid.mapbuilder.mapbuilder.md b/docs/source/api/evennia.contrib.grid.mapbuilder.mapbuilder.md
index d52ad8109..c37c529d9 100644
--- a/docs/source/api/evennia.contrib.grid.mapbuilder.mapbuilder.md
+++ b/docs/source/api/evennia.contrib.grid.mapbuilder.mapbuilder.md
@@ -4,7 +4,7 @@ evennia.contrib.grid.mapbuilder.mapbuilder
 
 .. automodule:: evennia.contrib.grid.mapbuilder.mapbuilder
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.grid.mapbuilder.md b/docs/source/api/evennia.contrib.grid.mapbuilder.md
index 54f16da21..c8f2be372 100644
--- a/docs/source/api/evennia.contrib.grid.mapbuilder.md
+++ b/docs/source/api/evennia.contrib.grid.mapbuilder.md
@@ -4,11 +4,10 @@ evennia.contrib.grid.mapbuilder
 
 .. automodule:: evennia.contrib.grid.mapbuilder
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.grid.mapbuilder.tests.md b/docs/source/api/evennia.contrib.grid.mapbuilder.tests.md
index e6e3277de..457a913c8 100644
--- a/docs/source/api/evennia.contrib.grid.mapbuilder.tests.md
+++ b/docs/source/api/evennia.contrib.grid.mapbuilder.tests.md
@@ -4,7 +4,7 @@ evennia.contrib.grid.mapbuilder.tests
 
 .. automodule:: evennia.contrib.grid.mapbuilder.tests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.grid.md b/docs/source/api/evennia.contrib.grid.md
index 885fd1489..6347b7d4b 100644
--- a/docs/source/api/evennia.contrib.grid.md
+++ b/docs/source/api/evennia.contrib.grid.md
@@ -4,11 +4,9 @@ evennia.contrib.grid
 
 .. automodule:: evennia.contrib.grid
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
-Subpackages
------------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.grid.simpledoor.md b/docs/source/api/evennia.contrib.grid.simpledoor.md
index 9ac3b1cf0..1335734da 100644
--- a/docs/source/api/evennia.contrib.grid.simpledoor.md
+++ b/docs/source/api/evennia.contrib.grid.simpledoor.md
@@ -4,11 +4,10 @@ evennia.contrib.grid.simpledoor
 
 .. automodule:: evennia.contrib.grid.simpledoor
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.grid.simpledoor.simpledoor.md b/docs/source/api/evennia.contrib.grid.simpledoor.simpledoor.md
index 15ce6141b..b7ef24318 100644
--- a/docs/source/api/evennia.contrib.grid.simpledoor.simpledoor.md
+++ b/docs/source/api/evennia.contrib.grid.simpledoor.simpledoor.md
@@ -4,7 +4,7 @@ evennia.contrib.grid.simpledoor.simpledoor
 
 .. automodule:: evennia.contrib.grid.simpledoor.simpledoor
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.grid.simpledoor.tests.md b/docs/source/api/evennia.contrib.grid.simpledoor.tests.md
index 1eb82139a..cd4344577 100644
--- a/docs/source/api/evennia.contrib.grid.simpledoor.tests.md
+++ b/docs/source/api/evennia.contrib.grid.simpledoor.tests.md
@@ -4,7 +4,7 @@ evennia.contrib.grid.simpledoor.tests
 
 .. automodule:: evennia.contrib.grid.simpledoor.tests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.grid.slow_exit.md b/docs/source/api/evennia.contrib.grid.slow_exit.md
index 9a2397ddf..ca9f75f36 100644
--- a/docs/source/api/evennia.contrib.grid.slow_exit.md
+++ b/docs/source/api/evennia.contrib.grid.slow_exit.md
@@ -4,11 +4,10 @@ evennia.contrib.grid.slow\_exit
 
 .. automodule:: evennia.contrib.grid.slow_exit
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.grid.slow_exit.slow_exit.md b/docs/source/api/evennia.contrib.grid.slow_exit.slow_exit.md
index 2a570bca9..3a83d0296 100644
--- a/docs/source/api/evennia.contrib.grid.slow_exit.slow_exit.md
+++ b/docs/source/api/evennia.contrib.grid.slow_exit.slow_exit.md
@@ -4,7 +4,7 @@ evennia.contrib.grid.slow\_exit.slow\_exit
 
 .. automodule:: evennia.contrib.grid.slow_exit.slow_exit
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.grid.slow_exit.tests.md b/docs/source/api/evennia.contrib.grid.slow_exit.tests.md
index d73e61717..847ecd56f 100644
--- a/docs/source/api/evennia.contrib.grid.slow_exit.tests.md
+++ b/docs/source/api/evennia.contrib.grid.slow_exit.tests.md
@@ -4,7 +4,7 @@ evennia.contrib.grid.slow\_exit.tests
 
 .. automodule:: evennia.contrib.grid.slow_exit.tests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.grid.wilderness.md b/docs/source/api/evennia.contrib.grid.wilderness.md
index 6f7f56d99..84f940127 100644
--- a/docs/source/api/evennia.contrib.grid.wilderness.md
+++ b/docs/source/api/evennia.contrib.grid.wilderness.md
@@ -4,11 +4,10 @@ evennia.contrib.grid.wilderness
 
 .. automodule:: evennia.contrib.grid.wilderness
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.grid.wilderness.tests.md b/docs/source/api/evennia.contrib.grid.wilderness.tests.md
index fc3910a4a..b3c6b15b7 100644
--- a/docs/source/api/evennia.contrib.grid.wilderness.tests.md
+++ b/docs/source/api/evennia.contrib.grid.wilderness.tests.md
@@ -4,7 +4,7 @@ evennia.contrib.grid.wilderness.tests
 
 .. automodule:: evennia.contrib.grid.wilderness.tests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.grid.wilderness.wilderness.md b/docs/source/api/evennia.contrib.grid.wilderness.wilderness.md
index 5c24257c0..6f521b688 100644
--- a/docs/source/api/evennia.contrib.grid.wilderness.wilderness.md
+++ b/docs/source/api/evennia.contrib.grid.wilderness.wilderness.md
@@ -4,7 +4,7 @@ evennia.contrib.grid.wilderness.wilderness
 
 .. automodule:: evennia.contrib.grid.wilderness.wilderness
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.grid.xyzgrid.commands.md b/docs/source/api/evennia.contrib.grid.xyzgrid.commands.md
index b586dfae1..01f8e2a45 100644
--- a/docs/source/api/evennia.contrib.grid.xyzgrid.commands.md
+++ b/docs/source/api/evennia.contrib.grid.xyzgrid.commands.md
@@ -4,7 +4,7 @@ evennia.contrib.grid.xyzgrid.commands
 
 .. automodule:: evennia.contrib.grid.xyzgrid.commands
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.grid.xyzgrid.example.md b/docs/source/api/evennia.contrib.grid.xyzgrid.example.md
index bffd8efc1..e5f357f99 100644
--- a/docs/source/api/evennia.contrib.grid.xyzgrid.example.md
+++ b/docs/source/api/evennia.contrib.grid.xyzgrid.example.md
@@ -4,7 +4,7 @@ evennia.contrib.grid.xyzgrid.example
 
 .. automodule:: evennia.contrib.grid.xyzgrid.example
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.grid.xyzgrid.launchcmd.md b/docs/source/api/evennia.contrib.grid.xyzgrid.launchcmd.md
index b17b1aa41..569ffabfb 100644
--- a/docs/source/api/evennia.contrib.grid.xyzgrid.launchcmd.md
+++ b/docs/source/api/evennia.contrib.grid.xyzgrid.launchcmd.md
@@ -4,7 +4,7 @@ evennia.contrib.grid.xyzgrid.launchcmd
 
 .. automodule:: evennia.contrib.grid.xyzgrid.launchcmd
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.grid.xyzgrid.md b/docs/source/api/evennia.contrib.grid.xyzgrid.md
index a12e2da1e..8267f3531 100644
--- a/docs/source/api/evennia.contrib.grid.xyzgrid.md
+++ b/docs/source/api/evennia.contrib.grid.xyzgrid.md
@@ -4,11 +4,10 @@ evennia.contrib.grid.xyzgrid
 
 .. automodule:: evennia.contrib.grid.xyzgrid
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.grid.xyzgrid.prototypes.md b/docs/source/api/evennia.contrib.grid.xyzgrid.prototypes.md
index da5715254..2d78d43ea 100644
--- a/docs/source/api/evennia.contrib.grid.xyzgrid.prototypes.md
+++ b/docs/source/api/evennia.contrib.grid.xyzgrid.prototypes.md
@@ -4,7 +4,7 @@ evennia.contrib.grid.xyzgrid.prototypes
 
 .. automodule:: evennia.contrib.grid.xyzgrid.prototypes
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.grid.xyzgrid.tests.md b/docs/source/api/evennia.contrib.grid.xyzgrid.tests.md
index b9e711c8a..a623d7a1f 100644
--- a/docs/source/api/evennia.contrib.grid.xyzgrid.tests.md
+++ b/docs/source/api/evennia.contrib.grid.xyzgrid.tests.md
@@ -4,7 +4,7 @@ evennia.contrib.grid.xyzgrid.tests
 
 .. automodule:: evennia.contrib.grid.xyzgrid.tests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.grid.xyzgrid.utils.md b/docs/source/api/evennia.contrib.grid.xyzgrid.utils.md
index c19523d7f..abd8ccc4f 100644
--- a/docs/source/api/evennia.contrib.grid.xyzgrid.utils.md
+++ b/docs/source/api/evennia.contrib.grid.xyzgrid.utils.md
@@ -4,7 +4,7 @@ evennia.contrib.grid.xyzgrid.utils
 
 .. automodule:: evennia.contrib.grid.xyzgrid.utils
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.grid.xyzgrid.xymap.md b/docs/source/api/evennia.contrib.grid.xyzgrid.xymap.md
index a219d54a4..dc0ec6813 100644
--- a/docs/source/api/evennia.contrib.grid.xyzgrid.xymap.md
+++ b/docs/source/api/evennia.contrib.grid.xyzgrid.xymap.md
@@ -4,7 +4,7 @@ evennia.contrib.grid.xyzgrid.xymap
 
 .. automodule:: evennia.contrib.grid.xyzgrid.xymap
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.grid.xyzgrid.xymap_legend.md b/docs/source/api/evennia.contrib.grid.xyzgrid.xymap_legend.md
index cf2548736..09db04a03 100644
--- a/docs/source/api/evennia.contrib.grid.xyzgrid.xymap_legend.md
+++ b/docs/source/api/evennia.contrib.grid.xyzgrid.xymap_legend.md
@@ -4,7 +4,7 @@ evennia.contrib.grid.xyzgrid.xymap\_legend
 
 .. automodule:: evennia.contrib.grid.xyzgrid.xymap_legend
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.grid.xyzgrid.xyzgrid.md b/docs/source/api/evennia.contrib.grid.xyzgrid.xyzgrid.md
index ccff5fc06..2c69a32a5 100644
--- a/docs/source/api/evennia.contrib.grid.xyzgrid.xyzgrid.md
+++ b/docs/source/api/evennia.contrib.grid.xyzgrid.xyzgrid.md
@@ -4,7 +4,7 @@ evennia.contrib.grid.xyzgrid.xyzgrid
 
 .. automodule:: evennia.contrib.grid.xyzgrid.xyzgrid
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.grid.xyzgrid.xyzroom.md b/docs/source/api/evennia.contrib.grid.xyzgrid.xyzroom.md
index e07726a43..ad621f183 100644
--- a/docs/source/api/evennia.contrib.grid.xyzgrid.xyzroom.md
+++ b/docs/source/api/evennia.contrib.grid.xyzgrid.xyzroom.md
@@ -4,7 +4,7 @@ evennia.contrib.grid.xyzgrid.xyzroom
 
 .. automodule:: evennia.contrib.grid.xyzgrid.xyzroom
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.md b/docs/source/api/evennia.contrib.md
index bbe101995..9b3b4c42c 100644
--- a/docs/source/api/evennia.contrib.md
+++ b/docs/source/api/evennia.contrib.md
@@ -4,11 +4,9 @@ evennia.contrib
 
 .. automodule:: evennia.contrib
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
-Subpackages
------------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.rpg.buffs.buff.md b/docs/source/api/evennia.contrib.rpg.buffs.buff.md
index 826198c22..e65874698 100644
--- a/docs/source/api/evennia.contrib.rpg.buffs.buff.md
+++ b/docs/source/api/evennia.contrib.rpg.buffs.buff.md
@@ -4,7 +4,7 @@ evennia.contrib.rpg.buffs.buff
 
 .. automodule:: evennia.contrib.rpg.buffs.buff
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.rpg.buffs.md b/docs/source/api/evennia.contrib.rpg.buffs.md
index 1ce833b51..6004f81ff 100644
--- a/docs/source/api/evennia.contrib.rpg.buffs.md
+++ b/docs/source/api/evennia.contrib.rpg.buffs.md
@@ -4,11 +4,10 @@ evennia.contrib.rpg.buffs
 
 .. automodule:: evennia.contrib.rpg.buffs
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.rpg.buffs.samplebuffs.md b/docs/source/api/evennia.contrib.rpg.buffs.samplebuffs.md
index ecad1d62b..fc166055a 100644
--- a/docs/source/api/evennia.contrib.rpg.buffs.samplebuffs.md
+++ b/docs/source/api/evennia.contrib.rpg.buffs.samplebuffs.md
@@ -4,7 +4,7 @@ evennia.contrib.rpg.buffs.samplebuffs
 
 .. automodule:: evennia.contrib.rpg.buffs.samplebuffs
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.rpg.buffs.tests.md b/docs/source/api/evennia.contrib.rpg.buffs.tests.md
index 84b3076df..85604618d 100644
--- a/docs/source/api/evennia.contrib.rpg.buffs.tests.md
+++ b/docs/source/api/evennia.contrib.rpg.buffs.tests.md
@@ -4,7 +4,7 @@ evennia.contrib.rpg.buffs.tests
 
 .. automodule:: evennia.contrib.rpg.buffs.tests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.rpg.character_creator.character_creator.md b/docs/source/api/evennia.contrib.rpg.character_creator.character_creator.md
index f4c39084a..c21029289 100644
--- a/docs/source/api/evennia.contrib.rpg.character_creator.character_creator.md
+++ b/docs/source/api/evennia.contrib.rpg.character_creator.character_creator.md
@@ -4,7 +4,7 @@ evennia.contrib.rpg.character\_creator.character\_creator
 
 .. automodule:: evennia.contrib.rpg.character_creator.character_creator
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.rpg.character_creator.example_menu.md b/docs/source/api/evennia.contrib.rpg.character_creator.example_menu.md
index b385ae33c..9a694c937 100644
--- a/docs/source/api/evennia.contrib.rpg.character_creator.example_menu.md
+++ b/docs/source/api/evennia.contrib.rpg.character_creator.example_menu.md
@@ -4,7 +4,7 @@ evennia.contrib.rpg.character\_creator.example\_menu
 
 .. automodule:: evennia.contrib.rpg.character_creator.example_menu
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.rpg.character_creator.md b/docs/source/api/evennia.contrib.rpg.character_creator.md
index 70d1930b3..2b960dfd4 100644
--- a/docs/source/api/evennia.contrib.rpg.character_creator.md
+++ b/docs/source/api/evennia.contrib.rpg.character_creator.md
@@ -4,11 +4,10 @@ evennia.contrib.rpg.character\_creator
 
 .. automodule:: evennia.contrib.rpg.character_creator
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.rpg.character_creator.tests.md b/docs/source/api/evennia.contrib.rpg.character_creator.tests.md
index af38951f1..9c7dab0a2 100644
--- a/docs/source/api/evennia.contrib.rpg.character_creator.tests.md
+++ b/docs/source/api/evennia.contrib.rpg.character_creator.tests.md
@@ -4,7 +4,7 @@ evennia.contrib.rpg.character\_creator.tests
 
 .. automodule:: evennia.contrib.rpg.character_creator.tests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.rpg.dice.dice.md b/docs/source/api/evennia.contrib.rpg.dice.dice.md
index c632dc4f1..fe270663b 100644
--- a/docs/source/api/evennia.contrib.rpg.dice.dice.md
+++ b/docs/source/api/evennia.contrib.rpg.dice.dice.md
@@ -4,7 +4,7 @@ evennia.contrib.rpg.dice.dice
 
 .. automodule:: evennia.contrib.rpg.dice.dice
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.rpg.dice.md b/docs/source/api/evennia.contrib.rpg.dice.md
index 6bc816dd6..cd1fdebc3 100644
--- a/docs/source/api/evennia.contrib.rpg.dice.md
+++ b/docs/source/api/evennia.contrib.rpg.dice.md
@@ -4,11 +4,10 @@ evennia.contrib.rpg.dice
 
 .. automodule:: evennia.contrib.rpg.dice
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.rpg.dice.tests.md b/docs/source/api/evennia.contrib.rpg.dice.tests.md
index f6dbd1d87..778d1f46c 100644
--- a/docs/source/api/evennia.contrib.rpg.dice.tests.md
+++ b/docs/source/api/evennia.contrib.rpg.dice.tests.md
@@ -4,7 +4,7 @@ evennia.contrib.rpg.dice.tests
 
 .. automodule:: evennia.contrib.rpg.dice.tests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.rpg.health_bar.health_bar.md b/docs/source/api/evennia.contrib.rpg.health_bar.health_bar.md
index 8213d8195..544867a5f 100644
--- a/docs/source/api/evennia.contrib.rpg.health_bar.health_bar.md
+++ b/docs/source/api/evennia.contrib.rpg.health_bar.health_bar.md
@@ -4,7 +4,7 @@ evennia.contrib.rpg.health\_bar.health\_bar
 
 .. automodule:: evennia.contrib.rpg.health_bar.health_bar
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.rpg.health_bar.md b/docs/source/api/evennia.contrib.rpg.health_bar.md
index ed84b45b0..b7c646f34 100644
--- a/docs/source/api/evennia.contrib.rpg.health_bar.md
+++ b/docs/source/api/evennia.contrib.rpg.health_bar.md
@@ -4,11 +4,10 @@ evennia.contrib.rpg.health\_bar
 
 .. automodule:: evennia.contrib.rpg.health_bar
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.rpg.health_bar.tests.md b/docs/source/api/evennia.contrib.rpg.health_bar.tests.md
index 8727383b3..5a60b5c5a 100644
--- a/docs/source/api/evennia.contrib.rpg.health_bar.tests.md
+++ b/docs/source/api/evennia.contrib.rpg.health_bar.tests.md
@@ -4,7 +4,7 @@ evennia.contrib.rpg.health\_bar.tests
 
 .. automodule:: evennia.contrib.rpg.health_bar.tests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.rpg.llm.llm_client.md b/docs/source/api/evennia.contrib.rpg.llm.llm_client.md
index a94e462ec..ffadf9321 100644
--- a/docs/source/api/evennia.contrib.rpg.llm.llm_client.md
+++ b/docs/source/api/evennia.contrib.rpg.llm.llm_client.md
@@ -4,7 +4,7 @@ evennia.contrib.rpg.llm.llm\_client
 
 .. automodule:: evennia.contrib.rpg.llm.llm_client
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.rpg.llm.llm_npc.md b/docs/source/api/evennia.contrib.rpg.llm.llm_npc.md
index 49f444412..12c294ee4 100644
--- a/docs/source/api/evennia.contrib.rpg.llm.llm_npc.md
+++ b/docs/source/api/evennia.contrib.rpg.llm.llm_npc.md
@@ -4,7 +4,7 @@ evennia.contrib.rpg.llm.llm\_npc
 
 .. automodule:: evennia.contrib.rpg.llm.llm_npc
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.rpg.llm.md b/docs/source/api/evennia.contrib.rpg.llm.md
index 523c972fc..e1f546873 100644
--- a/docs/source/api/evennia.contrib.rpg.llm.md
+++ b/docs/source/api/evennia.contrib.rpg.llm.md
@@ -4,11 +4,10 @@ evennia.contrib.rpg.llm
 
 .. automodule:: evennia.contrib.rpg.llm
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.rpg.llm.tests.md b/docs/source/api/evennia.contrib.rpg.llm.tests.md
index bd94a2b1b..a4bafaffe 100644
--- a/docs/source/api/evennia.contrib.rpg.llm.tests.md
+++ b/docs/source/api/evennia.contrib.rpg.llm.tests.md
@@ -4,7 +4,7 @@ evennia.contrib.rpg.llm.tests
 
 .. automodule:: evennia.contrib.rpg.llm.tests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.rpg.md b/docs/source/api/evennia.contrib.rpg.md
index 0a5c2aa3f..cba90625c 100644
--- a/docs/source/api/evennia.contrib.rpg.md
+++ b/docs/source/api/evennia.contrib.rpg.md
@@ -4,11 +4,9 @@ evennia.contrib.rpg
 
 .. automodule:: evennia.contrib.rpg
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
-Subpackages
------------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.rpg.rpsystem.md b/docs/source/api/evennia.contrib.rpg.rpsystem.md
index c62962662..3b5a39373 100644
--- a/docs/source/api/evennia.contrib.rpg.rpsystem.md
+++ b/docs/source/api/evennia.contrib.rpg.rpsystem.md
@@ -4,11 +4,10 @@ evennia.contrib.rpg.rpsystem
 
 .. automodule:: evennia.contrib.rpg.rpsystem
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.rpg.rpsystem.rplanguage.md b/docs/source/api/evennia.contrib.rpg.rpsystem.rplanguage.md
index ed8d67938..f24a24000 100644
--- a/docs/source/api/evennia.contrib.rpg.rpsystem.rplanguage.md
+++ b/docs/source/api/evennia.contrib.rpg.rpsystem.rplanguage.md
@@ -4,7 +4,7 @@ evennia.contrib.rpg.rpsystem.rplanguage
 
 .. automodule:: evennia.contrib.rpg.rpsystem.rplanguage
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.rpg.rpsystem.rpsystem.md b/docs/source/api/evennia.contrib.rpg.rpsystem.rpsystem.md
index 0f7ed6fb6..4ce47f15a 100644
--- a/docs/source/api/evennia.contrib.rpg.rpsystem.rpsystem.md
+++ b/docs/source/api/evennia.contrib.rpg.rpsystem.rpsystem.md
@@ -4,7 +4,7 @@ evennia.contrib.rpg.rpsystem.rpsystem
 
 .. automodule:: evennia.contrib.rpg.rpsystem.rpsystem
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.rpg.rpsystem.tests.md b/docs/source/api/evennia.contrib.rpg.rpsystem.tests.md
index 8ec1576cd..8354eb584 100644
--- a/docs/source/api/evennia.contrib.rpg.rpsystem.tests.md
+++ b/docs/source/api/evennia.contrib.rpg.rpsystem.tests.md
@@ -4,7 +4,7 @@ evennia.contrib.rpg.rpsystem.tests
 
 .. automodule:: evennia.contrib.rpg.rpsystem.tests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.rpg.traits.md b/docs/source/api/evennia.contrib.rpg.traits.md
index 4516c11df..35e198dfa 100644
--- a/docs/source/api/evennia.contrib.rpg.traits.md
+++ b/docs/source/api/evennia.contrib.rpg.traits.md
@@ -4,11 +4,10 @@ evennia.contrib.rpg.traits
 
 .. automodule:: evennia.contrib.rpg.traits
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.rpg.traits.tests.md b/docs/source/api/evennia.contrib.rpg.traits.tests.md
index c96dad0e5..39e0095a7 100644
--- a/docs/source/api/evennia.contrib.rpg.traits.tests.md
+++ b/docs/source/api/evennia.contrib.rpg.traits.tests.md
@@ -4,7 +4,7 @@ evennia.contrib.rpg.traits.tests
 
 .. automodule:: evennia.contrib.rpg.traits.tests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.rpg.traits.traits.md b/docs/source/api/evennia.contrib.rpg.traits.traits.md
index afcaaf55d..9ddbdc82c 100644
--- a/docs/source/api/evennia.contrib.rpg.traits.traits.md
+++ b/docs/source/api/evennia.contrib.rpg.traits.traits.md
@@ -4,7 +4,7 @@ evennia.contrib.rpg.traits.traits
 
 .. automodule:: evennia.contrib.rpg.traits.traits
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.tutorials.batchprocessor.example_batch_code.md b/docs/source/api/evennia.contrib.tutorials.batchprocessor.example_batch_code.md
index de1e3dfcf..a6f68b520 100644
--- a/docs/source/api/evennia.contrib.tutorials.batchprocessor.example_batch_code.md
+++ b/docs/source/api/evennia.contrib.tutorials.batchprocessor.example_batch_code.md
@@ -4,7 +4,7 @@ evennia.contrib.tutorials.batchprocessor.example\_batch\_code
 
 .. automodule:: evennia.contrib.tutorials.batchprocessor.example_batch_code
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.tutorials.batchprocessor.md b/docs/source/api/evennia.contrib.tutorials.batchprocessor.md
index 21588cdd1..bf054a1cc 100644
--- a/docs/source/api/evennia.contrib.tutorials.batchprocessor.md
+++ b/docs/source/api/evennia.contrib.tutorials.batchprocessor.md
@@ -4,11 +4,10 @@ evennia.contrib.tutorials.batchprocessor
 
 .. automodule:: evennia.contrib.tutorials.batchprocessor
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.tutorials.bodyfunctions.bodyfunctions.md b/docs/source/api/evennia.contrib.tutorials.bodyfunctions.bodyfunctions.md
index d010a76e9..e869779e9 100644
--- a/docs/source/api/evennia.contrib.tutorials.bodyfunctions.bodyfunctions.md
+++ b/docs/source/api/evennia.contrib.tutorials.bodyfunctions.bodyfunctions.md
@@ -4,7 +4,7 @@ evennia.contrib.tutorials.bodyfunctions.bodyfunctions
 
 .. automodule:: evennia.contrib.tutorials.bodyfunctions.bodyfunctions
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.tutorials.bodyfunctions.md b/docs/source/api/evennia.contrib.tutorials.bodyfunctions.md
index 8ceb40055..c69c614f6 100644
--- a/docs/source/api/evennia.contrib.tutorials.bodyfunctions.md
+++ b/docs/source/api/evennia.contrib.tutorials.bodyfunctions.md
@@ -4,11 +4,10 @@ evennia.contrib.tutorials.bodyfunctions
 
 .. automodule:: evennia.contrib.tutorials.bodyfunctions
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.tutorials.bodyfunctions.tests.md b/docs/source/api/evennia.contrib.tutorials.bodyfunctions.tests.md
index b389eb324..5b83fe5da 100644
--- a/docs/source/api/evennia.contrib.tutorials.bodyfunctions.tests.md
+++ b/docs/source/api/evennia.contrib.tutorials.bodyfunctions.tests.md
@@ -4,7 +4,7 @@ evennia.contrib.tutorials.bodyfunctions.tests
 
 .. automodule:: evennia.contrib.tutorials.bodyfunctions.tests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.ai.md b/docs/source/api/evennia.contrib.tutorials.evadventure.ai.md
index 684daff1f..fa3654976 100644
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.ai.md
+++ b/docs/source/api/evennia.contrib.tutorials.evadventure.ai.md
@@ -4,7 +4,7 @@ evennia.contrib.tutorials.evadventure.ai
 
 .. automodule:: evennia.contrib.tutorials.evadventure.ai
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.batchscripts.md b/docs/source/api/evennia.contrib.tutorials.evadventure.batchscripts.md
index 3328b0a79..3c82dcb6f 100644
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.batchscripts.md
+++ b/docs/source/api/evennia.contrib.tutorials.evadventure.batchscripts.md
@@ -4,11 +4,10 @@ evennia.contrib.tutorials.evadventure.batchscripts
 
 .. automodule:: evennia.contrib.tutorials.evadventure.batchscripts
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.batchscripts.turnbased_combat_demo.md b/docs/source/api/evennia.contrib.tutorials.evadventure.batchscripts.turnbased_combat_demo.md
index f7d227f76..9689c07d5 100644
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.batchscripts.turnbased_combat_demo.md
+++ b/docs/source/api/evennia.contrib.tutorials.evadventure.batchscripts.turnbased_combat_demo.md
@@ -4,7 +4,7 @@ evennia.contrib.tutorials.evadventure.batchscripts.turnbased\_combat\_demo
 
 .. automodule:: evennia.contrib.tutorials.evadventure.batchscripts.turnbased_combat_demo
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.build_techdemo.md b/docs/source/api/evennia.contrib.tutorials.evadventure.build_techdemo.md
index 5f361e9be..06ce3e736 100644
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.build_techdemo.md
+++ b/docs/source/api/evennia.contrib.tutorials.evadventure.build_techdemo.md
@@ -4,7 +4,7 @@ evennia.contrib.tutorials.evadventure.build\_techdemo
 
 .. automodule:: evennia.contrib.tutorials.evadventure.build_techdemo
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.build_world.md b/docs/source/api/evennia.contrib.tutorials.evadventure.build_world.md
index f6af810ae..e39fa726c 100644
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.build_world.md
+++ b/docs/source/api/evennia.contrib.tutorials.evadventure.build_world.md
@@ -4,7 +4,7 @@ evennia.contrib.tutorials.evadventure.build\_world
 
 .. automodule:: evennia.contrib.tutorials.evadventure.build_world
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.characters.md b/docs/source/api/evennia.contrib.tutorials.evadventure.characters.md
index e71572143..2d9565fe5 100644
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.characters.md
+++ b/docs/source/api/evennia.contrib.tutorials.evadventure.characters.md
@@ -4,7 +4,7 @@ evennia.contrib.tutorials.evadventure.characters
 
 .. automodule:: evennia.contrib.tutorials.evadventure.characters
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.chargen.md b/docs/source/api/evennia.contrib.tutorials.evadventure.chargen.md
index 41d36c79e..663d51ca3 100644
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.chargen.md
+++ b/docs/source/api/evennia.contrib.tutorials.evadventure.chargen.md
@@ -4,7 +4,7 @@ evennia.contrib.tutorials.evadventure.chargen
 
 .. automodule:: evennia.contrib.tutorials.evadventure.chargen
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.combat_base.md b/docs/source/api/evennia.contrib.tutorials.evadventure.combat_base.md
index 4da5d1457..c8ec5fbe3 100644
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.combat_base.md
+++ b/docs/source/api/evennia.contrib.tutorials.evadventure.combat_base.md
@@ -4,7 +4,7 @@ evennia.contrib.tutorials.evadventure.combat\_base
 
 .. automodule:: evennia.contrib.tutorials.evadventure.combat_base
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.combat_turnbased.md b/docs/source/api/evennia.contrib.tutorials.evadventure.combat_turnbased.md
index ffccb7f73..0bf004b6e 100644
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.combat_turnbased.md
+++ b/docs/source/api/evennia.contrib.tutorials.evadventure.combat_turnbased.md
@@ -4,7 +4,7 @@ evennia.contrib.tutorials.evadventure.combat\_turnbased
 
 .. automodule:: evennia.contrib.tutorials.evadventure.combat_turnbased
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.combat_twitch.md b/docs/source/api/evennia.contrib.tutorials.evadventure.combat_twitch.md
index 1236f5ac1..6792668af 100644
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.combat_twitch.md
+++ b/docs/source/api/evennia.contrib.tutorials.evadventure.combat_twitch.md
@@ -4,7 +4,7 @@ evennia.contrib.tutorials.evadventure.combat\_twitch
 
 .. automodule:: evennia.contrib.tutorials.evadventure.combat_twitch
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.commands.md b/docs/source/api/evennia.contrib.tutorials.evadventure.commands.md
index 6294691c6..e80266505 100644
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.commands.md
+++ b/docs/source/api/evennia.contrib.tutorials.evadventure.commands.md
@@ -4,7 +4,7 @@ evennia.contrib.tutorials.evadventure.commands
 
 .. automodule:: evennia.contrib.tutorials.evadventure.commands
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.dungeon.md b/docs/source/api/evennia.contrib.tutorials.evadventure.dungeon.md
index 7266f0958..f6350ef22 100644
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.dungeon.md
+++ b/docs/source/api/evennia.contrib.tutorials.evadventure.dungeon.md
@@ -4,7 +4,7 @@ evennia.contrib.tutorials.evadventure.dungeon
 
 .. automodule:: evennia.contrib.tutorials.evadventure.dungeon
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.enums.md b/docs/source/api/evennia.contrib.tutorials.evadventure.enums.md
index 5d7f579e6..99736d805 100644
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.enums.md
+++ b/docs/source/api/evennia.contrib.tutorials.evadventure.enums.md
@@ -4,7 +4,7 @@ evennia.contrib.tutorials.evadventure.enums
 
 .. automodule:: evennia.contrib.tutorials.evadventure.enums
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.equipment.md b/docs/source/api/evennia.contrib.tutorials.evadventure.equipment.md
index 12930ccdf..7229cbfcb 100644
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.equipment.md
+++ b/docs/source/api/evennia.contrib.tutorials.evadventure.equipment.md
@@ -4,7 +4,7 @@ evennia.contrib.tutorials.evadventure.equipment
 
 .. automodule:: evennia.contrib.tutorials.evadventure.equipment
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.md b/docs/source/api/evennia.contrib.tutorials.evadventure.md
index 5fcfd9561..a9641eb64 100644
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.md
+++ b/docs/source/api/evennia.contrib.tutorials.evadventure.md
@@ -4,20 +4,10 @@ evennia.contrib.tutorials.evadventure
 
 .. automodule:: evennia.contrib.tutorials.evadventure
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
-Subpackages
------------
 
-.. toctree::
-   :maxdepth: 6
-
-   evennia.contrib.tutorials.evadventure.batchscripts
-   evennia.contrib.tutorials.evadventure.tests
-
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
@@ -43,4 +33,11 @@ Submodules
    evennia.contrib.tutorials.evadventure.shops
    evennia.contrib.tutorials.evadventure.utils
 
+
+.. toctree::
+   :maxdepth: 6
+
+   evennia.contrib.tutorials.evadventure.batchscripts
+   evennia.contrib.tutorials.evadventure.tests
+
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.npcs.md b/docs/source/api/evennia.contrib.tutorials.evadventure.npcs.md
index 0ed8c452f..c5ddccf70 100644
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.npcs.md
+++ b/docs/source/api/evennia.contrib.tutorials.evadventure.npcs.md
@@ -4,7 +4,7 @@ evennia.contrib.tutorials.evadventure.npcs
 
 .. automodule:: evennia.contrib.tutorials.evadventure.npcs
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.objects.md b/docs/source/api/evennia.contrib.tutorials.evadventure.objects.md
index 9ce36e43f..0bf44eeb8 100644
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.objects.md
+++ b/docs/source/api/evennia.contrib.tutorials.evadventure.objects.md
@@ -4,7 +4,7 @@ evennia.contrib.tutorials.evadventure.objects
 
 .. automodule:: evennia.contrib.tutorials.evadventure.objects
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.quests.md b/docs/source/api/evennia.contrib.tutorials.evadventure.quests.md
index 99a1fc6bb..6ba691bd8 100644
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.quests.md
+++ b/docs/source/api/evennia.contrib.tutorials.evadventure.quests.md
@@ -4,7 +4,7 @@ evennia.contrib.tutorials.evadventure.quests
 
 .. automodule:: evennia.contrib.tutorials.evadventure.quests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.random_tables.md b/docs/source/api/evennia.contrib.tutorials.evadventure.random_tables.md
index 6fae231f9..5148258d4 100644
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.random_tables.md
+++ b/docs/source/api/evennia.contrib.tutorials.evadventure.random_tables.md
@@ -4,7 +4,7 @@ evennia.contrib.tutorials.evadventure.random\_tables
 
 .. automodule:: evennia.contrib.tutorials.evadventure.random_tables
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.rooms.md b/docs/source/api/evennia.contrib.tutorials.evadventure.rooms.md
index d8e128de2..d39973b13 100644
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.rooms.md
+++ b/docs/source/api/evennia.contrib.tutorials.evadventure.rooms.md
@@ -4,7 +4,7 @@ evennia.contrib.tutorials.evadventure.rooms
 
 .. automodule:: evennia.contrib.tutorials.evadventure.rooms
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.rules.md b/docs/source/api/evennia.contrib.tutorials.evadventure.rules.md
index c30a83463..5b4a8baea 100644
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.rules.md
+++ b/docs/source/api/evennia.contrib.tutorials.evadventure.rules.md
@@ -4,7 +4,7 @@ evennia.contrib.tutorials.evadventure.rules
 
 .. automodule:: evennia.contrib.tutorials.evadventure.rules
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.shops.md b/docs/source/api/evennia.contrib.tutorials.evadventure.shops.md
index 22f53bee3..99ca1f9b6 100644
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.shops.md
+++ b/docs/source/api/evennia.contrib.tutorials.evadventure.shops.md
@@ -4,7 +4,7 @@ evennia.contrib.tutorials.evadventure.shops
 
 .. automodule:: evennia.contrib.tutorials.evadventure.shops
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.tests.md b/docs/source/api/evennia.contrib.tutorials.evadventure.tests.md
index 252aaf522..4eb41ad86 100644
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.tests.md
+++ b/docs/source/api/evennia.contrib.tutorials.evadventure.tests.md
@@ -4,11 +4,10 @@ evennia.contrib.tutorials.evadventure.tests
 
 .. automodule:: evennia.contrib.tutorials.evadventure.tests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.tests.mixins.md b/docs/source/api/evennia.contrib.tutorials.evadventure.tests.mixins.md
index ebc21b75b..317d2e0fd 100644
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.tests.mixins.md
+++ b/docs/source/api/evennia.contrib.tutorials.evadventure.tests.mixins.md
@@ -4,7 +4,7 @@ evennia.contrib.tutorials.evadventure.tests.mixins
 
 .. automodule:: evennia.contrib.tutorials.evadventure.tests.mixins
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_ai.md b/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_ai.md
index 1d2bf3956..d65635759 100644
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_ai.md
+++ b/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_ai.md
@@ -4,7 +4,7 @@ evennia.contrib.tutorials.evadventure.tests.test\_ai
 
 .. automodule:: evennia.contrib.tutorials.evadventure.tests.test_ai
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_characters.md b/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_characters.md
index df42c7515..4acd8da56 100644
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_characters.md
+++ b/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_characters.md
@@ -4,7 +4,7 @@ evennia.contrib.tutorials.evadventure.tests.test\_characters
 
 .. automodule:: evennia.contrib.tutorials.evadventure.tests.test_characters
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_chargen.md b/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_chargen.md
index c7f7b274d..a341d15dd 100644
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_chargen.md
+++ b/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_chargen.md
@@ -4,7 +4,7 @@ evennia.contrib.tutorials.evadventure.tests.test\_chargen
 
 .. automodule:: evennia.contrib.tutorials.evadventure.tests.test_chargen
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_combat.md b/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_combat.md
index 5a384854c..d6db357c9 100644
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_combat.md
+++ b/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_combat.md
@@ -4,7 +4,7 @@ evennia.contrib.tutorials.evadventure.tests.test\_combat
 
 .. automodule:: evennia.contrib.tutorials.evadventure.tests.test_combat
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_commands.md b/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_commands.md
index 9c614b422..811480011 100644
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_commands.md
+++ b/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_commands.md
@@ -4,7 +4,7 @@ evennia.contrib.tutorials.evadventure.tests.test\_commands
 
 .. automodule:: evennia.contrib.tutorials.evadventure.tests.test_commands
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_dungeon.md b/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_dungeon.md
index 02b0598cf..5837a0bfd 100644
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_dungeon.md
+++ b/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_dungeon.md
@@ -4,7 +4,7 @@ evennia.contrib.tutorials.evadventure.tests.test\_dungeon
 
 .. automodule:: evennia.contrib.tutorials.evadventure.tests.test_dungeon
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_equipment.md b/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_equipment.md
index eef19c659..a56aed520 100644
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_equipment.md
+++ b/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_equipment.md
@@ -4,7 +4,7 @@ evennia.contrib.tutorials.evadventure.tests.test\_equipment
 
 .. automodule:: evennia.contrib.tutorials.evadventure.tests.test_equipment
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_npcs.md b/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_npcs.md
index a6c3d8159..d00b9e5b8 100644
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_npcs.md
+++ b/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_npcs.md
@@ -4,7 +4,7 @@ evennia.contrib.tutorials.evadventure.tests.test\_npcs
 
 .. automodule:: evennia.contrib.tutorials.evadventure.tests.test_npcs
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_quests.md b/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_quests.md
index 2f1db7d67..cdd3f1dfa 100644
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_quests.md
+++ b/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_quests.md
@@ -4,7 +4,7 @@ evennia.contrib.tutorials.evadventure.tests.test\_quests
 
 .. automodule:: evennia.contrib.tutorials.evadventure.tests.test_quests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_rooms.md b/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_rooms.md
index 47d7d74fa..256d4b09c 100644
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_rooms.md
+++ b/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_rooms.md
@@ -4,7 +4,7 @@ evennia.contrib.tutorials.evadventure.tests.test\_rooms
 
 .. automodule:: evennia.contrib.tutorials.evadventure.tests.test_rooms
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_rules.md b/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_rules.md
index 5aa668a14..79847e150 100644
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_rules.md
+++ b/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_rules.md
@@ -4,7 +4,7 @@ evennia.contrib.tutorials.evadventure.tests.test\_rules
 
 .. automodule:: evennia.contrib.tutorials.evadventure.tests.test_rules
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_utils.md b/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_utils.md
index 2dfa6e0dd..46a3f7cd1 100644
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_utils.md
+++ b/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_utils.md
@@ -4,7 +4,7 @@ evennia.contrib.tutorials.evadventure.tests.test\_utils
 
 .. automodule:: evennia.contrib.tutorials.evadventure.tests.test_utils
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.utils.md b/docs/source/api/evennia.contrib.tutorials.evadventure.utils.md
index 4dfb7e23c..7518f00bd 100644
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.utils.md
+++ b/docs/source/api/evennia.contrib.tutorials.evadventure.utils.md
@@ -4,7 +4,7 @@ evennia.contrib.tutorials.evadventure.utils
 
 .. automodule:: evennia.contrib.tutorials.evadventure.utils
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.tutorials.md b/docs/source/api/evennia.contrib.tutorials.md
index 7adb9a553..e011f5578 100644
--- a/docs/source/api/evennia.contrib.tutorials.md
+++ b/docs/source/api/evennia.contrib.tutorials.md
@@ -4,11 +4,9 @@ evennia.contrib.tutorials
 
 .. automodule:: evennia.contrib.tutorials
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
-Subpackages
------------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.tutorials.mirror.md b/docs/source/api/evennia.contrib.tutorials.mirror.md
index 7915c4aa2..860a6580d 100644
--- a/docs/source/api/evennia.contrib.tutorials.mirror.md
+++ b/docs/source/api/evennia.contrib.tutorials.mirror.md
@@ -4,11 +4,10 @@ evennia.contrib.tutorials.mirror
 
 .. automodule:: evennia.contrib.tutorials.mirror
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.tutorials.mirror.mirror.md b/docs/source/api/evennia.contrib.tutorials.mirror.mirror.md
index b20637714..1ec9bcbbe 100644
--- a/docs/source/api/evennia.contrib.tutorials.mirror.mirror.md
+++ b/docs/source/api/evennia.contrib.tutorials.mirror.mirror.md
@@ -4,7 +4,7 @@ evennia.contrib.tutorials.mirror.mirror
 
 .. automodule:: evennia.contrib.tutorials.mirror.mirror
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.tutorials.red_button.md b/docs/source/api/evennia.contrib.tutorials.red_button.md
index ed1830539..3240f8f78 100644
--- a/docs/source/api/evennia.contrib.tutorials.red_button.md
+++ b/docs/source/api/evennia.contrib.tutorials.red_button.md
@@ -4,11 +4,10 @@ evennia.contrib.tutorials.red\_button
 
 .. automodule:: evennia.contrib.tutorials.red_button
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.tutorials.red_button.red_button.md b/docs/source/api/evennia.contrib.tutorials.red_button.red_button.md
index 6b968bcf3..b35edf44f 100644
--- a/docs/source/api/evennia.contrib.tutorials.red_button.red_button.md
+++ b/docs/source/api/evennia.contrib.tutorials.red_button.red_button.md
@@ -4,7 +4,7 @@ evennia.contrib.tutorials.red\_button.red\_button
 
 .. automodule:: evennia.contrib.tutorials.red_button.red_button
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.tutorials.talking_npc.md b/docs/source/api/evennia.contrib.tutorials.talking_npc.md
index 9d5329a91..efc554c4f 100644
--- a/docs/source/api/evennia.contrib.tutorials.talking_npc.md
+++ b/docs/source/api/evennia.contrib.tutorials.talking_npc.md
@@ -4,11 +4,10 @@ evennia.contrib.tutorials.talking\_npc
 
 .. automodule:: evennia.contrib.tutorials.talking_npc
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.tutorials.talking_npc.talking_npc.md b/docs/source/api/evennia.contrib.tutorials.talking_npc.talking_npc.md
index 506941916..66c256cd9 100644
--- a/docs/source/api/evennia.contrib.tutorials.talking_npc.talking_npc.md
+++ b/docs/source/api/evennia.contrib.tutorials.talking_npc.talking_npc.md
@@ -4,7 +4,7 @@ evennia.contrib.tutorials.talking\_npc.talking\_npc
 
 .. automodule:: evennia.contrib.tutorials.talking_npc.talking_npc
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.tutorials.talking_npc.tests.md b/docs/source/api/evennia.contrib.tutorials.talking_npc.tests.md
index 72661eb87..a4480ee84 100644
--- a/docs/source/api/evennia.contrib.tutorials.talking_npc.tests.md
+++ b/docs/source/api/evennia.contrib.tutorials.talking_npc.tests.md
@@ -4,7 +4,7 @@ evennia.contrib.tutorials.talking\_npc.tests
 
 .. automodule:: evennia.contrib.tutorials.talking_npc.tests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.tutorials.tutorial_world.intro_menu.md b/docs/source/api/evennia.contrib.tutorials.tutorial_world.intro_menu.md
index dfcc268d9..6cb008147 100644
--- a/docs/source/api/evennia.contrib.tutorials.tutorial_world.intro_menu.md
+++ b/docs/source/api/evennia.contrib.tutorials.tutorial_world.intro_menu.md
@@ -4,7 +4,7 @@ evennia.contrib.tutorials.tutorial\_world.intro\_menu
 
 .. automodule:: evennia.contrib.tutorials.tutorial_world.intro_menu
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.tutorials.tutorial_world.md b/docs/source/api/evennia.contrib.tutorials.tutorial_world.md
index 4fed39895..95554399c 100644
--- a/docs/source/api/evennia.contrib.tutorials.tutorial_world.md
+++ b/docs/source/api/evennia.contrib.tutorials.tutorial_world.md
@@ -4,11 +4,10 @@ evennia.contrib.tutorials.tutorial\_world
 
 .. automodule:: evennia.contrib.tutorials.tutorial_world
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.tutorials.tutorial_world.mob.md b/docs/source/api/evennia.contrib.tutorials.tutorial_world.mob.md
index 42325eea2..4ea944ad6 100644
--- a/docs/source/api/evennia.contrib.tutorials.tutorial_world.mob.md
+++ b/docs/source/api/evennia.contrib.tutorials.tutorial_world.mob.md
@@ -4,7 +4,7 @@ evennia.contrib.tutorials.tutorial\_world.mob
 
 .. automodule:: evennia.contrib.tutorials.tutorial_world.mob
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.tutorials.tutorial_world.objects.md b/docs/source/api/evennia.contrib.tutorials.tutorial_world.objects.md
index b70af1db3..e1ea5af02 100644
--- a/docs/source/api/evennia.contrib.tutorials.tutorial_world.objects.md
+++ b/docs/source/api/evennia.contrib.tutorials.tutorial_world.objects.md
@@ -4,7 +4,7 @@ evennia.contrib.tutorials.tutorial\_world.objects
 
 .. automodule:: evennia.contrib.tutorials.tutorial_world.objects
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.tutorials.tutorial_world.rooms.md b/docs/source/api/evennia.contrib.tutorials.tutorial_world.rooms.md
index 94219a1e7..412376b49 100644
--- a/docs/source/api/evennia.contrib.tutorials.tutorial_world.rooms.md
+++ b/docs/source/api/evennia.contrib.tutorials.tutorial_world.rooms.md
@@ -4,7 +4,7 @@ evennia.contrib.tutorials.tutorial\_world.rooms
 
 .. automodule:: evennia.contrib.tutorials.tutorial_world.rooms
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.tutorials.tutorial_world.tests.md b/docs/source/api/evennia.contrib.tutorials.tutorial_world.tests.md
index 56ca945f8..81cba17f8 100644
--- a/docs/source/api/evennia.contrib.tutorials.tutorial_world.tests.md
+++ b/docs/source/api/evennia.contrib.tutorials.tutorial_world.tests.md
@@ -4,7 +4,7 @@ evennia.contrib.tutorials.tutorial\_world.tests
 
 .. automodule:: evennia.contrib.tutorials.tutorial_world.tests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.utils.auditing.md b/docs/source/api/evennia.contrib.utils.auditing.md
index 675881d96..8973a041c 100644
--- a/docs/source/api/evennia.contrib.utils.auditing.md
+++ b/docs/source/api/evennia.contrib.utils.auditing.md
@@ -4,11 +4,10 @@ evennia.contrib.utils.auditing
 
 .. automodule:: evennia.contrib.utils.auditing
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.utils.auditing.outputs.md b/docs/source/api/evennia.contrib.utils.auditing.outputs.md
index 8c03ec0dd..078733071 100644
--- a/docs/source/api/evennia.contrib.utils.auditing.outputs.md
+++ b/docs/source/api/evennia.contrib.utils.auditing.outputs.md
@@ -4,7 +4,7 @@ evennia.contrib.utils.auditing.outputs
 
 .. automodule:: evennia.contrib.utils.auditing.outputs
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.utils.auditing.server.md b/docs/source/api/evennia.contrib.utils.auditing.server.md
index 8fea2f238..bed3020b1 100644
--- a/docs/source/api/evennia.contrib.utils.auditing.server.md
+++ b/docs/source/api/evennia.contrib.utils.auditing.server.md
@@ -4,7 +4,7 @@ evennia.contrib.utils.auditing.server
 
 .. automodule:: evennia.contrib.utils.auditing.server
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.utils.auditing.tests.md b/docs/source/api/evennia.contrib.utils.auditing.tests.md
index b6ace0b9c..8aa6a1390 100644
--- a/docs/source/api/evennia.contrib.utils.auditing.tests.md
+++ b/docs/source/api/evennia.contrib.utils.auditing.tests.md
@@ -4,7 +4,7 @@ evennia.contrib.utils.auditing.tests
 
 .. automodule:: evennia.contrib.utils.auditing.tests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.utils.debugpy.cmd.md b/docs/source/api/evennia.contrib.utils.debugpy.cmd.md
index 216dfa7f4..8e981db5c 100644
--- a/docs/source/api/evennia.contrib.utils.debugpy.cmd.md
+++ b/docs/source/api/evennia.contrib.utils.debugpy.cmd.md
@@ -4,7 +4,7 @@ evennia.contrib.utils.debugpy.cmd
 
 .. automodule:: evennia.contrib.utils.debugpy.cmd
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.utils.debugpy.md b/docs/source/api/evennia.contrib.utils.debugpy.md
index 6c19eb166..21f9ac713 100644
--- a/docs/source/api/evennia.contrib.utils.debugpy.md
+++ b/docs/source/api/evennia.contrib.utils.debugpy.md
@@ -4,11 +4,10 @@ evennia.contrib.utils.debugpy
 
 .. automodule:: evennia.contrib.utils.debugpy
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.utils.fieldfill.fieldfill.md b/docs/source/api/evennia.contrib.utils.fieldfill.fieldfill.md
index 903a37e81..5c6d2568b 100644
--- a/docs/source/api/evennia.contrib.utils.fieldfill.fieldfill.md
+++ b/docs/source/api/evennia.contrib.utils.fieldfill.fieldfill.md
@@ -4,7 +4,7 @@ evennia.contrib.utils.fieldfill.fieldfill
 
 .. automodule:: evennia.contrib.utils.fieldfill.fieldfill
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.utils.fieldfill.md b/docs/source/api/evennia.contrib.utils.fieldfill.md
index e66fcc6a0..26fc48746 100644
--- a/docs/source/api/evennia.contrib.utils.fieldfill.md
+++ b/docs/source/api/evennia.contrib.utils.fieldfill.md
@@ -4,11 +4,10 @@ evennia.contrib.utils.fieldfill
 
 .. automodule:: evennia.contrib.utils.fieldfill
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.utils.git_integration.git_integration.md b/docs/source/api/evennia.contrib.utils.git_integration.git_integration.md
index 8c864dedb..db88381dc 100644
--- a/docs/source/api/evennia.contrib.utils.git_integration.git_integration.md
+++ b/docs/source/api/evennia.contrib.utils.git_integration.git_integration.md
@@ -4,7 +4,7 @@ evennia.contrib.utils.git\_integration.git\_integration
 
 .. automodule:: evennia.contrib.utils.git_integration.git_integration
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.utils.git_integration.md b/docs/source/api/evennia.contrib.utils.git_integration.md
index 7851815fb..978df664d 100644
--- a/docs/source/api/evennia.contrib.utils.git_integration.md
+++ b/docs/source/api/evennia.contrib.utils.git_integration.md
@@ -4,11 +4,10 @@ evennia.contrib.utils.git\_integration
 
 .. automodule:: evennia.contrib.utils.git_integration
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.utils.git_integration.tests.md b/docs/source/api/evennia.contrib.utils.git_integration.tests.md
index 0fd9f505b..234ae419b 100644
--- a/docs/source/api/evennia.contrib.utils.git_integration.tests.md
+++ b/docs/source/api/evennia.contrib.utils.git_integration.tests.md
@@ -4,7 +4,7 @@ evennia.contrib.utils.git\_integration.tests
 
 .. automodule:: evennia.contrib.utils.git_integration.tests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.utils.md b/docs/source/api/evennia.contrib.utils.md
index 9084d8b3a..cfdce83a2 100644
--- a/docs/source/api/evennia.contrib.utils.md
+++ b/docs/source/api/evennia.contrib.utils.md
@@ -4,11 +4,9 @@ evennia.contrib.utils
 
 .. automodule:: evennia.contrib.utils
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
-Subpackages
------------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.utils.name_generator.md b/docs/source/api/evennia.contrib.utils.name_generator.md
index 17a22b775..ae866bedd 100644
--- a/docs/source/api/evennia.contrib.utils.name_generator.md
+++ b/docs/source/api/evennia.contrib.utils.name_generator.md
@@ -4,11 +4,10 @@ evennia.contrib.utils.name\_generator
 
 .. automodule:: evennia.contrib.utils.name_generator
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.utils.name_generator.namegen.md b/docs/source/api/evennia.contrib.utils.name_generator.namegen.md
index d18231a0b..135adb34b 100644
--- a/docs/source/api/evennia.contrib.utils.name_generator.namegen.md
+++ b/docs/source/api/evennia.contrib.utils.name_generator.namegen.md
@@ -4,7 +4,7 @@ evennia.contrib.utils.name\_generator.namegen
 
 .. automodule:: evennia.contrib.utils.name_generator.namegen
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.utils.name_generator.tests.md b/docs/source/api/evennia.contrib.utils.name_generator.tests.md
index fcdae2476..dd8db2381 100644
--- a/docs/source/api/evennia.contrib.utils.name_generator.tests.md
+++ b/docs/source/api/evennia.contrib.utils.name_generator.tests.md
@@ -4,7 +4,7 @@ evennia.contrib.utils.name\_generator.tests
 
 .. automodule:: evennia.contrib.utils.name_generator.tests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.utils.random_string_generator.md b/docs/source/api/evennia.contrib.utils.random_string_generator.md
index 8db5bb66e..1bf0e139a 100644
--- a/docs/source/api/evennia.contrib.utils.random_string_generator.md
+++ b/docs/source/api/evennia.contrib.utils.random_string_generator.md
@@ -4,11 +4,10 @@ evennia.contrib.utils.random\_string\_generator
 
 .. automodule:: evennia.contrib.utils.random_string_generator
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.utils.random_string_generator.random_string_generator.md b/docs/source/api/evennia.contrib.utils.random_string_generator.random_string_generator.md
index 7ee5fcb03..1595ae79f 100644
--- a/docs/source/api/evennia.contrib.utils.random_string_generator.random_string_generator.md
+++ b/docs/source/api/evennia.contrib.utils.random_string_generator.random_string_generator.md
@@ -4,7 +4,7 @@ evennia.contrib.utils.random\_string\_generator.random\_string\_generator
 
 .. automodule:: evennia.contrib.utils.random_string_generator.random_string_generator
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.utils.random_string_generator.tests.md b/docs/source/api/evennia.contrib.utils.random_string_generator.tests.md
index cfb432948..7627e8830 100644
--- a/docs/source/api/evennia.contrib.utils.random_string_generator.tests.md
+++ b/docs/source/api/evennia.contrib.utils.random_string_generator.tests.md
@@ -4,7 +4,7 @@ evennia.contrib.utils.random\_string\_generator.tests
 
 .. automodule:: evennia.contrib.utils.random_string_generator.tests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.utils.tree_select.md b/docs/source/api/evennia.contrib.utils.tree_select.md
index d6e25b56c..b6219409c 100644
--- a/docs/source/api/evennia.contrib.utils.tree_select.md
+++ b/docs/source/api/evennia.contrib.utils.tree_select.md
@@ -4,11 +4,10 @@ evennia.contrib.utils.tree\_select
 
 .. automodule:: evennia.contrib.utils.tree_select
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.contrib.utils.tree_select.tests.md b/docs/source/api/evennia.contrib.utils.tree_select.tests.md
index 2e556c716..a11177e88 100644
--- a/docs/source/api/evennia.contrib.utils.tree_select.tests.md
+++ b/docs/source/api/evennia.contrib.utils.tree_select.tests.md
@@ -4,7 +4,7 @@ evennia.contrib.utils.tree\_select.tests
 
 .. automodule:: evennia.contrib.utils.tree_select.tests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.utils.tree_select.tree_select.md b/docs/source/api/evennia.contrib.utils.tree_select.tree_select.md
index f1d0f1c0c..049c58c82 100644
--- a/docs/source/api/evennia.contrib.utils.tree_select.tree_select.md
+++ b/docs/source/api/evennia.contrib.utils.tree_select.tree_select.md
@@ -4,7 +4,7 @@ evennia.contrib.utils.tree\_select.tree\_select
 
 .. automodule:: evennia.contrib.utils.tree_select.tree_select
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.help.filehelp.md b/docs/source/api/evennia.help.filehelp.md
index bb518c0a2..a2a48d059 100644
--- a/docs/source/api/evennia.help.filehelp.md
+++ b/docs/source/api/evennia.help.filehelp.md
@@ -4,7 +4,7 @@ evennia.help.filehelp
 
 .. automodule:: evennia.help.filehelp
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.help.manager.md b/docs/source/api/evennia.help.manager.md
index df99fbe2a..e90a11c63 100644
--- a/docs/source/api/evennia.help.manager.md
+++ b/docs/source/api/evennia.help.manager.md
@@ -4,7 +4,7 @@ evennia.help.manager
 
 .. automodule:: evennia.help.manager
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.help.md b/docs/source/api/evennia.help.md
index f8a697c60..6cf0a0db9 100644
--- a/docs/source/api/evennia.help.md
+++ b/docs/source/api/evennia.help.md
@@ -4,11 +4,10 @@ evennia.help
 
 .. automodule:: evennia.help
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.help.models.md b/docs/source/api/evennia.help.models.md
index 8e7ba3d09..18fdf42fa 100644
--- a/docs/source/api/evennia.help.models.md
+++ b/docs/source/api/evennia.help.models.md
@@ -4,7 +4,7 @@ evennia.help.models
 
 .. automodule:: evennia.help.models
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.help.utils.md b/docs/source/api/evennia.help.utils.md
index 82006ad1a..127febf81 100644
--- a/docs/source/api/evennia.help.utils.md
+++ b/docs/source/api/evennia.help.utils.md
@@ -4,7 +4,7 @@ evennia.help.utils
 
 .. automodule:: evennia.help.utils
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.locks.lockfuncs.md b/docs/source/api/evennia.locks.lockfuncs.md
index 3bf25f301..61d88f41d 100644
--- a/docs/source/api/evennia.locks.lockfuncs.md
+++ b/docs/source/api/evennia.locks.lockfuncs.md
@@ -4,7 +4,7 @@ evennia.locks.lockfuncs
 
 .. automodule:: evennia.locks.lockfuncs
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.locks.lockhandler.md b/docs/source/api/evennia.locks.lockhandler.md
index 97afd49eb..d07485918 100644
--- a/docs/source/api/evennia.locks.lockhandler.md
+++ b/docs/source/api/evennia.locks.lockhandler.md
@@ -4,7 +4,7 @@ evennia.locks.lockhandler
 
 .. automodule:: evennia.locks.lockhandler
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.locks.md b/docs/source/api/evennia.locks.md
index 1edf48c5f..dab72fb7a 100644
--- a/docs/source/api/evennia.locks.md
+++ b/docs/source/api/evennia.locks.md
@@ -4,11 +4,10 @@ evennia.locks
 
 .. automodule:: evennia.locks
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.md b/docs/source/api/evennia.md
index 38a3c922d..5b7a07238 100644
--- a/docs/source/api/evennia.md
+++ b/docs/source/api/evennia.md
@@ -4,11 +4,16 @@ evennia
 
 .. automodule:: evennia
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
+
+
+.. toctree::
+   :maxdepth: 6
+
+   evennia.settings_default
 
-Subpackages
------------
 
 .. toctree::
    :maxdepth: 6
@@ -27,12 +32,4 @@ Subpackages
    evennia.utils
    evennia.web
 
-Submodules
-----------
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.settings_default
-
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.objects.manager.md b/docs/source/api/evennia.objects.manager.md
index 5a4f69550..f67ee6cf4 100644
--- a/docs/source/api/evennia.objects.manager.md
+++ b/docs/source/api/evennia.objects.manager.md
@@ -4,7 +4,7 @@ evennia.objects.manager
 
 .. automodule:: evennia.objects.manager
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.objects.md b/docs/source/api/evennia.objects.md
index d4333b7db..0f53114af 100644
--- a/docs/source/api/evennia.objects.md
+++ b/docs/source/api/evennia.objects.md
@@ -4,11 +4,10 @@ evennia.objects
 
 .. automodule:: evennia.objects
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.objects.models.md b/docs/source/api/evennia.objects.models.md
index d1e3e0644..864825ae1 100644
--- a/docs/source/api/evennia.objects.models.md
+++ b/docs/source/api/evennia.objects.models.md
@@ -4,7 +4,7 @@ evennia.objects.models
 
 .. automodule:: evennia.objects.models
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.objects.objects.md b/docs/source/api/evennia.objects.objects.md
index 31ec2f75a..491bbb845 100644
--- a/docs/source/api/evennia.objects.objects.md
+++ b/docs/source/api/evennia.objects.objects.md
@@ -4,7 +4,7 @@ evennia.objects.objects
 
 .. automodule:: evennia.objects.objects
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.prototypes.md b/docs/source/api/evennia.prototypes.md
index 573780b5c..b162612cb 100644
--- a/docs/source/api/evennia.prototypes.md
+++ b/docs/source/api/evennia.prototypes.md
@@ -4,11 +4,10 @@ evennia.prototypes
 
 .. automodule:: evennia.prototypes
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.prototypes.menus.md b/docs/source/api/evennia.prototypes.menus.md
index 6ce545f12..4ed4bc995 100644
--- a/docs/source/api/evennia.prototypes.menus.md
+++ b/docs/source/api/evennia.prototypes.menus.md
@@ -4,7 +4,7 @@ evennia.prototypes.menus
 
 .. automodule:: evennia.prototypes.menus
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.prototypes.protfuncs.md b/docs/source/api/evennia.prototypes.protfuncs.md
index e99e28c19..0bca8653a 100644
--- a/docs/source/api/evennia.prototypes.protfuncs.md
+++ b/docs/source/api/evennia.prototypes.protfuncs.md
@@ -4,7 +4,7 @@ evennia.prototypes.protfuncs
 
 .. automodule:: evennia.prototypes.protfuncs
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.prototypes.prototypes.md b/docs/source/api/evennia.prototypes.prototypes.md
index 0de5ed363..a0554c80b 100644
--- a/docs/source/api/evennia.prototypes.prototypes.md
+++ b/docs/source/api/evennia.prototypes.prototypes.md
@@ -4,7 +4,7 @@ evennia.prototypes.prototypes
 
 .. automodule:: evennia.prototypes.prototypes
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.prototypes.spawner.md b/docs/source/api/evennia.prototypes.spawner.md
index 22cb8fe45..b47870d9b 100644
--- a/docs/source/api/evennia.prototypes.spawner.md
+++ b/docs/source/api/evennia.prototypes.spawner.md
@@ -4,7 +4,7 @@ evennia.prototypes.spawner
 
 .. automodule:: evennia.prototypes.spawner
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.scripts.manager.md b/docs/source/api/evennia.scripts.manager.md
index 6977deb55..64cde20b5 100644
--- a/docs/source/api/evennia.scripts.manager.md
+++ b/docs/source/api/evennia.scripts.manager.md
@@ -4,7 +4,7 @@ evennia.scripts.manager
 
 .. automodule:: evennia.scripts.manager
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.scripts.md b/docs/source/api/evennia.scripts.md
index 978b3cd92..a165278a6 100644
--- a/docs/source/api/evennia.scripts.md
+++ b/docs/source/api/evennia.scripts.md
@@ -4,11 +4,10 @@ evennia.scripts
 
 .. automodule:: evennia.scripts
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.scripts.models.md b/docs/source/api/evennia.scripts.models.md
index a3def5236..615986245 100644
--- a/docs/source/api/evennia.scripts.models.md
+++ b/docs/source/api/evennia.scripts.models.md
@@ -4,7 +4,7 @@ evennia.scripts.models
 
 .. automodule:: evennia.scripts.models
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.scripts.monitorhandler.md b/docs/source/api/evennia.scripts.monitorhandler.md
index fe89ead44..9570b7726 100644
--- a/docs/source/api/evennia.scripts.monitorhandler.md
+++ b/docs/source/api/evennia.scripts.monitorhandler.md
@@ -4,7 +4,7 @@ evennia.scripts.monitorhandler
 
 .. automodule:: evennia.scripts.monitorhandler
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.scripts.ondemandhandler.md b/docs/source/api/evennia.scripts.ondemandhandler.md
index cb0c99880..1d16c2128 100644
--- a/docs/source/api/evennia.scripts.ondemandhandler.md
+++ b/docs/source/api/evennia.scripts.ondemandhandler.md
@@ -4,7 +4,7 @@ evennia.scripts.ondemandhandler
 
 .. automodule:: evennia.scripts.ondemandhandler
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.scripts.scripthandler.md b/docs/source/api/evennia.scripts.scripthandler.md
index 7d07ea0b8..50823e87d 100644
--- a/docs/source/api/evennia.scripts.scripthandler.md
+++ b/docs/source/api/evennia.scripts.scripthandler.md
@@ -4,7 +4,7 @@ evennia.scripts.scripthandler
 
 .. automodule:: evennia.scripts.scripthandler
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.scripts.scripts.md b/docs/source/api/evennia.scripts.scripts.md
index b0503240b..bc87748b4 100644
--- a/docs/source/api/evennia.scripts.scripts.md
+++ b/docs/source/api/evennia.scripts.scripts.md
@@ -4,7 +4,7 @@ evennia.scripts.scripts
 
 .. automodule:: evennia.scripts.scripts
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.scripts.taskhandler.md b/docs/source/api/evennia.scripts.taskhandler.md
index d95eee9fb..fa95d6c03 100644
--- a/docs/source/api/evennia.scripts.taskhandler.md
+++ b/docs/source/api/evennia.scripts.taskhandler.md
@@ -4,7 +4,7 @@ evennia.scripts.taskhandler
 
 .. automodule:: evennia.scripts.taskhandler
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.scripts.tickerhandler.md b/docs/source/api/evennia.scripts.tickerhandler.md
index fbc2f16b9..3b00fc156 100644
--- a/docs/source/api/evennia.scripts.tickerhandler.md
+++ b/docs/source/api/evennia.scripts.tickerhandler.md
@@ -4,7 +4,7 @@ evennia.scripts.tickerhandler
 
 .. automodule:: evennia.scripts.tickerhandler
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.server.amp_client.md b/docs/source/api/evennia.server.amp_client.md
index d3772d958..202dc1ce3 100644
--- a/docs/source/api/evennia.server.amp_client.md
+++ b/docs/source/api/evennia.server.amp_client.md
@@ -4,7 +4,7 @@ evennia.server.amp\_client
 
 .. automodule:: evennia.server.amp_client
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.server.connection_wizard.md b/docs/source/api/evennia.server.connection_wizard.md
index 65f85d3f9..1e76e41d6 100644
--- a/docs/source/api/evennia.server.connection_wizard.md
+++ b/docs/source/api/evennia.server.connection_wizard.md
@@ -4,7 +4,7 @@ evennia.server.connection\_wizard
 
 .. automodule:: evennia.server.connection_wizard
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.server.deprecations.md b/docs/source/api/evennia.server.deprecations.md
index f6f5b5dcc..3933cca8f 100644
--- a/docs/source/api/evennia.server.deprecations.md
+++ b/docs/source/api/evennia.server.deprecations.md
@@ -4,7 +4,7 @@ evennia.server.deprecations
 
 .. automodule:: evennia.server.deprecations
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.server.evennia_launcher.md b/docs/source/api/evennia.server.evennia_launcher.md
index 6865277b1..c07b46a51 100644
--- a/docs/source/api/evennia.server.evennia_launcher.md
+++ b/docs/source/api/evennia.server.evennia_launcher.md
@@ -4,7 +4,7 @@ evennia.server.evennia\_launcher
 
 .. automodule:: evennia.server.evennia_launcher
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.server.game_index_client.client.md b/docs/source/api/evennia.server.game_index_client.client.md
index 1154de314..17dd6278f 100644
--- a/docs/source/api/evennia.server.game_index_client.client.md
+++ b/docs/source/api/evennia.server.game_index_client.client.md
@@ -4,7 +4,7 @@ evennia.server.game\_index\_client.client
 
 .. automodule:: evennia.server.game_index_client.client
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.server.game_index_client.md b/docs/source/api/evennia.server.game_index_client.md
index 0927bc124..e649cd67e 100644
--- a/docs/source/api/evennia.server.game_index_client.md
+++ b/docs/source/api/evennia.server.game_index_client.md
@@ -4,11 +4,10 @@ evennia.server.game\_index\_client
 
 .. automodule:: evennia.server.game_index_client
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.server.game_index_client.service.md b/docs/source/api/evennia.server.game_index_client.service.md
index 96b1905d7..e63ba67a7 100644
--- a/docs/source/api/evennia.server.game_index_client.service.md
+++ b/docs/source/api/evennia.server.game_index_client.service.md
@@ -4,7 +4,7 @@ evennia.server.game\_index\_client.service
 
 .. automodule:: evennia.server.game_index_client.service
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.server.initial_setup.md b/docs/source/api/evennia.server.initial_setup.md
index 65baae03b..84f0e1c3c 100644
--- a/docs/source/api/evennia.server.initial_setup.md
+++ b/docs/source/api/evennia.server.initial_setup.md
@@ -4,7 +4,7 @@ evennia.server.initial\_setup
 
 .. automodule:: evennia.server.initial_setup
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.server.inputfuncs.md b/docs/source/api/evennia.server.inputfuncs.md
index 6a422aebf..b1e11427f 100644
--- a/docs/source/api/evennia.server.inputfuncs.md
+++ b/docs/source/api/evennia.server.inputfuncs.md
@@ -4,7 +4,7 @@ evennia.server.inputfuncs
 
 .. automodule:: evennia.server.inputfuncs
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.server.manager.md b/docs/source/api/evennia.server.manager.md
index ce2a502be..1a6819bb3 100644
--- a/docs/source/api/evennia.server.manager.md
+++ b/docs/source/api/evennia.server.manager.md
@@ -4,7 +4,7 @@ evennia.server.manager
 
 .. automodule:: evennia.server.manager
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.server.md b/docs/source/api/evennia.server.md
index a50dd531d..d6fcb520f 100644
--- a/docs/source/api/evennia.server.md
+++ b/docs/source/api/evennia.server.md
@@ -4,21 +4,10 @@ evennia.server
 
 .. automodule:: evennia.server
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
-Subpackages
------------
 
-.. toctree::
-   :maxdepth: 6
-
-   evennia.server.game_index_client
-   evennia.server.portal
-   evennia.server.profiling
-
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
@@ -41,4 +30,12 @@ Submodules
    evennia.server.validators
    evennia.server.webserver
 
+
+.. toctree::
+   :maxdepth: 6
+
+   evennia.server.game_index_client
+   evennia.server.portal
+   evennia.server.profiling
+
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.server.models.md b/docs/source/api/evennia.server.models.md
index f46605891..2e6a6c7f5 100644
--- a/docs/source/api/evennia.server.models.md
+++ b/docs/source/api/evennia.server.models.md
@@ -4,7 +4,7 @@ evennia.server.models
 
 .. automodule:: evennia.server.models
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.server.portal.amp.md b/docs/source/api/evennia.server.portal.amp.md
index 66dda6f75..3420b8241 100644
--- a/docs/source/api/evennia.server.portal.amp.md
+++ b/docs/source/api/evennia.server.portal.amp.md
@@ -4,7 +4,7 @@ evennia.server.portal.amp
 
 .. automodule:: evennia.server.portal.amp
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.server.portal.amp_server.md b/docs/source/api/evennia.server.portal.amp_server.md
index 042a3dfba..5dd587ff6 100644
--- a/docs/source/api/evennia.server.portal.amp_server.md
+++ b/docs/source/api/evennia.server.portal.amp_server.md
@@ -4,7 +4,7 @@ evennia.server.portal.amp\_server
 
 .. automodule:: evennia.server.portal.amp_server
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.server.portal.discord.md b/docs/source/api/evennia.server.portal.discord.md
index 14f84719c..8269a083f 100644
--- a/docs/source/api/evennia.server.portal.discord.md
+++ b/docs/source/api/evennia.server.portal.discord.md
@@ -4,7 +4,7 @@ evennia.server.portal.discord
 
 .. automodule:: evennia.server.portal.discord
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.server.portal.grapevine.md b/docs/source/api/evennia.server.portal.grapevine.md
index 3f1b90c46..422210b93 100644
--- a/docs/source/api/evennia.server.portal.grapevine.md
+++ b/docs/source/api/evennia.server.portal.grapevine.md
@@ -4,7 +4,7 @@ evennia.server.portal.grapevine
 
 .. automodule:: evennia.server.portal.grapevine
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.server.portal.irc.md b/docs/source/api/evennia.server.portal.irc.md
index 4fc3a271e..3e1e14adb 100644
--- a/docs/source/api/evennia.server.portal.irc.md
+++ b/docs/source/api/evennia.server.portal.irc.md
@@ -4,7 +4,7 @@ evennia.server.portal.irc
 
 .. automodule:: evennia.server.portal.irc
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.server.portal.mccp.md b/docs/source/api/evennia.server.portal.mccp.md
index 34a5fa4c3..11ea1cba8 100644
--- a/docs/source/api/evennia.server.portal.mccp.md
+++ b/docs/source/api/evennia.server.portal.mccp.md
@@ -4,7 +4,7 @@ evennia.server.portal.mccp
 
 .. automodule:: evennia.server.portal.mccp
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.server.portal.md b/docs/source/api/evennia.server.portal.md
index e1c81f07e..f0ed61e74 100644
--- a/docs/source/api/evennia.server.portal.md
+++ b/docs/source/api/evennia.server.portal.md
@@ -4,11 +4,10 @@ evennia.server.portal
 
 .. automodule:: evennia.server.portal
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.server.portal.mssp.md b/docs/source/api/evennia.server.portal.mssp.md
index 90a5998a8..4080cd305 100644
--- a/docs/source/api/evennia.server.portal.mssp.md
+++ b/docs/source/api/evennia.server.portal.mssp.md
@@ -4,7 +4,7 @@ evennia.server.portal.mssp
 
 .. automodule:: evennia.server.portal.mssp
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.server.portal.mxp.md b/docs/source/api/evennia.server.portal.mxp.md
index 77c4dd78a..cf148dd47 100644
--- a/docs/source/api/evennia.server.portal.mxp.md
+++ b/docs/source/api/evennia.server.portal.mxp.md
@@ -4,7 +4,7 @@ evennia.server.portal.mxp
 
 .. automodule:: evennia.server.portal.mxp
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.server.portal.naws.md b/docs/source/api/evennia.server.portal.naws.md
index 11ead0319..f3161fea7 100644
--- a/docs/source/api/evennia.server.portal.naws.md
+++ b/docs/source/api/evennia.server.portal.naws.md
@@ -4,7 +4,7 @@ evennia.server.portal.naws
 
 .. automodule:: evennia.server.portal.naws
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.server.portal.portal.md b/docs/source/api/evennia.server.portal.portal.md
index f388f9a20..2ba57d853 100644
--- a/docs/source/api/evennia.server.portal.portal.md
+++ b/docs/source/api/evennia.server.portal.portal.md
@@ -4,7 +4,7 @@ evennia.server.portal.portal
 
 .. automodule:: evennia.server.portal.portal
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.server.portal.portalsessionhandler.md b/docs/source/api/evennia.server.portal.portalsessionhandler.md
index 60115e065..9d2ededfc 100644
--- a/docs/source/api/evennia.server.portal.portalsessionhandler.md
+++ b/docs/source/api/evennia.server.portal.portalsessionhandler.md
@@ -4,7 +4,7 @@ evennia.server.portal.portalsessionhandler
 
 .. automodule:: evennia.server.portal.portalsessionhandler
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.server.portal.rss.md b/docs/source/api/evennia.server.portal.rss.md
index 7ec2f823d..9e380a43b 100644
--- a/docs/source/api/evennia.server.portal.rss.md
+++ b/docs/source/api/evennia.server.portal.rss.md
@@ -4,7 +4,7 @@ evennia.server.portal.rss
 
 .. automodule:: evennia.server.portal.rss
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.server.portal.service.md b/docs/source/api/evennia.server.portal.service.md
index b8012ada9..b47b76a11 100644
--- a/docs/source/api/evennia.server.portal.service.md
+++ b/docs/source/api/evennia.server.portal.service.md
@@ -4,7 +4,7 @@ evennia.server.portal.service
 
 .. automodule:: evennia.server.portal.service
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.server.portal.ssh.md b/docs/source/api/evennia.server.portal.ssh.md
index 01166252a..81a6affbb 100644
--- a/docs/source/api/evennia.server.portal.ssh.md
+++ b/docs/source/api/evennia.server.portal.ssh.md
@@ -4,7 +4,7 @@ evennia.server.portal.ssh
 
 .. automodule:: evennia.server.portal.ssh
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.server.portal.ssl.md b/docs/source/api/evennia.server.portal.ssl.md
index 709714798..3c7815064 100644
--- a/docs/source/api/evennia.server.portal.ssl.md
+++ b/docs/source/api/evennia.server.portal.ssl.md
@@ -4,7 +4,7 @@ evennia.server.portal.ssl
 
 .. automodule:: evennia.server.portal.ssl
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.server.portal.suppress_ga.md b/docs/source/api/evennia.server.portal.suppress_ga.md
index 168273b06..cd5dc87ac 100644
--- a/docs/source/api/evennia.server.portal.suppress_ga.md
+++ b/docs/source/api/evennia.server.portal.suppress_ga.md
@@ -4,7 +4,7 @@ evennia.server.portal.suppress\_ga
 
 .. automodule:: evennia.server.portal.suppress_ga
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.server.portal.telnet.md b/docs/source/api/evennia.server.portal.telnet.md
index a7ed8cade..5b9943168 100644
--- a/docs/source/api/evennia.server.portal.telnet.md
+++ b/docs/source/api/evennia.server.portal.telnet.md
@@ -4,7 +4,7 @@ evennia.server.portal.telnet
 
 .. automodule:: evennia.server.portal.telnet
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.server.portal.telnet_oob.md b/docs/source/api/evennia.server.portal.telnet_oob.md
index 3bea639e5..141708905 100644
--- a/docs/source/api/evennia.server.portal.telnet_oob.md
+++ b/docs/source/api/evennia.server.portal.telnet_oob.md
@@ -4,7 +4,7 @@ evennia.server.portal.telnet\_oob
 
 .. automodule:: evennia.server.portal.telnet_oob
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.server.portal.telnet_ssl.md b/docs/source/api/evennia.server.portal.telnet_ssl.md
index 02114e575..0aa06d329 100644
--- a/docs/source/api/evennia.server.portal.telnet_ssl.md
+++ b/docs/source/api/evennia.server.portal.telnet_ssl.md
@@ -4,7 +4,7 @@ evennia.server.portal.telnet\_ssl
 
 .. automodule:: evennia.server.portal.telnet_ssl
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.server.portal.tests.md b/docs/source/api/evennia.server.portal.tests.md
index ff5b4db71..f73cb842c 100644
--- a/docs/source/api/evennia.server.portal.tests.md
+++ b/docs/source/api/evennia.server.portal.tests.md
@@ -4,7 +4,7 @@ evennia.server.portal.tests
 
 .. automodule:: evennia.server.portal.tests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.server.portal.ttype.md b/docs/source/api/evennia.server.portal.ttype.md
index 732143b7c..63c3dd9a3 100644
--- a/docs/source/api/evennia.server.portal.ttype.md
+++ b/docs/source/api/evennia.server.portal.ttype.md
@@ -4,7 +4,7 @@ evennia.server.portal.ttype
 
 .. automodule:: evennia.server.portal.ttype
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.server.portal.webclient.md b/docs/source/api/evennia.server.portal.webclient.md
index 2335ea43f..33419ca79 100644
--- a/docs/source/api/evennia.server.portal.webclient.md
+++ b/docs/source/api/evennia.server.portal.webclient.md
@@ -4,7 +4,7 @@ evennia.server.portal.webclient
 
 .. automodule:: evennia.server.portal.webclient
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.server.portal.webclient_ajax.md b/docs/source/api/evennia.server.portal.webclient_ajax.md
index d867edacb..c5fcd5318 100644
--- a/docs/source/api/evennia.server.portal.webclient_ajax.md
+++ b/docs/source/api/evennia.server.portal.webclient_ajax.md
@@ -4,7 +4,7 @@ evennia.server.portal.webclient\_ajax
 
 .. automodule:: evennia.server.portal.webclient_ajax
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.server.profiling.dummyrunner.md b/docs/source/api/evennia.server.profiling.dummyrunner.md
index a1283aa0e..4c0f08618 100644
--- a/docs/source/api/evennia.server.profiling.dummyrunner.md
+++ b/docs/source/api/evennia.server.profiling.dummyrunner.md
@@ -4,7 +4,7 @@ evennia.server.profiling.dummyrunner
 
 .. automodule:: evennia.server.profiling.dummyrunner
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.server.profiling.dummyrunner_settings.md b/docs/source/api/evennia.server.profiling.dummyrunner_settings.md
index 1d6b07ffb..e3b97399e 100644
--- a/docs/source/api/evennia.server.profiling.dummyrunner_settings.md
+++ b/docs/source/api/evennia.server.profiling.dummyrunner_settings.md
@@ -4,7 +4,7 @@ evennia.server.profiling.dummyrunner\_settings
 
 .. automodule:: evennia.server.profiling.dummyrunner_settings
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.server.profiling.md b/docs/source/api/evennia.server.profiling.md
index d6b1ea585..cfe0b4db4 100644
--- a/docs/source/api/evennia.server.profiling.md
+++ b/docs/source/api/evennia.server.profiling.md
@@ -4,11 +4,10 @@ evennia.server.profiling
 
 .. automodule:: evennia.server.profiling
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.server.profiling.memplot.md b/docs/source/api/evennia.server.profiling.memplot.md
index a3193c3b6..a0683e127 100644
--- a/docs/source/api/evennia.server.profiling.memplot.md
+++ b/docs/source/api/evennia.server.profiling.memplot.md
@@ -4,7 +4,7 @@ evennia.server.profiling.memplot
 
 .. automodule:: evennia.server.profiling.memplot
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.server.profiling.settings_mixin.md b/docs/source/api/evennia.server.profiling.settings_mixin.md
index e96c1c07a..45c3226f5 100644
--- a/docs/source/api/evennia.server.profiling.settings_mixin.md
+++ b/docs/source/api/evennia.server.profiling.settings_mixin.md
@@ -4,7 +4,7 @@ evennia.server.profiling.settings\_mixin
 
 .. automodule:: evennia.server.profiling.settings_mixin
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.server.profiling.test_queries.md b/docs/source/api/evennia.server.profiling.test_queries.md
index 19f5e1614..b697c1f84 100644
--- a/docs/source/api/evennia.server.profiling.test_queries.md
+++ b/docs/source/api/evennia.server.profiling.test_queries.md
@@ -4,7 +4,7 @@ evennia.server.profiling.test\_queries
 
 .. automodule:: evennia.server.profiling.test_queries
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.server.profiling.tests.md b/docs/source/api/evennia.server.profiling.tests.md
index a8535a082..e126dafd0 100644
--- a/docs/source/api/evennia.server.profiling.tests.md
+++ b/docs/source/api/evennia.server.profiling.tests.md
@@ -4,7 +4,7 @@ evennia.server.profiling.tests
 
 .. automodule:: evennia.server.profiling.tests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.server.profiling.timetrace.md b/docs/source/api/evennia.server.profiling.timetrace.md
index d01ca1839..4dc7ce8e3 100644
--- a/docs/source/api/evennia.server.profiling.timetrace.md
+++ b/docs/source/api/evennia.server.profiling.timetrace.md
@@ -4,7 +4,7 @@ evennia.server.profiling.timetrace
 
 .. automodule:: evennia.server.profiling.timetrace
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.server.server.md b/docs/source/api/evennia.server.server.md
index 6bdc50a34..6be209f30 100644
--- a/docs/source/api/evennia.server.server.md
+++ b/docs/source/api/evennia.server.server.md
@@ -4,7 +4,7 @@ evennia.server.server
 
 .. automodule:: evennia.server.server
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.server.serversession.md b/docs/source/api/evennia.server.serversession.md
index 482d6a879..ccd68477e 100644
--- a/docs/source/api/evennia.server.serversession.md
+++ b/docs/source/api/evennia.server.serversession.md
@@ -4,7 +4,7 @@ evennia.server.serversession
 
 .. automodule:: evennia.server.serversession
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.server.service.md b/docs/source/api/evennia.server.service.md
index bd758fe27..eef75750b 100644
--- a/docs/source/api/evennia.server.service.md
+++ b/docs/source/api/evennia.server.service.md
@@ -4,7 +4,7 @@ evennia.server.service
 
 .. automodule:: evennia.server.service
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.server.session.md b/docs/source/api/evennia.server.session.md
index b2dadbf11..c01c0d14d 100644
--- a/docs/source/api/evennia.server.session.md
+++ b/docs/source/api/evennia.server.session.md
@@ -4,7 +4,7 @@ evennia.server.session
 
 .. automodule:: evennia.server.session
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.server.sessionhandler.md b/docs/source/api/evennia.server.sessionhandler.md
index d4e610ccd..621bbf008 100644
--- a/docs/source/api/evennia.server.sessionhandler.md
+++ b/docs/source/api/evennia.server.sessionhandler.md
@@ -4,7 +4,7 @@ evennia.server.sessionhandler
 
 .. automodule:: evennia.server.sessionhandler
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.server.signals.md b/docs/source/api/evennia.server.signals.md
index 95e2ecd82..0afe1ef17 100644
--- a/docs/source/api/evennia.server.signals.md
+++ b/docs/source/api/evennia.server.signals.md
@@ -4,7 +4,7 @@ evennia.server.signals
 
 .. automodule:: evennia.server.signals
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.server.throttle.md b/docs/source/api/evennia.server.throttle.md
index fa7576f01..0cba786e1 100644
--- a/docs/source/api/evennia.server.throttle.md
+++ b/docs/source/api/evennia.server.throttle.md
@@ -4,7 +4,7 @@ evennia.server.throttle
 
 .. automodule:: evennia.server.throttle
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.server.validators.md b/docs/source/api/evennia.server.validators.md
index 7f452b197..ae840b915 100644
--- a/docs/source/api/evennia.server.validators.md
+++ b/docs/source/api/evennia.server.validators.md
@@ -4,7 +4,7 @@ evennia.server.validators
 
 .. automodule:: evennia.server.validators
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.server.webserver.md b/docs/source/api/evennia.server.webserver.md
index 7392273cc..82c37b9a2 100644
--- a/docs/source/api/evennia.server.webserver.md
+++ b/docs/source/api/evennia.server.webserver.md
@@ -4,7 +4,7 @@ evennia.server.webserver
 
 .. automodule:: evennia.server.webserver
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.settings_default.md b/docs/source/api/evennia.settings_default.md
index 9f05e4ff6..6c45f22e9 100644
--- a/docs/source/api/evennia.settings_default.md
+++ b/docs/source/api/evennia.settings_default.md
@@ -4,7 +4,7 @@ evennia.settings\_default
 
 .. automodule:: evennia.settings_default
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.typeclasses.attributes.md b/docs/source/api/evennia.typeclasses.attributes.md
index bf1918d41..a2e6b25f2 100644
--- a/docs/source/api/evennia.typeclasses.attributes.md
+++ b/docs/source/api/evennia.typeclasses.attributes.md
@@ -4,7 +4,7 @@ evennia.typeclasses.attributes
 
 .. automodule:: evennia.typeclasses.attributes
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.typeclasses.managers.md b/docs/source/api/evennia.typeclasses.managers.md
index d543efb45..e2800e064 100644
--- a/docs/source/api/evennia.typeclasses.managers.md
+++ b/docs/source/api/evennia.typeclasses.managers.md
@@ -4,7 +4,7 @@ evennia.typeclasses.managers
 
 .. automodule:: evennia.typeclasses.managers
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.typeclasses.md b/docs/source/api/evennia.typeclasses.md
index 0e5c3a367..940da2cba 100644
--- a/docs/source/api/evennia.typeclasses.md
+++ b/docs/source/api/evennia.typeclasses.md
@@ -4,11 +4,10 @@ evennia.typeclasses
 
 .. automodule:: evennia.typeclasses
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.typeclasses.models.md b/docs/source/api/evennia.typeclasses.models.md
index d672e4b1a..052a5cc62 100644
--- a/docs/source/api/evennia.typeclasses.models.md
+++ b/docs/source/api/evennia.typeclasses.models.md
@@ -4,7 +4,7 @@ evennia.typeclasses.models
 
 .. automodule:: evennia.typeclasses.models
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.typeclasses.tags.md b/docs/source/api/evennia.typeclasses.tags.md
index 3444b4eb9..d23e121a3 100644
--- a/docs/source/api/evennia.typeclasses.tags.md
+++ b/docs/source/api/evennia.typeclasses.tags.md
@@ -4,7 +4,7 @@ evennia.typeclasses.tags
 
 .. automodule:: evennia.typeclasses.tags
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.utils.ansi.md b/docs/source/api/evennia.utils.ansi.md
index 062fe2aed..d6f6c36d1 100644
--- a/docs/source/api/evennia.utils.ansi.md
+++ b/docs/source/api/evennia.utils.ansi.md
@@ -4,7 +4,7 @@ evennia.utils.ansi
 
 .. automodule:: evennia.utils.ansi
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.utils.batchprocessors.md b/docs/source/api/evennia.utils.batchprocessors.md
index 2c6e19119..074a311b2 100644
--- a/docs/source/api/evennia.utils.batchprocessors.md
+++ b/docs/source/api/evennia.utils.batchprocessors.md
@@ -4,7 +4,7 @@ evennia.utils.batchprocessors
 
 .. automodule:: evennia.utils.batchprocessors
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.utils.containers.md b/docs/source/api/evennia.utils.containers.md
index e8a82b25c..d1ea7f744 100644
--- a/docs/source/api/evennia.utils.containers.md
+++ b/docs/source/api/evennia.utils.containers.md
@@ -4,7 +4,7 @@ evennia.utils.containers
 
 .. automodule:: evennia.utils.containers
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.utils.create.md b/docs/source/api/evennia.utils.create.md
index d215c94b1..53ce6318d 100644
--- a/docs/source/api/evennia.utils.create.md
+++ b/docs/source/api/evennia.utils.create.md
@@ -4,7 +4,7 @@ evennia.utils.create
 
 .. automodule:: evennia.utils.create
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.utils.dbserialize.md b/docs/source/api/evennia.utils.dbserialize.md
index acfdc0c40..e295560da 100644
--- a/docs/source/api/evennia.utils.dbserialize.md
+++ b/docs/source/api/evennia.utils.dbserialize.md
@@ -4,7 +4,7 @@ evennia.utils.dbserialize
 
 .. automodule:: evennia.utils.dbserialize
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.utils.eveditor.md b/docs/source/api/evennia.utils.eveditor.md
index 7c5cde467..ff860a6dd 100644
--- a/docs/source/api/evennia.utils.eveditor.md
+++ b/docs/source/api/evennia.utils.eveditor.md
@@ -4,7 +4,7 @@ evennia.utils.eveditor
 
 .. automodule:: evennia.utils.eveditor
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.utils.evform.md b/docs/source/api/evennia.utils.evform.md
index 8f0126886..2e3ea98f8 100644
--- a/docs/source/api/evennia.utils.evform.md
+++ b/docs/source/api/evennia.utils.evform.md
@@ -4,7 +4,7 @@ evennia.utils.evform
 
 .. automodule:: evennia.utils.evform
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.utils.evmenu.md b/docs/source/api/evennia.utils.evmenu.md
index 8b545b5b3..05b8c4655 100644
--- a/docs/source/api/evennia.utils.evmenu.md
+++ b/docs/source/api/evennia.utils.evmenu.md
@@ -4,7 +4,7 @@ evennia.utils.evmenu
 
 .. automodule:: evennia.utils.evmenu
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.utils.evmore.md b/docs/source/api/evennia.utils.evmore.md
index 1f30b0445..e647cf28a 100644
--- a/docs/source/api/evennia.utils.evmore.md
+++ b/docs/source/api/evennia.utils.evmore.md
@@ -4,7 +4,7 @@ evennia.utils.evmore
 
 .. automodule:: evennia.utils.evmore
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.utils.evtable.md b/docs/source/api/evennia.utils.evtable.md
index 28fe18bc7..3078504b4 100644
--- a/docs/source/api/evennia.utils.evtable.md
+++ b/docs/source/api/evennia.utils.evtable.md
@@ -4,7 +4,7 @@ evennia.utils.evtable
 
 .. automodule:: evennia.utils.evtable
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.utils.funcparser.md b/docs/source/api/evennia.utils.funcparser.md
index 2f27f9663..c2e073c43 100644
--- a/docs/source/api/evennia.utils.funcparser.md
+++ b/docs/source/api/evennia.utils.funcparser.md
@@ -4,7 +4,7 @@ evennia.utils.funcparser
 
 .. automodule:: evennia.utils.funcparser
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.utils.gametime.md b/docs/source/api/evennia.utils.gametime.md
index b48f32923..1369f8ad8 100644
--- a/docs/source/api/evennia.utils.gametime.md
+++ b/docs/source/api/evennia.utils.gametime.md
@@ -4,7 +4,7 @@ evennia.utils.gametime
 
 .. automodule:: evennia.utils.gametime
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.utils.hex_colors.md b/docs/source/api/evennia.utils.hex_colors.md
index ef26cae11..ff276b783 100644
--- a/docs/source/api/evennia.utils.hex_colors.md
+++ b/docs/source/api/evennia.utils.hex_colors.md
@@ -4,7 +4,7 @@ evennia.utils.hex\_colors
 
 .. automodule:: evennia.utils.hex_colors
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.utils.idmapper.manager.md b/docs/source/api/evennia.utils.idmapper.manager.md
index 245ad5a65..80dd8a8f7 100644
--- a/docs/source/api/evennia.utils.idmapper.manager.md
+++ b/docs/source/api/evennia.utils.idmapper.manager.md
@@ -4,7 +4,7 @@ evennia.utils.idmapper.manager
 
 .. automodule:: evennia.utils.idmapper.manager
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.utils.idmapper.md b/docs/source/api/evennia.utils.idmapper.md
index ff458dcf1..46700fdb2 100644
--- a/docs/source/api/evennia.utils.idmapper.md
+++ b/docs/source/api/evennia.utils.idmapper.md
@@ -4,11 +4,10 @@ evennia.utils.idmapper
 
 .. automodule:: evennia.utils.idmapper
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.utils.idmapper.models.md b/docs/source/api/evennia.utils.idmapper.models.md
index 2763cc8c9..c9d640f8c 100644
--- a/docs/source/api/evennia.utils.idmapper.models.md
+++ b/docs/source/api/evennia.utils.idmapper.models.md
@@ -4,7 +4,7 @@ evennia.utils.idmapper.models
 
 .. automodule:: evennia.utils.idmapper.models
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.utils.idmapper.tests.md b/docs/source/api/evennia.utils.idmapper.tests.md
index 9a2b69404..1e628c126 100644
--- a/docs/source/api/evennia.utils.idmapper.tests.md
+++ b/docs/source/api/evennia.utils.idmapper.tests.md
@@ -4,7 +4,7 @@ evennia.utils.idmapper.tests
 
 .. automodule:: evennia.utils.idmapper.tests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.utils.logger.md b/docs/source/api/evennia.utils.logger.md
index 409bb8855..1479cb981 100644
--- a/docs/source/api/evennia.utils.logger.md
+++ b/docs/source/api/evennia.utils.logger.md
@@ -4,7 +4,7 @@ evennia.utils.logger
 
 .. automodule:: evennia.utils.logger
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.utils.md b/docs/source/api/evennia.utils.md
index 43bac89f0..eb7278258 100644
--- a/docs/source/api/evennia.utils.md
+++ b/docs/source/api/evennia.utils.md
@@ -4,20 +4,10 @@ evennia.utils
 
 .. automodule:: evennia.utils
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
-Subpackages
------------
 
-.. toctree::
-   :maxdepth: 6
-
-   evennia.utils.idmapper
-   evennia.utils.verb_conjugation
-
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
@@ -45,4 +35,11 @@ Submodules
    evennia.utils.utils
    evennia.utils.validatorfuncs
 
+
+.. toctree::
+   :maxdepth: 6
+
+   evennia.utils.idmapper
+   evennia.utils.verb_conjugation
+
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.utils.optionclasses.md b/docs/source/api/evennia.utils.optionclasses.md
index 8d56178cf..3b90c44f8 100644
--- a/docs/source/api/evennia.utils.optionclasses.md
+++ b/docs/source/api/evennia.utils.optionclasses.md
@@ -4,7 +4,7 @@ evennia.utils.optionclasses
 
 .. automodule:: evennia.utils.optionclasses
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.utils.optionhandler.md b/docs/source/api/evennia.utils.optionhandler.md
index 184dfc972..36876d2e4 100644
--- a/docs/source/api/evennia.utils.optionhandler.md
+++ b/docs/source/api/evennia.utils.optionhandler.md
@@ -4,7 +4,7 @@ evennia.utils.optionhandler
 
 .. automodule:: evennia.utils.optionhandler
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.utils.picklefield.md b/docs/source/api/evennia.utils.picklefield.md
index a9e7076ff..fa714a8d3 100644
--- a/docs/source/api/evennia.utils.picklefield.md
+++ b/docs/source/api/evennia.utils.picklefield.md
@@ -4,7 +4,7 @@ evennia.utils.picklefield
 
 .. automodule:: evennia.utils.picklefield
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.utils.search.md b/docs/source/api/evennia.utils.search.md
index e77e4731e..8a817cefc 100644
--- a/docs/source/api/evennia.utils.search.md
+++ b/docs/source/api/evennia.utils.search.md
@@ -4,7 +4,7 @@ evennia.utils.search
 
 .. automodule:: evennia.utils.search
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.utils.test_resources.md b/docs/source/api/evennia.utils.test_resources.md
index 2e0399852..4f6ee61fa 100644
--- a/docs/source/api/evennia.utils.test_resources.md
+++ b/docs/source/api/evennia.utils.test_resources.md
@@ -4,7 +4,7 @@ evennia.utils.test\_resources
 
 .. automodule:: evennia.utils.test_resources
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.utils.text2html.md b/docs/source/api/evennia.utils.text2html.md
index d205282f9..cc4abb8c6 100644
--- a/docs/source/api/evennia.utils.text2html.md
+++ b/docs/source/api/evennia.utils.text2html.md
@@ -4,7 +4,7 @@ evennia.utils.text2html
 
 .. automodule:: evennia.utils.text2html
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.utils.utils.md b/docs/source/api/evennia.utils.utils.md
index 85c523395..1ccb3f4c5 100644
--- a/docs/source/api/evennia.utils.utils.md
+++ b/docs/source/api/evennia.utils.utils.md
@@ -4,7 +4,7 @@ evennia.utils.utils
 
 .. automodule:: evennia.utils.utils
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.utils.validatorfuncs.md b/docs/source/api/evennia.utils.validatorfuncs.md
index 06ee8ff4e..9e5315030 100644
--- a/docs/source/api/evennia.utils.validatorfuncs.md
+++ b/docs/source/api/evennia.utils.validatorfuncs.md
@@ -4,7 +4,7 @@ evennia.utils.validatorfuncs
 
 .. automodule:: evennia.utils.validatorfuncs
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.utils.verb_conjugation.conjugate.md b/docs/source/api/evennia.utils.verb_conjugation.conjugate.md
index a0979cc5c..6e01f8bba 100644
--- a/docs/source/api/evennia.utils.verb_conjugation.conjugate.md
+++ b/docs/source/api/evennia.utils.verb_conjugation.conjugate.md
@@ -4,7 +4,7 @@ evennia.utils.verb\_conjugation.conjugate
 
 .. automodule:: evennia.utils.verb_conjugation.conjugate
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.utils.verb_conjugation.md b/docs/source/api/evennia.utils.verb_conjugation.md
index 07a5c1388..18d24e6ad 100644
--- a/docs/source/api/evennia.utils.verb_conjugation.md
+++ b/docs/source/api/evennia.utils.verb_conjugation.md
@@ -4,11 +4,10 @@ evennia.utils.verb\_conjugation
 
 .. automodule:: evennia.utils.verb_conjugation
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.utils.verb_conjugation.pronouns.md b/docs/source/api/evennia.utils.verb_conjugation.pronouns.md
index 1456e857e..609a6afe2 100644
--- a/docs/source/api/evennia.utils.verb_conjugation.pronouns.md
+++ b/docs/source/api/evennia.utils.verb_conjugation.pronouns.md
@@ -4,7 +4,7 @@ evennia.utils.verb\_conjugation.pronouns
 
 .. automodule:: evennia.utils.verb_conjugation.pronouns
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.utils.verb_conjugation.tests.md b/docs/source/api/evennia.utils.verb_conjugation.tests.md
index 6a14f9979..c46f8e579 100644
--- a/docs/source/api/evennia.utils.verb_conjugation.tests.md
+++ b/docs/source/api/evennia.utils.verb_conjugation.tests.md
@@ -4,7 +4,7 @@ evennia.utils.verb\_conjugation.tests
 
 .. automodule:: evennia.utils.verb_conjugation.tests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.web.admin.accounts.md b/docs/source/api/evennia.web.admin.accounts.md
index 270bbe9a9..ae2d80efa 100644
--- a/docs/source/api/evennia.web.admin.accounts.md
+++ b/docs/source/api/evennia.web.admin.accounts.md
@@ -4,7 +4,7 @@ evennia.web.admin.accounts
 
 .. automodule:: evennia.web.admin.accounts
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.web.admin.attributes.md b/docs/source/api/evennia.web.admin.attributes.md
index 111ae372f..0845bf9db 100644
--- a/docs/source/api/evennia.web.admin.attributes.md
+++ b/docs/source/api/evennia.web.admin.attributes.md
@@ -4,7 +4,7 @@ evennia.web.admin.attributes
 
 .. automodule:: evennia.web.admin.attributes
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.web.admin.comms.md b/docs/source/api/evennia.web.admin.comms.md
index 377a49379..45ca2bb88 100644
--- a/docs/source/api/evennia.web.admin.comms.md
+++ b/docs/source/api/evennia.web.admin.comms.md
@@ -4,7 +4,7 @@ evennia.web.admin.comms
 
 .. automodule:: evennia.web.admin.comms
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.web.admin.frontpage.md b/docs/source/api/evennia.web.admin.frontpage.md
index e3a4c9487..d0f717e02 100644
--- a/docs/source/api/evennia.web.admin.frontpage.md
+++ b/docs/source/api/evennia.web.admin.frontpage.md
@@ -4,7 +4,7 @@ evennia.web.admin.frontpage
 
 .. automodule:: evennia.web.admin.frontpage
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.web.admin.help.md b/docs/source/api/evennia.web.admin.help.md
index 45ca5db16..f3d1c40dc 100644
--- a/docs/source/api/evennia.web.admin.help.md
+++ b/docs/source/api/evennia.web.admin.help.md
@@ -4,7 +4,7 @@ evennia.web.admin.help
 
 .. automodule:: evennia.web.admin.help
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.web.admin.md b/docs/source/api/evennia.web.admin.md
index 420607783..b9c0781d7 100644
--- a/docs/source/api/evennia.web.admin.md
+++ b/docs/source/api/evennia.web.admin.md
@@ -4,11 +4,10 @@ evennia.web.admin
 
 .. automodule:: evennia.web.admin
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.web.admin.objects.md b/docs/source/api/evennia.web.admin.objects.md
index e176bc8d8..cead37dc6 100644
--- a/docs/source/api/evennia.web.admin.objects.md
+++ b/docs/source/api/evennia.web.admin.objects.md
@@ -4,7 +4,7 @@ evennia.web.admin.objects
 
 .. automodule:: evennia.web.admin.objects
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.web.admin.scripts.md b/docs/source/api/evennia.web.admin.scripts.md
index e65a5f4b2..24e76b5b1 100644
--- a/docs/source/api/evennia.web.admin.scripts.md
+++ b/docs/source/api/evennia.web.admin.scripts.md
@@ -4,7 +4,7 @@ evennia.web.admin.scripts
 
 .. automodule:: evennia.web.admin.scripts
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.web.admin.server.md b/docs/source/api/evennia.web.admin.server.md
index 6c9314bde..b3b4d1988 100644
--- a/docs/source/api/evennia.web.admin.server.md
+++ b/docs/source/api/evennia.web.admin.server.md
@@ -4,7 +4,7 @@ evennia.web.admin.server
 
 .. automodule:: evennia.web.admin.server
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.web.admin.tags.md b/docs/source/api/evennia.web.admin.tags.md
index 84e1bd2d0..73822c869 100644
--- a/docs/source/api/evennia.web.admin.tags.md
+++ b/docs/source/api/evennia.web.admin.tags.md
@@ -4,7 +4,7 @@ evennia.web.admin.tags
 
 .. automodule:: evennia.web.admin.tags
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.web.admin.urls.md b/docs/source/api/evennia.web.admin.urls.md
index 0f84751fa..4b0f8d72a 100644
--- a/docs/source/api/evennia.web.admin.urls.md
+++ b/docs/source/api/evennia.web.admin.urls.md
@@ -4,7 +4,7 @@ evennia.web.admin.urls
 
 .. automodule:: evennia.web.admin.urls
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.web.admin.utils.md b/docs/source/api/evennia.web.admin.utils.md
index 0f3752ed4..532f8413e 100644
--- a/docs/source/api/evennia.web.admin.utils.md
+++ b/docs/source/api/evennia.web.admin.utils.md
@@ -4,7 +4,7 @@ evennia.web.admin.utils
 
 .. automodule:: evennia.web.admin.utils
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.web.api.filters.md b/docs/source/api/evennia.web.api.filters.md
index 48085afc1..197262503 100644
--- a/docs/source/api/evennia.web.api.filters.md
+++ b/docs/source/api/evennia.web.api.filters.md
@@ -4,7 +4,7 @@ evennia.web.api.filters
 
 .. automodule:: evennia.web.api.filters
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.web.api.md b/docs/source/api/evennia.web.api.md
index b885eac56..04a051e94 100644
--- a/docs/source/api/evennia.web.api.md
+++ b/docs/source/api/evennia.web.api.md
@@ -4,11 +4,10 @@ evennia.web.api
 
 .. automodule:: evennia.web.api
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.web.api.permissions.md b/docs/source/api/evennia.web.api.permissions.md
index 61d3b4786..619998a7b 100644
--- a/docs/source/api/evennia.web.api.permissions.md
+++ b/docs/source/api/evennia.web.api.permissions.md
@@ -4,7 +4,7 @@ evennia.web.api.permissions
 
 .. automodule:: evennia.web.api.permissions
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.web.api.root.md b/docs/source/api/evennia.web.api.root.md
index 896ebbb47..214f662a0 100644
--- a/docs/source/api/evennia.web.api.root.md
+++ b/docs/source/api/evennia.web.api.root.md
@@ -4,7 +4,7 @@ evennia.web.api.root
 
 .. automodule:: evennia.web.api.root
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.web.api.serializers.md b/docs/source/api/evennia.web.api.serializers.md
index f6a2c2995..e5d93491d 100644
--- a/docs/source/api/evennia.web.api.serializers.md
+++ b/docs/source/api/evennia.web.api.serializers.md
@@ -4,7 +4,7 @@ evennia.web.api.serializers
 
 .. automodule:: evennia.web.api.serializers
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.web.api.tests.md b/docs/source/api/evennia.web.api.tests.md
index 45618b1e9..46aa88bf7 100644
--- a/docs/source/api/evennia.web.api.tests.md
+++ b/docs/source/api/evennia.web.api.tests.md
@@ -4,7 +4,7 @@ evennia.web.api.tests
 
 .. automodule:: evennia.web.api.tests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.web.api.urls.md b/docs/source/api/evennia.web.api.urls.md
index ccc88d41e..918973098 100644
--- a/docs/source/api/evennia.web.api.urls.md
+++ b/docs/source/api/evennia.web.api.urls.md
@@ -4,7 +4,7 @@ evennia.web.api.urls
 
 .. automodule:: evennia.web.api.urls
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.web.api.views.md b/docs/source/api/evennia.web.api.views.md
index 445c805f3..9400a71df 100644
--- a/docs/source/api/evennia.web.api.views.md
+++ b/docs/source/api/evennia.web.api.views.md
@@ -4,7 +4,7 @@ evennia.web.api.views
 
 .. automodule:: evennia.web.api.views
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.web.md b/docs/source/api/evennia.web.md
index 0358edbd4..3b4eb1f44 100644
--- a/docs/source/api/evennia.web.md
+++ b/docs/source/api/evennia.web.md
@@ -4,11 +4,16 @@ evennia.web
 
 .. automodule:: evennia.web
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
+
+
+.. toctree::
+   :maxdepth: 6
+
+   evennia.web.urls
 
-Subpackages
------------
 
 .. toctree::
    :maxdepth: 6
@@ -20,12 +25,4 @@ Subpackages
    evennia.web.webclient
    evennia.web.website
 
-Submodules
-----------
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.web.urls
-
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.web.templatetags.addclass.md b/docs/source/api/evennia.web.templatetags.addclass.md
index d352d4509..6ed17b044 100644
--- a/docs/source/api/evennia.web.templatetags.addclass.md
+++ b/docs/source/api/evennia.web.templatetags.addclass.md
@@ -4,7 +4,7 @@ evennia.web.templatetags.addclass
 
 .. automodule:: evennia.web.templatetags.addclass
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.web.templatetags.md b/docs/source/api/evennia.web.templatetags.md
index a26521b1a..dd5f4486b 100644
--- a/docs/source/api/evennia.web.templatetags.md
+++ b/docs/source/api/evennia.web.templatetags.md
@@ -4,11 +4,10 @@ evennia.web.templatetags
 
 .. automodule:: evennia.web.templatetags
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.web.urls.md b/docs/source/api/evennia.web.urls.md
index 516e04a6f..a6101167a 100644
--- a/docs/source/api/evennia.web.urls.md
+++ b/docs/source/api/evennia.web.urls.md
@@ -4,7 +4,7 @@ evennia.web.urls
 
 .. automodule:: evennia.web.urls
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.web.utils.adminsite.md b/docs/source/api/evennia.web.utils.adminsite.md
index 088d27607..1880ee638 100644
--- a/docs/source/api/evennia.web.utils.adminsite.md
+++ b/docs/source/api/evennia.web.utils.adminsite.md
@@ -4,7 +4,7 @@ evennia.web.utils.adminsite
 
 .. automodule:: evennia.web.utils.adminsite
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.web.utils.backends.md b/docs/source/api/evennia.web.utils.backends.md
index 8cc71c0a1..3badeb440 100644
--- a/docs/source/api/evennia.web.utils.backends.md
+++ b/docs/source/api/evennia.web.utils.backends.md
@@ -4,7 +4,7 @@ evennia.web.utils.backends
 
 .. automodule:: evennia.web.utils.backends
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.web.utils.general_context.md b/docs/source/api/evennia.web.utils.general_context.md
index a95ee1cf7..9a6c569ca 100644
--- a/docs/source/api/evennia.web.utils.general_context.md
+++ b/docs/source/api/evennia.web.utils.general_context.md
@@ -4,7 +4,7 @@ evennia.web.utils.general\_context
 
 .. automodule:: evennia.web.utils.general_context
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.web.utils.md b/docs/source/api/evennia.web.utils.md
index bce8f7155..3c1a084f3 100644
--- a/docs/source/api/evennia.web.utils.md
+++ b/docs/source/api/evennia.web.utils.md
@@ -4,11 +4,10 @@ evennia.web.utils
 
 .. automodule:: evennia.web.utils
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.web.utils.middleware.md b/docs/source/api/evennia.web.utils.middleware.md
index 9c277aca9..1562f6cf9 100644
--- a/docs/source/api/evennia.web.utils.middleware.md
+++ b/docs/source/api/evennia.web.utils.middleware.md
@@ -4,7 +4,7 @@ evennia.web.utils.middleware
 
 .. automodule:: evennia.web.utils.middleware
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.web.utils.tests.md b/docs/source/api/evennia.web.utils.tests.md
index 8152441f4..75f857740 100644
--- a/docs/source/api/evennia.web.utils.tests.md
+++ b/docs/source/api/evennia.web.utils.tests.md
@@ -4,7 +4,7 @@ evennia.web.utils.tests
 
 .. automodule:: evennia.web.utils.tests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.web.webclient.md b/docs/source/api/evennia.web.webclient.md
index f47dad415..8a8d44345 100644
--- a/docs/source/api/evennia.web.webclient.md
+++ b/docs/source/api/evennia.web.webclient.md
@@ -4,11 +4,10 @@ evennia.web.webclient
 
 .. automodule:: evennia.web.webclient
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.web.webclient.urls.md b/docs/source/api/evennia.web.webclient.urls.md
index 0d8fc75f6..b6e8609a7 100644
--- a/docs/source/api/evennia.web.webclient.urls.md
+++ b/docs/source/api/evennia.web.webclient.urls.md
@@ -4,7 +4,7 @@ evennia.web.webclient.urls
 
 .. automodule:: evennia.web.webclient.urls
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.web.webclient.views.md b/docs/source/api/evennia.web.webclient.views.md
index fa2923148..8f776e2b8 100644
--- a/docs/source/api/evennia.web.webclient.views.md
+++ b/docs/source/api/evennia.web.webclient.views.md
@@ -4,7 +4,7 @@ evennia.web.webclient.views
 
 .. automodule:: evennia.web.webclient.views
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.web.website.forms.md b/docs/source/api/evennia.web.website.forms.md
index 39bd6f805..078e240fb 100644
--- a/docs/source/api/evennia.web.website.forms.md
+++ b/docs/source/api/evennia.web.website.forms.md
@@ -4,7 +4,7 @@ evennia.web.website.forms
 
 .. automodule:: evennia.web.website.forms
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.web.website.md b/docs/source/api/evennia.web.website.md
index 0ea7d88f0..0588c534a 100644
--- a/docs/source/api/evennia.web.website.md
+++ b/docs/source/api/evennia.web.website.md
@@ -4,19 +4,10 @@ evennia.web.website
 
 .. automodule:: evennia.web.website
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
-Subpackages
------------
 
-.. toctree::
-   :maxdepth: 6
-
-   evennia.web.website.views
-
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
@@ -25,4 +16,10 @@ Submodules
    evennia.web.website.tests
    evennia.web.website.urls
 
+
+.. toctree::
+   :maxdepth: 6
+
+   evennia.web.website.views
+
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.web.website.tests.md b/docs/source/api/evennia.web.website.tests.md
index 7ad5f279a..ac7005111 100644
--- a/docs/source/api/evennia.web.website.tests.md
+++ b/docs/source/api/evennia.web.website.tests.md
@@ -4,7 +4,7 @@ evennia.web.website.tests
 
 .. automodule:: evennia.web.website.tests
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.web.website.urls.md b/docs/source/api/evennia.web.website.urls.md
index 9bc10a73f..7ca47a5a6 100644
--- a/docs/source/api/evennia.web.website.urls.md
+++ b/docs/source/api/evennia.web.website.urls.md
@@ -4,7 +4,7 @@ evennia.web.website.urls
 
 .. automodule:: evennia.web.website.urls
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.web.website.views.accounts.md b/docs/source/api/evennia.web.website.views.accounts.md
index 7fb51d3ae..94922ac8b 100644
--- a/docs/source/api/evennia.web.website.views.accounts.md
+++ b/docs/source/api/evennia.web.website.views.accounts.md
@@ -4,7 +4,7 @@ evennia.web.website.views.accounts
 
 .. automodule:: evennia.web.website.views.accounts
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.web.website.views.channels.md b/docs/source/api/evennia.web.website.views.channels.md
index 93fe0e8ae..0d8f33675 100644
--- a/docs/source/api/evennia.web.website.views.channels.md
+++ b/docs/source/api/evennia.web.website.views.channels.md
@@ -4,7 +4,7 @@ evennia.web.website.views.channels
 
 .. automodule:: evennia.web.website.views.channels
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.web.website.views.characters.md b/docs/source/api/evennia.web.website.views.characters.md
index ce70289f1..451a883bb 100644
--- a/docs/source/api/evennia.web.website.views.characters.md
+++ b/docs/source/api/evennia.web.website.views.characters.md
@@ -4,7 +4,7 @@ evennia.web.website.views.characters
 
 .. automodule:: evennia.web.website.views.characters
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.web.website.views.errors.md b/docs/source/api/evennia.web.website.views.errors.md
index 85d011be5..3e28d1c20 100644
--- a/docs/source/api/evennia.web.website.views.errors.md
+++ b/docs/source/api/evennia.web.website.views.errors.md
@@ -4,7 +4,7 @@ evennia.web.website.views.errors
 
 .. automodule:: evennia.web.website.views.errors
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.web.website.views.help.md b/docs/source/api/evennia.web.website.views.help.md
index 52e0f8f05..09c345c55 100644
--- a/docs/source/api/evennia.web.website.views.help.md
+++ b/docs/source/api/evennia.web.website.views.help.md
@@ -4,7 +4,7 @@ evennia.web.website.views.help
 
 .. automodule:: evennia.web.website.views.help
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.web.website.views.index.md b/docs/source/api/evennia.web.website.views.index.md
index 2283b9d61..9ad3e0071 100644
--- a/docs/source/api/evennia.web.website.views.index.md
+++ b/docs/source/api/evennia.web.website.views.index.md
@@ -4,7 +4,7 @@ evennia.web.website.views.index
 
 .. automodule:: evennia.web.website.views.index
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.web.website.views.md b/docs/source/api/evennia.web.website.views.md
index fb7af87ba..b1228cfa5 100644
--- a/docs/source/api/evennia.web.website.views.md
+++ b/docs/source/api/evennia.web.website.views.md
@@ -4,11 +4,10 @@ evennia.web.website.views
 
 .. automodule:: evennia.web.website.views
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
+
 
-Submodules
-----------
 
 .. toctree::
    :maxdepth: 6
diff --git a/docs/source/api/evennia.web.website.views.mixins.md b/docs/source/api/evennia.web.website.views.mixins.md
index 338a17ae0..08c758480 100644
--- a/docs/source/api/evennia.web.website.views.mixins.md
+++ b/docs/source/api/evennia.web.website.views.mixins.md
@@ -4,7 +4,7 @@ evennia.web.website.views.mixins
 
 .. automodule:: evennia.web.website.views.mixins
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/api/evennia.web.website.views.objects.md b/docs/source/api/evennia.web.website.views.objects.md
index 920de88b9..0da21d9d1 100644
--- a/docs/source/api/evennia.web.website.views.objects.md
+++ b/docs/source/api/evennia.web.website.views.objects.md
@@ -4,7 +4,7 @@ evennia.web.website.views.objects
 
 .. automodule:: evennia.web.website.views.objects
    :members:
-   :undoc-members:
    :show-inheritance:
+   :undoc-members:
 
 ```
\ No newline at end of file
diff --git a/docs/source/conf.py b/docs/source/conf.py
index f6b52a382..311f2ae57 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -33,7 +33,7 @@ html_css_files = [
 # -- General configuration ---------------------------------------------------
 
 extensions = [
-    #"sphinx_multiversion",
+    # "sphinx_multiversion",
     "sphinx.ext.napoleon",
     "sphinx.ext.autosectionlabel",
     "sphinx.ext.viewcode",
@@ -56,49 +56,38 @@ templates_path = ["_templates"]
 html_static_path = ["_static"]
 
 
-# -- Sphinx-multiversion config ----------------------------------------------
-
-# which branches to include in multi-versioned docs
-# smv_branch_whitelist = r"^develop$|^v[0-9\.]+?$"
-# smv_branch_whitelist = r"^develop$|^master$|^v1.0$"
-#smv_branch_whitelist = r"^main$"
-#smv_outputdir_format = "{config.release}"
-# don't make docs for tags
-#smv_tag_whitelist = r"^$"
+# -- Multiversion sidebar ----------------------------------------------
 
 # used to fill in versioning.html links for versions that are not actually built.
 # These are also read from the deploy.py script. These are also the names of
 # the folders built in the gh-pages evennia branch, under docs/.
+# See docs/deploy.py for more details on how to add to this during a major release.
 latest_version = "latest"
 legacy_versions = ["5.x", "4.x", "3.x", "2.x", "1.x", "0.x"]
 legacy_branches = ["v5.0.0", "v4.0.0", "v3.0.0", "v2.0.0", "v1.0.0", "v0.9.5"]
 
 DOCS_BASE = "https://www.evennia.com/docs/"
 
+
 def add_legacy_versions_to_html_page_context(app, pagename, templatename, context, doctree):
     # Add "latest" (main) version
     context["versions"] = [
-        {
-            "release": "latest",
-            "name": "main",
-            "url": f"{DOCS_BASE}latest/index.html"
-        }
+        {"release": "latest", "name": "main", "url": f"{DOCS_BASE}latest/index.html"}
     ]
     # Add legacy versions
     LVersion = namedtuple("legacy_version", ["release", "name", "url", "branch"])
     context["legacy_versions"] = [
         LVersion(
-            release=branch,            # e.g. v5.0.0
-            name=vers,                 # e.g. 5.x
+            release=branch,  # e.g. v5.0.0
+            name=vers,  # e.g. 5.x
             url=f"{DOCS_BASE}{vers}/index.html",  # absolute path!
-            branch=branch
+            branch=branch,
         )
         for vers, branch in zip(legacy_versions, legacy_branches)
     ]
     context["current_is_legacy"] = False
 
 
-
 # -- Options for HTML output -------------------------------------------------
 
 html_theme = "nature"