Merge branch 'master' into patch-1

diff --git a/faq/index.html.tt2 b/faq/index.html.tt2
index e5109ea..0accff2 100644 (file)
--- a/faq/index.html.tt2
+++ b/faq/index.html.tt2
@@ -126,7 +126,7 @@
 
         <ul>
 
-          <li>Intel-compatible CPU (i686 or later, preferably Pentium Pro class or higher)</li>
+          <li>Intel-compatible CPU (i686 or later, preferably Pentium class or higher; although some i586 processors e.g. the 'AMD Geode' are still supported)</li>
 
           <li>&gt;=256MB of RAM (&gt;=512MB recommended)</p>