Miscellaneous small fixes.
diff --git a/documentation/README.documentation b/documentation/README.documentation
index a94d4b9..87af690 100644
--- a/documentation/README.documentation
+++ b/documentation/README.documentation
@@ -4,8 +4,8 @@
Wine Man Page
- The man page for the wine emulator is in this directory. It is installed
-by 'make install'.
+ The man page for Wine is in this directory. It is installed by 'make
+install'.
Wine Reference Manual
diff --git a/documentation/how-to-port b/documentation/how-to-port
index 5800f92..4a89821 100644
--- a/documentation/how-to-port
+++ b/documentation/how-to-port
@@ -100,17 +100,17 @@
The next step depends on the nature of the missing function.
-Case 1: It's easy to write a complete emulation of the
+Case 1: It's easy to write a complete implementation of the
function. (`memmove' belongs to this case.)
- You add your emulation in misc/port.c surrounded by
+ You add your implementation in misc/port.c surrounded by
"#ifndef HAVE_MEMMOVE" and "#endif".
You might have to add a prototype for your function. If so,
include/miscemu.h might be the place. Don't forget to protect
that definition by "#ifndef HAVE_MEMMOVE" and "#endif" also!
-Case 2: A general emulation is hard, but Wine is only using
+Case 2: A general implementation is hard, but Wine is only using
a special case.
An example is the various "wait" calls used in SIGNAL_child
diff --git a/documentation/wine.man b/documentation/wine.man
index df226fa..8d0b81f 100644
--- a/documentation/wine.man
+++ b/documentation/wine.man
@@ -1,7 +1,7 @@
.\" -*- nroff -*-
-.TH WINE 1 "October 20, 1998" "Version 981018" "Windows Emulator"
+.TH WINE 1 "October 20, 1998" "Version 981018" "Windows On Unix"
.SH NAME
-wine \- run Windows programs under Unix
+wine \- run Windows programs on Unix
.SH SYNOPSIS
.B wine
[
@@ -20,7 +20,9 @@
]
.SH DESCRIPTION
.B wine
-invokes the Windows emulator.
+.I program
+loads and runs the given program, where the program is a DOS, Windows 3.x,
+or Win32 executable.
.PP
.B wine
currently runs a growing list of applications written for both Win3.1 and
@@ -441,12 +443,12 @@
The latest snapshot of the code may be obtained via CVS. For information
on how to do this, please see
.I
-http://www.winehq.com/cvs.html
+http://www.winehq.com/dev.html
.PP
-The
+WineHQ, the
.B wine
-homepage is at
-.I http://www.winehq.com.
+development headquarters, is at
+.I http://www.winehq.com/.
This website contains a great deal of information about
.B wine
as well as a collection of unofficial patches against the current release.
@@ -460,7 +462,7 @@
.PD 0
.TP
.I /usr/local/bin/wine
-The invoker program.
+The Wine program loader.
.TP
.I /usr/local/etc/wine.conf
Global configuration file for wine.
diff --git a/documentation/wine.texinfo b/documentation/wine.texinfo
index 01a14ec..050c23a 100644
--- a/documentation/wine.texinfo
+++ b/documentation/wine.texinfo
@@ -10,7 +10,7 @@
@ifinfo
@format
START-INFO-DIR-ENTRY
-* wine: (wine.info). The Windows Emulator.
+* wine: (wine.info). Windows on Unix.
END-INFO-DIR-ENTRY
@end format
@end ifinfo
@@ -20,7 +20,8 @@
@end iftex
@ifinfo
-This file documents Wine, the Windows Emulator.
+This file documents Wine, a system providing Microsoft Windows compatibility
+to Unix.
@c
Copyright @copyright{} 1997,1998 The Wine authors. @*
@@ -261,11 +262,13 @@
This is edition @winemanualversion{}, last updated @winemanualdate{},
of @winemanualtitle{}.
-Wine (Wine Is Not an Emulator, or the WINdows Emulator)
-is both an emulator that runs @mswindows{} executables and a library
-that can be used to compile @mswindows{} source code.
+Wine provides both source and binary compatibility with Microsoft Windows.
+The Wine API is designed to be as compatible as possible with various
+implementations of the Windows APIs. The Wine library allows porting
+Windows source to Unix, and a program loader allows unaltered Windows binaries
+to be run on Unix.
-Wine is free software. Wine is still in development-only state.
+Wine is free software. Wine is still under development.
@end ifinfo
@menu
@@ -356,9 +359,9 @@
@item
A library, called @winelib{}, which implements this API
@item
-A binary compatibility layer, sometimes referred to as the Wine
-emulator, which acts as a program loader for native Windows binaries.
-The emulator works for both 16 and 32 bit Intel binaries, and
+A binary compatibility layer
+acts as a program loader for native Windows binaries.
+It works for both 16 and 32 bit Intel binaries, and
provides all the appropriate translation between 16 and 32 bit code
(thunking). Real mode interrupts are also supported, and their
functionality is implemented in @winelib{}.