Remove favicon and logo

doc/templating.rst

@@ -273,15 +273,6 @@ in the future.
    that handles navigation, not the web browser, such as for HTML help or Qt
    help formats.  In this case, the sidebar is not included.
 
-.. data:: favicon
-
-   The path to the HTML favicon in the static path, or URL to the favicon, or
-   ``''``.
-
-   .. deprecated:: 4.0
-
-      Recommend to use ``favicon_url`` instead.
-
 .. data:: favicon_url
 
    The relative path to the HTML favicon image from the current document, or
@@ -308,15 +299,6 @@ in the future.
 
    The build date.
 
-.. data:: logo
-
-   The path to the HTML logo image in the static path, or URL to the logo, or
-   ``''``.
-
-   .. deprecated:: 4.0
-
-      Recommend to use ``logo_url`` instead.
-
 .. data:: logo_url
 
    The relative path to the HTML logo image from the current document, or URL

sphinx/builders/html/__init__.py

@@ -536,8 +536,8 @@ def prepare_writing(self, docnames: Set[str]) -> None:
             'rellinks': rellinks,
             'builder': self.name,
             'parents': [],
-            'logo': logo,
-            'favicon': favicon,
+            'logo_url': logo,
+            'favicon_url': favicon,
             'html5_doctype': not self.config.html4_writer,
         }
         if self.theme:
@@ -1215,18 +1215,14 @@ def setup_resource_paths(app: Sphinx, pagename: str, templatename: str,
     pathto = context.get('pathto')
 
     # favicon_url
-    favicon = context.get('favicon')
+    favicon = context.get('favicon_url')
     if favicon and not isurl(favicon):
         context['favicon_url'] = pathto('_static/' + favicon, resource=True)
-    else:
-        context['favicon_url'] = favicon
 
     # logo_url
-    logo = context.get('logo')
+    logo = context.get('logo_url')
     if logo and not isurl(logo):
         context['logo_url'] = pathto('_static/' + logo, resource=True)
-    else:
-        context['logo_url'] = logo
 
 
 def validate_math_renderer(app: Sphinx) -> None: