summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Doc/dist/dist.tex6
-rw-r--r--Doc/inst/inst.tex12
-rw-r--r--Doc/mac/libmacic.tex2
-rw-r--r--Doc/mac/libmacos.tex2
-rw-r--r--Doc/templates/howto.tex2
-rw-r--r--Doc/templates/manual.tex2
-rw-r--r--Doc/tut/tut.tex8
7 files changed, 17 insertions, 17 deletions
diff --git a/Doc/dist/dist.tex b/Doc/dist/dist.tex
index 38911a1..cc5be56 100644
--- a/Doc/dist/dist.tex
+++ b/Doc/dist/dist.tex
@@ -6,7 +6,7 @@
\title{Distributing Python Modules}
\author{Greg Ward}
-\authoraddress{E-mail: \email{gward@python.net}}
+\authoraddress{Email: \email{gward@python.net}}
\makeindex
@@ -1237,8 +1237,8 @@ extending the Distutils.)
\label{creating-wininst}
Executable Windows installers are the natural format for binary
-distributions on Windows. They display a nice GUI interface, display
-some information of the module distribution to be installed, taken
+distributions on Windows. They display a nice graphical user interface,
+display some information of the module distribution to be installed, taken
from the meta-dada in the setup script, let the user select a few
(currently maybe too few) options, and start or cancel the installation.
diff --git a/Doc/inst/inst.tex b/Doc/inst/inst.tex
index 89a4e3a..0037877 100644
--- a/Doc/inst/inst.tex
+++ b/Doc/inst/inst.tex
@@ -20,7 +20,7 @@
% and Feeding of a Python Installation" talk in here somewhere. Yow!
\author{Greg Ward}
-\authoraddress{E-mail: \email{gward@python.net}}
+\authoraddress{Email: \email{gward@python.net}}
\makeindex
@@ -198,10 +198,10 @@ python setup.py install
On Windows, you'd probably download \file{foo-1.0.zip}. If you
downloaded the archive file to \file{C:\textbackslash{}Temp}, then it
would unpack into \file{C:\textbackslash{}Temp\textbackslash{}foo-1.0};
-you can use either a GUI archive manipulator (such as WinZip) or a
-command-line tool (such as \program{unzip} or \program{pkunzip}) to
-unpack the archive. Then, open a command prompt window (``DOS box''),
-and run:
+you can use either a archive manipulator with a grapical user interface
+(such as WinZip) or a command-line tool (such as \program{unzip} or
+\program{pkunzip}) to unpack the archive. Then, open a command prompt
+window (``DOS box''), and run:
\begin{verbatim}
cd c:\Temp\foo-1.0
@@ -442,7 +442,7 @@ Borland \Cpp{} compiler version 5.5.\footnote{Check
First you have to know that the Borland's object file format(OMF) is
different from what is used by the Python version you can download
-from the Python web site. (Python is built with Microsoft Visual \Cpp,
+from the Python Web site. (Python is built with Microsoft Visual \Cpp,
which uses COFF as object file format.) For this reason you have to
convert Python's library \file{python20.lib} into the Borland format.
You can do this as follows:
diff --git a/Doc/mac/libmacic.tex b/Doc/mac/libmacic.tex
index 715b31b..de5daa6 100644
--- a/Doc/mac/libmacic.tex
+++ b/Doc/mac/libmacic.tex
@@ -34,7 +34,7 @@ Exception raised on errors in the \module{ic} module.
The \module{ic} module defines the following class and function:
\begin{classdesc}{IC}{\optional{signature\optional{, ic}}}
-Create an internet config object. The signature is a 4-character creator
+Create an Internet Config object. The signature is a 4-character creator
code of the current application (default \code{'Pyth'}) which may
influence some of ICs settings. The optional \var{ic} argument is a
low-level \code{icglue.icinstance} created beforehand, this may be
diff --git a/Doc/mac/libmacos.tex b/Doc/mac/libmacos.tex
index d3287f4..60e7f9b 100644
--- a/Doc/mac/libmacos.tex
+++ b/Doc/mac/libmacos.tex
@@ -51,7 +51,7 @@ runtime when Python is in the foreground and \var{bgyield} seconds per
All parameters are optional, and default to the current value. The return
value of this function is a tuple with the old values of these options.
Initial defaults are that all processing is enabled, checking is done every
-quarter second and the CPU is given up for a quarter second when in the
+quarter second and the processor is given up for a quarter second when in the
background.
\end{funcdesc}
diff --git a/Doc/templates/howto.tex b/Doc/templates/howto.tex
index 1f7bb6f..fdbb065 100644
--- a/Doc/templates/howto.tex
+++ b/Doc/templates/howto.tex
@@ -19,7 +19,7 @@
% The author and/or editor can define 'significant' however they like.
\release{0.00}
-% At minimum, give your name and an e-mail address. You can include a
+% At minimum, give your name and an email address. You can include a
% snail-mail address if you like.
\author{Me, 'cause I wrote it}
\authoraddress{Me, 'cause I'm self-employed.}
diff --git a/Doc/templates/manual.tex b/Doc/templates/manual.tex
index e1114d6..d75187c 100644
--- a/Doc/templates/manual.tex
+++ b/Doc/templates/manual.tex
@@ -16,7 +16,7 @@
\authoraddress{
Organization name, if applicable \\
Street address, if you want to use it \\
- E-mail: \email{your-email@your.domain}
+ Email: \email{your-email@your.domain}
}
\date{April 30, 1999} % update before release!
diff --git a/Doc/tut/tut.tex b/Doc/tut/tut.tex
index 8d75ff6..a3a01a4 100644
--- a/Doc/tut/tut.tex
+++ b/Doc/tut/tut.tex
@@ -33,7 +33,7 @@ on most platforms.
The Python interpreter and the extensive standard library are freely
available in source or binary form for all major platforms from the
-Python web site, \url{http://www.python.org}, and can be freely
+Python Web site, \url{http://www.python.org/}, and can be freely
distributed. The same site also contains distributions of and
pointers to many free third party Python modules, programs and tools,
and additional documentation.
@@ -105,7 +105,7 @@ reused in other Python programs. It comes with a large collection of
standard modules that you can use as the basis of your programs --- or
as examples to start learning to program in Python. There are also
built-in modules that provide things like file I/O, system calls,
-sockets, and even interfaces to GUI toolkits like Tk.
+sockets, and even interfaces to graphical user interface toolkits like Tk.
Python is an interpreted language, which can save you considerable time
during program development because no compilation and linking is
@@ -745,7 +745,7 @@ The built-in function \function{len()} returns the length of a string:
Starting with Python 2.0 a new data type for storing text data is
available to the programmer: the Unicode object. It can be used to
-store and manipulate Unicode data (see \url{http://www.unicode.org})
+store and manipulate Unicode data (see \url{http://www.unicode.org/})
and integrates well with the existing string objects providing
auto-conversions where necessary.
@@ -3936,7 +3936,7 @@ you an idea of what's available.
The major Python Web site is \url{http://www.python.org/}; it contains
code, documentation, and pointers to Python-related pages around the
-Web. This web site is mirrored in various places around the
+Web. This Web site is mirrored in various places around the
world, such as Europe, Japan, and Australia; a mirror may be faster
than the main site, depending on your geographical location. A more
informal site is \url{http://starship.python.net/}, which contains a