diff --git a/ChangeLog b/ChangeLog
index 76acbddd611b0411e4f1052145baa0e3ed92f482..374d9e10abe7fc7d0687231edf53414f50397202 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -77,7 +77,9 @@ CVS code -
in UTF-8 mode. (DLR, found by Duncan Geoffry Doyle, Nick
Warne, and Mike Frysinger)
- doc/faq.html:
- - Update the Free Translation Project's address. (DLR)
+ - Update the Free Translation Project's address, change the
+ character set to UTF-8, and remove broken links to contributed
+ RedHat nano packages. (DLR)
- doc/nano.1:
- Better display the default values for quotestr. (DLR)
- doc/nanorc.5:
diff --git a/doc/faq.html b/doc/faq.html
index 2c35e8e85eaabb24667d84be361925334f1cd493..ce8e07965544036a3327d77b0043b15c8cdc28b2 100644
--- a/doc/faq.html
+++ b/doc/faq.html
@@ -2,7 +2,7 @@
<html>
<head>
<title>The GNU nano editor FAQ</title>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
</head>
<body text="#330000" bgcolor="#ffffff" link="#0000ef" vlink="#51188e" alink="#ff0000">
<h1>The GNU nano editor FAQ</h1>
@@ -101,11 +101,6 @@
<li><a href="http://www.nano-editor.org/dist/v1.2/RPMS/">http://www.nano-editor.org/dist/v1.2/RPMS/</a></li>
<li><a href="http://www.ewtoo.org/~astyanax/nano/dist/v1.2/RPMS/">http://www.ewtoo.org/~astyanax/nano/dist/v1.2/RPMS/</a></li>
</ul>
- <p>Additionally, check out the RedHat contribs section at:</p>
- <ul>
- <li><a href="http://distro.ibiblio.org/pub/Linux/distributions/redhat/contrib/libc6/i386/">http://distro.ibiblio.org/pub/Linux/distributions/redhat/contrib/libc6/i386/</a></li>
- <li><a href="ftp://distro.ibiblio.org/pub/Linux/distributions/redhat/contrib/libc6/i386/">ftp://distro.ibiblio.org/pub/Linux/distributions/redhat/contrib/libc6/i386/</a></li>
- </ul>
</blockquote>
<h2><a name="2.3"></a>2.3. Debian (.deb) packages.</h2>
<blockquote><p>Debian users can check out the current nano packages for:</p>
@@ -255,7 +250,7 @@
<blockquote><p>Re-read Section <a href="#7.4">7.4</a> and you should know the answer.</p></blockquote>
<h2><a name="8"></a>8. ChangeLog</h2>
<blockquote>
-<p>2006/03/16 - Update the Free Translation Project's address. (DLR)<br>
+<p>2006/03/16 - Update the Free Translation Project's address, change the character set to UTF-8, and remove broken links to contributed RedHat nano packages. (DLR)<br>
2005/11/21 - Clarify section 5.3 to better explain how to enable Unicode support, and remove the mention of quirks, since they turned out to not be a nano problem. (Mike Frysinger and DLR)<br>
2005/11/19 - Add a new section 5.3 to explain the status of nano's Unicode support. (Mike Frysinger, minor tweaks by DLR)<br>
2005/08/27 - Update email address. (DLR)<br>