From 6924aaf5e0c9223d000cf626623a2008aad8c312 Mon Sep 17 00:00:00 2001
From: Peter Chang <peter.chang@diamond.ac.uk>
Date: Wed, 3 May 2023 15:27:41 +0100
Subject: [PATCH 1/5] Add favicon to HTML pages of manual

Remove extra copy of icon
---
 impatient-guide/conf.py     |   2 +-
 impatient-guide/favicon.ico | Bin 2494 -> 0 bytes
 manual/source/conf.py       |   5 +++++
 3 files changed, 6 insertions(+), 1 deletion(-)
 delete mode 100644 impatient-guide/favicon.ico

diff --git a/impatient-guide/conf.py b/impatient-guide/conf.py
index 0bedf1bde0..04d09a706d 100644
--- a/impatient-guide/conf.py
+++ b/impatient-guide/conf.py
@@ -117,7 +117,7 @@
 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
-html_favicon = 'favicon.ico'
+html_favicon = "../www/download.nexusformat.org/favicon.ico"
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
diff --git a/impatient-guide/favicon.ico b/impatient-guide/favicon.ico
deleted file mode 100644
index 064181b36adcb9101f157ac1762d1b896a2a2ec4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2494
zcmeHITTc@~7(J8a)`2B~hxSElqiNtlYYZ<!veFlEV+0e$xS=sjOduwN5Df+aBO(@C
z%F^y`uV5=7K!}$Y{RjRO|45zL*)1UWsJ!sCGxP17?{>~6EkO7u5`k;I0U*e|UcMrH
z#rYy=<2$!zc^uvA^*UBM?jqTKA0OHuV2wWJD*-d`1nD-0Y~U%@TPNYPJ;O%xG^~~x
zSWUAiw$7j&n1$W6fJ)0tR00dg(pgw^9u8l*&N*1!^RR*o$agHE*tCdh^K00hi*UN$
zpwzVtyPNyLC2R(hsDzf`TzHGZ#dokHOK>i)VCzy6b}R{}_dPbRr%(&0QM;1H$DR~+
zde*Uhbsc-xvT*uVVfU}1d@~JaFoo)XiRz$<Vw^t@rBJ$)L4ITn#d{f4hqKteVPe0}
z!d}0H-MEd<0|k7Imr%Q%#r}|k-C+mchRXOdQpR_E3;EFu%A+RoV;PjjHc((DO5+>Y
zerVy7VWBo|<Htx92aifPNR*JDFj1b!p)!@jJ}aU&X`?pfApatZ!gLm!&utW5<xrlp
z@N4Ji(bsYApDXZR6<}v&#%YZW!Y!%^NO=0mm?$A`rcMYwiSnB$iHdtl$f+=6iXsXS
z#SJ?xMo}2kmA|DkW>B3)6?aIHo=AwVG)c;!hC+RQx<-iR5z)M&x<YvmKc_J%=j7c{
z<p}l0E%ApkC~dUoR6Hh{;^R7{p~C`ES(R&RxYQX_scsyqr%6``M~1}!1`Qc3rh2n*
zEriEsW=s+ZsUd!$hP?oZQ-$XecPv#E%?&js1Kd_oS8q+=VTtn&az=sk>OwG0P*GLc
zTK7(YE7T>aQ=X-|g^h4H?2SN~MkNQ2itO9iDc3``lA|^N&!HhI2yxRn@sp;ivO34T
wk&nm3RR3+<^7{ON`%1BpugS3h!)vO?Vp^;bdo1LiJ@Ehky7<94KhH*o-$j6kasU7T

diff --git a/manual/source/conf.py b/manual/source/conf.py
index 51b35e4bb3..d44d506ef5 100644
--- a/manual/source/conf.py
+++ b/manual/source/conf.py
@@ -88,6 +88,11 @@
     ],
 }
 
+# The name of an image file (within the static path) to use as favicon of the
+# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
+# pixels large.
+html_favicon = "../../www/download.nexusformat.org/favicon.ico"
+
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'NeXusManualdoc'
 

From 17b514230ec8dc60f40809c641c60f5794a02e04 Mon Sep 17 00:00:00 2001
From: Peter Chang <peter.chang@diamond.ac.uk>
Date: Wed, 3 May 2023 18:15:54 +0100
Subject: [PATCH 2/5] Make favicon paths relative to _static

---
 impatient-guide/conf.py | 2 +-
 manual/source/conf.py   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/impatient-guide/conf.py b/impatient-guide/conf.py
index 04d09a706d..83b6492758 100644
--- a/impatient-guide/conf.py
+++ b/impatient-guide/conf.py
@@ -117,7 +117,7 @@
 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
-html_favicon = "../www/download.nexusformat.org/favicon.ico"
+html_favicon = "../../www/download.nexusformat.org/favicon.ico"
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
diff --git a/manual/source/conf.py b/manual/source/conf.py
index d44d506ef5..6b3981e86d 100644
--- a/manual/source/conf.py
+++ b/manual/source/conf.py
@@ -91,7 +91,7 @@
 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
-html_favicon = "../../www/download.nexusformat.org/favicon.ico"
+html_favicon = "../../../www/download.nexusformat.org/favicon.ico"
 
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'NeXusManualdoc'

From f127a63665b483500ffa0169a281fa44d12239a6 Mon Sep 17 00:00:00 2001
From: Peter Chang <peter.chang@diamond.ac.uk>
Date: Thu, 4 May 2023 09:44:11 +0100
Subject: [PATCH 3/5] Add favicon from main site and use it

---
 impatient-guide/conf.py           |   2 +-
 manual/source/_static/favicon.ico | Bin 0 -> 2238 bytes
 manual/source/conf.py             |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 manual/source/_static/favicon.ico

diff --git a/impatient-guide/conf.py b/impatient-guide/conf.py
index 83b6492758..f0dda2be76 100644
--- a/impatient-guide/conf.py
+++ b/impatient-guide/conf.py
@@ -117,7 +117,7 @@
 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
-html_favicon = "../../www/download.nexusformat.org/favicon.ico"
+html_favicon = "../../manual/source/_static/favicon.ico"
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
diff --git a/manual/source/_static/favicon.ico b/manual/source/_static/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..c8e69d204bec19a03aa349dc8512300568c042ed
GIT binary patch
literal 2238
zcmeH{TTqQr6vux_H}`9~E0>CpTjW~qLaK8*s8ocGv#AI%lIxHcM((Bu4-6?YYN~Pf
zkQu6R_mFCsW|GSoHRMc8O<CX9nc>BYH>UN?+TULP-(G9)Z|#{6?BsEGM@DC|oWT|F
z78i*?aZUe|g%HY8yAVR`LJ74GBdomvgM$%+qY<N1IN{DFOfDvtbzDwF*GM9|MH1Cx
zCDFZOh<1%3#x0h(0dcGyypH%GX3RsyhporrX~E*9P~IEZ=#xOgs6-M*Cz3cOi6q}m
zB#qs~=JCmFo{&tk<`cKD#cwOy{8LDolEU_BJJ=bJN@}3^tX-tdNh59UZuTzR$G#x(
zMf=&m_yFmKbkdE7IToA2Df4O0Sk7=(oh36VlMAUAxwPjpR}N&8eK3cdLs!W?l1tvv
zJn}R0$v<8|!HEJ2PZo0H+)Zv}-r~;ryA)k6qA2S=53dzdoLfvuUJ0f7r98g=m?t-%
z@a*<8p5J}Wi+e99dr-!!hp#9vDW{^eg33pgyngzcs+Uz%msRt&{4F&VHPlqT<HMT|
ze5(G$=Xal}eP2u6$2#h3>#47+$NI&J^{bVJZw)k98~E}42aS!5G&MER+}un{OUs|G
zuuX64z+ZR3?yocdkHnEmvu^sw1S&lBP<hR3eNVulcd(l8+D_wsO5y0eSg9!k96QgD
z1#3sSi0rF+=-EDI;o!JXjRmJ=!pG^lhtmJPZmUJn1efrLj!c&zK*#ja)y|Qk=rg*<
z1o_B(xmH}vO;a60L|M|x86F?6lzE6wZG5)i;C?pFQi=R+SkIp%!ir9MC6UKVWNiN%
zAH80wRj#c&LC-b9O&xymzHzeMNNgvy4;4H)YJuJpS>&doMDUZ@V5J?|U!q0yUpLKG
zpr6EQmKKarJz<#a726f2s)?HB<YN*XET?f8YEVJ$Bcdgo+r@s+9HnLsr1e5pbdr@G
VS{;ivC>7RAf34IiwAsJhfuE4935);$

literal 0
HcmV?d00001

diff --git a/manual/source/conf.py b/manual/source/conf.py
index 6b3981e86d..b6f2d46044 100644
--- a/manual/source/conf.py
+++ b/manual/source/conf.py
@@ -91,7 +91,7 @@
 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
-html_favicon = "../../../www/download.nexusformat.org/favicon.ico"
+html_favicon = "favicon.ico"
 
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'NeXusManualdoc'

From 3b0a5893f065a03ba42441a00db5f4962f1a1048 Mon Sep 17 00:00:00 2001
From: Peter Chang <peter.chang@diamond.ac.uk>
Date: Thu, 4 May 2023 14:42:29 +0100
Subject: [PATCH 4/5] Correct manual's path to favicon

---
 manual/source/conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manual/source/conf.py b/manual/source/conf.py
index b6f2d46044..4bd57ced63 100644
--- a/manual/source/conf.py
+++ b/manual/source/conf.py
@@ -91,7 +91,7 @@
 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
-html_favicon = "favicon.ico"
+html_favicon = "_static/favicon.ico"
 
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'NeXusManualdoc'

From 02f735448fe1dd6fd5977f0c4be74dc48120df14 Mon Sep 17 00:00:00 2001
From: Peter Chang <peter.chang@diamond.ac.uk>
Date: Tue, 20 Jun 2023 16:36:47 +0100
Subject: [PATCH 5/5] Move favicon to common directory

---
 {manual/source/_static => common}/favicon.ico | Bin
 impatient-guide/conf.py                       |   2 +-
 manual/source/conf.py                         |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename {manual/source/_static => common}/favicon.ico (100%)

diff --git a/manual/source/_static/favicon.ico b/common/favicon.ico
similarity index 100%
rename from manual/source/_static/favicon.ico
rename to common/favicon.ico
diff --git a/impatient-guide/conf.py b/impatient-guide/conf.py
index f0dda2be76..5b25e6f16e 100644
--- a/impatient-guide/conf.py
+++ b/impatient-guide/conf.py
@@ -117,7 +117,7 @@
 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
-html_favicon = "../../manual/source/_static/favicon.ico"
+html_favicon = "../../common/favicon.ico"
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
diff --git a/manual/source/conf.py b/manual/source/conf.py
index 4bd57ced63..6b584d6da5 100644
--- a/manual/source/conf.py
+++ b/manual/source/conf.py
@@ -91,7 +91,7 @@
 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
-html_favicon = "_static/favicon.ico"
+html_favicon = "../../../common/favicon.ico"
 
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'NeXusManualdoc'