From cd88660c0036b391535e21e1e6d47d49cf91c944 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 13 Jun 2020 23:28:25 +0200
Subject: [PATCH] Update favicon also for master

---
 docs/source/_static/favicon.ico | Bin 0 -> 1406 bytes
 docs/source/conf.py             |  10 ++++++----
 2 files changed, 6 insertions(+), 4 deletions(-)
 create mode 100644 docs/source/_static/favicon.ico

diff --git a/docs/source/_static/favicon.ico b/docs/source/_static/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..547a1686d60bafe0f8e5beacd0eb857a15fbbc96
GIT binary patch
literal 1406
zcmeH{ZBUd|6vuxc;3_M~n}7)7vchV*%R;i4$SP|ftpo(df^R7D7Rh^n1|nz+iKe9{
z6_D%Rn&Crf4UJ_ug_C{QW(vp;nbAxXZw*b;G)yD$(#5{_rI|i;p84H#{^!hno^zkM
z_kxprJeMO!1x2o~0?<f2C83gq{6Cq~Lebe7T%>oCxXNIO)JtXTE@KZl-^&Gsj{;Xe
zB?P*$EYKJK0AC1E;1cX5Kcpl$Xcdc9UaSZSLZS9S5iUE?c%uyW$5Z2nTCHZy+Az?q
zlmxLMLW8?5kO+;2@O83dz0B)_ASw`#$Pi*SstAY*hFF<5tVXYkBtvSQUI%e1%3^%*
z+!98tb_d!`(XcI)Sc3tjNkwg30J?ZBi*|;R7P}3X<OsYa9%eP_r1fky8cB%Ri_y3p
zQ$hl6=~~QYGp1cB)Tc%BR%RH9yOS|k%rs@ilbV%Dhs8inb`Dj0Qn2jH=4!5i4-ZF?
zmwS+piZ_#2m`_nbA-To*94INE_lSx2%M<ye(nNV_85L#aT&m3DMoo$&mFlW0nyX9b
ztx3mmG>OKVDhlh%xYLkM#qm0RY)+=Jp@F)_1_n>2^TjC(%}q^=x2EA}+0WOl7RK5#
zuv)FONWMICh|AW~+&Wvtg|=pfF6J`Wo=<ywJKuIyaMyMWTW1#!L@A@9mQLFhI^OQ2
zySrO*jcf0`%k}rJ)6>(#jhnrEaPt;@pZ4+l=Qcj;yUoY9@8EDa=<n}muz!GofdRf6
zyvx0B?s5PAcMJ^;@%;in{KW9^Fe4))jE;^nJ~qbBW8+LrOfWe)$#1{>%GA^pfBx}+
z>FH@^W@eb3on>xrj`{g{x#|A5|LPA2yAY!5O2y?f(hGr<#ZTaY)ApbaSwp-g?-TbW
zN>>Gsz98&~HCrC@->M0Yi*$DLxhU)GtWG=9P`ZCZLZC~A)EjehpW65Qi+c}dg|Fl#
z#H+8Q6k0axjkRTFt?$za+u6LNkkI3G&y}a{*c62j&o(~drLH<wlKptIJg0VX&ZJsh
z^GyDsnDdofkadx{=ww8qF8R`_qq0BQ(}`vAqOHZ6&YlG=?5&IaUT$iC!!zu_LoI}1
q?US8v7A^HY{kOg<Rz(M_Tfcnw!}Z7)+C}~0T?MZTyIkMDwZ8x?6fMdC

literal 0
HcmV?d00001

diff --git a/docs/source/conf.py b/docs/source/conf.py
index 581c788d95..5d664d5541 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -20,10 +20,10 @@ if not _no_autodoc:
     GAME_DIR = os.environ.get("EVGAMEDIR")
 
     if not (EV_ROOT and GAME_DIR):
-        print("The EVDIR and EVGAMEDIR environment variables must be set to "
+        err = ("The EVDIR and EVGAMEDIR environment variables must be set to "
               "the absolute paths to the evennia/ repo and an initialized "
               "evennia gamedir respectively.")
-        raise RuntimeError()
+        raise RuntimeError(err)
 
     print("Evennia root: {}, Game dir: {}".format(EV_ROOT, GAME_DIR))
 
@@ -85,6 +85,7 @@ html_sidebars = {
         "versioning.html",
     ]
 }
+html_favicon = "_static/favicon.ico"
 
 
 # napoleon Google-style docstring parser
@@ -140,8 +141,9 @@ 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$|^v1.0$"
+# 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 = "{config.release}"