From b37b863b93261aa74ae84f2846438b2c2adf04f7 Mon Sep 17 00:00:00 2001 From: Lawson Whitney <lawson_whitney@juno.com> Date: Mon, 6 Aug 2001 17:49:11 +0000 Subject: [PATCH] Reconciled the wine man pages to the absence of wine.conf. --- documentation/wine.conf.man.in | 22 +++++----------------- documentation/wine.man.in | 18 ++++++------------ 2 files changed, 11 insertions(+), 29 deletions(-) diff --git a/documentation/wine.conf.man.in b/documentation/wine.conf.man.in index 8963fadffa2..3455d0e6728 100644 --- a/documentation/wine.conf.man.in +++ b/documentation/wine.conf.man.in @@ -1,23 +1,14 @@ .\" -*- 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 wine.conf \- Wine configuration file .SH DESCRIPTION .B wine expects a configuration file ( -.I @sysconfdir@/wine.conf -), which should conform to the following rules. Common locations are -/usr/local/etc/wine.conf or (in some distributions) -/etc/wine.conf. The actual directory where that file resides may be -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 $WINEPREFIX/config +(~/.wine/config) +), which should conform to the following rules. +A sample configuration file is available as .I documentation/samples/config in the Wine source distribution. .SH CONFIGURATION FILE FORMAT @@ -273,9 +264,6 @@ A sample configuration file is distributed as in the Wine source distribution. .SH FILES .TP -.I @sysconfdir@/wine.conf -Global configuration file for wine. -.TP .I ~/.wine/config User-specific configuration file .SH ENVIRONMENT VARIABLES diff --git a/documentation/wine.man.in b/documentation/wine.man.in index 1aaf6c56843..45ae9da133a 100644 --- a/documentation/wine.man.in +++ b/documentation/wine.man.in @@ -1,5 +1,5 @@ .\" -*- 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 wine \- run Windows programs on Unix .SH SYNOPSIS @@ -225,7 +225,8 @@ All .B wine processes using the same .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 .I WINEPREFIX to different values for different @@ -265,16 +266,13 @@ Specifies the X11 display to use. .SH CONFIGURATION FILE .B wine expects a configuration file ( -.I @sysconfdir@/wine.conf +.I $WINEPREFIX/config +(~/.wine/config) ), 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. Alternatively a configuration file with the name -.I config -in the ~/.wine directory of the user running -.B wine -can be used. +source archive. .SH AUTHORS .B wine is available thanks to the work of many developers. For a listing @@ -369,10 +367,6 @@ Directory containing .B wine's shared libraries .TP -.I @sysconfdir@/wine.conf -Global configuration file for -.B wine. -.TP .I ~/.wine/config User-specific configuration file .TP -- GitLab