Merge branch 'Dalek-main-patch-76415' into 'main'

Update faqs.md

See merge request !29

content/en/docs/install/faqs.md

@@ -79,15 +79,28 @@ enable "Keep original image" to bypass the compression.
 
 You should also see an error in the browser console complaining about
 an "insecure operation" or something like that. It's a CORS problem
-with your instance's custom icon.
+with your instance's custom icon. Essentially, this error is telling
+you that the icon is not on the same domain as your instance. For
+example, if your instance is at `https://example.com/` and your icon
+is at `https:/files.example.com/path/to/image.png`
+
+There are a few ways to fix this issue.
 
 The simplest fix is for your admin to upload the custom icon to their
 drive, and use the drive URL for the uploaded file as the custom icon
-URL.
-
-Alternatively, the server that's hosting the icon must provide CORS
-headers that tell browsers that the instance's domain is allowed to
-use the icon. [MDN has some examples showing how to do
+URL. But, if you have configured S3 storage on a subdomain, this will still
+not fix the problem.
+
+The next easiest fix is to use your instance to proxy the image, using
+a URL like
+`https://example.com/proxy/?url=https:/files.example.com/path/to/image.png`
+(of course, replace the first `example.com` with your instance's host
+name, and the value after `?url=` with the actual URL of the custom
+icon)
+
+The "correct" fix would be for the server that's hosting the icon to
+provide CORS headers that tell browsers that the instance's domain is
+allowed to use the icon. [MDN has some examples showing how to do
 that](https://developer.mozilla.org/en-US/docs/Web/HTML/CORS_enabled_image#web_server_configuration).
 
 ## I've updated Sharkey, and all the icons are broken!