[PATCH] Point to the correct URLs for the FAQ

[Daniel Kahn Gillmor]

* doc/FAQ: correct URLs, use https

--

The old FAQ URLs (http://www.gnupg.org/faq/GnuPG-FAQ.html) return
versions from the end of 2012.  We probably also want to replace those
with an HTTP redirect to the correct page.

I also note that the plaintext version of the FAQ is sent by the web
server with the following header:

  Content-Type: text/plain

Note the lack of a charset parameter.  The file itself appears to
contain UTF-8-encoded text.  Many user-agents still interpret the lack
of a charset parameter to mean an encoding of iso-8859-1.

I recommend that the server send the following instead:

  Content-Type: text/plain;charset=utf-8

Signed-off-by Daniel Kahn Gillmor <dkg at fifthhorseman.net>
---
 doc/FAQ | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/doc/FAQ b/doc/FAQ
index 32d0744..d5f2a19 100644
--- a/doc/FAQ
+++ b/doc/FAQ
@@ -3,11 +3,8 @@ GnuPG Frequently Asked Questions
 A FAQ is a fast moving target and thus we don't distribute it anymore
 with GnuPG.  You may retrieve the current FAQ in HTML format at
 
-  http://www.gnupg.org/faq/GnuPG-FAQ.html
+  https://gnupg.org/faq/gnupg-faq.html
 
 or in plain text format at the FTP server:
 
-  ftp://ftp.gnupg.org/gcrypt/gnupg/GnuPG-FAQ.txt
-
-
-
+  https://gnupg.org/faq/gnupg-faq.txt
-- 
2.1.4