From 6bb5b53fc6aaae8515e625be6e5c1fed61f83197 Mon Sep 17 00:00:00 2001
From: "Michael[tm] Smith" <mike@w3.org>
Date: Thu, 4 Mar 2021 19:38:24 +0900
Subject: [PATCH 1/2] =?UTF-8?q?Push=20the=20=E2=80=9Cfixable=20flaws?=
 =?UTF-8?q?=E2=80=9D=20button?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../en-us/web/http/basics_of_http/data_uris/index.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/files/en-us/web/http/basics_of_http/data_uris/index.html b/files/en-us/web/http/basics_of_http/data_uris/index.html
index 935cd7a20c58a9c..c55ae16d9a54e09 100644
--- a/files/en-us/web/http/basics_of_http/data_uris/index.html
+++ b/files/en-us/web/http/basics_of_http/data_uris/index.html
@@ -46,7 +46,7 @@ <h2 id="Encoding_data_into_base64_format">Encoding data into base64 format</h2>
 
 <h3 id="Encoding_in_Javascript">Encoding in Javascript</h3>
 
-<p>The Web APIs have native methods to encode or decode to base64: <a href="/en-US/docs/Web/API/WindowBase64/Base64_encoding_and_decoding">Base64 encoding and decoding</a>.</p>
+<p>The Web APIs have native methods to encode or decode to base64: <a href="/en-US/docs/Glossary/Base64">Base64 encoding and decoding</a>.</p>
 
 <h3 id="Encoding_on_a_Unix_system">Encoding on a Unix system</h3>
 
@@ -128,10 +128,10 @@ <h2 id="Browser_compatibility">Browser compatibility</h2>
 <h2 id="See_also">See also</h2>
 
 <ul>
- <li><a href="/en-US/docs/Web/API/WindowBase64/Base64_encoding_and_decoding">Base64 encoding and decoding</a></li>
+ <li><a href="/en-US/docs/Glossary/Base64">Base64 encoding and decoding</a></li>
  <li><a href="/en-US/docs/Glossary/percent-encoding">Percent encoding</a></li>
- <li>{{domxref("WindowBase64.atob","atob()")}}</li>
- <li>{{domxref("WindowBase64.btoa","btoa()")}}</li>
- <li><a href="/en-US/docs/Web/CSS/uri">CSS <code>url()</code></a></li>
+ <li>{{domxref("WindowOrWorkerGlobalScope/atob","atob()")}}</li>
+ <li>{{domxref("WindowOrWorkerGlobalScope/btoa","btoa()")}}</li>
+ <li><a href="/en-US/docs/Web/CSS/url()">CSS <code>url()</code></a></li>
  <li><a href="/en-US/docs/Glossary/URI">URI</a></li>
 </ul>

From 1fa4bd6a54c64458eeacac41e8a8faa96ea71608 Mon Sep 17 00:00:00 2001
From: "Michael[tm] Smith" <mike@w3.org>
Date: Thu, 4 Mar 2021 19:39:01 +0900
Subject: [PATCH 2/2] Clarify what gets percent-encoded in data URLs

Also fixes https://github.com/mdn/content/issues/2840
---
 files/en-us/web/http/basics_of_http/data_uris/index.html | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/files/en-us/web/http/basics_of_http/data_uris/index.html b/files/en-us/web/http/basics_of_http/data_uris/index.html
index c55ae16d9a54e09..c185749e3a4fbda 100644
--- a/files/en-us/web/http/basics_of_http/data_uris/index.html
+++ b/files/en-us/web/http/basics_of_http/data_uris/index.html
@@ -25,13 +25,15 @@ <h2 id="Syntax">Syntax</h2>
 
 <p>The <code>mediatype</code> is a <a href="/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types">MIME type</a> string, such as <code>'image/jpeg'</code> for a JPEG image file. If omitted, defaults to <code>text/plain;charset=US-ASCII</code></p>
 
-<p>If the data is textual, you can embed the text (using the appropriate entities or escapes based on the enclosing document's type). Otherwise, you can specify <code>base64</code> to embed base64-encoded binary data. You can find more info on MIME types <a href="/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types">here</a> and <a href="/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types/Complete_list_of_MIME_types">here</a>.</p>
+<p>If the data contains <a href="https://tools.ietf.org/html/rfc3986#section-2.2">characters defined in RFC 3986 as reserved characters</a>, or contains space characters, newline characters, or other non-printing characters, those characters must be <a href="/en-US/docs/Glossary/percent-encoding">percent-encoded</a> (<em>aka</em> “URL-encoded”).</p>
+
+<p>If the data is textual, you can embed the text (using the appropriate entities or escapes based on the enclosing document's type). Otherwise, you can specify <code>base64</code> to embed base64-encoded binary data. You can find more info on MIME types <a href="/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types">here</a> and <a href="/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types/Common_types">here</a>.</p>
 
 <p>A few examples:</p>
 
 <dl>
  <dt><code>data:,Hello%2C%20World!</code></dt>
- <dd>Simple text/plain data. Note the use of <a href="/en-US/docs/Glossary/percent-encoding">percent-encoding</a> (URL-encoding) for the quote and space characters. Also, for CSV data (MIME type "text/csv"), percent-encoding is needed to preserve the line endings that delimit rows of the spreadsheet.</dd>
+ <dd>The text/plain data <code>Hello, World!</code>. Note how the comma is  <a href="/en-US/docs/Glossary/percent-encoding">percent-encoded</a> as <code>%2C</code>, and the space character as <code>%20</code>.</dd>
  <dt><code>data:text/plain;base64,SGVsbG8sIFdvcmxkIQ==</code></dt>
  <dd>base64-encoded version of the above</dd>
  <dt><code>data:text/html,%3Ch1%3EHello%2C%20World!%3C%2Fh1%3E</code></dt>