Merge pull request #15112 from fossilet/upstream_main

Fix sphinx.add_lexer.

docs/codeql/conf.py

@@ -49,10 +49,13 @@ highlight_language = "none"
 import os
 import sys
 
+import sphinx as sphinx_mod
+
+
 def setup(sphinx):
     sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))	
     from qllexer import QLLexer
-    sphinx.add_lexer("ql", QLLexer())
+    sphinx.add_lexer("ql", QLLexer() if sphinx_mod.version_info[0] <= 3 else QLLexer)
 
 # The version of CodeQL for the current release you're documenting, acts as replacement for
 # |version| and |release|. Not currently used.