wine.conf and the man pages

lawson_whitney at juno.com lawson_whitney at juno.com
Sun Aug 5 14:19:06 CDT 2001


Good day!

Is there some reason @sysconfdir@/wine.conf is still in the man pages?

Regards,

Lawson

ChangeLog:

	* documentation/wine.conf.man.in, documentation/wine.man.in:
	Lawson Whitney <lawson_whitney at juno.com>
	Reconciled the wine man pages to the absence of wine.conf.
-------------- next part --------------
diff -ur was/documentation/wine.conf.man.in is/documentation/wine.conf.man.in
--- was/documentation/wine.conf.man.in	Mon Mar 26 19:17:49 2001
+++ is/documentation/wine.conf.man.in	Sun Aug  5 13:53:47 2001
@@ -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
@@ -272,9 +263,6 @@
 .B documentation/samples/config
 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
diff -ur was/documentation/wine.man.in is/documentation/wine.man.in
--- was/documentation/wine.man.in	Fri May 11 07:03:46 2001
+++ is/documentation/wine.man.in	Sun Aug  5 14:03:36 2001
@@ -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 @@
 .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 @@
 .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
@@ -368,10 +366,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


More information about the wine-patches mailing list