From 0d9845fe0cfb767c95479944a590ae9938d145a5 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 11 Mar 2021 21:48:10 +0530 Subject: [PATCH] string changes --- manual/faq.rst | 4 ++-- manual/server.rst | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/manual/faq.rst b/manual/faq.rst index daf08863f0..3dc774fabf 100644 --- a/manual/faq.rst +++ b/manual/faq.rst @@ -923,7 +923,7 @@ Downloading from the Internet can sometimes result in a corrupted download. If t * Similarly, if the installer is failing/rolling and you have Microsoft PowerToys running, quit it. * Try rebooting your computer and running a registry cleaner like `Wise registry cleaner `_. * Try a clean install. That is, uninstall calibre, delete :file:`C:\\Program Files\\Calibre2` (or wherever you previously chose to install calibre). Then re-install calibre. Note that uninstalling does not touch your books or settings. - * Try downloading the installer with an alternate browser. For example if you are using Internet Explorer, try using Firefox or Chrome instead. + * Try downloading the installer with an alternate browser. For example if you are using Microsoft Edge, try using Firefox or Chrome instead. * If you get an error about a missing DLL on Windows, then most likely, the permissions on your temporary folder are incorrect. Go to the folder :file:`C:\\Users\\USERNAME\\AppData\\Local` in Windows explorer and then @@ -993,7 +993,7 @@ How do I get calibre to use my HTTP proxy? ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ By default, calibre uses whatever proxy settings are set in your OS. Sometimes -these are incorrect, for example, on Windows if you don't use Internet Explorer +these are incorrect, for example, on Windows if you don't use Microsoft Edge then the proxy settings may not be up to date. You can tell calibre to use a particular proxy server by setting the ``http_proxy`` and ``https_proxy`` environment variables. The format of the variable is: diff --git a/manual/server.rst b/manual/server.rst index bba7090554..a805b4889c 100644 --- a/manual/server.rst +++ b/manual/server.rst @@ -193,10 +193,7 @@ Browser support The new calibre server makes lots of use of advanced HTML 5 and CSS 3 features. As such it requires an up-to-date browser to use. It has been tested on Android -Chrome and iOS Safari as well as Chrome and Firefox on the desktop. It is known -not to work with Internet Explorer and Microsoft Edge (hopefully Edge will -start working when Microsoft gets around to implementing a few missing -standards). +Chrome and iOS Safari as well as Chrome and Firefox on the desktop. The server is careful to use functionality that has either been already standardised or is on the standards track. As such if it does not currently