From c50c66a3492fd41bcb26a749066e8b96d1b3fe00 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Fri, 12 Jun 2020 22:09:43 +0200
Subject: [PATCH] Set up multi-version branch whitelist

---
 docs/source/conf.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/docs/source/conf.py b/docs/source/conf.py
index c0293faad5..1547ea52ff 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -48,7 +48,7 @@ copyright = '2020, The Evennia developer community'
 author = 'The Evennia developer community'
 
 # The full version, including alpha/beta/rc tags
-release = '0.9'
+release = '1.0-dev'
 
 # -- General configuration ---------------------------------------------------
 
@@ -140,7 +140,10 @@ html_theme = 'alabaster'
 # sphinx-multiversion config
 
 smv_tag_whitelist = r"^$"
-smv_branch_whitelist = r"^static-file-docs$|^static-file-dev$"
+smv_branch_whitelist = r"^master$|^develop$"
+# which branches to include in multi-version docs
+# - master, develop and vX.X branches 
+smv_branch_whitelist = r"^master$|^develop$|^v[0-9\.]+?$"
 smv_outputdir_format = "versions" + sep + "{config.release}"