Skip to content
This repository has been archived by the owner on Jul 30, 2019. It is now read-only.

add in canonical #1467

Merged
merged 4 commits into from Jun 20, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions sections/changes.include
Expand Up @@ -13,6 +13,9 @@
<h3 id="changes-wd3">Changes since the <a href="https://www.w3.org/TR/2017/WD-html53-20170206/">HTML 5.3 Second Public Working Draft</a></h3>

<dl>
<dt><a href="https://github.com/w3c/html/pull/1467">Add <code>canonical</code></a>
as a supported link type.</dt>
<dd>Defined in [[rfc6596]].</dd>
<dt><a href="https://github.com/w3c/html/pull/1406">Only select a browsing context by name</a>
from within the <a>unit of related browsing contexts</a>.</dt>
<dd>Match Firefox and Blink changes, to mitigate <a href="https://github.com/w3c/html/issues/262">an XSS attack vector</a>.</dd>
Expand Down
17 changes: 2 additions & 15 deletions sections/semantics-document-metadata.include
Expand Up @@ -405,21 +405,8 @@

<{link/rel}>'s [=supported tokens=] are the keywords defined in [=HTML link types=] which are
allowed to be used with <{link}> elements, impact the processing model, and are supported by
the user agent. The possible [=supported tokens=] are
<{link/alternate}>,
<code>dns-prefetch</code>,
<{link/icon}>,
<{link/next}>,
<code data-x="rel-pingback">pingback</code>,

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove pingback from the rel attribute value of <link> element?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

probably should do that as a different issue / PR. better to track things rather than get them all mixed together. Happy to have you open an issue about that though :)

<code data-x="rel-preconnect">preconnect</code>,
<code data-x="rel-prefetch">prefetch</code>,
<code data-x="rel-preload">preload</code>,
<code data-x="rel-prerender">prerender</code>,
<{link/search}>,
<code data-x="rel-serviceworker">serviceworker</code>, and
<{link/stylesheet}>.
A <{link/rel}>'s [=supported tokens=] must only include the tokens (keywords) from this list
that the user agent implements the processing model for.
the user agent. A <{link/rel}> must only include the tokens (keywords) outlined in the
table of [=supported tokens=] that the user agent implements the processing model for.

If a <{link}> element has a <{link/rel}> attribute that contains only keywords that are
<a>body-ok</a>, then the element is said to be <dfn>allowed in the body</dfn>. This means
Expand Down
17 changes: 17 additions & 0 deletions sections/semantics-links.include
Expand Up @@ -1098,6 +1098,14 @@
<td>Gives the permalink for the nearest ancestor section.</td>
</tr>

<tr>
<td><{link/canonical}></td>
<td><em>not allowed</em></td>
<td><a>hyperlink</a></td>
<td class="no"> · </td>
<td>Gives the preferred URL for the current document.</td>
</tr>

<tr>
<td><{link/dns-prefetch}></td>
<td><em>not allowed</em></td>
Expand Down Expand Up @@ -1401,6 +1409,15 @@
</xmp>
</div>

<h5 id="link-type-canonical">Link type "<dfn element-state for="link"><code>canonical</code></dfn>"</h5>

The <{link/canonical}> keyword may be used with the <{link}> element.
This keyword creates a <a>hyperlink</a>

The <{link/canonical}> keyword indicates that the URL given by the <{links/href}> attribute
is the preferred URL for the current document. Indicating the preferred URL helps search engines
reduce duplicate content, as described in more detail in The Canonical Link Relation specification [[!rfc6596]].

<h5 id="link-type-dns-prefetch">Link type "<dfn element-state for="link"><code>dns-prefetch</code></dfn>"</h5>

The <{link/dns-prefetch}> keyword may be used with <{link}>.This keyword is <a>body-ok</a>.
Expand Down