Ticket #8488: diff.txt

--- faq.inc     2005-11-23 22:26:10.000000000 +0100
+++ faq.new     2005-11-23 22:20:45.000000000 +0100
@@ -60,7 +60,7 @@
 disappears too quick to see the error message.</a></dt>
 <dt>4.7. <a href="#question.messy-colors">The game colors are
 messed up.</a></dt>
-<dt>4.8. <a href="#AEN188">The subtitles in my non english game are
+<dt>4.8. <a href="#AEN188">The subtitles in my non English game are
 messed up.</a></dt>
 <dt>4.9. <a href="#AEN195">How do I make my mac version of a game
 work?</a></dt>
@@ -125,8 +125,10 @@
 an up to date list of what games work, and how well they work. As
 well as SCUMM games, we also include virtual machines for the first
 two Simon the Sorcerer games (by Adventure Soft), Broken Sword 1/2
-and Beneath a Steel Sky (by Revolution), as well as Flight of the
-Amazon Queen. Other games may be added, but this is not a common
+and Beneath a Steel Sky (by Revolution), Flight of the
+Amazon Queen, Gobliiins 1 (by Coktel Vision) as well as Inherit
+the Earth (by The Dreamers' Guild).
+Other games may be added, but this is not a common
 occurrence - see below.</p></div></div>
 <div class="qandaentry">
 <div class="question">
@@ -189,9 +191,9 @@
 just small modifications.</p>
 <p>&#13; Currently tested platforms are Win32 (Windows
 95/98/ME/NT/2000/XP), Linux i386 and PPC, BeOS, Solaris, Mac OS X,
-Dreamcast, MorphOS, IRIX, PalmOS and WinCE. It is also part of the
+Dreamcast, MorphOS, IRIX, PalmOS and WinCE, Sony PSP and PS2. It is also part of the
 Free/Net/Open BSD ports collections and included in Debian testing
-and unstable</p></div></div>
+and unstable.</p></div></div>
 <div class="qandaentry">
 <div class="question">
 <p><a name="AEN64"></a><b>1.10.</b> Does ScummVM run any non-SCUMM
@@ -199,14 +201,17 @@
 <div class="answer">
 <p>Yes. As well as SCUMM titles, ScummVM supports Simon the
 Sorcerer (1 and 2), Flight of the Amazon Queen, and the Revolution
-Games: Broken Sword 1, Broken Sword 2, and Beneath a Steel Sky.</p>
+Games: Broken Sword 1, Broken Sword 2, and Beneath a Steel Sky,
+as well as Gobliiins 1 and Inherit the Earth.</p>
 <p>&#13; Simon support was initially written by the original
 founder of ScummVM as a separate program, and later included in the
 main binary. Revolution Software Ltd. are very nice people and
 kindly provided us with the source code to BASS and Broken Sword
 1/2, from which we based our interpreters. John Passfield and
 Steven Stamatiadis kindly provided the original source code to
-Flight of the Amazon Queen.</p>
+Flight of the Amazon Queen. The Wyrmkeep Entertainment Co. kindly
+provided the sourcecode to Inherit the Earth. Gobliiins 1 was
+widely researched by Ivan Dubrov.</p>
 <p>&#13; We do not have any plans to support any other non-SCUMM
 games at this time. If we do, it will be added to the <a href=
 "compatibility.php">Compatibility List</a>.</p>
@@ -224,7 +229,7 @@
 ScummVM. Potential game authors are encouraged to look at open
 source technologies such as <a href="http://www.libsdl.org"
   >libSDL</a> for a cross platform DirectX like
-   library, and the <a href="http://www.lua.org">>Lua</a>
+   library, and the <a href="http://www.lua.org">Lua</a>
    and <a href="http://www.python.org">Python</a> scripting
    languages for game logic.</p></div></div></div>
 <div class="qandadiv">
@@ -292,7 +297,7 @@
 <div class="answer">
 <p>Yes. You can use LAME or some other CD audio conversion utility
 to convert your CD audio to MP3. Since version 0.3.0 we also
-support Ogg Vorbis files. And FLAC is supported since version
+support Ogg Vorbis files, and FLAC is supported since version
 0.7.0. See the <a href=
 "http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/scummvm/scummvm/README?rev=HEAD"
   >README</a> for more info.</p></div></div>
@@ -319,7 +324,7 @@
 graphic modes?</p></div>
 <div class="answer">
 <p>Yes, ScummVM supports several filtered graphic modes such as
-super2xsai. See the <a href=
+<a href="http://elektron.its.tudelft.nl/~dalikifa/">super2xsai</a>. See the <a href=
 "http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/scummvm/scummvm/README?rev=HEAD"
   >README</a> for more info.</p></div></div>
 <div class="qandaentry">
@@ -385,7 +390,7 @@
 please report it to our Bug Tracker. See "<a href=
 "#question.report-bugs"><i>Reporting Bugs.</i></a>".</p>
 <p>&#13; If you are experiencing random crashes, and your game
-plays music from CD, you have encountered a Windows bug. Try
+plays music from CD, you most certainly have encountered a Windows bug. Try
 copying the data files from CD to your hard disk, and running them
 from there.</p></div></div>
 <div class="qandaentry">
@@ -413,7 +418,7 @@
 code.</p></div></div>
 <div class="qandaentry">
 <div class="question">
-<p><a name="AEN188"></a><b>4.8.</b> The subtitles in my non english
+<p><a name="AEN188"></a><b>4.8.</b> The subtitles in my non English
 game are messed up.</p></div>
 <div class="answer">
 <p>You are most likely using a game such as Maniac Mansion or Zak
@@ -440,6 +445,8 @@
 name as the data file, except that it lacks the " Data" at the
 end). In that case there is still a separate data file but it is
 invisible.</p>
+<p>&#13; There also exists a seperate <a href="http://www.scummvm.org/documentation.php?view=maccd-howto">tutorial</a>
+for setting up mac versions</p>
 <p>&#13; The older games which have LFL files should only need the
 platform set to 'macintosh' to run. See "<a href=
 "#question.messy-colors"><i>The game colors are messed up.</i></a>"
@@ -501,7 +508,8 @@
 configration file C:\windows\scummvm.ini!"</p></div>
 <div class="answer">
 <p>Make sure you have enough permissions to write in c:\windows
-directory.</p></div></div>
+directory. Also note that this warning the first time you run
+ScummVM, since the file does not exist yet then.</p></div></div>
 <div class="qandaentry">
 <div class="question">
 <p><a name="AEN240"></a><b>4.14.</b> I get "Failed to save game