FF90 - remove ftp (#5485)

* Remove release note

* Remove ftp from experimental features

* Minor tidy up about FTP (general)

* Proxy settings: fix up browser-compat metadata

* Revert removal of ftp proxy setting

files/en-us/glossary/ftp/index.html

@@ -7,7 +7,9 @@
   - Glossary
   - Protocol
 ---
-<p><strong>FTP </strong>(File Transfer Protocol) was the standard {{glossary("protocol")}} for many years for transferring files from one {{glossary("host")}} to another over the Internet. Increasingly, though, teams and hosting accounts don't allow FTP and instead rely on a version control system like Git. You will still find it used on older hosting accounts, but it is safe to say that FTP is no longer considered best practice.</p>
+<p><strong>FTP</strong> (File Transfer Protocol) is an insecure {{glossary("protocol")}} for transferring files from one {{glossary("host")}} to another over the Internet.</p>
+
+<p>For many years it was the defacto standard way of transferring files, but as it is inherently insecure, it is no longer supported by many hosting accounts. Instead you should use SFTP (a secure, encrypted version of FTP) or another secure method for transferring files like Rsync over SSH.</p>
 
 <h2 id="Learn_more">Learn more</h2>
 

files/en-us/learn/common_questions/index.html

@@ -90,9 +90,7 @@ <h2 id="Tools_and_setup">Tools and setup</h2>
   <dt><a
     href="/en-US/docs/Learn/Common_questions/Upload_files_to_a_web_server">How do you upload files to a web server?</a></dt>
   <dd>
-    <p>This article shows how to publish your site online with <a class="glossaryLink" href="/en-US/docs/Glossary/FTP"
-      title="FTP: FTP (File Transfer Protocol) is the standard network protocol for transferring files from one host to another over the Internet through TCP.">FTP</a>
-    tools — one of the most common ways to get a website online so others can access it from their computers.</p>
+    <p>This article shows how to publish your site online with {{Glossary("FTP")}} tools — one of the most common ways to get a website online so others can access it from their computers.</p>
   </dd>
   <dt><a href="/en-US/docs/Learn/Common_questions/Using_Github_pages">How do I use GitHub
     Pages?</a></dt>

files/en-us/learn/common_questions/upload_files_to_a_web_server/index.html

@@ -9,7 +9,7 @@
   - WebMechanics
   - hosting
   - rsync
-  - sftp
+  - SFTP
 ---
 <div class="summary">
 <p>This article shows you how to publish your site online using file transfer tools.</p>

files/en-us/learn/common_questions/what_is_a_url/index.html

@@ -59,7 +59,7 @@ <h2 id="Scheme">Scheme</h2>
 
 <img alt="Scheme" src="mdn-url-protocol@x2_update.png">
 
-<p>The first part of the URL is the <em>scheme</em>, which indicates the protocol that the browser must use to request the resouce (a protocol is a set method for exchanging or transferring data around a computer network). Usually for websites the protocol is HTTPS or HTTP (its unsecured version). Addressing web pages requires one of these two, but browsers also know how to handle other schemes such as <code>mailto:</code> (to open a mail client) or <code>ftp:</code> to handle file transfer, so don't be surprised if you see such protocols.</p>
+<p>The first part of the URL is the <em>scheme</em>, which indicates the protocol that the browser must use to request the resouce (a protocol is a set method for exchanging or transferring data around a computer network). Usually for websites the protocol is HTTPS or HTTP (its unsecured version). Addressing web pages requires one of these two, but browsers also know how to handle other schemes such as <code>mailto:</code> (to open a mail client), so don't be surprised if you see other protocols.</p>
 
 <h2 id="Authority">Authority</h2>
 

files/en-us/mozilla/add-ons/webextensions/api/proxy/settings/index.html

@@ -30,9 +30,8 @@ <h4>Note</h4>
  <dd><code>string</code>. A URL to use to configure the proxy.</dd>
  <dt><code>autoLogin</code>{{optional_inline}}</dt>
  <dd><code>boolean</code>. Do not prompt for authentication if the password is saved. Defaults to <code>false</code>.</dd>
- <dt><code>ftp</code>{{optional_inline}} {{Deprecated_Inline}}</dt>
+  <dt><code>ftp</code>{{optional_inline}} {{Deprecated_Inline}}</dt>
  <dd><code>string</code>. The address of the FTP proxy. Can include a port.
-</dd>
  <dt><code>http</code>{{optional_inline}}</dt>
  <dd><code>string</code>. The address of the HTTP proxy. Can include a port.</dd>
  <dt><code>httpProxyAll</code>{{optional_inline}}</dt>

files/en-us/mozilla/firefox/experimental_features/index.html

@@ -1537,47 +1537,6 @@ <h4>Note</h4>
   </tbody>
  </table>
 
-
-<h4 id="FTP_support_disabled">FTP support disabled</h4>
-
-<p>For security reasons, {{Glossary("FTP")}} is disabled from Firefox 88 in all releases ({{bug(1691890)}}), with the intention of removing the feature in Firefox 90 (previously FTP was only disabled in nightly builds). The <code>network.ftp.enabled</code> preference must be enabled (set to <code>true</code>) to allow FTP to be used.</p>
-
-<table class="standard-table">
- <thead>
-  <tr>
-   <th scope="col" style="vertical-align: bottom;">Release channel</th>
-   <th scope="col" style="vertical-align: bottom;">Version changed</th>
-   <th scope="col" style="vertical-align: bottom;">Enabled by default?</th>
-  </tr>
- </thead>
- <tbody>
-  <tr>
-   <th scope="row">Nightly</th>
-   <td>77</td>
-   <td>No</td>
-  </tr>
-  <tr>
-   <th scope="row">Developer Edition</th>
-   <td>88</td>
-   <td>No</td>
-  </tr>
-  <tr>
-   <th scope="row">Beta</th>
-   <td>88</td>
-   <td>No</td>
-  </tr>
-  <tr>
-   <th scope="row">Release</th>
-   <td>88</td>
-   <td>No</td>
-  </tr>
-  <tr>
-   <th scope="row">Preference name</th>
-   <th colspan="2"><code>network.ftp.enabled</code></th>
-  </tr>
- </tbody>
-</table>
-
 <h2 id="Developer_tools">Developer tools</h2>
 
 <p>Mozilla's developer tools are constantly evolving. We experiment with new ideas, add new features, and test them on the Nightly and Developer Edition channels before letting them go through to beta and release. The features below are the current crop of experimental developer tool features.</p>

files/en-us/mozilla/firefox/releases/90/index.html

@@ -33,6 +33,10 @@ <h3 id="HTTP">HTTP</h3>
 
 <h4 id="removals_http">Removals</h4>
 
+<ul>
+  <li>FTP has now been removed from Firefox ({{bug(1574475)}}). This follows <a href="/en-US/docs/Mozilla/Firefox/Releases/88#http">deprecation in Firefox 88</a>. Note that web extensions can still register themselves as <a href="/en-US/docs/Mozilla/Add-ons/WebExtensions/manifest.json/protocol_handlers">FTP protocol handlers</a>.</li>
+</ul>
+
 <h3 id="Security">Security</h3>
 
 <h4 id="removals_sec">Removals</h4>

files/en-us/web/http/basics_of_http/identifying_resources_on_the_web/index.html

@@ -78,7 +78,7 @@ <h3 id="Scheme_or_protocol">Scheme or protocol</h3>
 		</tr>
 		<tr>
 			<td>ftp</td>
-			<td><a href="/en-US/docs/Glossary/FTP">File Transfer Protocol</a></td>
+			<td>{{Glossary("FTP","File Transfer Protocol")}}</td>
 		</tr>
 		<tr>
 			<td>http/https</td>