Use symlinks in dosdevices/ for the drive devices too.
Store drive types in the registry instead of in the config file.
Added some more code to convert existing config to the new scheme.
diff --git a/documentation/samples/config b/documentation/samples/config
index a56b1a0..2ca0562 100644
--- a/documentation/samples/config
+++ b/documentation/samples/config
@@ -4,35 +4,6 @@
;; If you think it is necessary to show others your complete config for a
;; bug report, filter out empty lines and comments with
;; grep -v "^;" ~/.wine/config | grep '.'
-;;
-;; MS-DOS drives configuration
-;;
-;; Each section has the following format:
-;; [Drive X]
-;; "Path"="xxx" (Unix path for drive root)
-;; "Type"="xxx" (supported types are 'floppy', 'hd', 'cdrom' and 'network')
-;; "Device"="/dev/xx" (only if you want to allow raw device access)
-;;
-[Drive A]
-"Type" = "floppy"
-"Device" = "/dev/fd0"
-
-[Drive C]
-"Type" = "hd"
-
-[Drive D]
-"Type" = "cdrom"
-; make sure that device is correct and has proper permissions !
-"Device" = "/dev/cdrom"
-
-[Drive E]
-"Type" = "hd"
-
-[Drive F]
-"Type" = "network"
-
-[Drive Z]
-"Type" = "hd"
[wine]
"Windows" = "c:\\windows"
diff --git a/documentation/wine.conf.man b/documentation/wine.conf.man
index 58df5eb..3b8c180 100644
--- a/documentation/wine.conf.man
+++ b/documentation/wine.conf.man
@@ -1,5 +1,5 @@
.\" -*- nroff -*-
-.TH WINE.CONF 5 "September 2003" "Version 20030911" "Wine Configuration File"
+.TH WINE.CONF 5 "April 2004" "Version 20040408" "Wine Configuration File"
.SH NAME
wine.conf \- Wine configuration file
.SH DESCRIPTION
@@ -24,42 +24,12 @@
The entry and value can be any text strings, included in double
quotes; it can also contain references to environment variables
surrounded by
-.I ${}.
+.I %
+signs.
Inside the double quotes, special characters, backslashes and quotes
must be escaped with backslashes. Supported section names and entries
are listed below.
.PP
-.B [Drive X]
-.br
-This section is used to specify the root directory and type of each emulated
-.B DOS
-drive, since most Windows applications require a DOS/MS-Windows based
-disk drive & directory scheme, which is either provided by a real
-DOS partition mounted somewhere or by some carefully crafted directory layout
-on a Unix file system ("no-windows fake installation").
-There is one such section for every drive you want to configure.
-.PP
-.I format: """Path""=""<rootdirectory>"""
-.br
-default: none
-.br
-If you mounted your dos partition as
-.I /dos
-and installed Microsoft Windows in
-C:\\WINDOWS (thus it shows up as /dos/WINDOWS), then you should specify
-.I """Path""=""/dos"""
-in the
-.I [Drive C]
-section in order to configure /dos as the drive root of drive C:.
-.PP
-.I format: """Type""=""<type>"""
-.br
-default: "hd"
-.br
-Used to specify the drive type this drive appears as in Windows
-or DOS programs; supported types are "floppy", "hd", "cdrom"
-and "network".
-.PP
.B [wine]
.br
.I format: """windows""=""<directory>"""
@@ -331,11 +301,5 @@
.TP
.I $WINEPREFIX/config
User-specific configuration file
-.TP
-.I $WINEPREFIX/dosdevices
-Directory containing the DOS device mappings. Each file in that
-directory is a symlink to the Unix device file implementing a given
-device. For instance, if COM1 is mapped to /dev/ttyS0 you'd have a
-symlink of the form $WINEPREFIX/dosdevices/com1 -> /dev/ttyS0.
.SH "SEE ALSO"
.BR wine (1)
diff --git a/documentation/wine.man.in b/documentation/wine.man.in
index 8f28b8e..f19b298 100644
--- a/documentation/wine.man.in
+++ b/documentation/wine.man.in
@@ -115,7 +115,8 @@
.B wine
stores its data (the default is
.I $HOME/.wine
-). This directory contains also the socket, which is used to communicate with the
+). This directory is also used to identify the socket which is used to
+communicate with the
.I wineserver.
All
.B wine
@@ -254,18 +255,59 @@
.TP
.I DISPLAY
Specifies the X11 display to use.
-.SH CONFIGURATION FILE
-.B wine
-expects a configuration file (
+.SH FILES
+.TP
+.I @bindir@/wine
+The
+.B wine
+program loader.
+.TP
+.I @bindir@/wineconsole
+The
+.B wine
+program loader for CUI (console) applications.
+.TP
+.I @bindir@/wineserver
+The
+.B wine
+server
+.TP
+.I @bindir@/winedbg
+The
+.B wine
+debugger
+.TP
+.I @bindir@/wineclipsrv
+The
+.B wine
+clipboard server
+.TP
+.I @dlldir@
+Directory containing
+.B wine's
+shared libraries
+.TP
.I $WINEPREFIX/config
-or
-.I ~/.wine/config
-if WINEPREFIX is not set), which must conform to the format specified
+User-specific configuration file, which must conform to the format specified
in the
.BR wine.conf (5)
man page. A sample configuration file is documentation/samples/config in the
.B wine
source archive.
+.TP
+.I $WINEPREFIX/dosdevices
+Directory containing the DOS device mappings. Each file in that
+directory is a symlink to the Unix device file implementing a given
+device. For instance, if COM1 is mapped to /dev/ttyS0 you'd have a
+symlink of the form $WINEPREFIX/dosdevices/com1 -> /dev/ttyS0.
+.br
+DOS drives are also specified with symlinks; for instance if drive D:
+corresponds to the CDROM mounted at /mnt/cdrom, you'd have a symlink
+$WINEPREFIX/dosdevices/d: -> /mnt/cdrom. The Unix device corresponding
+to a DOS drive can be specified the same way, except with '::' instead
+of ':'. So for the previous example, if the CDROM device is mounted
+from /dev/hdc, the corresponding symlink would be
+$WINEPREFIX/dosdevices/d:: -> /dev/hdc.
.SH AUTHORS
.B wine
is available thanks to the work of many developers. For a listing
@@ -276,7 +318,7 @@
.B wine
can be distributed under the terms of the LGPL license. A copy of the
license is in the file
-.B LICENSE
+.B COPYING.LIB
in the top-level directory of the source distribution.
.SH BUGS
.PP
@@ -326,45 +368,6 @@
.B wine
mailing lists at
.I http://www.winehq.org/forums
-.SH FILES
-.PD 0
-.TP
-.I @bindir@/wine
-The
-.B wine
-program loader.
-.TP
-.I @bindir@/wineconsole
-The
-.B wine
-program loader for CUI (console) applications.
-.TP
-.I @bindir@/wineserver
-The
-.B wine
-server
-.TP
-.I @bindir@/winedbg
-The
-.B wine
-debugger
-.TP
-.I @bindir@/wineclipsrv
-The
-.B wine
-clipboard server
-.TP
-.I @dlldir@
-Directory containing
-.B wine's
-shared libraries
-.TP
-.I ~/.wine/config
-User-specific configuration file
-.TP
-.I ~/.wine
-Directory containing user specific data managed by
-.B wine.
.SH "SEE ALSO"
.BR wine.conf (5)
