huge docu update

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi all,

Wine User Guide update:

- move "questions and comments" at the top of the document
- removed elfdll documentation
- properly documented Desktop and Managed config
- rearranged config entries according to importance
- "wine.conf" -> "the wine config file" in some cases
- updated to new FTP URLs
- fix non-backslash-escaped paths (ouch !)
- replace text references by real links
- misc. other updates

Now anyone still complaining "Wine User Guide bad" will get hit by
my XXL-sized clue stick :)
(just joking !)

-- 
Andreas Mohr                        Stauferstr. 6, D-71272 Renningen, Germany
Determining best CVS host...
Using CVSROOT :pserver:cvs@rhlx01.fht-esslingen.de:/home/wine
? documentation/configuring.sgml.BV_OLEAUT32
? documentation/docbook.txt
Index: documentation//authors.ent
===================================================================
RCS file: /home/wine/wine/documentation/authors.ent,v
retrieving revision 1.1
diff -u -r1.1 authors.ent
--- documentation//authors.ent	13 Dec 2000 21:52:37 -0000	1.1
+++ documentation//authors.ent	20 Jul 2002 22:43:17 -0000
@@ -13,6 +13,9 @@
 -->
 
 
+<!entity name-web-admin "WineHQ Web-Admin">
+<!entity email-web-admin "web-admin@winehq.com">
+
 <!entity name-jonathan-buzzard "Jonathan Buzzard">
 <!entity email-jonathan-buzzard "jab@hex.prestel.co.uk">
 
Index: documentation//bugs.sgml
===================================================================
RCS file: /home/wine/wine/documentation/bugs.sgml,v
retrieving revision 1.5
diff -u -r1.5 bugs.sgml
--- documentation//bugs.sgml	10 Jun 2002 02:32:59 -0000	1.5
+++ documentation//bugs.sgml	20 Jul 2002 22:43:17 -0000
@@ -210,17 +210,6 @@
           </listitem>
         </orderedlist>
       </sect2>
-
-      <sect2>
-        <title>Questions and comments</title>
-        <para>
-          If after reading this document there is something you
-          couldn't figure out, or think could be explained better, or
-          that should have been included, please post to
-	  <ulink url="http://bugs.winehq.com/";>Wine Bugzilla</ulink> to
-          let us know how this document can be improved.
-        </para>
-      </sect2>
     </sect1>
  </chapter>
 
Index: documentation//configuring.sgml
===================================================================
RCS file: /home/wine/wine/documentation/configuring.sgml,v
retrieving revision 1.14
diff -u -r1.14 configuring.sgml
--- documentation//configuring.sgml	4 Jun 2002 23:09:35 -0000	1.14
+++ documentation//configuring.sgml	20 Jul 2002 22:43:20 -0000
@@ -18,17 +18,17 @@
           <itemizedlist>
             <listitem>
               <para>
-                Drives and Information about them
+                Drives and information about them
               </para>
             </listitem>
             <listitem>
               <para>
-                Directory Settings
+                Directory settings
               </para>
             </listitem>
             <listitem>
               <para>
-                Port Settings
+                Port settings
               </para>
             </listitem>
             <listitem>
@@ -38,12 +38,12 @@
             </listitem>
             <listitem>
               <para>
-                Wine's DLL Usage
+                Wine's DLL usage
               </para>
             </listitem>
             <listitem>
               <para>
-                Wine's Multimedia drivers and DLL configuration
+                Wine's multimedia drivers and DLL configuration
               </para>
             </listitem>
           </itemizedlist>
@@ -524,10 +524,13 @@
                     </para></listitem>
                 </varlistentry>
                 <varlistentry>
-                  <term>elfdll</term>
+                  <term>builtin</term>
                   <listitem><para>
-                      ELF encapsulated windows DLL's. This is currently
-                      experimental (Not working yet).
+                      The most common form of DLL loading. This is
+                      what you will use if the DLL is error-prone in
+                      native form (KERNEL for example), you don't have
+                      the native DLL, or you just want to be
+                      Microsoft-free.
                     </para></listitem>
                 </varlistentry>
                 <varlistentry>
@@ -537,13 +540,10 @@
                     </para></listitem>
                 </varlistentry>
                 <varlistentry>
-                  <term>builtin</term>
+                  <term>elfdll</term>
                   <listitem><para>
-                      The most common form of DLL loading. This is
-                      what you will use if the DLL is error-prone in
-                      native form (KERNEL for example), you don't have
-                      the native DLL, or you just want to be
-                      Microsoft-free.
+                      ELF encapsulated windows DLL's.
+		      No longer used, ignored.
                     </para></listitem>
                 </varlistentry>
               </variablelist>
@@ -576,8 +576,8 @@
           Wine itself. (The purpose of this section was merely to be
           able to issue warnings if the user attempted to pair
           codependent 16-bit/32-bit DLLs of different types.) If you
-          still have this in your <filename>wine.conf</filename> or
-          <filename>~/.wine/config</filename>, you may safely delete it.
+          still have this in your <filename>~/.wine/.config</filename> or
+          <filename>wine.conf</filename>, you may safely delete it.
           </para>
 	</sect3>
 
@@ -614,18 +614,22 @@
             that was included with your wine package):
             <programlisting>
 [DllOverrides]
+"rpcrt4"       = "builtin, native"
+"oleaut32"     = "builtin, native"
+"ole32"        = "builtin, native"
 "commdlg"      = "builtin, native"
 "comdlg32"     = "builtin, native"
 "ver"          = "builtin, native"
 "version"      = "builtin, native"
 "shell"        = "builtin, native"
 "shell32"      = "builtin, native"
+"shfolder"     = "builtin, native"
+"shlwapi"      = "builtin, native"
+"shdocvw"      = "builtin, native"
 "lzexpand"     = "builtin, native"
 "lz32"         = "builtin, native"
 "comctl32"     = "builtin, native"
 "commctrl"     = "builtin, native"
-"wsock32"      = "builtin"
-"winsock"      = "builtin"
 "advapi32"     = "builtin, native"
 "crtdll"       = "builtin, native"
 "mpr"          = "builtin, native"
@@ -633,8 +637,7 @@
 "ddraw"        = "builtin, native"
 "dinput"       = "builtin, native"
 "dsound"       = "builtin, native"
-"mmsystem"     = "builtin"
-"winmm"        = "builtin"
+"opengl32"     = "builtin, native"
 "msvcrt"       = "native, builtin"
 "msvideo"      = "builtin, native"
 "msvfw32"      = "builtin, native"
@@ -647,16 +650,16 @@
 "msacm"        = "builtin, native"
 "msacm32"      = "builtin, native"
 "midimap.drv"  = "builtin, native"
-"wnaspi32"     = "builtin"
-"icmp"         = "builtin"
+; you can specify applications too
+"notepad.exe"  = "native, builtin"
+; default for all other dlls
+"*" = "native, builtin"
             </programlisting>
           </para>
           <note>
             <para>
-              You see that elfdll or so is the first option for a few
-              of these dll's. This will fail for you, but you won't
-              notice it as wine will just use the second or third
-              option.
+              If loading of the libraries that are listed first fails,
+              wine will just go on by using the second or third option.
             </para>
           </note>
         </sect3>
@@ -708,10 +711,10 @@
           </para>
           <para>
             Here is an example of an alias without masking. The font will show up in windows
-            apps as "Google". When defining an alias in a config file, forget about my
-            comment text (The "&lt;-- blah" stuff)
+            apps as "Google".
+
             <programlisting>
-"Alias0" = "Foo,--google-"      &lt;
+"Alias0" = "Foo,--google-"
             </programlisting>
           </para>
           <para>
@@ -722,7 +725,8 @@
             </programlisting>
           </para>
           <para>
-            For more info check out <filename>&lt;dirs to wine>/documentation/fonts</filename>
+            For more info check out the <link linkend="fonts">Fonts</link>
+	    chapter.
           </para>
         </sect3>
 
@@ -894,8 +898,8 @@
 	      </listitem>
 	      <listitem>
 	        <para>
-		  The "MidiMapper" represents the name of the module containing the Midi 
-		  Mapper driver. Only one Midi mapper can be defined in the system.
+		  The "MidiMapper" represents the name of the module containing the MIDI 
+		  Mapper driver. Only one MIDI mapper can be defined in the system.
 	        </para>
 	      </listitem>
 	    </itemizedlist>
@@ -905,18 +909,20 @@
         <sect3>
           <title>The [AppDefaults] Section</title>
           <para>
-            The section is used to overwrite the setting of this file for a
+            The section is used to overwrite certain settings of this file for a
             special program with different settings.
             [AppDefaults] is not the real name of the section. The real name
             consists of the leading word AppDefaults followed by the name 
-            of the executable the section is valid for. The end of the section
-            name is the name of the section of the configuration file its 
-            values should be overwritten with different settings. The three 
-            parts of the section name are separated by two backslashes.
+            of the executable the section is valid for.
+	    The end of the section name is the name of the
+	    corresponding "standard" section of the configuration file
+	    that should have some of its settings overwritten with the
+	    application specific settings you define.
+	    The three parts of the section name are separated by two backslashes.
           </para>
           <para>
             Currently wine supports only overwriting the sections 
-            [DllOverrides] and [x11drv].
+            [DllOverrides], [x11drv], [version] and [dsound].
           </para>
           <para>
             Here is an example that overwrites the normal settings for a
@@ -948,21 +954,21 @@
                 A systemwide config file, used for anyone who doesn't
                 have their own. NOTE: this file is currently unused as a
                 new global configuration mechanism is not in place at this
-                time
+                time.
             </para></listitem>
           </varlistentry>
           <varlistentry>
             <term><filename>$HOME/.wine/config</filename></term>
             <listitem><para>
-                Your own config file, that only is used for your user. 
+                Your own config file (which only is used for your user).
             </para></listitem>
           </varlistentry>
         </variablelist>
         <para>
-          So copy your version of the <filename>wine.conf</filename> file to
-          <filename>/usr/local/etc/wine.conf</filename> or
-          <filename>$HOME/.wine/config</filename> for wine to recognize
-	  it. 
+          So copy your version of the wine config file to
+          <filename>$HOME/.wine/config</filename>
+	  or <filename>/usr/local/etc/wine.conf</filename>
+	  for wine to recognize it. 
         </para>
       </sect2>
 
@@ -970,7 +976,7 @@
         <title>What If It Doesn't Work?</title>
         <para>
           There is always a chance that things will go wrong. If the
-          unthinkable happens report the problem to
+          unthinkable happens, report the problem to
 	  <ulink url="http://bugs.winehq.com/";>Wine Bugzilla</ulink>,
 	  try the newsgroup
           <systemitem>comp.emulators.ms-windows.wine</systemitem>,
@@ -985,8 +991,7 @@
           </listitem>
           <listitem>
             <para>
-              <filename>http://www.la-sorciere.de/wine/index.html</filename>
-              (optional but recommended)
+              <filename>http://www.winehq.org/trouble/</filename>
             </para>
           </listitem>
         </itemizedlist>
@@ -1065,10 +1070,8 @@
             <term>Managed</term>
             <listitem>
               <para>
-                Specified by using the
-                <parameter>--managed</parameter> command-line option
-                or the <literal>Managed</literal>
-                <filename>wine.conf</filename> option (see below).
+                Specified by using the <literal>Managed</literal>
+                wine config file option (see below).
                 Ordinary top-level frame windows with thick borders,
                 title bars, and system menus will be managed by your
                 window manager. This lets these applications integrate
@@ -1084,11 +1087,11 @@
             <term>Desktop-in-a-Box</term>
             <listitem>
               <para>
-                Specified by using the
-                <parameter>--desktop</parameter> command-line option
-                (with a geometry, e.g. <parameter>--desktop
-                  800x600</parameter> for a such-sized desktop, or
-                even <parameter>--desktop 800x600+0+0</parameter> to
+                Specified by using the <literal>Desktop</literal>
+		wine config file option (see below).
+                (adding a geometry, e.g. <literal>800x600</literal>
+		for a such-sized desktop, or
+                even <literal>800x600+0+0</literal> to
                 automatically position the desktop at the upper-left
                 corner of the display). This is the mode most
                 compatible with the Windows model. All application
@@ -1098,6 +1101,8 @@
                 applications can roam freely within this virtual
                 workspace and think they own it all, without
                 disturbing your other X apps.
+		Note: currently there's on desktop window for every
+		application; this will be fixed in the future.
               </para>
             </listitem>
           </varlistentry>
@@ -1109,74 +1114,35 @@
 
         <variablelist>
           <varlistentry>
-            <term>AllocSystemColors</term>
-            <listitem>
-              <para>
-                Applies only if you have a palette-based display, i.e.
-                if your X server is set to a depth of 8bpp, and if you
-                haven't requested a private color map. It specifies
-                the maximum number of shared colormap cells (palette
-                entries) Wine should occupy. The higher this value,
-                the less colors will be available to other
-                applications.
-              </para>
-            </listitem>
-          </varlistentry>          
-          <varlistentry>
-            <term>PrivateColorMap</term>
-            <listitem>
-              <para>
-                Applies only if you have a palette-based display, i.e.
-                if your X server is set to a depth of 8bpp. It
-                specifies that you don't want to use the shared color
-                map, but a private color map, where all 256 colors are
-                available. The disadvantage is that Wine's private
-                color map is only seen while the mouse pointer is
-                inside a Wine window, so psychedelic flashing and
-                funky colors will become routine if you use the mouse
-                a lot.
-              </para>
-            </listitem>
-          </varlistentry>          
-          <varlistentry>
-            <term>PerfectGraphics</term>
-            <listitem>
-              <para>
-                This option only determines whether fast X11 routines
-                or exact Wine routines will be used for certain ROP
-                codes in blit operations. Most users won't notice any
-                difference.
-              </para>
-            </listitem>
-          </varlistentry>          
-          <varlistentry>
-            <term>ScreenDepth</term>
+            <term>Managed</term>
             <listitem>
               <para>
-                Applies only to multi-depth displays. It specifies
-                which of the available depths Wine should use (and
-                tell Windows apps about).
+                Wine can let frame windows be managed by your window
+                manager. This option specifies whether you want that
+                by default.
               </para>
             </listitem>
           </varlistentry>          
           <varlistentry>
-            <term>Display</term>
+            <term>Desktop</term>
             <listitem>
               <para>
-                This specifies which X11 display to use, and if
-                specified, will override both the
-                <envar>DISPLAY</envar> environment variable and the
-                <parameter>--display</parameter> command-line option.
+                Creates a main desktop window of a specified size
+		to display all Windows applications in.
+		The size argument could e.g. be "800x600".
               </para>
             </listitem>
           </varlistentry>          
           <varlistentry>
-            <term>Managed</term>
+            <term>DXGrab</term>
             <listitem>
               <para>
-                Wine can let frame windows be managed by your window
-                manager. This option specifies whether you want that
-                by default.
+                If you don't use DGA, you may want an alternative
+                means to convince the mouse cursor to stay within the
+                game window. This option does that. Of course, as with
+                DGA, if Wine crashes, you're in trouble (although not
+                as badly as in the DGA case, since you can still use
+                the keyboard to get out of X).
               </para>
             </listitem>
           </varlistentry>          
@@ -1217,19 +1183,6 @@
             </listitem>
           </varlistentry>          
           <varlistentry>
-            <term>DXGrab</term>
-            <listitem>
-              <para>
-                If you don't use DGA, you may want an alternative
-                means to convince the mouse cursor to stay within the
-                game window. This option does that. Of course, as with
-                DGA, if Wine crashes, you're in trouble (although not
-                as badly as in the DGA case, since you can still use
-                the keyboard to get out of X).
-              </para>
-            </listitem>
-          </varlistentry>          
-          <varlistentry>
             <term>DesktopDoubleBuffered</term>
             <listitem>
               <para>
@@ -1243,16 +1196,81 @@
             </listitem>
           </varlistentry>
           <varlistentry>
-            <term>TextCP</term>
+            <term>AllocSystemColors</term>
             <listitem>
               <para>
-                <!-- FIXME: To be documented -->
-                To be documented...
+                Applies only if you have a palette-based display, i.e.
+                if your X server is set to a depth of 8bpp, and if you
+                haven't requested a private color map. It specifies
+                the maximum number of shared colormap cells (palette
+                entries) Wine should occupy. The higher this value,
+                the less colors will be available to other
+                applications.
+              </para>
+            </listitem>
+          </varlistentry>          
+          <varlistentry>
+            <term>PrivateColorMap</term>
+            <listitem>
+              <para>
+                Applies only if you have a palette-based display, i.e.
+                if your X server is set to a depth of 8bpp. It
+                specifies that you don't want to use the shared color
+                map, but a private color map, where all 256 colors are
+                available. The disadvantage is that Wine's private
+                color map is only seen while the mouse pointer is
+                inside a Wine window, so psychedelic flashing and
+                funky colors will become routine if you use the mouse
+                a lot.
+              </para>
+            </listitem>
+          </varlistentry>          
+          <varlistentry>
+            <term>Synchronous</term>
+            <listitem>
+              <para>
+                To be used for debugging X11 operations.
+		If Wine crashes with an X11 error, then you should enable
+		Synchronous mode to disable X11 request caching in order
+		to make sure that the X11 error happens directly after
+		the corresponding X11 call in the log file appears.
+		Will slow down X11 output !
               </para>
             </listitem>
           </varlistentry>
           <varlistentry>
-            <term>XVideoPort</term>
+            <term>ScreenDepth</term>
+            <listitem>
+              <para>
+                Applies only to multi-depth displays. It specifies
+                which of the available depths Wine should use (and
+                tell Windows apps about).
+              </para>
+            </listitem>
+          </varlistentry>          
+          <varlistentry>
+            <term>Display</term>
+            <listitem>
+              <para>
+                This specifies which X11 display to use, and if
+                specified, will override the
+                <envar>DISPLAY</envar> environment variable.
+              </para>
+            </listitem>
+          </varlistentry>          
+          <varlistentry>
+            <term>PerfectGraphics</term>
+            <listitem>
+              <para>
+                This option only determines whether fast X11 routines
+                or exact Wine routines will be used for certain ROP
+                codes in blit operations. Most users won't notice any
+                difference.
+              </para>
+            </listitem>
+          </varlistentry>          
+          <varlistentry>
+            <term>TextCP</term>
             <listitem>
               <para>
                 <!-- FIXME: To be documented -->
@@ -1261,7 +1279,7 @@
             </listitem>
           </varlistentry>
           <varlistentry>
-            <term>Synchronous</term>
+            <term>XVideoPort</term>
             <listitem>
               <para>
                 <!-- FIXME: To be documented -->
@@ -1448,7 +1466,7 @@
         </para>
   
         <para>
-          The <filename>wine.conf</filename> directives [DllDefaults]
+          The wine config file directives [DllDefaults]
           and [DllOverrides] are the subject of some confusion. The
           overall purpose of most of these directives are clear enough,
           though - given a choice, should Wine use its own built-in
@@ -1477,24 +1495,6 @@
                 </para> </listitem>
             </varlistentry>
             <varlistentry>
-              <term>elfdll</term>
-              <listitem> <para>
-                  An "elfdll" is a Wine <filename>.so</filename> file
-                  with a special Windows-like file structure that is as
-                  close to Windows as possible, and that can also
-                  seamlessly link dynamically with "native" DLLs, by
-                  using special ELF loader and linker tricks. Bertho
-                  Stultiens did some work on this, but this feature has
-                  not yet been merged back into Wine (because of
-                  political reasons and lack of time), so this DLL type
-                  does not exist in the official Wine at this time. In
-                  the meantime, the "builtin" DLL type gained some of
-                  the features of elfdlls (such as dynamic loading), so
-                  it's possible that "elfdll" functionality will be
-                  folded into "builtin" at some point.
-                </para> </listitem>
-            </varlistentry>
-            <varlistentry>
               <term>so</term>
               <listitem> <para>
                   A native Unix <filename>.so</filename> file, with
@@ -1530,8 +1530,8 @@
             Wine itself. (The purpose of this section was merely to be
             able to issue warnings if the user attempted to pair
             codependent 16-bit/32-bit DLLs of different types.) If you
-            still have this in your <filename>wine.conf</filename> or
-            <filename>~/.wine/config</filename>, you may safely delete it.
+            still have this in your <filename>~/.wine/config</filename> or
+            <filename>wine.conf</filename>, you may safely delete it.
           </para>
         </sect3>
   
@@ -1840,11 +1840,33 @@
 	  SearchPath() function.
 	  This function searches directories in the following order:
 	  
-	  a) The directory the program was started from.
-	  b) The current directory.
-	  c) The Windows system directory.
-	  d) The Windows directory.
-	  e) The PATH variable directories.
+          <orderedlist>
+            <listitem>
+              <para>
+	        The directory the program was started from.
+              </para>
+            </listitem>
+            <listitem>
+              <para>
+	        The current directory.
+              </para>
+            </listitem>
+            <listitem>
+              <para>
+	        The Windows system directory.
+              </para>
+            </listitem>
+            <listitem>
+              <para>
+	        The Windows directory.
+              </para>
+            </listitem>
+            <listitem>
+              <para>
+	        The PATH variable directories.
+              </para>
+            </listitem>
+          </orderedlist>
 	  
 	  In short: either put the required DLL into your application
 	  directory (might be ugly), or usually put it into the Windows system
Index: documentation//consoles.sgml
===================================================================
RCS file: /home/wine/wine/documentation/consoles.sgml,v
retrieving revision 1.2
diff -u -r1.2 consoles.sgml
--- documentation//consoles.sgml	13 Dec 2000 21:52:37 -0000	1.2
+++ documentation//consoles.sgml	20 Jul 2002 22:43:21 -0000
@@ -236,10 +236,10 @@
         </sect3>
 
         <sect3>
-          <title>II. <filename>wine.conf</filename> Configuration</title>
+          <title>II. wine config file configuration</title>
 
           <para>
-            In the <filename>wine.conf</filename> file, you can create
+            In the wine config file, you can create
             a section called [console] that contains configuration
             options that are respected by the assorted console
             drivers.
@@ -370,7 +370,7 @@
             As X terminals typically use a 24x80 screen resolution
             rather than the typical 25x80 one, it is necessary to
             resize the screen to allow a DOS program to work
-            full-screen. There is a <filename>wine.conf</filename>
+            full-screen. There is a wine config file
             option to work around this in some cases but run-time
             resizing will be disabled.
           </para>
Index: documentation//debugging.sgml
===================================================================
RCS file: /home/wine/wine/documentation/debugging.sgml,v
retrieving revision 1.5
diff -u -r1.5 debugging.sgml
--- documentation//debugging.sgml	3 Jul 2002 01:20:46 -0000	1.5
+++ documentation//debugging.sgml	20 Jul 2002 22:43:22 -0000
@@ -760,7 +760,7 @@
           <listitem>
             <para>
               for messages intended for the user (specifically those that
-              report errors in <filename>wine.conf</filename>), use the
+              report errors in the wine config file), use the
               <literal>MSG</literal> macro. Use it like a
               <function>printf</function>:
               <programlisting>
Index: documentation//fonts.sgml
===================================================================
RCS file: /home/wine/wine/documentation/fonts.sgml,v
retrieving revision 1.10
diff -u -r1.10 fonts.sgml
--- documentation//fonts.sgml	4 Jun 2002 23:09:35 -0000	1.10
+++ documentation//fonts.sgml	20 Jul 2002 22:43:23 -0000
@@ -398,7 +398,7 @@
 
       <orderedlist>
         <listitem>
-          <para>Get <filename>freetype-1.0.full.tar.gz</filename></para>
+          <para>Get a freetype source archive (<filename>freetype-X.Y.tar.gz</filename> ?).</para>
         </listitem>
         <listitem>
           <para>Read docs, unpack, configure and install</para>
@@ -485,7 +485,7 @@
           </para>
         </listitem>
         <listitem>
-          <para>Test with e.g <command>xlsfont | grep arial</command></para>
+          <para>Test with e.g. <command>xlsfont | grep arial</command></para>
         </listitem>
       </orderedlist>
 
Index: documentation//getting.sgml
===================================================================
RCS file: /home/wine/wine/documentation/getting.sgml,v
retrieving revision 1.4
diff -u -r1.4 getting.sgml
--- documentation//getting.sgml	16 May 2002 18:31:57 -0000	1.4
+++ documentation//getting.sgml	20 Jul 2002 22:43:23 -0000
@@ -25,7 +25,7 @@
         linkend="getting-dist-other">other</link> distributions.
       </para>
       <para>
-        If you're not lucky enough to have an available package for
+        If you're not lucky enough to have a package available for
         your operating system, or if you'd prefer a newer version of
         Wine than already exists as a package, you may have to
         download the Wine source code and compile it yourself on your
@@ -33,7 +33,7 @@
         especially with the many helpful tools that come with Wine.
         You don't need any programming experience to compile and
         install Wine, although it might be nice to have some minor
-        UNIX administrative skill.  We'll cover how to retrieve and
+        UNIX administrative skills.  We'll cover how to retrieve and
         compile the official source releases from the <link
         linkend="getting-source-ftp">FTP archives</link>, and also how
         to get the cutting edge up-to-the-minute fresh Wine source
@@ -160,7 +160,7 @@
       <para>
         The safest way to grab the source is from one of the official
         FTP archives.  An up to date listing is in the <ulink
-        url="http://www.winehq.com/source/ANNOUNCE";>ANNOUNCE </ulink>
+        url="http://www.winehq.com/source/ANNOUNCE";>ANNOUNCE</ulink>
         file in the Wine distribution (which you would have if you
         already downloaded it).  Here is a (possibly out of date) list
         of FTP servers carrying Wine:
@@ -168,22 +168,22 @@
       <itemizedlist>
         <listitem>
           <para>
-            <ulink url="ftp://metalab.unc.edu/pub/Linux/ALPHA/wine/development/";>
-              ftp://metalab.unc.edu/pub/Linux/ALPHA/wine/development/
+            <ulink url="ftp://ftp.ibiblio.org/pub/Linux/ALPHA/wine/development/";>
+              ftp://ftp.ibiblio.org/pub/Linux/ALPHA/wine/development/
             </ulink>
           </para>
         </listitem>
         <listitem>
           <para>
-            <ulink url="ftp://tsx-11.mit.edu/pub/linux/ALPHA/Wine/development/";>
-              ftp://tsx-11.mit.edu/pub/linux/ALPHA/Wine/development/
+            <ulink url="ftp://ftp.infomagic.com/pub/mirrors/linux/sunsite/ALPHA/wine/development/";>
+              ftp://ftp.infomagic.com/pub/mirrors/linux/sunsite/ALPHA/wine/development/
             </ulink>
           </para>
         </listitem>
         <listitem>
           <para>
-            <ulink url="ftp://ftp.infomagic.com/pub/mirrors/linux/sunsite/ALPHA/wine/development/";>
-              ftp://ftp.infomagic.com/pub/mirrors/linux/sunsite/ALPHA/wine/development/
+            <ulink url="ftp://sunsite.informatik.rwth-aachen.de/pub/Linux/sunsite.unc.edu/ALPHA/wine/development/";>
+              ftp://sunsite.informatik.rwth-aachen.de/pub/Linux/sunsite.unc.edu/ALPHA/wine/development/
             </ulink>
           </para>
         </listitem>
@@ -237,13 +237,13 @@
         the updates:
       </para>
       <screen>
-$ cvs -dP update
+$ cvs -PAd update
       </screen>
       <para>
         <command>cvs update</command> works from inside the source tree.
         You don't need the <envar>CVSROOT</envar> environment variable
         to run it either.  You just have to be inside the source tree.
-        The <parameter>-d</parameter> and <parameter>-P</parameter>
+        The <parameter>-P</parameter>, <parameter>-A</parameter> and <parameter>-d</parameter>
         options make sure your local Wine tree directory structure stays
         in sync with the remote repository.
       </para>
Index: documentation//installing.sgml
===================================================================
RCS file: /home/wine/wine/documentation/installing.sgml,v
retrieving revision 1.6
diff -u -r1.6 installing.sgml
--- documentation//installing.sgml	4 Jun 2002 23:09:35 -0000	1.6
+++ documentation//installing.sgml	20 Jul 2002 22:43:24 -0000
@@ -72,7 +72,8 @@
           paths, class IDs, and more; it must be installed before most
           <filename>INSTALL.EXE</filename> or
           <filename>SETUP.EXE</filename> applications will work. The
-          registry is covered in more detail in an earlier article.
+          registry is covered in more detail <link
+	  linkend="registry">here</link>.
         </para>
       </sect2>
 
@@ -134,9 +135,9 @@
           file existence to determine whether a particular feature
           (such as Winsock and its TCP/IP networking) is available. If
           this is a problem for you, you can create empty files in the
-          <filename>system</filename> directory to make the
-          application think it's there, and Wine's built-in DLL will
-          be loaded when the application actually asks for it.
+          configured <filename>c:\windows\system</filename> directory
+	  to make the application think it's there, and Wine's built-in DLL
+	  will be loaded when the application actually asks for it.
           (Unfortunately, <filename>tools/wineinstall</filename> does
           not create such empty files itself.)
         </para>
@@ -242,10 +243,10 @@
         <listitem>
           <para>
             Run the application with <parameter>--debugmsg
-              +module,+file</parameter> to find out which files are
+              +loaddll</parameter> to find out which files are
             needed. Copy the required DLLs one by one to the
             <filename>C:\windows\system</filename> directory. Do not
-            copy KERNEL/KERNEL32, GDI/GDI32, or USER/USER32. These
+            copy KERNEL/KERNEL32, GDI/GDI32, USER/USER32 or NTDLL. These
             implement the core functionality of the Windows API, and
             the Wine internal versions must be used.
           </para>
Index: documentation//introduction.sgml
===================================================================
RCS file: /home/wine/wine/documentation/introduction.sgml,v
retrieving revision 1.3
diff -u -r1.3 introduction.sgml
--- documentation//introduction.sgml	10 Oct 2001 20:22:35 -0000	1.3
+++ documentation//introduction.sgml	20 Jul 2002 22:43:25 -0000
@@ -48,7 +48,7 @@
           </footnote>
           However, Wine makes it possible to run native Windows
           applications alongside native Linux applications on a Linux
-          (or Solaris) system.  You can share desktop space between MS
+          (or BSD or Solaris) system.  You can share desktop space between MS
           Word and GnuCash, overlapping their windows, iconizing them,
           and even running them from the same launcher.
         </para>
@@ -98,6 +98,21 @@
         <para>
         </para>
       </sect2>
+      <sect2>
+        <title>Burning questions and comments</title>
+        <para>
+          If during reading this document there is something you
+          can't figure out, or think could be explained better, or
+          that should have been included, please immediately mail to
+          &name-web-admin; <email>&email-web-admin</email> or
+          post a bug report at the
+          <ulink url="http://bugs.winehq.com/";>Wine Bugzilla</ulink> to
+          let us know how this document can be improved.
+          Remember, Open Source is
+          "free as in free speech, not as in free beer":
+          it can only work in case of very active involvement of its users !
+        </para>
+      </sect2>
     </sect1>
 
 <!-- *** Not really useful as is, but may be able to recycle this elsewhere...
@@ -142,7 +157,7 @@
             <listitem>
               <para>
                 a computer ;-) Wine: only PCs >= i386 are supported at
-                the moment.  Winelib: other platforms might be
+                the moment.  Winelib: other platforms may be
                 supported, but can be tricky.
               </para>
             </listitem>
@@ -155,7 +170,7 @@
             <listitem>
               <para>
                 >= 16MB of RAM.  Everything below is pretty much
-                unusable.  >= 64 MB is needed for a "good" execution.
+                unusable.  >= 64 MB is needed for "good" execution.
               </para>
             </listitem>
             <listitem>
@@ -163,7 +178,7 @@
                 an X11 window system (XFree86 etc.).  Wine is prepared
                 for other graphics display drivers, but writing
                 support is not too easy.  The text console display
-                driver is nearly usable.
+                driver (ttydrv) is nearly usable.
               </para>
             </listitem>
           </itemizedlist>
@@ -181,7 +196,7 @@
           <itemizedlist>
             <listitem>
               <para>
-                Support for executing DOS, Win 3.x and Win9x/NT/Win2000
+                Support for executing DOS, Win 3.x and Win9x/NT/Win2000/XP
                 programs (most of Win32's controls are supported)
               </para>
             </listitem>
Index: documentation//multimedia.sgml
===================================================================
RCS file: /home/wine/wine/documentation/multimedia.sgml,v
retrieving revision 1.1
diff -u -r1.1 multimedia.sgml
--- documentation//multimedia.sgml	22 May 2001 19:26:31 -0000	1.1
+++ documentation//multimedia.sgml	20 Jul 2002 22:43:26 -0000
@@ -820,7 +820,7 @@
 	  occurs when the MCI procedures are initialised. Make sure that this is
 	  not in the list from above. Try adding:
 	  mci=CDAUDIO:SEQUENCER:WAVEAUDIO:AVIVIDEO:MPEGVIDEO
-	  to the [options] section of wine.conf.
+	  to the [options] section of the wine config file.
 	</para>
 	
 	<para>TODO:
@@ -977,7 +977,7 @@
 	
 	<para>
 	  The list of loadable (recognized) MCI drivers can be altered in the
-	  [option] section of wine.conf, like:
+	  [option] section of the wine config file, like:
 	  mci=CDAUDIO:SEQUENCER:WAVEAUDIO:AVIVIDEO:MPEGVIDEO
 	</para>
 	
Index: documentation//packaging.sgml
===================================================================
RCS file: /home/wine/wine/documentation/packaging.sgml,v
retrieving revision 1.7
diff -u -r1.7 packaging.sgml
--- documentation//packaging.sgml	30 Apr 2002 21:16:39 -0000	1.7
+++ documentation//packaging.sgml	20 Jul 2002 22:43:29 -0000
@@ -813,6 +813,8 @@
                     This is the global Wine configuration file.  It
                     is only used if the user running Wine has
                     no local configuration file.
+		    Global wine configuration is currently not possible;
+		    this might get reenabled at some time.
                     </para>
                     <para>
                     Some packagers feel that this file should not
Index: documentation//printing.sgml
===================================================================
RCS file: /home/wine/wine/documentation/printing.sgml,v
retrieving revision 1.10
diff -u -r1.10 printing.sgml
--- documentation//printing.sgml	10 Sep 2001 23:17:08 -0000	1.10
+++ documentation//printing.sgml	20 Jul 2002 22:43:29 -0000
@@ -59,8 +59,7 @@
 printer=on
         </screen>
         <para>
-          to the [wine] section of <filename>wine.conf</filename> (or
-          <filename>~/.wine/config</filename>). This lets
+          to the [wine] section of the wine config file. This lets
           <function>CreateDC</function> proceed if its driver argument is a 16
           bit driver. You will probably also need to add
         </para>
@@ -77,7 +76,7 @@
         <title>Spooling</title>
         <para>
           Spooling is rather primitive. The [spooler] section of
-          <filename>wine.conf</filename> maps a port (e.g.
+          the wine config file maps a port (e.g.
           <systemitem>LPT1:</systemitem>) to a file or a command via a pipe. For
           example the following lines
         </para>
@@ -133,7 +132,7 @@
 	  <title>Installation of LPR /etc/printcap based printers</title>
 	  <para>
 	    If your system is not yet using CUPS, it probably uses LPRng
-	    or a LPR based system with configuration based on /etc/printcap.
+	    or a LPR based system with configuration based on <filename>/etc/printcap</filename>.
 	  </para>
 	  <para>
 	    If it does, your printers in <filename>/etc/printcap</filename>
@@ -238,7 +237,7 @@
 	  </para>
 	  <para>
 	    Note that you need not set <literal>printer=on</literal> in
-	    the [wine] section of <filename>wine.conf</filename>, this
+	    the [wine] section of the wine config file, this
 	    enables printing via external printer drivers and does not
 	    affect the builtin PostScript driver.
 	  </para>
Index: documentation//registry.sgml
===================================================================
RCS file: /home/wine/wine/documentation/registry.sgml,v
retrieving revision 1.5
diff -u -r1.5 registry.sgml
--- documentation//registry.sgml	27 Feb 2002 01:30:34 -0000	1.5
+++ documentation//registry.sgml	20 Jul 2002 22:43:40 -0000
@@ -36,7 +36,7 @@
           <term>HKEY_LOCAL_MACHINE</term>
           <listitem>
             <para>
-              This fundamental root key (in win9x, stored in the
+              This fundamental root key (in win9x it's stored in the
               hidden file <filename>system.dat</filename>) contains
               everything pertaining to the current Windows
               installation.
@@ -47,7 +47,7 @@
           <term>HKEY_USERS</term>
           <listitem>
             <para>
-              This fundamental root key (in win9x, stored in the
+              This fundamental root key (in win9x it's stored in the
               hidden file <filename>user.dat</filename>) contains
               configuration data for every user of the installation.
             </para>
@@ -149,9 +149,12 @@
       <para>
         All of these files are human-readable text files, so unlike
         Windows, you can actually use an ordinary text editor on them
-        if you must.
+        if you want (make sure you don't have Wine running when modifying
+	them, otherwise your changes will be discarded).
       </para>
       <para>
+        FIXME: global config currently not implemented.
+	
         In addition to these files, Wine can also optionally load from
         global registry files residing in the same directory as the
         global <filename>wine.conf</filename> (i.e.
@@ -248,7 +251,7 @@
 
       <para>
         With the above information fresh in mind, let's look at the 
-	<filename>wine.conf</filename>/<filename>~/.wine/config</filename>
+	<filename>wine.conf</filename> / <filename>~/.wine/config</filename>
         options for handling the registry.
       </para>
 
@@ -295,12 +298,17 @@
           </listitem>
         </varlistentry>
         <varlistentry>
-          <term>UseNewFormat</term>
+          <term>SaveOnlyUpdatedKeys</term>
           <listitem>
             <para>
-              This option is obsolete. Wine now always uses the new
-              format; support for the old format was removed a while
-              ago.
+              Controls whether the entire registry is saved to the
+              user's registry files, or only subkeys the user have
+              actually changed. Considering that the user's registry
+              will override any global registry files and Windows
+              registry files, it usually makes sense to only save
+              user-modified subkeys; that way, changes to the rest of
+              the global or Windows registries will still affect the
+              user.
             </para>
           </listitem>
         </varlistentry>
@@ -316,17 +324,12 @@
           </listitem>
         </varlistentry>
         <varlistentry>
-          <term>SaveOnlyUpdatedKeys</term>
+          <term>UseNewFormat</term>
           <listitem>
             <para>
-              Controls whether the entire registry is saved to the
-              user's registry files, or only subkeys the user have
-              actually changed. Considering that the user's registry
-              will override any global registry files and Windows
-              registry files, it usually makes sense to only save
-              user-modified subkeys; that way, changes to the rest of
-              the global or Windows registries will still affect the
-              user.
+              This option is obsolete. Wine now always uses the new
+              format; support for the old format was removed a while
+              ago.
             </para>
           </listitem>
         </varlistentry>
Index: documentation//running.sgml
===================================================================
RCS file: /home/wine/wine/documentation/running.sgml,v
retrieving revision 1.10
diff -u -r1.10 running.sgml
--- documentation//running.sgml	8 Jul 2002 19:36:51 -0000	1.10
+++ documentation//running.sgml	20 Jul 2002 22:43:40 -0000
@@ -53,7 +53,7 @@
       </para>
       <screen>
 [wine]
-"Path"="c:\windows;c:\windows\system;e:\;e:\test;f:\"
+"Path"="c:\\windows;c:\\windows\\system;e:\\;e:\\test;f:\\"
       </screen>
       <para>
         You could run the file
@@ -67,18 +67,20 @@
         <filename>c:\myapps\foo.exe</filename> with this command:
       </para>
       <screen>
-<prompt>$</prompt> <userinput>wine c:\myapps\foo.exe</userinput>
+<prompt>$</prompt> <userinput>wine c:\\myapps\\foo.exe</userinput>
       </screen>
+      <para>
+      (note the backslash-escaped "\" !)
+      </para>
 
       <para>
         If you want to run a console program (aka a CUI executable), use
 	<command>wineconsole</command> instead of <command>wine</command>
 	to start it. It will display the program in a separate Window
 	(this requires X11 to be run). If you don't, you'll still be able
-	to run able your program, in the Unix console were you're started
-	your program, but with very limited capacities (so, your program
-	might work, but your mileage may vary). This shall be improved
-	in the future.
+	to run your program directly in the Unix console where you started it,
+	but with very limited capacities (so your program might work,
+	but your mileage may vary). This shall be improved in the future.
       </para>
     </sect1>
 
@@ -89,7 +91,7 @@
         <title>--debugmsg [channels]</title>
         <para>
           Wine isn't perfect, and many Windows applications still
-          don't run without bugs under Wine (but then, many of them
+          don't run without bugs under Wine (but then, a lot of programs
           don't run without bugs under native Windows either!).  To
           make it easier for people to track down the causes behind
           each bug, Wine provides a number of <firstterm>debug
@@ -155,7 +157,7 @@
         </screen>
         <para>
           Here is a master list of all the debug channels and classes
-          in Wine.  More channels might be added to (or subtracted
+          in Wine.  More channels will be added to (or subtracted
           from) later versions.
         </para>
 
@@ -245,21 +247,27 @@
       <sect2>
         <title>--dll</title>
         <para>
-
+          Specifies whether to load the builtin or the native (if
+	  available) version of a DLL.
+	  Example:
+	  <screen>
+<prompt>$</prompt> <userinput>wine --dll setupx=n foo.exe</userinput>
+          </screen>
+	  See the <link linkend="dlls">DLL chapter</link> for more details.
         </para>
       </sect2>
 
       <sect2>
         <title>--help</title>
         <para>
-
+          Shows a small command line help page.
         </para>
       </sect2>
 
       <sect2>
         <title>--version</title>
         <para>
-
+	  Shows the Wine version string. Useful to verify your installation.
         </para>
       </sect2>
     </sect1>
Index: documentation//winelib-porting.sgml
===================================================================
RCS file: /home/wine/wine/documentation/winelib-porting.sgml,v
retrieving revision 1.2
diff -u -r1.2 winelib-porting.sgml
--- documentation//winelib-porting.sgml	18 May 2001 21:01:44 -0000	1.2
+++ documentation//winelib-porting.sgml	20 Jul 2002 22:43:41 -0000
@@ -354,7 +354,7 @@
         </listitem>
       </itemizedlist>
       <para>
-        This may sound complex by Winemaker makes it simple. Just specify 
+        This may sound complex but Winemaker makes it simple. Just specify 
         <option>--wrap</option> or <option>--mfc</option> on the command line 
         and it will adapt its makefiles to build the wrapper and the 
         application library.

[Index of Archives]     [Gimp for Windows]     [Red Hat]     [Samba]     [Yosemite Camping]     [Graphics Cards]     [Wine Home]

  Powered by Linux