From: Oto Šťáva <oto.stava@nic.cz>
Date: Wed, 10 Jan 2024 15:19:55 +0000 (+0100)
Subject: Merge branch 'master' into 6.0
X-Git-Tag: v6.0.6~12
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fenvironments%2Fdocs-develop-tmp-wti7ta%2Fdeployments%2F2999;p=thirdparty%2Fknot-resolver.git

Merge branch 'master' into 6.0
---

c48f6e193a776439cc1b4789ffcee54dc65a5047
diff --cc doc/conf.py
index f7952a95e,a2aad176a..da04f0dc0
--- a/doc/conf.py
+++ b/doc/conf.py
@@@ -13,13 -13,12 +13,17 @@@ if os.environ.get('READTHEDOCS', None) 
      subprocess.call('doxygen')
  
  # Add any Sphinx extension module names here, as strings.
 -extensions = ['sphinx.ext.todo', 'sphinx.ext.viewcode', 'breathe']
 +extensions = [
 +    'sphinx.ext.todo',
 +    'sphinx.ext.viewcode',
 +    'sphinx_tabs.tabs',
 +    'breathe',
 +]
  
+ theme_major = sphinx_rtd_theme.__version__.partition('.')[0]
+ if theme_major == '2':
+     extensions.append('sphinxcontrib.jquery')
+ 
  # Breathe configuration
  breathe_projects = {"libkres": "doxyxml"}
  breathe_default_project = "libkres"