From b459bb8fb3e267728a35c67865a4b30ba3557b41 Mon Sep 17 00:00:00 2001
From: "Dimitrie O. Paun" <dpaun@rogers.com>
Date: Tue, 10 Dec 2002 19:06:05 +0000
Subject: [PATCH]  Update Wine FAQ to latest revision.   - Better Bochs/Plex86
 info   - Add Q&A about upgrading configuration   - Replace Deneba's Canvas 7
 with Ability Office From entries submitted by Tom Wickline.

---
 documentation/faq.sgml | 51 ++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 41 insertions(+), 10 deletions(-)

diff --git a/documentation/faq.sgml b/documentation/faq.sgml
index 33cce0a7a12..77d4fce6b29 100644
--- a/documentation/faq.sgml
+++ b/documentation/faq.sgml
@@ -91,13 +91,31 @@
         <para>
           There are two free x86 hardware emulators:
           <ulink url="http://bochs.sourceforge.net"> bochs</ulink>, and 
-          <ulink url="http://savannah.nongnu.org/projects/plex86"> plex86</ulink>
-          that allow use of hardware other than x86 to run x86 programs. Both 
-          use the GPL. Bochs is older than plex86, seems to be easier to 
-          install, but plex86 will run faster because plex86 uses a real
-          time binary compiler. The drawback of all emulators is that you
-          need a version of Windows in order to run Windows.
+          <ulink url="http://savannah.nongnu.org/projects/plex86"> plex86</ulink>.
        </para>
+
+       <para>
+          Plex86 is the opensource free-software alternative for VMWare,
+	  VirtualPC, and other IA-32 on IA-32 "Virtual PC products." It
+          can only run on the IA-32 architecture.
+       </para>
+
+       <para>
+          Bochs is a highly portable open source IA-32 (x86) PC emulator 
+          written in C++, that runs on most popular platforms. It includes emulation
+          of the Intel x86 CPU, common I/O devices, and a custom BIOS. Currently, 
+          bochs can be compiled to emulate a 386, 486 or Pentium CPU. Bochs is capable 
+          of running most Operating Systems inside the emulation including Linux, 
+          Windows® 95, DOS, and recently Windows® NT 4.
+       </para>
+
+       <para>
+          Both are licensed under the GPL. Bochs is older than plex86, seems to be 
+          easier to install, but plex86 will run faster because plex86 uses a real 
+          time binary compiler. The drawback of all emulators is that you need a version 
+          of Windows in order to run Windows.
+       </para>
+
       </answer>
       </qandaentry>
 
@@ -818,7 +836,7 @@
       </qandaentry>
       
     </qandadiv>
-    <qandadiv id="Getting-Wine-faq">
+    <qandadiv id="Getting-Wine">
       <title>Getting Wine</title>
       <qandaentry>
       <question id="Where-can-I-get-Wine">
@@ -1044,6 +1062,19 @@ wine
       </qandaentry>
 
       <qandaentry>
+      <question id="How-do-I-upgrade-configuration">
+        <para>How do I upgrade Wine without losing my working configuration?</para>
+      </question>
+      <answer>
+        <para>
+          Upgrading the wine installation does not affect the existing wine
+          configuration. So after upgrading wine you still have the old (working )
+          wine configuration.
+        </para>
+      </answer>
+      </qandaentry>
+
+      <qandaentry>
       <question id="If-I-use-Windows-which-versions-OK">
         <para>If I want to use a Windows install, which versions are OK?</para>
       </question>
@@ -1612,9 +1643,9 @@ rm -fR \[/path/\]Wine*
           </listitem>
           <listitem>
           <para>
-            Deneba's Canvas 7 
-            (<ulink url="http://www.deneba.com/dazroot/softlibs/cv7_linux/default.html">
-             http://www.deneba.com/dazroot/softlibs/cv7_linux/default.html</ulink>)
+            Ability Office
+            (<ulink url="http://www.ability.com/linux/abilitylinux.php">
+             http://www.ability.com/linux/abilitylinux.php</ulink>)
           </para>
           </listitem>
           <listitem>
-- 
2.11.4.GIT