--- doc/faq.html
+++ doc/faq.html
@@ -45,7 +45,8 @@
   <a href="#4.11">4.11. How do I select text for the clipboard in an X terminal when I'm running nano in one and nano's mouse support is turned on?</a></p></blockquote>
 <h2><a href="#5">5. Internationalization</a></h2>
 <blockquote><p><a href="#5.1">5.1. There's no translation for my language!</a><br>
-  <a href="#5.2">5.2. I don't like the translation for &lt;x&gt; in my language. How can I fix it?</a></p></blockquote>
+  <a href="#5.2">5.2. I don't like the translation for &lt;x&gt; in my language. How can I fix it?</a>
+  <a href="#5.3">5.3. What is the status of unicode support?</a></p></blockquote>
 <h2><a href="#6">6. Advocacy and Licensing</a></h2>
 <blockquote><p><a href="#6.1">6.1. Why should I use nano instead of Pico?</a><br>
   <a href="#6.2">6.2. Why should I use Pico instead of nano?</a><br>
@@ -221,6 +222,8 @@
   <p>In any case, translating nano is very easy. Just grab the <b>nano.pot</b> file from the latest and greatest nano distribution (it's in the <b>po/</b> directory) and translate each line into your native language on the <b>msgstr</b> line. When you're done, you should send it to the TP's central po repository.</p></blockquote>
 <h2><a name="5.2"></a>5.2. I don't like the translation for &lt;x&gt; in my language. How can I fix it?</h2>
 <blockquote><p>The best way would probably be to e-mail the person listed in the <code>Last-Translator:</code> field in the <b>&lt;your_language&gt;.po</b> file with your suggested corrections and they can make the changes reach the nano-devel list.</p></blockquote>
+<h2><a name="5.3"></a>5.3. What is the status of unicode support?</h2>
+<blockquote><p>With the latest development version (1.3.9+), unicode should be mostly usuable.  There are few works with character counting, but with proper terminal/encoding, you should be able to enter and save unicode text.</p></blockquote>
 <hr width="100%">
 <h1><a name="6"></a>6. Advocacy and Licensing</h1>
 <h2><a name="6.1"></a>6.1. Why should I use nano instead of Pico?</h2>
--- doc/texinfo/nano.texi
+++ doc/texinfo/nano.texi
@@ -492,12 +492,13 @@ familiar with compiling programs with au
 @item make install
 @end itemize
 
-if you are looking to optimize @code{nano} for size, you may want to
-consider the following command line options:
-
 
 @table @code
 
address@hidden --enable-debug
+Enable support for runtime debug output.  This can get pretty messy so 
+chances are you only want this feature to work on the nano source.
+
 @item --disable-tabcomp
 Disable the tab completion code when reading or writing files.
 
@@ -529,13 +530,40 @@ internals of the editor, like the marker
 (-k) option, which depends on the marker code to work properly.  It also
 disables the function toggles.
 
address@hidden --enable-extra
+Enable extra features.  At the moment, this is just easter egg type stuff.
+
address@hidden --enable-color
+Enable support for syntax coloring of files.  See the nanorc documentation for 
+more details.  The nanorc feature will also be enabled.
+
address@hidden --enable-multibuffer
+Enable support for opening multiple files at a time and switching between them 
+on the fly.
+
address@hidden --enable-nanorc
+Enable support for reading the nanorc file at startup.  You can store custom 
+settings in the nanorc file rather than having to pass command line options to 
+get desired behavior.
+
address@hidden --enable-all
+Shortcut for enabling the above four features (extra, color, multibuffer, 
+nanorc).
+
 @item --disable-wrapping
 Disable all word wrapping in the editor.  This also eliminates the -w
 command line flag, as nonwrapping is then the default behavior.
 
address@hidden --disable-wrapping-as-root
+Disable word wrapping by default when nano is run as root.
+
 @item --disable-nls
 Disables Native Language support.  This will make the available GNU
 @code{nano} translations unusable.
+
address@hidden --enable-utf8
+Enable support for reading and writing unicode files.  This will require 
+either the wide version of ncurses, or a UTF-8 enabled version of Slang.
 
 @item --with-slang
 Compiling @code{nano} with Slang is supported, and will make the binary