Begin to uniformize sample commands in documentation.

This commit is contained in:
Vincent Béron 2003-07-21 22:23:38 +00:00 committed by Alexandre Julliard
parent 7006ab1450
commit 473d7ac0dd
5 changed files with 190 additions and 259 deletions

View File

@ -519,8 +519,6 @@
</para>
<para>
<programlisting>"DefaultLoadOrder" =" native, builtin"</programlisting>
</para>
<para>
This setting is a comma-delimited list of the order in
which to attempt loading DLLs. If the first option fails,
it will try the second, and so on. The order specified
@ -546,75 +544,59 @@
<title>The [DllOverrides] Section</title>
<para>
The format for this section is the same for each line:
<programlisting>
&lt;DLL>{,&lt;DLL>,&lt;DLL>...} = &lt;FORM>{,&lt;FORM>,&lt;FORM>...}
</programlisting>
</para>
<para>
<programlisting>&lt;DLL>{,&lt;DLL>,&lt;DLL>...} = &lt;FORM>{,&lt;FORM>,&lt;FORM>...}</programlisting>
For example, to load built-in KERNEL pair (case doesn't
matter here):
<programlisting>
"kernel,kernel32" = "builtin"
</programlisting>
</para>
<para>
<programlisting>"kernel,kernel32" = "builtin"</programlisting>
To load the native COMMDLG pair, but if that doesn't work
try built-in:
<programlisting>
"commdlg,comdlg32" = "native, builtin"
</programlisting>
</para>
<para>
<programlisting>"commdlg,comdlg32" = "native, builtin"</programlisting>
To load the native COMCTL32:
<programlisting>
"comctl32" = "native"
</programlisting>
</para>
<para>
<programlisting>"comctl32" = "native"</programlisting>
Here is a good generic setup (As it is defined in config
that was included with your wine package):
<programlisting>
[DllOverrides]
"rpcrt4" = "builtin, native"
"oleaut32" = "builtin, native"
"ole32" = "builtin, native"
"commdlg" = "builtin, native"
"comdlg32" = "builtin, native"
"ver" = "builtin, native"
"version" = "builtin, native"
"shell" = "builtin, native"
"shell32" = "builtin, native"
"shfolder" = "builtin, native"
"shlwapi" = "builtin, native"
"shdocvw" = "builtin, native"
"lzexpand" = "builtin, native"
"lz32" = "builtin, native"
"comctl32" = "builtin, native"
"commctrl" = "builtin, native"
"advapi32" = "builtin, native"
"crtdll" = "builtin, native"
"mpr" = "builtin, native"
"winspool.drv" = "builtin, native"
"ddraw" = "builtin, native"
"dinput" = "builtin, native"
"dsound" = "builtin, native"
"opengl32" = "builtin, native"
"msvcrt" = "native, builtin"
"msvideo" = "builtin, native"
"msvfw32" = "builtin, native"
"mcicda.drv" = "builtin, native"
"mciseq.drv" = "builtin, native"
"mciwave.drv" = "builtin, native"
"mciavi.drv" = "native, builtin"
"mcianim.drv" = "native, builtin"
"msacm.drv" = "builtin, native"
"msacm" = "builtin, native"
"msacm32" = "builtin, native"
"midimap.drv" = "builtin, native"
; you can specify programs too
"notepad.exe" = "native, builtin"
; default for all other DLLs
"*" = "native, builtin"
[DllOverrides]
"rpcrt4" = "builtin, native"
"oleaut32" = "builtin, native"
"ole32" = "builtin, native"
"commdlg" = "builtin, native"
"comdlg32" = "builtin, native"
"ver" = "builtin, native"
"version" = "builtin, native"
"shell" = "builtin, native"
"shell32" = "builtin, native"
"shfolder" = "builtin, native"
"shlwapi" = "builtin, native"
"shdocvw" = "builtin, native"
"lzexpand" = "builtin, native"
"lz32" = "builtin, native"
"comctl32" = "builtin, native"
"commctrl" = "builtin, native"
"advapi32" = "builtin, native"
"crtdll" = "builtin, native"
"mpr" = "builtin, native"
"winspool.drv" = "builtin, native"
"ddraw" = "builtin, native"
"dinput" = "builtin, native"
"dsound" = "builtin, native"
"opengl32" = "builtin, native"
"msvcrt" = "native, builtin"
"msvideo" = "builtin, native"
"msvfw32" = "builtin, native"
"mcicda.drv" = "builtin, native"
"mciseq.drv" = "builtin, native"
"mciwave.drv" = "builtin, native"
"mciavi.drv" = "native, builtin"
"mcianim.drv" = "native, builtin"
"msacm.drv" = "builtin, native"
"msacm" = "builtin, native"
"msacm32" = "builtin, native"
"midimap.drv" = "builtin, native"
; you can specify programs too
"notepad.exe" = "native, builtin"
; default for all other DLLs
"*" = "native, builtin"
</programlisting>
</para>
<note>
@ -632,8 +614,6 @@
</para>
<para>
<programlisting>"Resolution" = "96"</programlisting>
</para>
<para>
Since the way X handles fonts is different from the way
Windows does, wine uses a special mechanism to deal with
them. It must scale them using the number defined in the
@ -656,11 +636,7 @@
The <literal>Alias</literal> setting allows you to map an X font to a font
used in wine. This is good for apps that need a special font you don't have,
but a good replacement exists. The syntax is like so:
<programlisting>
"AliasX" = "[Fake windows name],[Real X name]"&lt;,optional "masking" section>
</programlisting>
</para>
<para>
<programlisting>"AliasX" = "[Fake windows name],[Real X name]"&lt;,optional "masking" section></programlisting>
Pretty straightforward. Replace "AliasX" with "Alias0",
then "Alias1" and so on. The fake windows name is the name
that the font will be under a windows app in wine. The
@ -673,19 +649,10 @@
<para>
Here is an example of an alias without masking. The font will show up in windows
apps as "Google".
<programlisting>
"Alias0" = "Foo,--google-"
</programlisting>
</para>
<para>
<programlisting>"Alias0" = "Foo,--google-"</programlisting>
Here is an example with masking enabled. The font will show up as "Foo" in
windows apps.
<programlisting>
"Alias1" = "Foo,--google-,subst"
</programlisting>
</para>
<para>
<programlisting>"Alias1" = "Foo,--google-,subst"</programlisting>
For more information check out the <link linkend="config-fonts-main">Fonts</link>
chapter.
</para>
@ -702,8 +669,6 @@
The [serialports] section tells wine what serial ports it
is allowed to use.
<programlisting>"ComX" = "/dev/ttySY"</programlisting>
</para>
<para>
Replace <literal>X</literal> with the number of the COM
port in Windows (1-8) and <literal>Y</literal> with the
number of it in <literal>X</literal> (Usually the number
@ -713,8 +678,6 @@
not always necessary to define any COM ports (An optional
setting). Here is an example:
<programlisting>"Com1" = "/dev/ttyS0"</programlisting>
</para>
<para>
Use as many of these as you like in the section to define
all of the COM ports you need.
</para>
@ -722,8 +685,6 @@
The [parallelports] section sets up any parallel ports
that will be allowed access under wine.
<programlisting>"LptX" = "/dev/lpY"</programlisting>
</para>
<para>
Sounds familiar? Syntax is just like the COM port setting.
Replace <literal>X</literal> with a value from 1-4 as it
is in Windows and <literal>Y</literal> with a value from
@ -733,8 +694,6 @@
the other section, LptX can equal any device (Maybe
<medialabel>/dev/printer</medialabel>). Here is an
example: <programlisting>"Lpt1" = "/dev/lp0"</programlisting>
</para>
<para>
The [spooler] section will inform wine where to spool
print jobs. Use this if you want to try printing. Wine
docs claim that spooling is "rather primitive" at this
@ -743,13 +702,9 @@
for example) to a file or a command. Here is an example,
mapping LPT1 to the file <filename>out.ps</filename>:
<programlisting>"LPT1:" = "out.ps"</programlisting>
</para>
<para>
The following command maps printing jobs to LPT1 to the
command <command>lpr</command>. Notice the |:
<programlisting>"LPT1:" = "|lpr"</programlisting>
</para>
<para>
The [ports] section is usually useful only for people who
need direct port access for programs requiring dongles or
scanners. <emphasis>If you don't need it, don't use
@ -1004,9 +959,7 @@
configuration on Linux, then <emphasis>make sure</emphasis> to add
the <quote>unhide</quote> mount option to the CD-ROM file system
entry in <filename>/etc/fstab</filename>, e.g.:
<programlisting>
/dev/cdrom /cdrom iso9660 ro,noauto,users,unhide 0 0
</programlisting>
<programlisting>/dev/cdrom /cdrom iso9660 ro,noauto,users,unhide 0 0</programlisting>
Several Windows program setup CD-ROMs or other CD-ROMs chose
to do such braindamaged things as marking very important setup
helper files on the CD-ROM as <quote>hidden</quote>.
@ -1296,11 +1249,7 @@ And here is a setup for Drive A, a generic floppy drive:
access</emphasis>!!
</para>
<para>
<programlisting>
"Path" = "c:\\windows;c:\\windows\\system;c:\\blanco"
</programlisting>
</para>
<para>
<programlisting>"Path" = "c:\\windows;c:\\windows\\system;c:\\blanco"</programlisting>
Behaves like the <envar>PATH</envar> setting on UNIX
boxes. When wine is run like <userinput>wine
sol.exe</userinput>, if <filename>sol.exe</filename>
@ -1313,9 +1262,7 @@ And here is a setup for Drive A, a generic floppy drive:
<filename>"c:\\windows;c:\\windows\\system"</filename>).
</para>
<para id="dirsymlinks">
<programlisting>
"ShowDirSymlinks" = "1"
</programlisting>
<programlisting>"ShowDirSymlinks" = "1"</programlisting>
Wine doesn't pass directory symlinks to Windows programs by
default, as doing so may crash some programs that do
recursive lookups of whole subdirectory trees
@ -1626,9 +1573,9 @@ And here is a setup for Drive A, a generic floppy drive:
from a <filename>~/.wine/config</filename> file does this:
</para>
<programlisting>
[Drive C]
"Path" = "/c"
"Type" = "hd"
[Drive C]
"Path" = "/c"
"Type" = "hd"
</programlisting>
<para>
Although VFAT filesystems are preferable to FAT filesystems
@ -1803,7 +1750,7 @@ And here is a setup for Drive A, a generic floppy drive:
<prompt>/c_shadow></prompt><userinput>rm windows AnApp</userinput>
<prompt>/c_shadow></prompt><userinput>cp -R /c_/{windows,AnApp} .</userinput>
<prompt>/c_shadow></prompt><userinput>chmod -R 777 windows AnApp</userinput>
<prompt>/c_shadow></prompt><userinput>perl -p -i -e 's|/c$|/c_shadow|g' ~/.wine/config</userinput>
<prompt>/c_shadow></prompt><userinput>perl -p -i -e 's|/c$|/c_shadow|g' ~/.wine/config</userinput>
</screen>
<para>
The above gives everyone complete read and write access to
@ -1922,31 +1869,31 @@ And here is a setup for Drive A, a generic floppy drive:
read from the device on both CD-ROM and floppy; serial
numbers on floppy only:
</para>
<screen>
[Drive A]
"Path" = "/mnt/floppy"
"Type" = "floppy"
"Device" = "/dev/fd0"
"Filesystem" = "msdos"
<programlisting>
[Drive A]
"Path" = "/mnt/floppy"
"Type" = "floppy"
"Device" = "/dev/fd0"
"Filesystem" = "msdos"
[Drive R]
"Path" = "/mnt/cdrom"
"Type" = "cdrom"
"Device" = "/dev/hda1"
"Filesystem" = "win95"
</screen>
[Drive R]
"Path" = "/mnt/cdrom"
"Type" = "cdrom"
"Device" = "/dev/hda1"
"Filesystem" = "win95"
</programlisting>
<para>
Here's an example of overriding the CD-ROM label:
</para>
<screen>
[Drive J]
"Path" = "/mnt/cdrom"
"Type" = "cdrom"
"Label" = "X234GCDSE"
; note that the device isn't really needed here as we have a fixed label
"Device" = "/dev/cdrom"
"Filesystem" = "msdos"
</screen>
<programlisting>
[Drive J]
"Path" = "/mnt/cdrom"
"Type" = "cdrom"
"Label" = "X234GCDSE"
; note that the device isn't really needed here as we have a fixed label
"Device" = "/dev/cdrom"
"Filesystem" = "msdos"
</programlisting>
</sect3>
<sect3>

View File

@ -265,11 +265,10 @@
<title>Red Hat Linux</title>
<para>
Red Hat users can use <ulink url="http://rpmfind.net/linux/RPM/">
rpmfind.net</ulink> to track down available Wine RPM binaries.
<ulink url="http://rpmfind.net/linux/RPM/WByName.html">This
page</ulink> contains a list of all rpmfind packages that start with
the letter "W", including a few Wine packages.
Red Hat users can use the
<ulink url="http://sourceforge.net/project/showfiles.php?group_id=6241">
sourceforge.net Wine page</ulink> to get the RPM most suitable for
their system.
</para>
</sect2>
@ -301,12 +300,12 @@
If you want to install Wine from the FreeBSD CD-ROM, run in a
<glossterm>terminal</glossterm>:
</para>
<screen>
<prompt>$ </><userinput>su -</>
<prompt># </><userinput>mount /cdrom</>
<prompt># </><userinput>cd /cdrom/packages/All</>
<prompt># </><userinput>pkg_add wine_.X.X.X.tgz</>
</screen>
<screen>
<prompt>$ </><userinput>su -</>
<prompt># </><userinput>mount /cdrom</>
<prompt># </><userinput>cd /cdrom/packages/All</>
<prompt># </><userinput>pkg_add wine_.X.X.X.tgz</>
</screen>
<para>
</para>
<para>
@ -407,22 +406,8 @@
</listitem>
<listitem>
<para>
<ulink url="ftp://ftp.infomagic.com/pub/mirrors/linux/sunsite/ALPHA/wine/development/">
ftp://ftp.infomagic.com/pub/mirrors/linux/sunsite/ALPHA/wine/development/
</ulink>
</para>
</listitem>
<listitem>
<para>
<ulink url="ftp://ftp.fu-berlin.de/unix/linux/mirrors/sunsite.unc.edu/ALPHA/wine/development/">
ftp://ftp.fu-berlin.de/unix/linux/mirrors/sunsite.unc.edu/ALPHA/wine/development/
</ulink>
</para>
</listitem>
<listitem>
<para>
<ulink url="ftp://orcus.progsoc.uts.edu.au/pub/Wine/development/">
ftp://orcus.progsoc.uts.edu.au/pub/Wine/development/
<ulink url="http://prdownloads.sourceforge.net/wine/">
http://prdownloads.sourceforge.net/wine/
</ulink>
</para>
</listitem>
@ -443,9 +428,9 @@
switch to the directory containing the file you just
downloaded. Then extract the source in a
<glossterm>terminal</glossterm> with (e.g.):
<screen>
<prompt>$ </><userinput>tar xvzf wine-<replaceable>20030115</>.tar.gz</>
</screen>
<screen>
<prompt>$ </><userinput>tar xvzf wine-<replaceable>20030115</>.tar.gz</>
</screen>
</para>
<para>
Just in case you happen to get a Wine archive that uses
@ -645,16 +630,16 @@ checkout -P
mailing list</>, and received a patch file to fix the bug.
You can apply the patch with the <command>patch</> command,
which takes a streamed patch from <filename>stdin</>:
<screen>
<prompt>$ </><userinput>cd wine</>
<prompt>$ </><userinput>patch -p0 &lt;<replaceable>../patch_to_apply.diff</></>
</screen>
<screen>
<prompt>$ </><userinput>cd wine</>
<prompt>$ </><userinput>patch -p0 &lt;<replaceable>../patch_to_apply.diff</></>
</screen>
</para>
<para>
To remove the patch, use the <parameter>-R</> option:
<screen>
<prompt>$ </><userinput>patch -p0 -R &lt;<replaceable>../patch_to_apply.diff</></>
</screen>
<screen>
<prompt>$ </><userinput>patch -p0 -R &lt;<replaceable>../patch_to_apply.diff</></>
</screen>
</para>
<para>
If you want to do a test run to see if the patch will apply
@ -662,10 +647,9 @@ checkout -P
newer version of the tree), you can use the
<parameter>--dry-run</> parameter to run the patch
without writing to any files:
<screen>
<prompt>$ </><userinput>patch -p0 --dry-run &lt;<replaceable>../patch_to_apply.d
iff</></>
</screen>
<screen>
<prompt>$ </><userinput>patch -p0 --dry-run &lt;<replaceable>../patch_to_apply.diff</></>
</screen>
</para>
<para>
<command>patch</> is pretty smart about extracting

View File

@ -48,12 +48,12 @@
.deb package file to. Once there, type these commands,
adapting the package file name as required:
</para>
<screen>
<prompt>$ </><userinput>su -</>
Password:
<prompt># </><userinput>cd /home/user</>
<prompt># </><userinput>dpkg -i wine_<replaceable>0.0.20030115-1</>.deb</>
</screen>
<screen>
<prompt>$ </><userinput>su -</>
Password:
<prompt># </><userinput>cd /home/user</>
<prompt># </><userinput>dpkg -i wine_<replaceable>0.0.20030115-1</>.deb</>
</screen>
<para>
(Type the root password at the "Password:" prompt)
</para>
@ -69,17 +69,17 @@ Password:
Uninstalling an installed Wine Debian package can be done by
running:
</para>
<screen>
<prompt># </><userinput>dpkg -l|grep wine</>
</screen>
<screen>
<prompt># </><userinput>dpkg -l|grep wine</>
</screen>
<para>
The second column of the output (if any) of this command will
indicate the installed packages dealing with "wine".
The corresponding packages can be uninstalled by running:
</para>
<screen>
<prompt># </><userinput>dpkg -r <replaceable>&lt;package_name&gt;</></>
</screen>
<screen>
<prompt># </><userinput>dpkg -r <replaceable>&lt;package_name&gt;</></>
</screen>
<para>
where &lt;package_name&gt; is the name of the Wine-related package
which you want to uninstall.
@ -93,9 +93,9 @@ Password:
Once there, type this one command as root, adapting the
package file name as required:
</para>
<screen>
<prompt># </><userinput>rpm -ivh wine-<replaceable>20020605-2.i386</>.rpm</>
</screen>
<screen>
<prompt># </><userinput>rpm -ivh wine-<replaceable>20020605-2.i386</>.rpm</>
</screen>
<para>
You may also want to install the
<systemitem>wine-devel</systemitem> package.
@ -104,16 +104,16 @@ Password:
Uninstalling an installed Wine RPM package can be done by
running:
</para>
<screen>
<prompt># </><userinput>rpm -qa|grep -i wine</>
</screen>
<screen>
<prompt># </><userinput>rpm -qa|grep -i wine</>
</screen>
<para>
This command will indicate the installed packages dealing with "wine".
The corresponding packages can be uninstalled by running:
</para>
<screen>
<prompt># </><userinput>rpm -e <replaceable>&lt;package_name&gt;</></>
</screen>
<screen>
<prompt># </><userinput>rpm -e <replaceable>&lt;package_name&gt;</></>
</screen>
<para>
where &lt;package_name&gt; is the name of the Wine-related package
which you want to uninstall.
@ -128,9 +128,9 @@ Password:
If you are in the directory of the Wine version that you just
compiled (e.g. by having run <command>make depend && make</command>), then you may now install this Wine version by running as <glossterm>root</glossterm>:
</para>
<screen>
<prompt># </><userinput>make install</>
</screen>
<screen>
<prompt># </><userinput>make install</>
</screen>
<para>
This will copy the Wine binary files to their final destination
in your system. You can then proceed to the <link
@ -143,9 +143,9 @@ Password:
source code version, then change to the main directory of this
version and run as <glossterm>root</glossterm>:
</para>
<screen>
<prompt># </><userinput>make uninstall</>
</screen>
<screen>
<prompt># </><userinput>make uninstall</>
</screen>
</sect1>
</chapter>

View File

@ -520,7 +520,7 @@
<itemizedlist>
<listitem>
<para>
<literallayout>A computer ;-)</literallayout>
A computer ;-)
<literallayout> Wine: only PCs >= i386 are supported at the moment.</literallayout>
<literallayout> Winelib: selected other platforms are supported, but can be tricky.</literallayout>
</para>

View File

@ -36,10 +36,10 @@
workarounds for certain programs etc.).
In the main Wine source code directory in a <glossterm>terminal</glossterm>, run:
</para>
<screen>
<prompt>$ </><userinput>cd programs/regedit</>
<prompt>$ </><userinput>./regedit ../../winedefault.reg</>
</screen>
<screen>
<prompt>$ </><userinput>cd programs/regedit</>
<prompt>$ </><userinput>./regedit ../../winedefault.reg</>
</screen>
</sect2>
<sect2>
@ -233,17 +233,17 @@
<filename>/usr/local/etc</filename> here), with:
</para>
<screen>
cd ~/.wine
cp system.reg /usr/local/etc/wine.systemreg
cp wine.userreg /usr/local/etc/wine.userreg
cd ~/.wine
cp system.reg /usr/local/etc/wine.systemreg
cp wine.userreg /usr/local/etc/wine.userreg
</screen>
<para>
and perhaps even symlink these back to the administrator's
account, to make it easier to install apps system-wide later:
</para>
<screen>
ln -sf /usr/local/etc/wine.systemreg system.reg
ln -sf /usr/local/etc/wine.userreg wine.userreg
ln -sf /usr/local/etc/wine.systemreg system.reg
ln -sf /usr/local/etc/wine.userreg wine.userreg
</screen>
<para>
Note that the <filename>tools/wineinstall</filename> script