Updated for change in config file name. Removed references to

documentation/fonts.sgml

@@ -66,7 +66,7 @@
           </listitem>
           <listitem>
             <para>
-              Edit the <filename>wine.conf</filename> file to remove
+              Edit the <filename>~/.wine/config</filename> file to remove
               aliases for the fonts you've just installed.
             </para>
           </listitem>
@@ -112,7 +112,7 @@ STUB: AddFontResource( SOMEFILE.FON )
       </sect2>
 
       <sect2>
-        <title>How To Add Font Aliases To <filename>wine.conf</filename></title>
+        <title>How To Add Font Aliases To <filename>~/.wine/config</filename></title>
         <para>
           Many Windows applications assume that fonts included in
           original Windows 3.1  distribution are always present. By
@@ -331,7 +331,7 @@ Default = -adobe-times-
           WINE stores detailed information about available fonts in
           the <filename>~/.wine/.cachedmetrics</filename> file. You
           can copy it elsewhere and add this entry to the [fonts]
-          section  in your <filename>wine.conf</filename>:
+          section  in your <filename>~/.wine/config</filename>:
         </para>
         <screen>
 FontMetrics = &lt;file with metrics&gt;

documentation/installation-und-konfiguration.german

@@ -361,7 +361,7 @@ die folgenden Programme und Dateien installiert sein:
    gültige Konfigurationsdatei oder über eine benutzerspezifische
    Datei im Heimatverzeichnis des betreffenden Benutzers konfiguriert
    werden.  Die benutzerspezifische Konfigurationsdatei trägt den
-   Namen .winerc.  Wenn diese Datei existiert, wird die systemweit
+   Namen ~/.wine/config.  Wenn diese Datei existiert, wird die systemweit
    gültige Konfigurationsdatei (standardmäßig
    /usr/local/etc/wine.conf) nicht beachtet und es werden alle
    Einstellungen aus der Konfigurationsdatei des betreffenden
@@ -410,7 +410,7 @@ die folgenden Programme und Dateien installiert sein:
    diese Vorlage durch den folgenden Befehl an den richtigen Platz
    kopiert werden:
    
-   cp ~/wine/wine.ini ~/.winerc
+   cp ~/wine/documentation/samples/config ~/.wine/config
    
    Die Werte, welche Variablen in der Konfigurationsdatei zugewiesen
    werden, lassen sich in drei Typen einteilen: Zeichenketten, Zahlen
@@ -439,7 +439,7 @@ die folgenden Programme und Dateien installiert sein:
    Weil Programme, die für DOS oder Windows geschrieben sind,
    Laufwerksbuchstaben verwenden, um Dateien zu bezeichnen, muss WINE
    diese Buchstaben auf das UNIX-Dateisystem abbilden. Das Problem ist
-   auf die folgende Art gelöst: In der Konfigurationsdatei (.winerc
+   auf die folgende Art gelöst: In der Konfigurationsdatei (~/.wine/config
    oder /usr/local/etc/wine.conf) wird jedem Laufwerksbuchstaben ein
    Verzeichnis im UNIX-Dateisystem zugeordnet. Dieses Verzeichnis
    stellt dann (aus Sicht der Windows-Programme) das Basisverzeichnis
@@ -892,8 +892,8 @@ die folgenden Programme und Dateien installiert sein:
    WINE-Versionen oder den Windows-Versionen dieser Bibliotheken
    funktioniert. 
 
-   In der Datei .winerc bzw. wine.conf gibt es zwei Abschnitte mit
-   denen bestimmt wird, welche Bibliotheken aus einer
+   In der Datei ~/.wine/config bzw. wine.conf gibt es zwei Abschnitte
+   mit denen bestimmt wird, welche Bibliotheken aus einer
    Windows-Installation geladen werden sollen. Darüberhinaus können
    diese Einstellungen beim Aufruf von WINE an der Kommandozeile
    überschrieben werden. Im allgemeinen empfiehlt es sich, die
@@ -1222,7 +1222,7 @@ die folgenden Programme und Dateien installiert sein:
    
     7.6.3 Font-Einstellungen in der WINEs Konfigurationsdatei
     
-   In der Konfigurationsdatei .winerc bzw. wine.conf stehen die
+   In der Konfigurationsdatei ~/.wine/config bzw. wine.conf stehen die
    folgenden Variablen zur Verfügung, mit denen WINEs Umgang mit
    Schriftarten beeinflusst werden kann:
    

documentation/installing.sgml

@@ -139,15 +139,15 @@ WinNT/2000 directory for common 16-bit DLLs</literallayout></entry>
           be (<filename>tools/wineinstall</filename> will even ask
           you). If you choose, say, <filename>/var/wine</filename>, as
           the root of your virtual drive <medialabel>C</medialabel>,
-          then you'd put this in your <filename>wine.conf</filename>:
+          then you'd put this in your <filename>~/.wine/config</filename>:
         </para>
 
         <programlisting>
 [Drive C]
-Path=/var/wine
-Type=hd
-Label=MS-DOS
-Filesystem=win95
+"Path" = "/var/wine"
+"Type" = "hd"
+"Label" = "MS-DOS"
+"Filesystem" = "win95"
         </programlisting>
 
         <para>
@@ -155,8 +155,8 @@ Filesystem=win95
           "c:\windows\system" would map to
           <filename>/var/wine/windows/system</filename> in the UNIX
           filesystem. Note that you need to specify
-          <literal>Filesystem=win95</literal>, NOT
-          <literal>Filesystem=unix</literal>, to make Wine simulate a
+          <literal>"Filesystem" = "win95"</literal>, NOT
+          <literal>"Filesystem" = "unix"</literal>, to make Wine simulate a
           Windows-compatible (case-insensitive) filesystem, otherwise
           most apps won't work.
         </para>
@@ -235,11 +235,10 @@ Filesystem=win95
         <listitem>
           <para>
             Point <medialabel>[Drive C]</medialabel> in
-            <filename>wine.conf</filename> or
-            <filename>.winerc</filename> to where you want
+            <filename>~/.wine/config</filename> to where you want
             <filename>C:</filename> to be. Refer to the Wine man page
             for more information. Remember to use
-            <userinput>filesystem=win95</userinput>!
+            <userinput>"Filesystem" = "win95"</userinput>!
           </para>
         </listitem>
         <listitem>
@@ -286,8 +285,7 @@ Filesystem=win95
         <listitem>
           <para>
             Edit the <quote>[DllOverrides]</quote> section of
-            <filename>wine.conf</filename> or
-            <filename>.winerc</filename> to specify
+            <filename>~/.wine/config</filename> to specify
             <quote>native</quote> before <quote>builtin</quote> for
             the Windows DLLs you want to use. For more information
             about this, see the Wine manpage.
@@ -307,7 +305,7 @@ Filesystem=win95
             only as pairs to your Wine directory (these DLLs are
             <quote>clean</quote> to use).  Make sure you have these
             specified in the <quote>[DllPairs]</quote> section of
-            <filename>wine.conf</filename> or .winerc.
+            <filename>~/.wine/config</filename>.
           </para>
         </listitem>
         <listitem>
@@ -364,13 +362,13 @@ Filesystem=win95
           Wine maps mounted FAT filesystems, such as
           <filename>/c</filename>, to driver letters, such as
           <quote>c:</quote>, as indicated by the
-          <filename>wine.conf</filename> file.  The following excerpt
-          from a <filename>wine.conf</filename> file does this:
+          <filename>~/.wine/config</filename> file.  The following excerpt
+          from a <filename>~/.wine/config</filename> file does this:
         </para>
         <programlisting>
 [Drive C]
-Path=/c
-Type=hd
+"Path" = "/c"
+"Type" = "hd"
         </programlisting>
         <para>
           Although VFAT filesystems are preferable to FAT filesystems
@@ -682,17 +680,17 @@ THIS MAY TRASH YOUR SYSTEM IF USED CORRECTLY
             <para>
 	      For Win32 software (WNASPI32), Wine has auto-detection in place.
 	      For Win16 software (WINASPI), you need to add a SCSI device entry
-	      for your particular scanner to wine.conf. The format is
+	      for your particular scanner to ~/.wine/config. The format is
 	      <literal>[scsi cCtTdD]</literal> where
-              <literal>C=controller</literal>,
-              <literal>T=target</literal>, <literal>D=LUN</literal>
+              <literal>"C" = "controller"</literal>,
+              <literal>"T" = "target"</literal>, <literal>D=LUN</literal>
             </para>
             <para>
               For example, I set mine up as  controller <literal>0</literal>,
               Target <literal>6</literal>, LUN <literal>0</literal>.
               <programlisting>
 [scsi c0t6d0]
-Device=/dev/sgi
+"Device" = "/dev/sgi"
               </programlisting>
               Yours will vary with your particular SCSI setup.
             </para>

documentation/opengl.sgml

@@ -144,7 +144,7 @@
         contexts, if you want to prevent the screen to flicker when
         using OpenGL applications (all games are using double-buffered
         contexts), you need to set the following option in your
-        <filename>.winerc</filename> / <filename>wine.ini</filename>
+        <filename>~/.wine/config</filename> file
         in the [x11drv] section :
       </para>
       <programlisting>

documentation/printing.sgml

@@ -44,15 +44,15 @@ printer=on
         </screen>
         <para>
           to the [wine] section of <filename>wine.conf</filename> (or
-          <filename>~/.winerc</filename>). This lets
+          <filename>~/.wine/config</filename>). This lets
           <function>CreateDC</function> proceed if its driver argument is a 16
           bit driver. You will probably also need to add
         </para>
         <screen>
-TTEnable=0 TTOnly=0
+"TTEnable" = "0" "TTOnly" = "0"
         </screen>
         <para>
-          to the [TrueType] section of <filename>win.ini</filename>. The code for
+          to the [TrueType] section of <filename>~/.wine/config</filename>. The code for
           the driver interface is in <filename>graphics/win16drv</filename>.
         </para>
       </sect2>
@@ -76,7 +76,7 @@ TTEnable=0 TTOnly=0
           example the following lines
         </para>
         <screen>
-LPT1:=foo.ps LPT2:=|lpr
+"LPT1:" = "foo.ps" "LPT2:" = "|lpr"
         </screen>
         <para>
           map <systemitem>LPT1:</systemitem> to file <filename>foo.ps</filename>
@@ -116,23 +116,23 @@ LPT1:=foo.ps LPT2:=|lpr
           To install it add
         </para>
         <screen>
-Wine PostScript Driver=WINEPS,LPT1:
+"Wine PostScript Driver" = "WINEPS,LPT1:"
         </screen>
         <para>
           to the [devices] section and
         </para>
         <screen>
-Wine PostScript Driver=WINEPS,LPT1:,15,45
+"Wine PostScript Driver" = "WINEPS,LPT1:,15,45"
         </screen>
         <para>
           to the [PrinterPorts] section of <filename>win.ini</filename> and to set it
           as the default printer also add
         </para>
         <screen>
-device=Wine PostScript Driver,WINEPS,LPT1:
+"device" = "Wine PostScript Driver,WINEPS,LPT1:"
         </screen>
         <para>
-          to the [windows] section of <filename>win.ini</filename> and ???
+          to the [windows] section of <filename>~/.wine/config</filename> and ???
           <emphasis>[sic]</emphasis>
         </para>
         <para>
@@ -161,10 +161,10 @@ device=Wine PostScript Driver,WINEPS,LPT1:
         <para>
           Then create a [afmfiles] section in your
           <filename>wine.conf</filename> (or
-          <filename>~/.winerc</filename>) and add a line of the form
+          <filename>~/.wine/config</filename>) and add a line of the form
         </para>
         <screen>
-file&lt;n&gt;=/unix/path/name/filename.afm
+"file&lt;n&gt;" = "/unix/path/name/filename.afm"
         </screen>
         <para>
           for each AFM file that you wish to use. [This might change in the future]
@@ -176,10 +176,10 @@ file&lt;n&gt;=/unix/path/name/filename.afm
           have a look in <ulink url="ftp://ftp.adobe.com/pub/adobe/printerdrivers/win/all/">
             ftp://ftp.adobe.com/pub/adobe/printerdrivers/win/all/</ulink>. Create
           a [psdrv] section in your <filename>wine.conf</filename> (or
-          <filename>~/.winerc</filename>) and add the  following entry:
+          <filename>~/.wine/config</filename>) and add the  following entry:
         </para>
         <screen>
-ppdfile=/somewhere/file.ppd
+"ppdfile" = "/somewhere/file.ppd"
         </screen>
         <para>
           By default, the driver will look for a file named

documentation/registry.sgml

@@ -81,8 +81,7 @@
       <para>
         If you point Wine at an existing MS Windows installation (by
         setting the appropriate directories in
-        <filename>wine.conf</filename> or
-        <filename>.winerc</filename>), then Wine is able to load
+        <filename>~/.wine/config</filename>, then Wine is able to load
         registry data from it. However, Wine will not save anything to
         the real Windows registry, but rather to its own registry
         files (see below). Of course, if a particular registry value
@@ -249,8 +248,8 @@ ln -sf /usr/local/etc/wine.userreg wine.userreg
       <title>The [registry] section</title>
 
       <para>
-        With the above information fresh in mind, let's look at the
-        <filename>wine.conf</filename>/<filename>.winerc</filename>
+        With the above information fresh in mind, let's look at the 
+	<filename>wine.conf</filename>/<filename>~/.wine/config</filename>
         options for handling the registry.
       </para>
 

documentation/running.sgml

@@ -26,7 +26,6 @@
 Usage: ./wine [options] program_name [arguments]
 
 Options:
-   --config name    Specify config file to use
    --debugmsg name  Turn debugging-messages on or off
    --desktop geom   Use a desktop window of the given geometry
    --display name   Use the specified display
@@ -49,12 +48,7 @@ Options:
         up with a sensible set of defaults; in this case, you can run
         <command>wine</command> without explicitly listing any
         options.  In rare cases, you might want to override certain
-        parameters on the command line.  If you find yourself using
-        the same long set of command options with certain
-        applications, you might find it easier to work with multiple
-        config files, using the <link
-        linkend="config-parameter"><parameter>--config</parameter>
-        parameter</link> to specify a non-default configuration.
+        parameters on the command line.  
       </para>
       <para>
         After the options, you should put the name of the file you
@@ -108,25 +102,6 @@ Options:
     <sect1 id="command-line-options">
       <title>Command-Line Options</title>
       <sect2 id="config-parameter">
-        <title>--config</title>
-        <para>
-          The <parameter>--config</parameter> parameter allows you to
-          specify which configuration file you want to use for the
-          current invocation of <command>wine</command>.  For example,
-          if you like to run a specific application or set of
-          applications with a different array of options than your
-          normal defaults, you might set up a different config file
-          for them, and use the <parameter>--config</parameter> option
-          to make use of it.
-        </para>
-        <para>
-          The default value of <parameter>--config</parameter> is
-          <filename>~/.winerc</filename>.  This value is hardwired
-          into the Wine source code.  In future versions of Wine, the
-          default may change to <filename>~/.wine/conf</filename>.
-        </para>
-      </sect2>
-
       <sect2>
         <title>--debugmsg [channels]</title>
         <para>