AFAIK, when referring to the Wine project, the standard capitalization
is 'Wine'. The web site seems to confirm this (except for the bitmaps
used for the menus, etc.). So this updates the documentation and
bug_report.pl to standardize on this capitalization.
Changelog:
* documentation/architecture.sgml,
documentation/debugger.sgml,
documentation/fonts.sgml,
documentation/implementation.sgml,
documentation/multimedia.sgml,
documentation/ole.sgml,
documentation/packaging.sgml,
documentation/porting.sgml,
documentation/printing.sgml,
documentation/winelib-bindlls.sgml,
tools/bug_report.pl
Standardize the capitalization of Wine.
Index: documentation/architecture.sgml
===================================================================
RCS file: /home/wine/wine/documentation/architecture.sgml,v
retrieving revision 1.4
diff -u -r1.4 architecture.sgml
--- documentation/architecture.sgml 7 Nov 2001 20:16:22 -0000 1.4
+++ documentation/architecture.sgml 4 Jan 2003 05:17:40 -0000
@@ -802,7 +802,7 @@
</sect1>
<sect1 id="arch-dlls">
- <title>WINE/WINDOWS DLLs</title>
+ <title>Wine/Windows DLLs</title>
<para>
Based upon various messages on wine-devel especially by Ulrich
@@ -829,21 +829,21 @@
routines they implement. For example, using the native USER
DLL would maintain a virtually perfect and Windows 95-like
look for window borders, dialog controls, and so on. Using
- the built-in WINE version of this library, on the other
+ the built-in Wine version of this library, on the other
hand, would produce a display that does not precisely mimic
that of Windows 95. Such subtle differences can be
engendered in other important DLLs, such as the common
controls library COMMCTRL or the common dialogs library
- COMMDLG, when built-in WINE DLLs outrank other types in load
+ COMMDLG, when built-in Wine DLLs outrank other types in load
order.
</para>
<para>
More significant, less aesthetically-oriented problems can
- result if the built-in WINE version of the SHELL DLL is
+ result if the built-in Wine version of the SHELL DLL is
loaded before the native version of this library. SHELL
contains routines such as those used by installer utilities
to create desktop shortcuts. Some installers might fail when
- using WINE's built-in SHELL.
+ using Wine's built-in SHELL.
</para>
</sect2>
@@ -857,16 +857,16 @@
work much worse than the corresponding built-in one, if at
all. For example, the native Windows GDI library must be
paired with a Windows display driver, which of course is not
- present under Intel Unix and WINE.
+ present under Intel Unix and Wine.
</para>
<para>
- Finally, occassionally built-in WINE DLLs implement more
+ Finally, occassionally built-in Wine DLLs implement more
features than the corresponding native Windows DLLs.
Probably the most important example of such behavior is the
- integration of Wine with X provided by WINE's built-in USER
+ integration of Wine with X provided by Wine's built-in USER
DLL. Should the native Windows USER library take load-order
precedence, such features as the ability to use the
- clipboard or drag-and- drop between Wine windows and X
+ clipboard or drag-and-drop between Wine windows and X
windows will be lost.
</para>
</sect2>
@@ -923,7 +923,7 @@
pairs. In general, these are DLLs for either 16-bit or
32-bit applications. In most cases in Windows, the 32-bit
version cannot be used without its 16-bit counterpart. For
- WINE, it is customary that the 16-bit implementations rely
+ Wine, it is customary that the 16-bit implementations rely
on the 32-bit implementations and cast the results back to
16-bit arguments. Changing anything in this section is bound
to result in errors.
@@ -943,7 +943,7 @@
<para>
The following list briefly describes each of the DLLs
commonly found in Windows whose load order may be modified
- during the configuration and compilation of WINE.
+ during the configuration and compilation of Wine.
</para>
<para>
(See also <filename>./DEVELOPER-HINTS</filename> or the
Index: documentation/debugger.sgml
===================================================================
RCS file: /home/wine/wine/documentation/debugger.sgml,v
retrieving revision 1.15
diff -u -r1.15 debugger.sgml
--- documentation/debugger.sgml 7 Dec 2002 23:48:36 -0000 1.15
+++ documentation/debugger.sgml 4 Jan 2003 05:17:42 -0000
@@ -399,7 +399,7 @@
into the functions you find relevant. See The section on Debug
Logging in this guide for more information. You might
also try to run the program in <command>gdb</command>
- instead of using the WINE-debugger. If you do that, use
+ instead of using the Wine debugger. If you do that, use
<parameter>handle SIGSEGV nostop noprint</parameter> to
disable the handling of seg faults inside
<command>gdb</command> (needed for Win16).
@@ -474,14 +474,14 @@
</para>
<para>
The best, freely available, disassembler for Win16 programs is
- <application>Windows Codeback</application>, archivename
+ <application>Windows Codeback</application>, archive name
<filename>wcbxxx.zip</filename>, which usually can be found in
- the <filename>Cica-Mirror</filename> subdirectory on the WINE
- ftpsites. (See <filename>ANNOUNCE</filename>).
+ the <filename>Cica-Mirror</filename> subdirectory on the Wine
+ ftp sites. (See <filename>ANNOUNCE</filename>).
</para>
<para>
Disassembling win32 programs is possible using
- <application>Windows Disassembler 32</application>, archivename
+ <application>Windows Disassembler 32</application>, archive name
something like <filename>w32dsm87.zip</filename> (or similar)
on <systemitem class="systemname">ftp.winsite.com</systemitem>
and mirrors. The shareware version does not allow saving of
Index: documentation/fonts.sgml
===================================================================
RCS file: /home/wine/wine/documentation/fonts.sgml,v
retrieving revision 1.11
diff -u -r1.11 fonts.sgml
--- documentation/fonts.sgml 24 Jul 2002 03:00:02 -0000 1.11
+++ documentation/fonts.sgml 4 Jan 2003 05:17:42 -0000
@@ -75,9 +75,9 @@
</listitem>
</orderedlist>
<para>
- WINE can get by without these fonts but 'the look and feel'
+ Wine can get by without these fonts but 'the look and feel'
may be quite different. Also, some applications try to load
- their custom fonts on the fly (WinWord 6.0) and since WINE
+ their custom fonts on the fly (WinWord 6.0) and since Wine
does not implement this yet it instead prints out something
like;
</para>
@@ -89,7 +89,7 @@
<filename>.FON</filename> file may not hold any bitmap
fonts and <command>fnt2bdf</command> will fail if this is
the case. Also note that although the above message will not
- disappear WINE will work around the problem by using the
+ disappear Wine will work around the problem by using the
font you extracted from the
<filename>SOMEFILE.FON</filename>.
<command>fnt2bdf</command> will only work for Windows 3.1
@@ -306,7 +306,7 @@
specifying the typeface name of the font. Font table starts
with Arial in most Windows installations, however X font
table starts with whatever is the first line in the
- <filename>fonts.dir</filename>. Therefore WINE uses the
+ <filename>fonts.dir</filename>. Therefore Wine uses the
following entry to determine which font to check first.
</para>
<para>
@@ -332,7 +332,7 @@
<sect3>
<title>How To Manage Cached Font Metrics</title>
<para>
- WINE stores detailed information about available fonts in
+ Wine stores detailed information about available fonts in
the <filename>~/.wine/cachedmetrics.[display]</filename> file. You
can copy it elsewhere and add this entry to the [fonts]
section in your <filename>~/.wine/config</filename>:
@@ -341,7 +341,7 @@
FontMetrics = <file with metrics>
</screen>
<para>
- If WINE detects changes in the X font configuration it will
+ If Wine detects changes in the X font configuration it will
rebuild font metrics from scratch and then it will overwrite
<filename>~/.wine/cachedmetrics.[display]</filename> with the new
information. This process can take a while.
@@ -351,7 +351,7 @@
<sect3>
<title>Too Small Or Too Large Fonts</title>
<para>
- Windows programs may ask WINE to render a font with the
+ Windows programs may ask Wine to render a font with the
height specified in points. However, point-to-pixel ratio
depends on the real physical size of your display (15",
17", etc...). X tries to provide an estimate of that but it
Index: documentation/implementation.sgml
===================================================================
RCS file: /home/wine/wine/documentation/implementation.sgml,v
retrieving revision 1.3
diff -u -r1.3 implementation.sgml
--- documentation/implementation.sgml 4 Jun 2002 23:09:35 -0000 1.3
+++ documentation/implementation.sgml 4 Jan 2003 05:17:43 -0000
@@ -138,7 +138,7 @@
Accelerators in NE resources. These have a size of 5 byte
and do not have any padding. This is also the internal
layout of the global handle <type>HACCEL</type> (16 and
- 32) in Windows 95 and WINE. Exposed to the user as Win16
+ 32) in Windows 95 and Wine. Exposed to the user as Win16
global handles <type>HACCEL16</type> and
<type>HACCEL32</type> by the Win16/Win32 API.
</para>
Index: documentation/multimedia.sgml
===================================================================
RCS file: /home/wine/wine/documentation/multimedia.sgml,v
retrieving revision 1.3
diff -u -r1.3 multimedia.sgml
--- documentation/multimedia.sgml 23 Dec 2002 02:05:30 -0000 1.3
+++ documentation/multimedia.sgml 4 Jan 2003 05:17:43 -0000
@@ -3,7 +3,7 @@
<para>
This file contains information about the implementation of the
- multimedia layer of WINE.
+ multimedia layer of Wine.
</para>
<para>
@@ -67,8 +67,8 @@
<para>
Please note that native low level drivers are not currently supported
- in WINE, because they either access hardware components or require
- VxDs to be loaded; WINE does not correctly supports those two so far.
+ in Wine, because they either access hardware components or require
+ VxDs to be loaded; Wine does not correctly supports those two so far.
</para>
<para>
@@ -476,7 +476,7 @@
<para>
The mid level drivers are represented by some common API functions,
mostly mciSendCommand and mciSendString. See status in chapter 3 for
- more information. WINE implements several MCI mid level drivers
+ more information. Wine implements several MCI mid level drivers
(status is given for both built-in and native implementation):
</para>
@@ -746,7 +746,7 @@
The rest (basically the MMSYSTEM and WINMM DLLs entry points). It also
provides the skeleton for the core functionality for multimedia
rendering. Note that native MMSYSTEM and WINMM do not currently work
- under WINE and there is no plan to support them (it would require to
+ under Wine and there is no plan to support them (it would require to
also fully support VxD, which is not done yet).
Moreover, native DLLs require 16 bit MCI and low level drivers. Wine
implements them as 32 bit drivers.
@@ -800,7 +800,7 @@
</para>
<para>
- MCI drivers are seen as regular WINE modules, and can be loaded (with
+ MCI drivers are seen as regular Wine modules, and can be loaded (with
a correct load order between built-in, native, elfdll, so), as any
other DLL. Please note, that MCI drivers module names must bear the
.drv extension to be correctly understood.
@@ -810,7 +810,7 @@
The list of available MCI drivers is obtained as follows:
1. key 'mci' in [option] section from .winerc (or wineconf)
mci=CDAUDIO:SEQUENCER gives the list of MCI drivers (names, in
- uppercase only) to be used in WINE.
+ uppercase only) to be used in Wine.
2. This list, when defined, supersedes the mci key in
c:\windows\system.ini
</para>
Index: documentation/ole.sgml
===================================================================
RCS file: /home/wine/wine/documentation/ole.sgml,v
retrieving revision 1.1
diff -u -r1.1 ole.sgml
--- documentation/ole.sgml 13 Dec 2000 21:52:37 -0000 1.1
+++ documentation/ole.sgml 4 Jan 2003 05:17:44 -0000
@@ -67,7 +67,7 @@
as that of an egcs virtual table which is not the same as
that generated by Visual C+. There are workarounds to make
the virtual tables compatible via padding but unfortunately
- the one which is imposed to the WINE emulator by the Windows
+ the one which is imposed to the Wine emulator by the Windows
binaries, i.e. the Visual C++ one, is the most compact of
all.
</para>
Index: documentation/packaging.sgml
===================================================================
RCS file: /home/wine/wine/documentation/packaging.sgml,v
retrieving revision 1.8
diff -u -r1.8 packaging.sgml
--- documentation/packaging.sgml 24 Jul 2002 03:00:02 -0000 1.8
+++ documentation/packaging.sgml 4 Jan 2003 05:17:45 -0000
@@ -1277,7 +1277,7 @@
<listitem>
<para>Building the package</para>
<para>
- WINE is configured the usual way (depending on your
+ Wine is configured the usual way (depending on your
build environment). The "prefix" is chosen using your
application placement policy
(<filename>/usr/</filename>,
@@ -1311,13 +1311,13 @@
# the clipboard server is started on demand.
install -m 755 dlls/x11drv/wineclipsrv $BR/usr/X11R6/bin/
-# The WINE server is needed.
+# The Wine server is needed.
install -m 755 server/wineserver $BR/usr/X11R6/bin/
</screen>
<para>
Here we unfortunately do need to create
<filename>wineuser.reg</filename> and
- <filename>winesystem.reg</filename> from the WINE
+ <filename>winesystem.reg</filename> from the Wine
distributed <filename>winedefault.reg</filename>. This
can be done using <command>./regapi</command> once for
one example user and then reusing his
@@ -1376,7 +1376,7 @@
<para>
For the rationales of needing as less input from the
user as possible arises the need for a very good
- configuration file. The one supplied with WINE is
+ configuration file. The one supplied with Wine is
currently lacking. We need:
</para>
<itemizedlist>
@@ -1493,7 +1493,7 @@
<para>Add this prepared configuration file to the package.</para>
</listitem>
<listitem>
- <para>Installing WINE for the system administrator</para>
+ <para>Installing Wine for the system administrator</para>
<para>
Install the package using the usual packager
<command>rpm -i wine.rpm</command>. You may edit
@@ -1521,10 +1521,10 @@
</para>
</listitem>
<listitem>
- <para>Installing WINE for the user</para>
+ <para>Installing Wine for the user</para>
<para>
The user will need to run a setup script before the
- first invocation of WINE. This script should:
+ first invocation of Wine. This script should:
</para>
@@ -1718,7 +1718,7 @@
Filesystem=win95
;
-; Standard Windows path entries. WINE will not work if they are incorrect.
+; Standard Windows path entries. Wine will not work if they are incorrect.
;
[wine]
;
@@ -1846,7 +1846,7 @@
LPT3:=/dev/lp3
;
-; Allow port access to WINE started by the root user. Useful for some
+; Allow port access to Wine started by the root user. Useful for some
; supported devices, but it can make the system unstable.
; Read /usr/doc/wine-cvs-xxxxx/ioport-trace-hints.
;
@@ -1870,14 +1870,14 @@
;
; Layout/Look modifications. Here you can switch with a single line between
; windows 3.1 and windows 95 style.
-; This does not change WINE behaviour or reported versions, just the look!
+; This does not change Wine behaviour or reported versions, just the look!
;
[Tweak.Layout]
;; WineLook=xxx (supported styles are 'Win31'(default), 'Win95', 'Win98')
WineLook=Win95
;
-; What programs to start on WINE startup. (you should probably leave it empty)
+; What programs to start on Wine startup. (you should probably leave it empty)
;
[programs]
Default=
Index: documentation/porting.sgml
===================================================================
RCS file: /home/wine/wine/documentation/porting.sgml,v
retrieving revision 1.3
diff -u -r1.3 porting.sgml
--- documentation/porting.sgml 4 Jan 2002 18:53:56 -0000 1.3
+++ documentation/porting.sgml 4 Jan 2003 05:17:45 -0000
@@ -233,7 +233,7 @@
</sect1>
<sect1 id="os2-wine">
- <title>Running & Compiling WINE in OS/2</title>
+ <title>Running & Compiling Wine in OS/2</title>
<para>
Written by &name-robert-pouliot; <email>&email-robert-pouliot;</email>,
@@ -244,7 +244,7 @@
</para>
<para>
- If you want to help the port of WINE to OS/2, send me a
+ If you want to help the port of Wine to OS/2, send me a
message at <email>krynos@clic.net</email> I currently don't
want beta testers. It must work before we can test it.
</para>
Index: documentation/printing.sgml
===================================================================
RCS file: /home/wine/wine/documentation/printing.sgml,v
retrieving revision 1.11
diff -u -r1.11 printing.sgml
--- documentation/printing.sgml 24 Jul 2002 03:00:03 -0000 1.11
+++ documentation/printing.sgml 4 Jan 2003 05:17:46 -0000
@@ -140,7 +140,7 @@
printers and also configured mostly automatic.
</para>
<para>
- Since WINE cannot find out what type of printer this is, you
+ Since Wine cannot find out what type of printer this is, you
need to specify a PPD file in the [ppd] section of
<filename>~/.wine/config</filename>. Either use the shortcut
name and make the entry look like:
Index: documentation/winelib-bindlls.sgml
===================================================================
RCS file: /home/wine/wine/documentation/winelib-bindlls.sgml,v
retrieving revision 1.4
diff -u -r1.4 winelib-bindlls.sgml
--- documentation/winelib-bindlls.sgml 27 Sep 2002 22:07:40 -0000 1.4
+++ documentation/winelib-bindlls.sgml 4 Jan 2003 05:17:46 -0000
@@ -18,7 +18,7 @@
<para>
There is a well-defined interface available and there are several
Linux solutions that are available for it.
- (The ODBC interface in WINE)
+ (The ODBC interface in Wine)
</para>
</listitem>
<listitem>
@@ -135,7 +135,7 @@
*
* Copyright (c) The copyright holder.
*
- * Basic WINE wrapper for the linux <3rd party library> so that it can be
+ * Basic Wine wrapper for the Linux <3rd party library> so that it can be
* used by <the application>
*
* Currently this file makes no attempt to be a full wrapper for the <3rd
Index: tools/bug_report.pl
===================================================================
RCS file: /home/wine/wine/tools/bug_report.pl,v
retrieving revision 1.16
diff -u -r1.16 bug_report.pl
--- tools/bug_report.pl 2 Jan 2003 17:53:26 -0000 1.16
+++ tools/bug_report.pl 4 Jan 2003 05:17:52 -0000
@@ -24,7 +24,7 @@
##Changelog:
##August 29, 1999 - Work around for debugger exit (or lack thereof)
## - Should now put debugging output in correct place
-##April 19, 1999 - Much nicer way to select wine's location
+##April 19, 1999 - Much nicer way to select Wine's location
## - Option to disable creation of a debugging output
## - Now places debugging output where it was started
##April 4, 1999 - Sanity check for file locations/wine strippedness
@@ -50,10 +50,10 @@
open STDERR, ">&SAVEERR"; open STDERR, ">&STDOUT";
$ENV{'SHELL'}="/bin/bash";
$var0 = qq{
- What is your level of WINE expertise? 1-newbie 2-intermediate 3-advanced
+ What is your level of Wine expertise? 1-newbie 2-intermediate 3-advanced
- 1 - Makes a debug report as defined in the WINE documentation. Best
- for new WINE users. If you're not sure what -debugmsg is, then
+ 1 - Makes a debug report as defined in the Wine documentation. Best
+ for new Wine users. If you're not sure what -debugmsg is, then
use this mode.
2 - Makes a debug report that is more customizable (Example: you can
choose what -debugmsg 's to use). You are asked more questions in
@@ -63,14 +63,14 @@
};
print do_var($var0)."\n";
until ($debuglevel >= 1 and $debuglevel <= 3) {
- print "Enter your level of WINE expertise (1-3): ";
+ print "Enter your level of Wine expertise (1-3): ";
$debuglevel=<STDIN>;
chomp $debuglevel;
}
if ($debuglevel < 3) {
$var1 = qq{
- This program will make a debug report for WINE developers. It generates
+ This program will make a debug report for Wine developers. It generates
two files. The first one has everything asked for by the bugreports guide;
the second has *all* of the debug output, which can go to thousands of
lines.
@@ -199,7 +199,7 @@
}
while ($ifstrip =~ /not recognized/) {
$var26 = qq{
- Looks like you gave me something that isn't a wine binary (It could be a
+ Looks like you gave me something that isn't a Wine binary (It could be a
text file). Try again.
};
print do_var($var26);
@@ -208,7 +208,7 @@
$ifstrip = `nm $wineloc 2>&1`;
}
-print "\nWhat version of windows are you using with wine?\n\n".
+print "\nWhat version of Windows are you using with Wine?\n\n".
"0 - None\n".
"1 - Windows 3.x\n".
"2 - Windows 95\n".
@@ -220,7 +220,7 @@
"8 - Other\n\n";
do
{
- print "Enter the number that corresponds to your windows version: ";
+ print "Enter the number that corresponds to your Windows version: ";
$winver=<STDIN>;
chomp $winver;
}
@@ -349,7 +349,7 @@
}
if ($debuglevel > 1) {
$var15 = qq{
- Enter any extra options you want to pass to WINE.
+ Enter any extra options you want to pass to Wine.
};
print do_var($var15);
$extraops=<STDIN>;
@@ -367,13 +367,13 @@
$var16 = qq{
When you ran ./configure to build wine, were there any special options
you used to do so (Example: --enable-dll)? If you didn't use any special
- options or didn't compile WINE on your own, just hit enter:
+ options or didn't compile Wine on your own, just hit enter:
};
print do_var($var16);
} elsif ($debuglevel =~ 3) {
$var17 = qq{
- Enter any special options you used when running ./configure for WINE
- (Default is none, use if you didn't compile wine yourself):
+ Enter any special options you used when running ./configure for Wine
+ (Default is none, use if you didn't compile Wine yourself):
};
print do_var($var17);
}
@@ -388,7 +388,7 @@
if ($debuglevel > 1) {
if ($debuglevel =~ 2) {
$var18 = qq{
- Is your wine version CVS or from a .tar.gz file? As in... did you download it
+ Is your Wine version CVS or from a .tar.gz file? As in... did you download it
off a website/ftpsite or did you/have you run cvs on it to update it?
For CVS: YYMMDD, where YY is the year (99), MM is the month (01), and DD
is the day (14), that you last updated it (Example: 990114).
@@ -397,7 +397,7 @@
print do_var($var18);
} elsif ($debuglevel =~ 3) {
$var19 = qq{
- Is your wine from CVS? Enter the last CVS update date for it here, in
+ Is your Wine from CVS? Enter the last CVS update date for it here, in
YYMMDD form (If it's from a tarball, just hit enter):
};
print do_var($var19);
@@ -427,18 +427,18 @@
$wineneeds=`ldd $wineloc`;
if ($debuglevel < 3) {
$var20 = qq{
- OK, now I'm going to run WINE. I will close it for you once the wine
+ OK, now I'm going to run Wine. I will close it for you once the Wine
debugger comes up. NOTE: You won't see ANY debug messages. Don't
worry, they are being output to a file. Since there are so many, it's
not a good idea to have them all output to a terminal (Speed slowdown
mainly).
- WINE will still run much slower than normal, because there will be so
+ Wine will still run much slower than normal, because there will be so
many debug messages being output to file.
};
print do_var($var20);
} elsif ($debuglevel =~ 3) {
$var21 = qq{
- OK, now it's time to run WINE. I will close down WINE for you after
+ OK, now it's time to run Wine. I will close down Wine for you after
the debugger is finished doing its thing.
};
print do_var($var21);
@@ -446,7 +446,7 @@
$bashver=qw("/bin/bash -version");
if ($bashver =~ /2\./) { $outflags = "2>" }
else { $outflags = ">\&" }
-print "Hit enter to start wine!\n";
+print "Hit enter to start Wine!\n";
$blank=<STDIN>;
$dir=$program;
$dir=~m#(.*)/#;
@@ -570,7 +570,7 @@
$var30 = qq{
Having problems with the script?
Submit a bug report to Wine bugtracking system at http://bugs.winehq.com or
-tell the wine newsgroup (comp.emulators.ms-windows.wine).
+tell the Wine newsgroup (comp.emulators.ms-windows.wine).
};
print do_var($var22);
print do_var($var28) if $outfile ne "no file";
--
Francois Gouget fgouget@free.fr http://fgouget.free.fr/
If it stinks, it's chemistry. If it moves, it's biology.
If it does not work, It's computer science.
