diff --git a/documentation/PACKAGING b/documentation/PACKAGING index 296fb642a04..ba4d4f4ecba 100644 --- a/documentation/PACKAGING +++ b/documentation/PACKAGING @@ -468,14 +468,6 @@ Example (split this into %build and %install section for rpm: # The Wine server is needed. install -m 755 server/wineserver $BR/usr/X11R6/bin/ -Here we unfortunately do need to create wineuser.reg and winesystem.reg -from the Wine distributed winedefault.reg. This can be done using regedit -once for one example user and then reusing his WINEPREFIX/user.reg and -WINEPREFIX/system.reg files. -FIXME: this needs to be done better. - - install -m 644 wine.sytemreg $BR/etc/wine/ - install -m 644 wine.userreg $BR/etc/wine/ There are now a lot of libraries generated by the build process, so a separate library directory should be used. diff --git a/documentation/configuring.sgml b/documentation/configuring.sgml index 71cc5deefb5..7468f3ab1a2 100644 --- a/documentation/configuring.sgml +++ b/documentation/configuring.sgml @@ -2709,12 +2709,12 @@ export LIB_ODBC_DRIVER_MANAGER=/usr/lib/libodbc.so.1.0.0 calling code and the Unix ODBC library. - If you have any problems then you can use the debugmsg channel - odbc32 to trace what is happening. One word of warning. Some - programs actually cheat a little and bypass the ODBC library. For - example the Crystal Reports engine goes to the registry to check on - the DSN. The fix for this is documented at unixODBC's site where - there is a section on using unixODBC with Wine. + If you have any problems then you can use WINEDEBUG=+odbc32 command + before running wine to trace what is happening. One word of + warning. Some programs actually cheat a little and bypass the ODBC + library. For example the Crystal Reports engine goes to the registry + to check on the DSN. The fix for this is documented at unixODBC's + site where there is a section on using unixODBC with Wine. diff --git a/documentation/implementation.sgml b/documentation/implementation.sgml index dc49e417d9e..0a78bce93a5 100644 --- a/documentation/implementation.sgml +++ b/documentation/implementation.sgml @@ -133,12 +133,12 @@ WINEDEBUG=+key,+keyboard wine > key.log 2>&1 SUBLANG_* definitions are in include/winnls.h, which you might need to know to find out which numbers your language is assigned, and - find it in the debugmsg output. The numbers will be + find it in the WINEDEBUG output. The numbers will be (SUBLANG * 0x400 + LANG), so, for example the combination LANG_NORWEGIAN (0x14) and SUBLANG_DEFAULT (0x1) will be (in hex) 14 + 1*400 = 414, so since I'm Norwegian, I - could look for 0414 in the debugmsg output + could look for 0414 in the WINEDEBUG output to find out why my keyboard won't detect. diff --git a/documentation/multimedia.sgml b/documentation/multimedia.sgml index 26e72930d43..c02f9fab313 100644 --- a/documentation/multimedia.sgml +++ b/documentation/multimedia.sgml @@ -990,7 +990,7 @@ Configuration of low level drivers is done with the Wine configuration file. - Default keys are provided in winedefault.reg. + Default keys are provided in wine.inf. diff --git a/documentation/printing.sgml b/documentation/printing.sgml index 65a9cf6fd19..d8122e85e64 100644 --- a/documentation/printing.sgml +++ b/documentation/printing.sgml @@ -135,7 +135,7 @@ You also need to add certain entries to the registry. The easiest way to do this is to customize the PostScript - driver contents of winedefault.reg (see below) and use the + driver contents of wine.inf (see below) and use the Winelib program programs/regedit/regedit. For example, if you have installed the Wine source tree in /usr/src/wine, you could use the following @@ -143,24 +143,19 @@ - cp /usr/src/wine/winedefault.reg ~ + #vi /usr/share/wine/wine.inf - vi ~/winedefault.reg - - - - - Edit the copy of winedefault.reg to suit your + Edit the copy of wine.inf to suit your PostScript printing requirements. At a minimum, you must specify a PPD file for each printer. - regedit ~/winedefault.reg + $wineprefixcreate diff --git a/documentation/registry.sgml b/documentation/registry.sgml index 73dc1a63fd9..d4b7e25fe95 100644 --- a/documentation/registry.sgml +++ b/documentation/registry.sgml @@ -19,23 +19,19 @@ them are necessary for even installers to operate correctly. The keys that the Wine developers have found necessary to install applications are distributed in a file called - winedefault.reg. It is automatically + wine.inf. It is automatically installed for you if you use the tools/wineinstall script in the Wine source, but if you want to install it manually, you can do so by using the regedit tool to be found in the programs/regedit/ directory in Wine source. - winedefault.reg should even be applied if + wine.inf is applied even if you plan to use a native Windows registry, since Wine needs some specific registry settings in its registry (for special workarounds for certain programs etc.). - In the main Wine source code directory in a terminal, run: - - - $ cd programs/regedit - $ ./regedit ../../winedefault.reg - + This is done automatically by wine the first time you run it. + @@ -60,7 +56,7 @@ The initial default registry content to be used by the Wine registry files is in the file - winedefault.reg. It contains directory + wine.inf. It contains directory paths, class IDs, and more; it must be installed before most INSTALL.EXE or SETUP.EXE applications will work.