diff options
| author | Dylan DPC <99973273+Dylan-DPC@users.noreply.github.com> | 2022-03-04 02:06:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-04 02:06:38 +0100 |
| commit | c695de05f23555bc7119f2b2a7ab4be5602dbaf2 (patch) | |
| tree | 6589d952afd0f9e44c42892ec538c41b5797d209 | |
| parent | 4c7020047605dcabe5d0611bb5b575e8344fe515 (diff) | |
| parent | 30685ed754d398934c62ec9fb9aba0344dcf81de (diff) | |
| download | rust-c695de05f23555bc7119f2b2a7ab4be5602dbaf2.tar.gz rust-c695de05f23555bc7119f2b2a7ab4be5602dbaf2.zip | |
Rollup merge of #93418 - ojeda:no-shortcut, r=camelid
rustdoc & doc: no `shortcut` for `rel="icon"`
According to https://html.spec.whatwg.org/multipage/links.html#rel-icon:
> For historical reasons, the `icon` keyword may be preceded by the keyword "`shortcut`".
And to https://developer.mozilla.org/en-US/docs/Web/HTML/Link_types:
> **Warning:** The `shortcut` link type is often seen before `icon`, but this link type is non-conforming, ignored and **web authors must not use it anymore.**
While it was removed from the Rust logo case a while ago in commit 085679c ("Use theme-adaptive SVG favicon from other Rust sites"), it is still there for the custom logo case.
Also updated a few other instances.
Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
| -rw-r--r-- | src/doc/favicon.inc | 2 | ||||
| -rw-r--r-- | src/doc/redirect.inc | 2 | ||||
| -rw-r--r-- | src/doc/rustdoc/src/the-doc-attribute.md | 2 | ||||
| -rw-r--r-- | src/librustdoc/html/templates/page.html | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/doc/favicon.inc b/src/doc/favicon.inc index 8f881657bdc..9c330685209 100644 --- a/src/doc/favicon.inc +++ b/src/doc/favicon.inc @@ -1 +1 @@ -<link rel="shortcut icon" href="https://www.rust-lang.org/favicon.ico"> +<link rel="icon" href="https://www.rust-lang.org/favicon.ico"> diff --git a/src/doc/redirect.inc b/src/doc/redirect.inc index 33e3860c2a4..2fb44be0145 100644 --- a/src/doc/redirect.inc +++ b/src/doc/redirect.inc @@ -1,2 +1,2 @@ <meta name="robots" content="noindex,follow"> -<link rel="shortcut icon" href="https://www.rust-lang.org/favicon.ico"> +<link rel="icon" href="https://www.rust-lang.org/favicon.ico"> diff --git a/src/doc/rustdoc/src/the-doc-attribute.md b/src/doc/rustdoc/src/the-doc-attribute.md index a75b6d38931..c5cc84022e3 100644 --- a/src/doc/rustdoc/src/the-doc-attribute.md +++ b/src/doc/rustdoc/src/the-doc-attribute.md @@ -59,7 +59,7 @@ This form of the `doc` attribute lets you control the favicon of your docs. #![doc(html_favicon_url = "https://example.com/favicon.ico")] ``` -This will put `<link rel="shortcut icon" href="{}">` into your docs, where +This will put `<link rel="icon" href="{}">` into your docs, where the string for the attribute goes into the `{}`. If you don't use this attribute, there will be no favicon. diff --git a/src/librustdoc/html/templates/page.html b/src/librustdoc/html/templates/page.html index baadd3c27b4..564731ab735 100644 --- a/src/librustdoc/html/templates/page.html +++ b/src/librustdoc/html/templates/page.html @@ -54,7 +54,7 @@ href="{{static_root_path|safe}}theme{{page.resource_suffix}}.css"> {#- -#} {%- endif -%} {%- if !layout.favicon.is_empty() -%} - <link rel="shortcut icon" href="{{layout.favicon}}"> {#- -#} + <link rel="icon" href="{{layout.favicon}}"> {#- -#} {%- else -%} <link rel="alternate icon" type="image/png" {# -#} href="{{static_root_path|safe}}favicon-16x16{{page.resource_suffix}}.png"> {#- -#} |