From 7572148823e50eb3fc0de1019bf4b5fb07d95b97 Mon Sep 17 00:00:00 2001 From: Francois Gouget Date: Sun, 5 Jan 2003 01:08:56 +0000 Subject: [PATCH] Standardize the capitalization of Wine. --- documentation/architecture.sgml | 22 ++++++++++----------- documentation/debugger.sgml | 10 +++++----- documentation/fonts.sgml | 14 ++++++------- documentation/implementation.sgml | 2 +- documentation/multimedia.sgml | 14 ++++++------- documentation/ole.sgml | 2 +- documentation/packaging.sgml | 22 ++++++++++----------- documentation/porting.sgml | 4 ++-- documentation/printing.sgml | 2 +- documentation/winelib-bindlls.sgml | 2 +- tools/bug_report.pl | 40 +++++++++++++++++++------------------- 11 files changed, 67 insertions(+), 67 deletions(-) diff --git a/documentation/architecture.sgml b/documentation/architecture.sgml index b3e413b8dde..a45b481ea39 100644 --- a/documentation/architecture.sgml +++ b/documentation/architecture.sgml @@ -802,7 +802,7 @@ child1->popup->child2->child3->wnd1->child4->wnd2->desktop. - WINE/WINDOWS DLLs + Wine/Windows DLLs Based upon various messages on wine-devel especially by Ulrich @@ -829,21 +829,21 @@ child1->popup->child2->child3->wnd1->child4->wnd2->desktop. 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. 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. @@ -857,16 +857,16 @@ child1->popup->child2->child3->wnd1->child4->wnd2->desktop. 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. - 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. @@ -923,7 +923,7 @@ child1->popup->child2->child3->wnd1->child4->wnd2->desktop. 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 @@ child1->popup->child2->child3->wnd1->child4->wnd2->desktop. 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. (See also ./DEVELOPER-HINTS or the diff --git a/documentation/debugger.sgml b/documentation/debugger.sgml index ffe97736f18..3419029548e 100644 --- a/documentation/debugger.sgml +++ b/documentation/debugger.sgml @@ -399,7 +399,7 @@ winedbg "hl.exe -windowed" 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 gdb - instead of using the WINE-debugger. If you do that, use + instead of using the Wine debugger. If you do that, use handle SIGSEGV nostop noprint to disable the handling of seg faults inside gdb (needed for Win16). @@ -474,14 +474,14 @@ winedbg "hl.exe -windowed" The best, freely available, disassembler for Win16 programs is - Windows Codeback, archivename + Windows Codeback, archive name wcbxxx.zip, which usually can be found in - the Cica-Mirror subdirectory on the WINE - ftpsites. (See ANNOUNCE). + the Cica-Mirror subdirectory on the Wine + ftp sites. (See ANNOUNCE). Disassembling win32 programs is possible using - Windows Disassembler 32, archivename + Windows Disassembler 32, archive name something like w32dsm87.zip (or similar) on ftp.winsite.com and mirrors. The shareware version does not allow saving of diff --git a/documentation/fonts.sgml b/documentation/fonts.sgml index db876051108..17cab9de592 100644 --- a/documentation/fonts.sgml +++ b/documentation/fonts.sgml @@ -75,9 +75,9 @@ - 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; @@ -89,7 +89,7 @@ STUB: AddFontResource( SOMEFILE.FON ) .FON file may not hold any bitmap fonts and fnt2bdf 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 SOMEFILE.FON. fnt2bdf will only work for Windows 3.1 @@ -306,7 +306,7 @@ Alias.. = System, ...bold font without serifs 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 - fonts.dir. Therefore WINE uses the + fonts.dir. Therefore Wine uses the following entry to determine which font to check first. @@ -332,7 +332,7 @@ Default = -adobe-times- How To Manage Cached Font Metrics - WINE stores detailed information about available fonts in + Wine stores detailed information about available fonts in the ~/.wine/cachedmetrics.[display] file. You can copy it elsewhere and add this entry to the [fonts] section in your ~/.wine/config: @@ -341,7 +341,7 @@ Default = -adobe-times- FontMetrics = <file with metrics> - 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 ~/.wine/cachedmetrics.[display] with the new information. This process can take a while. @@ -351,7 +351,7 @@ FontMetrics = <file with metrics> Too Small Or Too Large Fonts - 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 diff --git a/documentation/implementation.sgml b/documentation/implementation.sgml index 415b42bfd2c..b1f2c4feb53 100644 --- a/documentation/implementation.sgml +++ b/documentation/implementation.sgml @@ -138,7 +138,7 @@ WORD cmd; 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 HACCEL (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 HACCEL16 and HACCEL32 by the Win16/Win32 API. diff --git a/documentation/multimedia.sgml b/documentation/multimedia.sgml index 374e58fe94f..cc019986dc8 100644 --- a/documentation/multimedia.sgml +++ b/documentation/multimedia.sgml @@ -3,7 +3,7 @@ This file contains information about the implementation of the - multimedia layer of WINE. + multimedia layer of Wine. @@ -67,8 +67,8 @@ 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. @@ -476,7 +476,7 @@ 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): @@ -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 @@ - 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 diff --git a/documentation/ole.sgml b/documentation/ole.sgml index 20e455516dd..47d0f7e2798 100644 --- a/documentation/ole.sgml +++ b/documentation/ole.sgml @@ -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. diff --git a/documentation/packaging.sgml b/documentation/packaging.sgml index ba6ff5867fa..0a346f42f94 100644 --- a/documentation/packaging.sgml +++ b/documentation/packaging.sgml @@ -1277,7 +1277,7 @@ Building the package - 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 (/usr/, @@ -1311,13 +1311,13 @@ mv $BR/usr/X11R6/lib/lib* $BR/usr/X11R6/lib/wine/ # 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/ Here we unfortunately do need to create wineuser.reg and - winesystem.reg from the WINE + winesystem.reg from the Wine distributed winedefault.reg. This can be done using ./regapi once for one example user and then reusing his @@ -1376,7 +1376,7 @@ fi 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: @@ -1493,7 +1493,7 @@ Path=/ Add this prepared configuration file to the package. - Installing WINE for the system administrator + Installing Wine for the system administrator Install the package using the usual packager rpm -i wine.rpm. You may edit @@ -1521,10 +1521,10 @@ Path=/ - Installing WINE for the user + Installing Wine for the user 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: @@ -1718,7 +1718,7 @@ Label=ROOT 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 @@ LPT2:=|gs -sDEVICE=bj200 -sOutputFile=/tmp/fred -q - 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 @@ Exclude=WM_SIZE;WM_TIMER; ; ; 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= diff --git a/documentation/porting.sgml b/documentation/porting.sgml index a54df220094..b185b1d9be9 100644 --- a/documentation/porting.sgml +++ b/documentation/porting.sgml @@ -233,7 +233,7 @@ AC_CHECK_HEADER(foo.h, AC_DEFINE(HAVE_FOO_H)) - Running & Compiling WINE in OS/2 + Running & Compiling Wine in OS/2 Written by &name-robert-pouliot; &email-robert-pouliot;, @@ -244,7 +244,7 @@ AC_CHECK_HEADER(foo.h, AC_DEFINE(HAVE_FOO_H)) - 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 krynos@clic.net I currently don't want beta testers. It must work before we can test it. diff --git a/documentation/printing.sgml b/documentation/printing.sgml index 841be8b1861..b11eac4b34d 100644 --- a/documentation/printing.sgml +++ b/documentation/printing.sgml @@ -140,7 +140,7 @@ printer=on printers and also configured mostly automatic. - 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 ~/.wine/config. Either use the shortcut name and make the entry look like: diff --git a/documentation/winelib-bindlls.sgml b/documentation/winelib-bindlls.sgml index 95e21271780..5e04b2c1745 100644 --- a/documentation/winelib-bindlls.sgml +++ b/documentation/winelib-bindlls.sgml @@ -135,7 +135,7 @@ signed short MyLinuxFunc (unsigned short a, void *b, void *c, * * 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 diff --git a/tools/bug_report.pl b/tools/bug_report.pl index 469af1db54d..0fa393c7171 100755 --- a/tools/bug_report.pl +++ b/tools/bug_report.pl @@ -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 @@ sub do_var { 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 @@ $var0 = qq{ }; 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=; 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 =~ /no symbols/) { } 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 @@ while ($ifstrip =~ /not recognized/) { $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 @@ print "\nWhat version of windows are you using with wine?\n\n". "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=; chomp $winver; } @@ -349,7 +349,7 @@ if ($debuglevel > 1) { } 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=; @@ -367,13 +367,13 @@ if ($debuglevel > 1) { $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 > 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 @@ if ($debuglevel > 1) { 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 @@ chomp $ostype; $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 @@ if ($debuglevel < 3) { $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=; $dir=$program; $dir=~m#(.*)/#; @@ -570,7 +570,7 @@ Note that it is $dbgoutfile.gz, since I compressed it with gzip for you. $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"; -- 2.11.4.GIT