diff --git a/FAQ b/FAQ
index 2fae77b8..63c5c08f 100644
--- a/FAQ
+++ b/FAQ
@@ -1,3 +1,42 @@
+QUESTION INDEX
+--------------
+
+Q: What is Smarty?
+Q: What's the difference between Smarty and other template engines?
+Q: What do you mean "Compiled PHP Scripts" ?
+Q: Why can't I just use APC <http://apc.communityconnect.com/> (or Zend Cache)?
+Q: Why does smarty have a built in cache? Wouldn't it be better to handle this
+   in a separate class?
+Q: Is Smarty faster than <insert other PHP template engine>?
+Q: How can I be sure to get the best performance from Smarty?
+Q: Do you have a mailing list?
+
+Q: Smarty doesn't work.
+Q: I get the following error when running Smarty:
+   Warning: Wrong parameter count for preg_replace() in
+   Smarty.class.php on line 371
+Q: I get the following error when running Smarty:
+   Fatal error: Failed opening required 'PEAR.php'
+   (include_path='') in Config_File.class.php on line 3
+Q: I get this error when passing variables to {include}:
+   Fatal error: Call to undefined function: get_defined_vars() in
+   /path/to/Smarty/templates_c/index.tpl.php on line 8
+Q: I get PHP errors in my {if} tag logic.
+Q: I'm changing my php code and/or templates, and my results are not getting
+   updated.
+Q: I'm running Windows 2000 and I get blank content. My compiled PHP files are
+   also zero length.
+Q: The template goes into an infinite loop when I include included templates
+   that pass local variables
+Q: My ISP did not setup the PEAR repository, nor will they set it up. How do I
+   make Smarty run without it?
+Q: Javascript is causing Smarty errors in my templates.
+
+Q: Can I use Macromedia's Dreamweaver to edit my templates?
+Q: Dreamweaver is urlencoding the template delimiters when they are in a SRC or
+   HREF link. How do I get around this?
+
+
 GENERAL
 -------
 
diff --git a/NEWS b/NEWS
index 8efe70f9..48c13f29 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,4 @@
+    - update FAQ with index of questions at the top
     - update overlib to 3.50, adjust addon code so that the overlib.js
       file isn't modified, and not using the mini one. (Monte)
     - added many more options to html_select_date. (Alexander Skwar, Andrei)
diff --git a/docs.sgml b/docs.sgml
index 635b9ee2..4abf09e9 100644
--- a/docs.sgml
+++ b/docs.sgml
@@ -2043,7 +2043,7 @@ Intro = """This is a value that spans more
 			do something with the passed values and return the results. These results
 			are then displayed in the template in place of the insert tag.
 			In this example, Smarty would call this function:
-			insert_getBanner(array("banner_id" => "12345","page_id" => "67890"));
+			insert_getBanner(array("lid" => "12345","sid" => "67890"));
 			and display the returned results in place of the insert tag.
 			</para>
 			<para>