docs/en wine-faq.sgml

[Dimi Paun]

ChangeSet ID:	1127430098768964603151293
CVSROOT:	/cvsroot/wine
Module name:	docs
Changes by:	dimi at sc8-pr-cvs1.sourceforge.net	2005/09/22 16:01:38

Modified files:
	en             : wine-faq.sgml 

Log message:
	Tom Wickline <twickline at gmail.com>
	Trademark Bricscad.
	Fix the Bricscad URL.
	Remove  MusicMatch Jukebox 5 and replace it with Vividas.
	Change question to ask about a Monolithic application.


Old revision  New revision  Changes     Path
 1.7           1.8           +12 -19     docs/en/wine-faq.sgml

Index: docs/en/wine-faq.sgml
diff -u -p docs/en/wine-faq.sgml:1.7 docs/en/wine-faq.sgml:1.8
--- docs/en/wine-faq.sgml	22 Sep 2005 23: 1:38 -0000
+++ /dev/null	22 Sep 2005 23: 1:38 -0000
@@ -41,8 +41,7 @@ cvs -z3 -d:pserver:anonymous at cvs.sourcef
  <para>
  When prompted for a password, just press the enter key.  </para>
  <para> 
- A subdirectory
- named docs will be created.  If you navigate through there you'll
+ A subdirectory named docs will be created.  If you navigate through there you'll
  find the FAQ in <filename>docs/en/wine-faq.sgml</filename>.  
  The file is written in SGML, which is simply a superset of HTML.
  You can use your favorite text editor to make changes to it but
@@ -391,8 +390,8 @@ cvs -z3 -d:pserver:anonymous at cvs.sourcef
           <ulink url="http://www.winehq.org/site/download">the Download page</ulink>
           for some of these choices), you can make sure that you are getting 
           the latest version by watching the version numbers in the distribution
-          file name. For instance, the distribution released on July 25, 2005
-          was called Wine-20050725.tar.gz. Patch files are also available. If
+          file name. For instance, the distribution released on August 30, 2005
+          was called Wine-20050830.tar.gz. Patch files are also available. If
           you are current to the previous version, you can download and apply 
           just the current patch file rather than the entire new distribution.
           The patch file names follow the same conventions as the monthly 
@@ -693,10 +692,9 @@ cvs -z3 -d:pserver:anonymous at cvs.sourcef
       <answer>
         <para>
           Wine is getting to be quite large, and building from scratch takes a
-          lot of processing. As of July 2005, compile times were around 15
-          minutes on a Intel 3.8GHz Laptop with 1 GB of RAM and 20 minutes on a Athlon 
-          2000 with 512 MB of RAM. If you have a CVS copy of wine, you may not need
-          to rebuild every thing each update.
+          lot of processing. As of September 2005, compile times were around 15
+          minutes on a Intel 3.8GHz Laptop with 1 GB of RAM. If you have a CVS copy of wine, 
+	  you may not need to rebuild every thing each update.
         </para>
       </answer>
       </qandaentry>
@@ -1103,7 +1101,7 @@ wine 
       </question>
       <answer>
         <para>
-          As of 08/2005:
+          As of 09/2005:
         </para>
         <para>
           I'd say Win98SE is the best version to use with Wine, as it's fairly
@@ -1715,10 +1713,8 @@ export PATH=$PATH:/path/to/wine/binary 
           </listitem>
           <listitem>
           <para>
-            MusicMatch Jukebox 5 has also been
-            <ulink url="http://www.itworld.com/nl/lnx_desktop/01042001/">ported</ulink>
-            to Linux using Winelib. However more recent versions have not, and
-            version 5 is no longer available.
+            Vividas Streaming Video
+            (<ulink url="http://www.vividas.com/support/">http://www.vividas.com/support/</ulink>)
           </para>
           </listitem>
           <listitem>
@@ -1735,8 +1731,8 @@ export PATH=$PATH:/path/to/wine/binary 
           </listitem>
           <listitem>
           <para>
-            BricsCad
-            (<ulink url="ftp://ftp.bricscad.com/pub/Eng-Us/B4L/Readme.htm">BricsCad V6 for Linux</ulink>)
+            <trademark class="registered">BricsCad</>
+            (<ulink url="ftp://ftp0:bricscad@ftp.bricscad.com/pub/Eng-Us/B4L/Readme.htm"><trademark class="registered">BricsCad</> V6 for Linux</ulink>)
           </para>
           </listitem>
         </itemizedlist>
@@ -1746,10 +1742,7 @@ export PATH=$PATH:/path/to/wine/binary 
       <qandaentry>
       <question id="Can-I-bundle-everything-in-one-huge-exe">
         <para>
-          Is there a way to bind the Wine code, a Windows .exe, associated DLLs,
-          and any necessary accompanying files into a single Linux executable which
-          can execute as if it were a native linux binary (ie without also having
-          Wine pre-installed)?
+          Can I build one large Monolithic application?
         </para>
       </question>
       <answer>