Reconciled the wine man pages to the absence of wine.conf.

This commit is contained in:
Lawson Whitney 2001-08-06 17:49:11 +00:00 committed by Alexandre Julliard
parent 8c03474b45
commit b37b863b93
2 changed files with 11 additions and 29 deletions

View File

@ -1,23 +1,14 @@
.\" -*- nroff -*- .\" -*- nroff -*-
.TH WINE.CONF 5 "December 5, 2000" "Version 20001202" "Wine Configuration File" .TH WINE.CONF 5 "August 5, 2001" "Version 20010731" "Wine Configuration File"
.SH NAME .SH NAME
wine.conf \- Wine configuration file wine.conf \- Wine configuration file
.SH DESCRIPTION .SH DESCRIPTION
.B wine .B wine
expects a configuration file ( expects a configuration file (
.I @sysconfdir@/wine.conf .I $WINEPREFIX/config
), which should conform to the following rules. Common locations are (~/.wine/config)
/usr/local/etc/wine.conf or (in some distributions) ), which should conform to the following rules.
/etc/wine.conf. The actual directory where that file resides may be A sample configuration file is available as
specified during the execution of the
.B configure
script with the --sysconfdir option. Alternatively, you may have a
file named
.I config
in this format in your ~/.wine directory or in the directory named in
the
.B WINEPREFIX
environment variable. A sample configuration file is available as
.I documentation/samples/config .I documentation/samples/config
in the Wine source distribution. in the Wine source distribution.
.SH CONFIGURATION FILE FORMAT .SH CONFIGURATION FILE FORMAT
@ -273,9 +264,6 @@ A sample configuration file is distributed as
in the Wine source distribution. in the Wine source distribution.
.SH FILES .SH FILES
.TP .TP
.I @sysconfdir@/wine.conf
Global configuration file for wine.
.TP
.I ~/.wine/config .I ~/.wine/config
User-specific configuration file User-specific configuration file
.SH ENVIRONMENT VARIABLES .SH ENVIRONMENT VARIABLES

View File

@ -1,5 +1,5 @@
.\" -*- nroff -*- .\" -*- nroff -*-
.TH WINE 1 "Apr 19, 2001" "Version 20010418" "Windows On Unix" .TH WINE 1 "Aug 5, 2001" "Version 20010731" "Windows On Unix"
.SH NAME .SH NAME
wine \- run Windows programs on Unix wine \- run Windows programs on Unix
.SH SYNOPSIS .SH SYNOPSIS
@ -225,7 +225,8 @@ All
.B wine .B wine
processes using the same processes using the same
.B wineserver .B wineserver
(i.e.: same user) share certain things like registry and shared memory. (i.e.: same user) share certain things like registry, shared memory,
and config file.
By setting By setting
.I WINEPREFIX .I WINEPREFIX
to different values for different to different values for different
@ -265,16 +266,13 @@ Specifies the X11 display to use.
.SH CONFIGURATION FILE .SH CONFIGURATION FILE
.B wine .B wine
expects a configuration file ( expects a configuration file (
.I @sysconfdir@/wine.conf .I $WINEPREFIX/config
(~/.wine/config)
), which must conform to the format specified in the ), which must conform to the format specified in the
.BR wine.conf (5) .BR wine.conf (5)
man page. A sample configuration file is documentation/samples/config in the man page. A sample configuration file is documentation/samples/config in the
.B wine .B wine
source archive. Alternatively a configuration file with the name source archive.
.I config
in the ~/.wine directory of the user running
.B wine
can be used.
.SH AUTHORS .SH AUTHORS
.B wine .B wine
is available thanks to the work of many developers. For a listing is available thanks to the work of many developers. For a listing
@ -369,10 +367,6 @@ Directory containing
.B wine's .B wine's
shared libraries shared libraries
.TP .TP
.I @sysconfdir@/wine.conf
Global configuration file for
.B wine.
.TP
.I ~/.wine/config .I ~/.wine/config
User-specific configuration file User-specific configuration file
.TP .TP