- stress the fact that wineinstall is in Wine source
- add missing ttydrv/x11drv section to wine.conf.man
- make sure that we also load shdocvw as builtin in sample config file
- add sample AppDefaults section to sample config file
- winecheck update
diff --git a/documentation/installing.sgml b/documentation/installing.sgml
index 51005de..fdd73bc 100644
--- a/documentation/installing.sgml
+++ b/documentation/installing.sgml
@@ -52,7 +52,7 @@
<para>
While the users are of course free to set up everything
- themselves, the Wine team will make the automated Wine
+ themselves, the Wine team will make the automated Wine source
installation script, <filename>tools/wineinstall</filename>,
do everything we find necessary to do; running the
conventional <userinput>configure && make depend && make && make
diff --git a/documentation/registry.sgml b/documentation/registry.sgml
index 76b9728..99252ce 100644
--- a/documentation/registry.sgml
+++ b/documentation/registry.sgml
@@ -206,7 +206,7 @@
</screen>
<para>
Note that the <filename>tools/wineinstall</filename> script
- already does all of this for you, if you install Wine as root.
+ already does all of this for you, if you install Wine source as root.
If you then install Windows applications while logged in as
root, all your users will automatically be able to use them.
While the application setup will be taken from the global
@@ -235,12 +235,11 @@
install applications are distributed in a file called
<filename>winedefault.reg</filename>. It is automatically
installed for you if you use the
- <filename>tools/wineinstall</filename> script, but if you want
- to install it manually, you can do so by using the
- <command>regapi</command> tool. You can find more information
- about this in the
- <filename>documentation/no-windows</filename> document in the
- Wine distribution.
+ <filename>tools/wineinstall</filename> script in the Wine source,
+ but if you want to install it manually, you can do so by using the
+ <command>regapi</command> tool to be found in the
+ <filename>programs/regapi/</filename>
+ directory in Wine source.
</para>
</sect2>
diff --git a/documentation/samples/config b/documentation/samples/config
index 43ea380..1b70823 100644
--- a/documentation/samples/config
+++ b/documentation/samples/config
@@ -81,6 +81,7 @@
"shell32" = "builtin, native"
"shfolder" = "builtin, native"
"shlwapi" = "builtin, native"
+"shdocvw" = "builtin, native"
"lzexpand" = "builtin, native"
"lz32" = "builtin, native"
"comctl32" = "builtin, native"
@@ -240,4 +241,19 @@
"WaveMapper" = "msacm.drv"
"MidiMapper" = "midimap.drv"
+;; sample AppDefaults entries
+;[AppDefaults\\iexplore.exe\\DllOverrides]
+;"shlwapi" = "native"
+;"rpcrt4" = "native"
+;"ole32" = "native"
+;"shdocvw" = "native"
+;"wininet" = "native"
+;"shfolder" = "native"
+;"shell32" = "native"
+;"shell" = "native"
+;"comctl32" = "native"
+;
+;[AppDefaults\\setup.exe\\x11drv]
+;"Desktop" = "800x600"
+
# </wineconf>
diff --git a/documentation/wine.conf.man b/documentation/wine.conf.man
index 43263dc2..613910c 100644
--- a/documentation/wine.conf.man
+++ b/documentation/wine.conf.man
@@ -145,6 +145,14 @@
Used to specify the path which will be used to find executables and
dlls. Make sure to double the backslashes.
.PP
+.I format: """GraphicsDriver""=""<x11drv|ttydrv>"""
+.br
+default: "x11drv"
+.br
+Tells Wine which graphics driver to use. Normally you'd want to use
+x11drv (for X11). In case you want to run programs as text console/TTY only
+without having Wine rely on X11 support, then use ttydrv.
+.PP
.B [DllOverrides]
.br
.I format: """modulename""=""native,so,builtin"""
