[docs] wineusr: Assorted formatting & tagging fixes.
Frédéric Delanoy
frederic.delanoy at gmail.com
Thu Aug 29 08:02:34 CDT 2013
A couple typos as well.
---
en/wineusr-bugs.sgml | 36 ++++++++++++++++++++++-----------
en/wineusr-configuring.sgml | 47 ++++++++++++++++++++++----------------------
en/wineusr-getting.sgml | 6 +++---
en/wineusr-glossary.sgml | 26 +++++++++---------------
en/wineusr-introduction.sgml | 16 +++++++--------
en/wineusr-running.sgml | 41 +++++++++++++++++++-------------------
6 files changed, 90 insertions(+), 82 deletions(-)
diff --git a/en/wineusr-bugs.sgml b/en/wineusr-bugs.sgml
index 9762536..c47cce5 100644
--- a/en/wineusr-bugs.sgml
+++ b/en/wineusr-bugs.sgml
@@ -14,7 +14,7 @@
</para>
<sect2>
- <title>Verify your wine configuration</title>
+ <title>Verify your Wine configuration</title>
<para>
Look at the output from <userinput>wine --version</userinput> to make sure you're running
a recent version of Wine. Launch <command>winecfg</command> and look over the
@@ -25,7 +25,7 @@
</sect2>
<sect2>
- <title>Use different windows version settings</title>
+ <title>Use different Windows version settings</title>
<para>
In several cases <link linkend="config-windows-versions">using different Windows version
@@ -38,10 +38,24 @@
<para>
The following sometimes helps, too:
- <userinput>wine x:\\full\\path\\to\\prg.exe</userinput>,
- <userinput>wine ~/.wine/drive_c/full/path/to/prg.exe</userinput> and
- <userinput>cd ~/.wine/drive_c/full/path/to/ && wine prg.exe</userinput>
</para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <userinput>wine <replaceable>x</replaceable>:\\<replaceable>full</replaceable>\\<replaceable>path</replaceable>\\<replaceable>to</replaceable>\\<replaceable>prg.exe</replaceable></userinput>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <userinput>wine ~/.wine/drive_c/<replaceable>full</replaceable>/<replaceable>path</replaceable>/<replaceable>to</replaceable>/<replaceable>prg.exe</replaceable></userinput>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <userinput>cd ~/.wine/drive_c/<replaceable>full</replaceable>/<replaceable>path</replaceable>/<replaceable>to</replaceable>/ && wine <replaceable>prg.exe</replaceable></userinput>
+ </para>
+ </listitem>
+ </itemizedlist>
</sect2>
<sect2>
@@ -94,7 +108,7 @@
<title>Reconfigure Wine</title>
<para>
- Sometimes wine installation process changes and new versions of
+ Sometimes Wine installation process changes and new versions of
Wine account on these changes.
This is especially true if your setup was created long time ago.
@@ -133,7 +147,7 @@
useful depending on how you use it. You may
find it helpful to search
<ulink url="http://groups.google.com">Google Groups</ulink>,
- in particular the comp.emulators.ms-windows.wine group.
+ in particular the <literal>comp.emulators.ms-windows.wine</literal> group.
</para>
</listitem>
<listitem>
@@ -152,7 +166,7 @@
can be used to supply this. Note, these components are subject to
their own license and are not part of the Wine project.
- For further information on winetricks see <ulink
+ For further information on <command>winetricks</command> see <ulink
url="http://wiki.winehq.org/winetricks">the winetricks wiki entry</ulink>.
</para>
</listitem>
@@ -217,7 +231,7 @@
</para>
<para>
This means we need more information than a simple <quote>MS
- Word crashes whenever I run it. Do you know why?</quote>
+ Word crashes whenever I run it. Do you know why?</quote>.
Include at least the following information:
</para>
<itemizedlist spacing="compact">
@@ -248,8 +262,8 @@
</listitem>
<listitem>
<para>
- The exact command line you used to start wine.
- (e.g. <userinput>wine "C:\Program Files\Test\program.exe"</userinput>).
+ The exact command line you used to start Wine.
+ (e.g. <userinput>wine "C:\Program Files\<replaceable>Test</replaceable>\<replaceable>program.exe</replaceable>"</userinput>).
</para>
</listitem>
<listitem>
diff --git a/en/wineusr-configuring.sgml b/en/wineusr-configuring.sgml
index 4b67d8a..78031c0 100644
--- a/en/wineusr-configuring.sgml
+++ b/en/wineusr-configuring.sgml
@@ -136,7 +136,7 @@
<title>DLL Overrides</title>
<para>
It's not always possible to run an application on builtin
- DLLs, but sometimes native versions will be recommended as
+ DLLs, so sometimes native versions will be recommended as
a workaround for a specific problem.
Some may be directly copied to the directory configured
as <filename class="directory">c:\windows\system32</filename> (more on that in
@@ -161,7 +161,7 @@
selecting an application in the <guilabel>Applications</guilabel> tab.
</para>
<para>
- To add an override for <filename>FOO.DLL,</filename> enter
+ To add an override for <filename>FOO.DLL</filename>, enter
<userinput>FOO</userinput> into the box
labeled <guilabel>New override for library:</guilabel> and
click on the <guibutton>Add</guibutton> button. To change how
@@ -293,18 +293,21 @@
</para>
<screen>
<prompt>$ </prompt><userinput>ls -la ~/.wine/dosdevices/</userinput>
- <computeroutput>lrwxrwxrwx 1 wineuser wineuser 10 Jul 23 15:12 c: -> ../drive_c</computeroutput>
- <computeroutput>lrwxrwxrwx 1 wineuser wineuser 1 Jul 23 15:12 z: -> /</computeroutput>
+ <computeroutput>lrwxrwxrwx 1 <replaceable>wineuser</replaceable> <replaceable>wineuser</replaceable> 10 Jul 23 15:12 c: -> ../drive_c</computeroutput>
+ <computeroutput>lrwxrwxrwx 1 <replaceable>wineuser</replaceable> <replaceable>wineuser</replaceable> 1 Jul 23 15:12 z: -> /</computeroutput>
</screen>
<para>
To add another drive, for example your CD-ROM, just create a new
link pointing to it:
- <prompt>$ </prompt>
- <userinput>ln -s /mnt/cdrom ~/.wine/dosdevices/d:</userinput>
+ </para>
+ <screen>
+ <prompt>$ </prompt><userinput>ln -s /mnt/cdrom ~/.wine/dosdevices/d:</userinput>
+ </screen>
+ <para>
Take note of the DOS-style naming convention used for links -
the format is a letter followed by a colon, such as <quote>a:</quote>. So,
if the link to your c: drive points to
- <filename class="directory"> ~/.wine/drive_c</filename>, you
+ <filename class="directory">~/.wine/drive_c</filename>, you
can interpret references to <filename class="directory">c:\windows\system32</filename>
to mean <filename class="directory">~/.wine/drive_c/windows/system32</filename>.
</para>
@@ -328,8 +331,8 @@
Wine can load Windows themes if you have them available. While
this certainly isn't necessary in order to use Wine or applications,
it does allow you to customize the look and feel of a program. Wine
- supports the newer MSStyles type of themes. Unlike the older Microsoft
- Plus! style themes, the <literal>uxtheme</literal> engine supports special
+ supports the newer MSStyles type of themes. Unlike the older <productname>Microsoft
+ Plus!</productname> style themes, the <literal>uxtheme</literal> engine supports special
<filename>.msstyles</filename> files
that can retheme all of the Windows controls. This is more or less the
same kind of theming that modern Linux desktops have supported for
@@ -575,8 +578,8 @@
<sect2>
<title>Complete List of Registry Keys</title>
<para>
- You'll find an up-to-date list of useful registry keys and values in
- the <ulink url="http://wiki.winehq.org/UsefulRegistryKeys">developers' wiki</ulink>.
+ You'll find an up-to-date <ulink url="http://wiki.winehq.org/UsefulRegistryKeys"> list of
+ useful registry keys and values</ulink> in the wiki.
</para>
</sect2>
</sect1>
@@ -679,7 +682,7 @@
Wine you'll first need to make sure you can access it using
SANE. After that you'll need to make sure you have
<command>xscanimage</command> available for use. Currently
- <command>xscanimage</command> is shipped with the
+ it is shipped with the
<literal>sane-frontends</literal> package but it
may not be installed with your distribution. Scanner access
is currently known to have problems. If you find it works for
@@ -692,7 +695,7 @@
<para>
The ODBC system within Wine, as with the printing system, is designed
to hook across to the Unix system at a high level. Rather than
- ensuring that all the windows code works under wine it uses a suitable
+ ensuring that all the Windows code works under Wine it uses a suitable
Unix ODBC provider, such as UnixODBC. Thus if you configure Wine to
use the built-in <filename>odbc32.dll</filename>,
that Wine DLL will interface to your
@@ -705,24 +708,22 @@
<para>
The first step in using a Unix ODBC system with Wine is, of course,
to get the Unix ODBC system working itself. This may involve
- downloading code or RPMs etc. There are several Unix ODBC systems
- available; the one the author is used to is unixODBC (with the
- IBM DB2 driver). There is also and ODBC-ODBC bridge that can be used
+ downloading code or binary packages etc. There are several Unix ODBC systems
+ available such as unixODBC or an ODBC-ODBC bridge that can be used
to access a Microsoft Access database. Typically such systems will
include a tool, such as <command>isql</command>, which will allow
you to access the data from the command line so that you can check
that the system is working.
</para>
<para>
- The next step is to hook the Unix ODBC library to the wine built-in
+ The next step is to hook the Unix ODBC library to the Wine built-in
<filename>odbc32</filename> DLL. The built-in <filename>odbc32</filename> (currently)
- looks to the environment variable
+ looks in the environment variable
<envar>LIB_ODBC_DRIVER_MANAGER</envar> for the name of the ODBC
- library. For example in the author's
- <filename>.bashrc</filename> file is the line:
+ library. For example:
</para>
<screen>
- export LIB_ODBC_DRIVER_MANAGER=/usr/lib/libodbc.so.1.0.0
+ LIB_ODBC_DRIVER_MANAGER=/usr/lib/libodbc.so.1.0.0
</screen>
<para>
If that environment variable is not set then it looks for a
@@ -745,7 +746,7 @@
<para>
If you have any problems then you can use
<userinput><envar>WINEDEBUG</envar>=+odbc32</userinput> command
- before running wine to trace what is happening. One word of
+ 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
@@ -777,7 +778,7 @@
when run natively.
</para>
<para>
- Types successfully tested under wine:
+ Types successfully tested under Wine:
</para>
<informaltable>
<tgroup cols="2">
diff --git a/en/wineusr-getting.sgml b/en/wineusr-getting.sgml
index 98878e0..37c97b3 100644
--- a/en/wineusr-getting.sgml
+++ b/en/wineusr-getting.sgml
@@ -38,7 +38,7 @@
<para>
Sometimes the Wine packages don't fit your needs exactly. Perhaps
they're not available for your architecture or distribution, or
- perhaps you want to build wine using your own compiler optimizations
+ perhaps you want to build Wine using your own compiler optimizations
or with some options disabled, or perhaps you need to modify a
specific part of the source code before compilation. Being an open
source project, you are free to do all of these things with Wine
@@ -70,7 +70,7 @@
Please take note that the usual warnings for using a developmental
version still apply. The source code on the Git repository is largely
untested and may not even compile properly. It is, however, the
- best way to test out how Wine will work in the next version, and if
+ best way to test out how Wine will work in the next release, and if
you're modifying source code it's best to get the latest copy. The
Git repository is also useful for application maintainers interested
in testing if an application will still work right for the next
@@ -183,7 +183,7 @@
<prompt># </prompt><userinput>make uninstall</userinput>
</screen>
This command will require root privileges, and should remove all of
- the Wine binary files from your system. It will not, however,
+ the Wine files from your system. It will not, however,
remove your Wine configuration and applications located in your
user home directory, so you are free to install another version of
Wine or delete that configuration by hand.
diff --git a/en/wineusr-glossary.sgml b/en/wineusr-glossary.sgml
index a90d702..9326eac 100644
--- a/en/wineusr-glossary.sgml
+++ b/en/wineusr-glossary.sgml
@@ -43,7 +43,7 @@ EXAMPLE:
<para>
A DLL (Dynamic Link Library) is a file that can be loaded and executed by programs dynamically. Basically it's an external code repository for programs.
Since usually several different programs reuse the same DLL instead of having that code in their own file, this dramatically reduces required storage space.
- A synonym for a DLL would be library.
+ A synonym for a DLL would be <quote>library</quote>.
</para>
</glossdef>
</glossentry>
@@ -100,7 +100,7 @@ EXAMPLE:
<glossterm>Git</glossterm>
<glossdef>
<para>
- Git is a fast directory content manager, originally written for use with
+ Git is a fast version control system, originally written for use with
large repositories, such as the Linux Kernel source.
See the Git chapter in the Wine Developers Guide for detailed usage information.
</para>
@@ -122,7 +122,7 @@ EXAMPLE:
<glossterm>root</glossterm>
<glossdef>
<para>
- root is the account name of the system administrator.
+ <literal>root</literal> is the account name of the system administrator.
In order to run programs as root, simply open a
<glossterm>Terminal</glossterm> window, then run:
</para>
@@ -130,9 +130,9 @@ EXAMPLE:
<prompt>$ </prompt><userinput>su -</userinput>
</screen>
<para>
- This will prompt you for the password of the root user of your system,
+ This will prompt you for the password of the <literal>root</literal> user of your system,
and after that you will be able to system administration tasks
- that require special root privileges. The root account is indicated by the
+ that require special root privileges. The <literal>root</literal> account is indicated by the
</para>
<screen>
<prompt># </prompt>
@@ -173,19 +173,11 @@ EXAMPLE:
<glossdef>
<para>
A terminal window is usually a graphical window that one uses to
- execute a <command>Shell</command>. If Wine asks you to open a
+ execute a <glossterm>Shell</glossterm>. If Wine asks you to open a
terminal, then you usually need to click on an icon on your desktop
- that shows a big black window (or, in other cases, an icon displaying a
- maritime shell).
- Wine assumes you're using the <command>bash</command> shell in a
- terminal window, so if your terminal happens to use a different
- shell program, simply type:
- </para>
- <screen>
- <userinput>bash</userinput>
- </screen>
- <para>
- in the terminal window.
+ that usually shows a big black window.
+ Wine assumes you're using the <command>bash</command> shell, so if your terminal happens to use
+ a different shell program, simply type <userinput>bash</userinput> in the terminal window.
</para>
</glossdef>
</glossentry>
diff --git a/en/wineusr-introduction.sgml b/en/wineusr-introduction.sgml
index c510b45..b487e6d 100644
--- a/en/wineusr-introduction.sgml
+++ b/en/wineusr-introduction.sgml
@@ -30,7 +30,7 @@
believe that something can be explained better, you can file
a <ulink url="http://bugs.winehq.org/">bug report</ulink>
or <ulink url="http://wiki.winehq.org/SubmittingPatches">post
- a patch</ulink> on Wines documentation itself.
+ a patch</ulink> on Wine documentation itself.
</para>
</sect2>
@@ -56,7 +56,7 @@
<sect2>
<title>Quick start</title>
<para>
- The process of installing and running wine can be summarised as
+ The process of installing and running Wine can be summarised as
follows:
<itemizedlist>
<listitem>
@@ -70,7 +70,7 @@
</listitem>
<listitem>
<para>
- Optionally configure wine using the <link
+ Optionally configure Wine using the <link
linkend="config-wine-main"><command>winecfg</command></link> command.
Wine should work without any additional configuration options.
</para>
@@ -92,7 +92,7 @@
<para>
Run Wine using the <link
linkend="running"><userinput>wine
- <replaceable>filespec</replaceable>/<replaceable>appname.exe</replaceable></userinput></link> command.
+ <replaceable>path</replaceable>/<replaceable>to</replaceable>/<replaceable>appname.exe</replaceable></userinput></link> command.
</para>
<para>
The first command you will run will be to install an application.
@@ -238,7 +238,7 @@
</listitem>
<listitem>
<para>
- Advanced unicode and foreign language support
+ Advanced Unicode and foreign language support
</para>
</listitem>
<listitem>
@@ -255,14 +255,14 @@
<sect1 id="wine-versions">
<title>Versions of Wine</title>
<sect2>
- <title>Wine from Wine HQ</title>
+ <title>Wine from WineHQ</title>
<para>
Wine is an open source project, and there are accordingly
many different versions of Wine for you to choose from. The
standard version of Wine comes in intermittent releases
(roughly twice a month), and can be downloaded over the
- internet in both prepackaged binary form and ready to compile
+ Internet in both prepackaged binary form and ready to compile
source code form. Alternatively, you can install a development
version of Wine by using the latest available source code from
the Git repository. See the next chapter, <link
@@ -336,7 +336,7 @@
Furthermore, a sizable number of Windows programs have been
ported to Linux directly, eliminating the need for Wine (or
Windows) entirely. These alternatives should be found through
- your system's package management facilities.
+ your system package management facilities.
</para>
</sect2>
<sect2>
diff --git a/en/wineusr-running.sgml b/en/wineusr-running.sgml
index 65d7cbd..747e704 100644
--- a/en/wineusr-running.sgml
+++ b/en/wineusr-running.sgml
@@ -214,7 +214,7 @@ Path="c:\windows;c:\windows\system;e:\;e:\test;f:\"
<prompt>$</prompt> <userinput>WINEDEBUG=warn+heap wine <replaceable>program_name</replaceable></userinput>
</screen>
<para>
- If you leave off the message class, <command>wine</command>
+ If you leave off the message class, Wine
will display messages from all four classes for that channel:
</para>
<screen>
@@ -222,7 +222,7 @@ Path="c:\windows;c:\windows\system;e:\;e:\test;f:\"
</screen>
<para>
If you wanted to see log messages for everything except the
- relay channel, you might do something like this:
+ <literal>relay</literal> channel, you might do something like this:
</para>
<screen>
<prompt>$</prompt> <userinput>WINEDEBUG=+all,-relay wine <replaceable>program_name</replaceable></userinput>
@@ -253,14 +253,14 @@ Path="c:\windows;c:\windows\system;e:\;e:\test;f:\"
</screen>
<para>
Try to load <filename>comdlg32</filename> and <filename>shell32</filename> as native
- windows DLLs first and try the builtin version if the native load fails.
+ Windows DLLs first and try the builtin version if the native load fails.
</para>
<screen>
<prompt>$</prompt> <userinput>WINEDLLOVERRIDES="comdlg32,shell32=n;c:\\foo\\bar\\baz=b" wine <replaceable>program_name</replaceable></userinput>
</screen>
<para>
- Try to load the libraries <filename>comdlg32</filename> and <filename>shell32</filename>
- as native windows DLLs. Furthermore, if an application requests to load
+ Try to load the <filename>comdlg32</filename> and <filename>shell32</filename> libraries
+ as native Windows DLLs. Furthermore, if an application requests to load
<filename>c:\foo\bar\baz.dll</filename> load
the builtin library <filename>baz</filename>.
</para>
@@ -330,7 +330,7 @@ Path="c:\windows;c:\windows\system;e:\;e:\test;f:\"
<para>
<command>wineserver</command> usually gets started automatically by Wine whenever
- the first wine process gets started.
+ the first Wine process gets started.
However, <command>wineserver</command> has some useful command line options that
you can add if you start it up manually, e.g. via a user login
script or so.
@@ -417,7 +417,7 @@ Path="c:\windows;c:\windows\system;e:\;e:\test;f:\"
</para>
<para>
<programlisting>"System" = "c:\\windows\\system"</programlisting>
- This sets up where the windows system files are. The Windows
+ This sets up where the Windows system files are. The Windows
system directory should reside below the directory used for the
<literal>Windows</literal> setting.
Thus when using <filename class="directory">/usr/local/wine_c_windows</filename>
@@ -435,11 +435,11 @@ Path="c:\windows;c:\windows\system;e:\;e:\test;f:\"
<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
+ boxes. When Wine is run like <userinput>wine sol.exe</userinput>, if
<filename>sol.exe</filename> resides in a directory specified in the
- <literal>Path</literal> setting, wine will run it (of
+ <literal>Path</literal> setting, Wine will run it (of
course, if <filename>sol.exe</filename> resides in the
- current directory, wine will run that one). Make sure it
+ current directory, Wine will run that one). Make sure it
always has your <filename class="directory">windows</filename> directory
and system directory (for this setup, it must contain
<literal>"c:\\windows;c:\\windows\\system"</literal>).
@@ -482,8 +482,8 @@ Path="c:\windows;c:\windows\system;e:\;e:\test;f:\"
</para>
<para>
The names here are a bit obscure. <quote>bare streams</quote> means
- that no extra support of wine is provided to map between the
- unix console access and Windows console access. The two other
+ that no extra support of Wine is provided to map between the
+ Unix console access and Windows console access. The two other
ways require the use of a specific Wine program
(<command>wineconsole</command>)
which provide extended facilities. The following table
@@ -541,12 +541,12 @@ Path="c:\windows;c:\windows\system;e:\;e:\test;f:\"
standard Unix streams (stdin/stdout/stderr)
</entry>
<entry>
- <command>wineconsole</command> will create a new Window (hence
- requiring the USER32 DLL is available) where all
+ <command>wineconsole</command> will create a new window (hence
+ requiring the <filename>user32</filename> DLL is available) where all
information will be displayed
</entry>
<entry>
- <command>wineconsole</command> will use existing unix console
+ <command>wineconsole</command> will use existing Unix console
(from which the program is run) and with the help of
the (n)curses library take control of all the terminal
surface for interacting with the user
@@ -645,13 +645,14 @@ Path="c:\windows;c:\windows\system;e:\;e:\test;f:\"
click in the console's window. However, this can
be an issue when the application you run inside
<command>wineconsole</command> expects the right click events to be
- sent to it. By ticking control or shift you select
+ sent to it. By ticking <guilabel>Control</guilabel> or
+ <guilabel>Shift</guilabel> you select
additional modifiers on the right click for
- opening the popup. For example, ticking shift will
+ opening the popup. For example, ticking <guilabel>Shift</guilabel> will
send events to the application when you right
- click the window without shift being hold down,
+ click the window without <keycap>Shift</keycap> being hold down,
and open the window when you right-click while
- shift being hold down.
+ <keycap>Shift</keycap> being hold down.
</entry>
</row>
<row>
@@ -700,7 +701,7 @@ Path="c:\windows;c:\windows\system;e:\;e:\test;f:\"
<row>
<entry>Close on exit</entry>
<entry>
- If it's ticked, then the <command>wineconsole</command> will exit
+ If it's ticked, then <command>wineconsole</command> will exit
when the application within terminates. Otherwise,
it'll remain opened until the user manually closes
it: this allows seeing the latest information of a
--
1.8.4
More information about the wine-patches
mailing list